Misc tweaks for Mac version

* Accessing disks and prefs windows forces app into "almost-fullscreen"
    * Added emulator icons
    * Mac version is 0.9
    * About text updated

Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj

@@ -1218,7 +1218,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = YES;
+				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

Apple2Mac/Apple2Mac/Apple2Mac-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib

@@ -38,7 +38,7 @@ CA
                                     <items>
                                         <menuItem title="Insert..." keyEquivalent="D" id="Oj8-qO-A80" userLabel="Menu Item - Insert">
                                             <connections>
-                                                <action selector="makeKeyAndOrderFront:" target="RAk-at-ZT4" id="KbU-Gy-HOD"/>
+                                                <action selector="showDisksWindow:" target="M8b-ga-iOS" id="GVw-D1-gi0"/>
                                             </connections>
                                         </menuItem>
                                     </items>
@@ -49,7 +49,7 @@ CA
                             </menuItem>
                             <menuItem title="Preferences…" keyEquivalent="," id="129">
                                 <connections>
-                                    <action selector="makeKeyAndOrderFront:" target="Mzv-VG-jce" id="Oek-48-Eyd"/>
+                                    <action selector="showPreferences:" target="M8b-ga-iOS" id="oDD-g4-QEJ"/>
                                 </connections>
                             </menuItem>
                             <menuItem title="Toggle Full Screen" keyEquivalent="F" id="rP9-cs-9dM">
@@ -723,14 +723,5 @@ DQ
                 <outlet property="soundCardChoice" destination="3d5-Z5-xDN" id="uHI-Ip-s2E"/>
             </connections>
         </customObject>
-        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="pRW-C0-1xO">
-            <rect key="frame" x="0.0" y="0.0" width="38" height="17"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="F3o-9U-Mth">
-                <font key="font" metaFont="system"/>
-                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-            </textFieldCell>
-        </textField>
     </objects>
 </document>

Apple2Mac/Apple2Mac/Classes/OSX/EmulatorWindowController.m

@@ -64,14 +64,36 @@
     cpu65_reboot();
 }
 
+- (IBAction)showDisksWindow:(id)sender
+{
+    if (self.fullscreenWindow)
+    {
+        [self toggleFullScreen:nil];
+        [self.standardWindow setFrame:[[NSScreen mainScreen] frame] display:YES];
+    }
+    [self.disksWindow makeKeyAndOrderFront:sender];
+}
+
+- (IBAction)showPreferences:(id)sender
+{
+    if (self.fullscreenWindow)
+    {
+        [self toggleFullScreen:nil];
+        [self.standardWindow setFrame:[[NSScreen mainScreen] frame] display:YES];
+    }
+    [self.prefsWindow makeKeyAndOrderFront:sender];
+}
+
 - (IBAction)toggleFullScreen:(id)sender
 {
     if (self.fullscreenWindow)
     {
+        [NSCursor unhide];
         [self goWindow];
     }
     else
     {
+        [NSCursor hide];
         [self goFullscreen];
     }
 }

Apple2Mac/Apple2Mac/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,43 +1,51 @@
 {
   "images" : [
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "2e-16.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "2e-32.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "2e-32-1.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "2e-64.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "2e-128.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "2e-256.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "2e-256-1.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "2e-512.png",
       "scale" : "2x"
     },
     {

Apple2Mac/Apple2Mac/en.lproj/Credits.rtf

@@ -1,31 +1,26 @@
-{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\paperw9840\paperh8400
+\vieww9600\viewh8400\viewkind0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl216\slmult1\qc
 
-\f0\b\fs24 \cf0 Engineering:
+\f0\b\fs24 \cf0 Authors
 \b0 \
 Aaron Culliney\
-        and\
+and other contributors\
-        A Cast of Characters\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl120\slmult1\qc
-\
+\cf0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl216\slmult1\qc
 
-\b Human Interface Design:
+\b \cf0 Web Resources
 \b0 \
-	A starving artist\
-\
 
-\b Testing:
+\i ftp.apple.asimov.net
-\b0 \
+\i0  and elsewhere\
-	Yes, but not on any animals\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl120\slmult1
-\
+\cf0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl216\slmult1\qc
 
-\b Documentation:
+\b \cf0 Special thanks to
 \b0 \
-	Really?\
+The Shm00}
-\
-
-\b With special thanks to:
-\b0 \
-	The Shm00\
-}