diff --git a/Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib b/Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib index a9ce772c..71f1e3e5 100644 --- a/Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib +++ b/Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib @@ -391,7 +391,7 @@ CA - + @@ -1023,8 +1023,8 @@ DQ + - diff --git a/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/Contents.json b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/Contents.json index f8f827e4..3e1071d4 100644 --- a/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/Contents.json +++ b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/Contents.json @@ -1,16 +1,14 @@ { "images" : [ { - "idiom" : "universal", + "idiom" : "mac", + "filename" : "floppy32.png", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "mac", + "filename" : "floppy64.png", "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" } ], "info" : { diff --git a/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy32.png b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy32.png new file mode 100644 index 00000000..52c1bb20 Binary files /dev/null and b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy32.png differ diff --git a/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy64.png b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy64.png new file mode 100644 index 00000000..ae2e8183 Binary files /dev/null and b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy64.png differ diff --git a/Apple2Mac/Apple2Mac/Images.xcassets/Run.imageset/Contents.json b/Apple2Mac/Apple2Mac/Images.xcassets/Run.imageset/Contents.json index 8d226a5d..8e103777 100644 --- a/Apple2Mac/Apple2Mac/Images.xcassets/Run.imageset/Contents.json +++ b/Apple2Mac/Apple2Mac/Images.xcassets/Run.imageset/Contents.json @@ -1,17 +1,13 @@ { "images" : [ { - "idiom" : "universal", + "idiom" : "mac", "filename" : "StepForwardNormalBlue.png", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "mac", "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" } ], "info" : { diff --git a/Apple2Mac/Apple2Mac/disksViewController.h b/Apple2Mac/Apple2Mac/disksViewController.h index 9e8fdcf9..46ae3f40 100644 --- a/Apple2Mac/Apple2Mac/disksViewController.h +++ b/Apple2Mac/Apple2Mac/disksViewController.h @@ -11,6 +11,8 @@ @interface disksViewController : UIViewController @property (retain, nonatomic) IBOutlet UIPickerView *disk1Picker; @property (retain, nonatomic) IBOutlet UIPickerView *disk2Picker; +@property (retain, nonatomic) IBOutlet UISwitch *diskAProtection; +@property (retain, nonatomic) IBOutlet UISwitch *diskBProtection; @property (strong,nonatomic) NSArray *_disks; @property (retain,nonatomic) NSString *path; diff --git a/Apple2Mac/Apple2Mac/disksViewController.m b/Apple2Mac/Apple2Mac/disksViewController.m index 7a804461..1c2e52ec 100644 --- a/Apple2Mac/Apple2Mac/disksViewController.m +++ b/Apple2Mac/Apple2Mac/disksViewController.m @@ -20,7 +20,9 @@ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); - self.path = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"Disks"]; + //self.path = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"Disks"]; + self.path = [paths objectAtIndex:0]; + NSLog(@"Path:%@",self.path); self._disks=[[NSFileManager defaultManager] contentsOfDirectoryAtPath:self.path error:NULL]; // Connect data @@ -54,9 +56,23 @@ { // This method is triggered whenever the user makes a change to the picker selection. // The parameter named row and component represents what was selected. - NSLog(@"Selected Row %d %@", row,(NSString*)[self._disks objectAtIndex:row]); - disk6_eject(0); - const char *errMsg = disk6_insert(0, [[self.path stringByAppendingPathComponent:[self._disks objectAtIndex:row]] UTF8String], YES); + int drive=0; + BOOL ro=YES; + + if(pickerView==self.disk1Picker) + { + drive=0; + ro=self.diskAProtection.on; + } + if(pickerView==self.disk2Picker) + { + drive=1; + ro=self.diskBProtection.on; + } + + NSLog(@"Selected Row %d %@ %c", row,(NSString*)[self._disks objectAtIndex:row],ro); + disk6_eject(drive); + const char *errMsg = disk6_insert(drive, [[self.path stringByAppendingPathComponent:[self._disks objectAtIndex:row]] UTF8String], ro); } - (IBAction)unwindToMainViewController:(UIStoryboardSegue*)sender @@ -68,5 +84,10 @@ cpu_resume(); } +- (void)dealloc { + [_diskAProtection release]; + [_diskBProtection release]; + [super dealloc]; +} @end diff --git a/Apple2Mac/Apple2Mac/en.lproj/MainMenu.xib b/Apple2Mac/Apple2Mac/en.lproj/MainMenu.xib index 48ee495d..d9ff21a2 100644 --- a/Apple2Mac/Apple2Mac/en.lproj/MainMenu.xib +++ b/Apple2Mac/Apple2Mac/en.lproj/MainMenu.xib @@ -391,7 +391,7 @@ CA - + @@ -811,7 +811,7 @@ DQ - + @@ -1023,8 +1023,8 @@ DQ + - diff --git a/Apple2Mac/Apple2Mac/fr.lproj/MainMenu.xib b/Apple2Mac/Apple2Mac/fr.lproj/MainMenu.xib index 3da041b7..5a6af8b1 100644 --- a/Apple2Mac/Apple2Mac/fr.lproj/MainMenu.xib +++ b/Apple2Mac/Apple2Mac/fr.lproj/MainMenu.xib @@ -399,7 +399,7 @@ CA - + @@ -1054,8 +1054,8 @@ DQ + - diff --git a/Apple2Mac/Apple2iOS/Assets.xcassets/Disk.imageset/floppy.png b/Apple2Mac/Apple2iOS/Assets.xcassets/Disk.imageset/floppy.png index 8f7b8023..8edadee9 100644 Binary files a/Apple2Mac/Apple2iOS/Assets.xcassets/Disk.imageset/floppy.png and b/Apple2Mac/Apple2iOS/Assets.xcassets/Disk.imageset/floppy.png differ diff --git a/Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard b/Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard index 69389ea1..da4c3bff 100644 --- a/Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard +++ b/Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard @@ -202,22 +202,42 @@ - + - @@ -232,11 +252,13 @@ + + - +