From 75114c37ebb202aa2db8519783a497091e356320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesu=CC=81s=20A=2E=20A=CC=81lvarez?= <zydeco@namedfork.net>
Date: Sat, 28 May 2016 22:20:55 +0200
Subject: [PATCH] add settings UI for choosing emulated machine

---
 Mini vMac.xcodeproj/project.pbxproj  |  24 ++++++++
 Mini vMac/AppDelegate.h              |   2 +-
 Mini vMac/AppDelegate.m              |   5 +-
 Mini vMac/Base.lproj/Main.storyboard |  38 +++++++++---
 Mini vMac/Emulator.m                 |   4 ++
 Mini vMac/EmulatorProtocol.h         |   1 +
 Mini vMac/MacII/Info.plist           |   4 ++
 Mini vMac/MacII/MacII.png            | Bin 0 -> 178 bytes
 Mini vMac/MacII/MacII@2x.png         | Bin 0 -> 204 bytes
 Mini vMac/MacII/MacII@3x.png         | Bin 0 -> 230 bytes
 Mini vMac/MacPlus4M/Info.plist       |   6 +-
 Mini vMac/MacPlus4M/MacPlus.png      | Bin 0 -> 203 bytes
 Mini vMac/MacPlus4M/MacPlus@2x.png   | Bin 0 -> 235 bytes
 Mini vMac/MacPlus4M/MacPlus@3x.png   | Bin 0 -> 265 bytes
 Mini vMac/SettingsViewController.m   |  85 ++++++++++++++++++++-------
 15 files changed, 136 insertions(+), 33 deletions(-)
 create mode 100644 Mini vMac/MacII/MacII.png
 create mode 100644 Mini vMac/MacII/MacII@2x.png
 create mode 100644 Mini vMac/MacII/MacII@3x.png
 create mode 100644 Mini vMac/MacPlus4M/MacPlus.png
 create mode 100644 Mini vMac/MacPlus4M/MacPlus@2x.png
 create mode 100644 Mini vMac/MacPlus4M/MacPlus@3x.png

diff --git a/Mini vMac.xcodeproj/project.pbxproj b/Mini vMac.xcodeproj/project.pbxproj
index 9098150..6b62bac 100644
--- a/Mini vMac.xcodeproj/project.pbxproj	
+++ b/Mini vMac.xcodeproj/project.pbxproj	
@@ -45,6 +45,12 @@
 		283423E01CF9C66D0088B634 /* VIA2EMDV.c in Sources */ = {isa = PBXBuildFile; fileRef = 283423591CF9C0F10088B634 /* VIA2EMDV.c */; };
 		283423E11CF9C66D0088B634 /* VIAEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 2834235B1CF9C0F10088B634 /* VIAEMDEV.c */; };
 		283423E21CF9C66D0088B634 /* VIDEMDEV.c in Sources */ = {isa = PBXBuildFile; fileRef = 2834235D1CF9C0F10088B634 /* VIDEMDEV.c */; };
+		283423E91CFA32870088B634 /* MacPlus.png in Resources */ = {isa = PBXBuildFile; fileRef = 283423E31CFA32800088B634 /* MacPlus.png */; };
+		283423EA1CFA32870088B634 /* MacPlus@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 283423E41CFA32800088B634 /* MacPlus@2x.png */; };
+		283423EB1CFA32870088B634 /* MacPlus@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 283423E51CFA32800088B634 /* MacPlus@3x.png */; };
+		283423EF1CFA329C0088B634 /* MacII.png in Resources */ = {isa = PBXBuildFile; fileRef = 283423EC1CFA329C0088B634 /* MacII.png */; };
+		283423F01CFA329C0088B634 /* MacII@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 283423ED1CFA329C0088B634 /* MacII@2x.png */; };
+		283423F11CFA329C0088B634 /* MacII@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 283423EE1CFA329C0088B634 /* MacII@3x.png */; };
 		28848B621CDE97D600B86C45 /* InsertDiskViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28848B611CDE97D600B86C45 /* InsertDiskViewController.m */; };
 		28848B651CDE97E900B86C45 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28848B641CDE97E900B86C45 /* SettingsViewController.m */; };
 		28BA897E1CE7315400A98104 /* KBKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 28BA89751CE7315400A98104 /* KBKey.m */; };
@@ -219,6 +225,12 @@
 		2834239A1CF9C5380088B634 /* CNFGRAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNFGRAPI.h; sourceTree = "<group>"; };
 		2834239B1CF9C5380088B634 /* EMCONFIG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EMCONFIG.h; sourceTree = "<group>"; };
 		2834239C1CF9C5380088B634 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		283423E31CFA32800088B634 /* MacPlus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = MacPlus.png; sourceTree = "<group>"; };
+		283423E41CFA32800088B634 /* MacPlus@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "MacPlus@2x.png"; sourceTree = "<group>"; };
+		283423E51CFA32800088B634 /* MacPlus@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "MacPlus@3x.png"; sourceTree = "<group>"; };
+		283423EC1CFA329C0088B634 /* MacII.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = MacII.png; sourceTree = "<group>"; };
+		283423ED1CFA329C0088B634 /* MacII@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "MacII@2x.png"; sourceTree = "<group>"; };
+		283423EE1CFA329C0088B634 /* MacII@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "MacII@3x.png"; sourceTree = "<group>"; };
 		28848B601CDE97D600B86C45 /* InsertDiskViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InsertDiskViewController.h; sourceTree = "<group>"; };
 		28848B611CDE97D600B86C45 /* InsertDiskViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InsertDiskViewController.m; sourceTree = "<group>"; };
 		28848B631CDE97E900B86C45 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
@@ -350,6 +362,9 @@
 				283422E81CF8F1C80088B634 /* CNFGRAPI.h */,
 				283422E91CF8F1C80088B634 /* EMCONFIG.h */,
 				283422CE1CF8EF8C0088B634 /* Info.plist */,
+				283423E31CFA32800088B634 /* MacPlus.png */,
+				283423E41CFA32800088B634 /* MacPlus@2x.png */,
+				283423E51CFA32800088B634 /* MacPlus@3x.png */,
 			);
 			path = MacPlus4M;
 			sourceTree = "<group>";
@@ -451,6 +466,9 @@
 				2834239A1CF9C5380088B634 /* CNFGRAPI.h */,
 				2834239B1CF9C5380088B634 /* EMCONFIG.h */,
 				2834239C1CF9C5380088B634 /* Info.plist */,
+				283423EC1CFA329C0088B634 /* MacII.png */,
+				283423ED1CFA329C0088B634 /* MacII@2x.png */,
+				283423EE1CFA329C0088B634 /* MacII@3x.png */,
 			);
 			path = MacII;
 			sourceTree = "<group>";
@@ -791,6 +809,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				283423E91CFA32870088B634 /* MacPlus.png in Resources */,
+				283423EA1CFA32870088B634 /* MacPlus@2x.png in Resources */,
+				283423EB1CFA32870088B634 /* MacPlus@3x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -798,6 +819,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				283423EF1CFA329C0088B634 /* MacII.png in Resources */,
+				283423F01CFA329C0088B634 /* MacII@2x.png in Resources */,
+				283423F11CFA329C0088B634 /* MacII@3x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Mini vMac/AppDelegate.h b/Mini vMac/AppDelegate.h
index 2057905..b409dd9 100644
--- a/Mini vMac/AppDelegate.h	
+++ b/Mini vMac/AppDelegate.h	
@@ -14,7 +14,7 @@
 @property (strong, nonatomic) UIWindow *window;
 @property (nonatomic, readonly) NSString *documentsPath;
 @property (nonatomic, readonly) NSArray<NSString*> *diskImageExtensions;
-@property (nonatomic, readonly) NSArray<NSBundle*> *availableEmulators;
+@property (nonatomic, readonly) NSArray<NSBundle*> *emulatorBundles;
 @property (readonly, nonatomic, getter = isSandboxed) BOOL sandboxed;
 
 + (instancetype)sharedInstance;
diff --git a/Mini vMac/AppDelegate.m b/Mini vMac/AppDelegate.m
index 9ae834c..f13b1ff 100644
--- a/Mini vMac/AppDelegate.m	
+++ b/Mini vMac/AppDelegate.m	
@@ -50,7 +50,7 @@ static NSObject<Emulator> *sharedEmulator = nil;
     NSDictionary *defaultValues = @{@"trackpad": @([UIDevice currentDevice].userInterfaceIdiom != UIUserInterfaceIdiomPad),
                                     @"frameskip": @(0),
                                     @"keyboardLayout": layoutForLanguage[firstLanguage],
-                                    @"machine": @"MacII"
+                                    @"machine": @"MacPlus4M"
                                     };
     
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -67,7 +67,7 @@ static NSObject<Emulator> *sharedEmulator = nil;
     }
 }
 
-- (NSArray<NSBundle*>*)availableEmulators {
+- (NSArray<NSBundle*>*)emulatorBundles {
     NSString *pluginsPath = [NSBundle mainBundle].builtInPlugInsPath;
     NSArray<NSString*> *names = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:pluginsPath error:NULL];
     NSMutableArray *emulatorBundles = [NSMutableArray arrayWithCapacity:names.count];
@@ -79,7 +79,6 @@ static NSObject<Emulator> *sharedEmulator = nil;
 }
 
 - (BOOL)loadEmulator:(NSString*)name {
-    NSLog(@"Loading %@", name);
     NSString *emulatorBundleName = [name stringByAppendingPathExtension:@"mnvm"];
     NSString *emulatorBundlePath = [[NSBundle mainBundle].builtInPlugInsPath stringByAppendingPathComponent:emulatorBundleName];
     NSBundle *emulatorBundle = [NSBundle bundleWithPath:emulatorBundlePath];
diff --git a/Mini vMac/Base.lproj/Main.storyboard b/Mini vMac/Base.lproj/Main.storyboard
index 337ea91..86cebb3 100644
--- a/Mini vMac/Base.lproj/Main.storyboard	
+++ b/Mini vMac/Base.lproj/Main.storyboard	
@@ -48,7 +48,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="9gA-gD-7Wx">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="speed" id="v4I-0T-H8m">
                                 <rect key="frame" x="0.0" y="93.5" width="600" height="44"/>
@@ -115,13 +115,13 @@
                                             <rect key="frame" x="15" y="0.0" width="570" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
                                 </tableViewCellContentView>
                             </tableViewCell>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="about" textLabel="znE-ML-UrQ" detailTextLabel="xcq-HY-ZDe" style="IBUITableViewCellStyleValue1" id="MGj-K1-5lZ">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="machine" textLabel="znE-ML-UrQ" detailTextLabel="xcq-HY-ZDe" style="IBUITableViewCellStyleSubtitle" id="MGj-K1-5lZ">
                                 <rect key="frame" x="0.0" y="225.5" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MGj-K1-5lZ" id="ueO-zm-JQP">
@@ -129,17 +129,41 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="znE-ML-UrQ">
+                                            <rect key="frame" x="15" y="6" width="31.5" height="19.5"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xcq-HY-ZDe">
+                                            <rect key="frame" x="15" y="25.5" width="30.5" height="13.5"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                            <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="about" textLabel="YWX-qF-gPj" detailTextLabel="xr3-v1-hzM" style="IBUITableViewCellStyleValue1" id="Mon-vq-IrO">
+                                <rect key="frame" x="0.0" y="269.5" width="600" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Mon-vq-IrO" id="mGZ-Jb-6j4">
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YWX-qF-gPj">
                                             <rect key="frame" x="15" y="12" width="31.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xcq-HY-ZDe">
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xr3-v1-hzM">
                                             <rect key="frame" x="543.5" y="12" width="41.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
@@ -205,7 +229,7 @@
                                             <rect key="frame" x="15" y="12" width="31.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" id="CbL-Kq-e9s">
diff --git a/Mini vMac/Emulator.m b/Mini vMac/Emulator.m
index b2f54dc..9d18b54 100644
--- a/Mini vMac/Emulator.m	
+++ b/Mini vMac/Emulator.m	
@@ -56,6 +56,10 @@ static dispatch_once_t onceToken;
     return WantInitSpeedValue;
 }
 
+- (NSBundle *)bundle {
+    return [NSBundle bundleForClass:self.class];
+}
+
 - (NSInteger)speed {
     return SpeedValue;
 }
diff --git a/Mini vMac/EmulatorProtocol.h b/Mini vMac/EmulatorProtocol.h
index eb73a8d..90d27c1 100644
--- a/Mini vMac/EmulatorProtocol.h	
+++ b/Mini vMac/EmulatorProtocol.h	
@@ -17,6 +17,7 @@
 @property (nonatomic, assign) NSInteger speed;
 @property (nonatomic, weak) CALayer *screenLayer;
 
+@property (nonatomic, readonly) NSBundle *bundle;
 @property (nonatomic, readonly) CGSize screenSize;
 @property (nonatomic, readonly) NSString *insertDiskNotification, *ejectDiskNotification;
 @property (nonatomic, readonly) NSInteger initialSpeed;
diff --git a/Mini vMac/MacII/Info.plist b/Mini vMac/MacII/Info.plist
index ae9fbc8..ced6acd 100644
--- a/Mini vMac/MacII/Info.plist	
+++ b/Mini vMac/MacII/Info.plist	
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDisplayName</key>
 	<string>Mac II</string>
+	<key>CFBundleGetInfoString</key>
+	<string>8M, 1024×768 @ 8-bit, no sound</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -24,5 +26,7 @@
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
 	<string>Emulator</string>
+	<key>CFBundleIconFile</key>
+	<string>MacII.png</string>
 </dict>
 </plist>
diff --git a/Mini vMac/MacII/MacII.png b/Mini vMac/MacII/MacII.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb089cd4b7e4038f25157367ace241adfd55ed5d
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJN>3NZkcwMxryk@ypuppr+g{45
zeo9X70h8VZMj3^--<94jz0e&0qW*&ipOce;REvNUha$^diN*1aN$Y!;TstLjR6O&*
znO*O!UH*N^ofChqk1Z;jCtp}$#|4&SOEnljZF|5W{pX?7BUhu%Hw#TB1bv$G`Af&G
cFZ&;`^lCSji*<GS0v*BN>FVdQ&MBb@03P2(h5!Hn

literal 0
HcmV?d00001

diff --git a/Mini vMac/MacII/MacII@2x.png b/Mini vMac/MacII/MacII@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e103a22c248a095e974d1f321195927c729dec0e
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0J61mIfqm-MY1O>C*rI
znLdC1%y5?BIRj&PdHI0@2W~c{-vmlCmIV0)GdMiE0a6?3>Eakt!I&&@FF~ZIDbRq6
zW$Fhe$3t9GdOk9#?$RhI<m4@7WSp@(V8#&*kHg#@fe)I*1p*vY%_XF#Pk+qsd5Fu(
wibHEbVGh@>2hB$`X6)pWS6S2WsfLkZ8|V4Ip7X1h0WD$hboFyt=akR{0A=MxUH||9

literal 0
HcmV?d00001

diff --git a/Mini vMac/MacII/MacII@3x.png b/Mini vMac/MacII/MacII@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5ccfcb254752c0409b32696c83de1c34922ce08
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!S1AIbUfpl708j!qo>(<hxOaK38
z`uzDb!&!#s42<RF<p&NNxY?9`6DZAC666=m;PC7QNNusFi(^Q|t+&^$`5F`iTm$F#
z$lv(iq*@~4mLwy5yqYV6W4oe&8c-n!95}6VHcy3><BI0am9vF^cpjLwbmP66qyono
z2VSZ99Jo_sc|cR@N^Dv5WI0it4dyHrU*5B-%$#{#LTy5^-qMO5MW#O&^_baj=9}~X
SR1De;GSbu4&t;ucLK6V`c2V#E

literal 0
HcmV?d00001

diff --git a/Mini vMac/MacPlus4M/Info.plist b/Mini vMac/MacPlus4M/Info.plist
index beb84b3..721411f 100644
--- a/Mini vMac/MacPlus4M/Info.plist	
+++ b/Mini vMac/MacPlus4M/Info.plist	
@@ -3,7 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDisplayName</key>
-	<string>Mac Plus 4M</string>
+	<string>Mac Plus</string>
+	<key>CFBundleGetInfoString</key>
+	<string>4M, 512×342</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -24,5 +26,7 @@
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
 	<string>Emulator</string>
+	<key>CFBundleIconFile</key>
+	<string>MacPlus.png</string>
 </dict>
 </plist>
diff --git a/Mini vMac/MacPlus4M/MacPlus.png b/Mini vMac/MacPlus4M/MacPlus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d3f4d72de298b2e0e77e5639513e150ffc3f655
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJNuDl_Ar*{or-h5MDDp5ApDJi(
zo%4Xf(y*bic;nv7H{*=npUp38$Snvz)$FtAN|bz(@$X8;IiG#=xL&YLnVqwMfeVBh
zp0k<cJ^eX9nd^k8pl&!jgHv)%D5E*+pNH2acnS>vt2!TfF3V`k%KKC?Er3fg#_IoH
y$z;RN%uA*y);g}^Ue6ui)q1A)B)^3VyXfp0ZHag9#+n0N$KdJe=d#Wzp$Pzejz`J>

literal 0
HcmV?d00001

diff --git a/Mini vMac/MacPlus4M/MacPlus@2x.png b/Mini vMac/MacPlus4M/MacPlus@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a361cec74a6688149ba5ea4e89a276887c1ac02
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e^#Gp`S0D`pw{G1^OG~?T>pu{j
zJ$shnEW>jK#`5xVdwct7)21z5y0onA&JCbC#*!evU<QY0H`0KdB2O2`kP61+1wsNx
zxI6+BR<ww6T#9Zqlv0Rn+{i7(AscG2Dj}pXNJA<>DUeZ3;uqH?hlUW=r%w%v7dE7@
z%E~H4MoeJlHax_o@%?B*C-<q>IxS5z6B2lsRwp!=u<l;Su!uv)cTtmZK*N%@2-Yd>
a%naRK#%%`XGadkKXYh3Ob6Mw<&;$U2luq3M

literal 0
HcmV?d00001

diff --git a/Mini vMac/MacPlus4M/MacPlus@3x.png b/Mini vMac/MacPlus4M/MacPlus@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..239e88006d22c170292e4d3517ea64cb61278b15
GIT binary patch
literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy$o1AIbUfiw`@x^*ipE$!B=|3Gl|
z>{*7h49^)D%gf8{?d_*co3?c6(z3QYH-PFGOM?7@862M7NCR>vc)B=-RNQ)d%a^M`
zLBQeRsb&9v&);qk6Vb`D>tyA7hR=-)xVI|j))t;+O8gaY$CQQP!8uK1mX?=`jRYA%
zw!**)o)(vz4}KdTNabKS5Z|bIPQ>8%zUdYdO%p!WG6_9*@@2@`qH`dVD?spp={Avw
x_?<g+=L#nHe>o<%_$`C`qBU2z4xAUzEnpJ+9hj1kcXbNLTu)a&mvv4FO#sdUV{iZf

literal 0
HcmV?d00001

diff --git a/Mini vMac/SettingsViewController.m b/Mini vMac/SettingsViewController.m
index f57310f..9955817 100644
--- a/Mini vMac/SettingsViewController.m	
+++ b/Mini vMac/SettingsViewController.m	
@@ -13,9 +13,18 @@
 
 @end
 
+typedef enum : NSInteger {
+    SettingsSectionSpeed,
+    SettingsSectionMouse,
+    SettingsSectionKeyboard,
+    SettingsSectionMachine,
+    SettingsSectionAbout
+} SettingsSection;
+
 @implementation SettingsViewController
 {
     NSArray *keyboardLayouts;
+    NSArray<NSBundle*> *emulatorBundles;
     NSString *aboutTitle;
     NSArray<NSDictionary<NSString*,NSString*>*> *aboutItems;
     UITextView *footerView;
@@ -24,6 +33,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     keyboardLayouts = [[NSBundle mainBundle] pathsForResourcesOfType:@"nfkeyboardlayout" inDirectory:@"Keyboard Layouts"];
+    emulatorBundles = [AppDelegate sharedInstance].emulatorBundles;
     [self loadCredits];
 }
 
@@ -79,42 +89,59 @@
 #pragma mark - Table view data source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return 4;
+    return 5;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    if (section == 2) {
-        return keyboardLayouts.count;
-    } else if (section == 3) {
-        return aboutItems.count;
-    } else {
-        return 1;
+    switch (section) {
+        case SettingsSectionKeyboard:
+            return keyboardLayouts.count;
+        case SettingsSectionMachine:
+            return emulatorBundles.count;
+        case SettingsSectionAbout:
+            return aboutItems.count;
+        default:
+            return 1;
     }
 }
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
     switch (section) {
-        case 0: return NSLocalizedString(@"Speed", nil);
-        case 1: return NSLocalizedString(@"Mouse Type", nil);
-        case 2: return NSLocalizedString(@"Keyboard Layout", nil);
-        case 3: return aboutTitle;
-        default: return nil;
+        case SettingsSectionSpeed:
+            return NSLocalizedString(@"Speed", nil);
+        case SettingsSectionMouse:
+            return NSLocalizedString(@"Mouse Type", nil);
+        case SettingsSectionMachine:
+            return NSLocalizedString(@"Emulated Machine", nil);
+        case SettingsSectionKeyboard:
+            return NSLocalizedString(@"Keyboard Layout", nil);
+        case SettingsSectionAbout:
+            return aboutTitle;
+        default:return nil;
     }
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
-    if (section == 3) {
+    if (section == SettingsSectionAbout) {
         return footerView;
     } else {
         return nil;
     }
 }
 
+- (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section {
+    if (section == SettingsSectionMachine) {
+        return NSLocalizedString(@"Changing the emulated machine requires to relaunch Mini vMac", nil);
+    } else {
+        return nil;
+    }
+}
+
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
-    if (section == 3) {
+    if (section == SettingsSectionAbout) {
         return footerView.bounds.size.height;
     } else {
-        return 0.0;
+        return UITableViewAutomaticDimension;
     }
 }
 
@@ -122,21 +149,31 @@
     UITableViewCell *cell = nil;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSInteger section = indexPath.section;
-    if (section == 0) {
+    if (section == SettingsSectionSpeed) {
         cell = [tableView dequeueReusableCellWithIdentifier:@"speed" forIndexPath:indexPath];
         UISegmentedControl *speedControl = (UISegmentedControl*)[cell viewWithTag:128];
         speedControl.selectedSegmentIndex = [defaults integerForKey:@"speedValue"];
-    } else if (section == 1) {
+    } else if (section == SettingsSectionMouse) {
         cell = [tableView dequeueReusableCellWithIdentifier:@"mouse" forIndexPath:indexPath];
         UISegmentedControl *mouseControl = (UISegmentedControl*)[cell viewWithTag:128];
         mouseControl.selectedSegmentIndex = [defaults boolForKey:@"trackpad"] ? 1 : 0;
-    } else if (section == 2) {
+    } else if (section == SettingsSectionKeyboard) {
         cell = [tableView dequeueReusableCellWithIdentifier:@"keyboard" forIndexPath:indexPath];
         NSString *layout = keyboardLayouts[indexPath.row];
         cell.textLabel.text = layout.lastPathComponent.stringByDeletingPathExtension;
         BOOL selected = [[defaults stringForKey:@"keyboardLayout"] isEqualToString:layout.lastPathComponent];
         cell.accessoryType = selected ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone;
-    } else if (section == 3) {
+    } else if (section == SettingsSectionMachine) {
+        NSBundle *bundle = emulatorBundles[indexPath.row];
+        NSString *bundleName = bundle.bundlePath.lastPathComponent.stringByDeletingPathExtension;
+        cell = [tableView dequeueReusableCellWithIdentifier:@"machine" forIndexPath:indexPath];
+        cell.textLabel.text = [bundle objectForInfoDictionaryKey:@"CFBundleDisplayName"];
+        cell.detailTextLabel.text = [bundle objectForInfoDictionaryKey:@"CFBundleGetInfoString"];
+        NSString *iconName = [bundle objectForInfoDictionaryKey:@"CFBundleIconFile"];
+        cell.imageView.image = [UIImage imageNamed:iconName inBundle:bundle compatibleWithTraitCollection:nil];
+        BOOL selected = [[defaults stringForKey:@"machine"] isEqualToString:bundleName];
+        cell.accessoryType = selected ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone;
+    } else if (section == SettingsSectionAbout) {
         cell = [tableView dequeueReusableCellWithIdentifier:@"about" forIndexPath:indexPath];
         NSDictionary<NSString*,NSString*> *item = aboutItems[indexPath.row];
         cell.textLabel.text = item[@"text"];
@@ -156,12 +193,18 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    if (indexPath.section == 2) {
+    if (indexPath.section == SettingsSectionKeyboard) {
         // selected keyboard layout
         NSString *layout = keyboardLayouts[indexPath.row];
         [defaults setValue:layout.lastPathComponent forKey:@"keyboardLayout"];
         [tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationAutomatic];
-    } if (indexPath.section == 3) {
+    } else if (indexPath.section == SettingsSectionMachine) {
+        // selected emulated machine
+        NSBundle *bundle = emulatorBundles[indexPath.row];
+        NSString *bundleName = bundle.bundlePath.lastPathComponent.stringByDeletingPathExtension;
+        [defaults setValue:bundleName forKey:@"machine"];
+        [tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationAutomatic];
+    } else if (indexPath.section == SettingsSectionAbout) {
         // links in about
         NSString *linkURL = aboutItems[indexPath.row][@"link"];
         if (linkURL != nil) {