diff --git a/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj b/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj index fb5dd90e..5ce2e5e0 100644 --- a/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj +++ b/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj @@ -124,7 +124,8 @@ 4AFC17181AAE9CC000B215FA /* testvm1.nib.gz in Resources */ = {isa = PBXBuildFile; fileRef = 4AFC17101AAE9CC000B215FA /* testvm1.nib.gz */; }; 4E1733E31C2C5F7600CDF9DF /* iosPrefControllerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E4E62A01C2C5B56002E324F /* iosPrefControllerViewController.m */; }; 4E1733E41C2C5F7A00CDF9DF /* AppleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E1733DD1C2C5E5D00CDF9DF /* AppleViewController.m */; }; - 4E1733F01C2E958B00CDF9DF /* speedtest.dsk.gz in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ADC523519E8D3F600186B36 /* speedtest.dsk.gz */; }; + 4ECBEADF1C3432010046F537 /* speedtest.dsk in Resources */ = {isa = PBXBuildFile; fileRef = 4ECBEADD1C3432010046F537 /* speedtest.dsk */; }; + 4ECBEAE01C3432010046F537 /* testvm1.dsk in Resources */ = {isa = PBXBuildFile; fileRef = 4ECBEADE1C3432010046F537 /* testvm1.dsk */; }; 773B3D101956885A0085CE5F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 773B3D0F1956885A0085CE5F /* Cocoa.framework */; }; 773B3D1A1956885A0085CE5F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 773B3D181956885A0085CE5F /* InfoPlist.strings */; }; 773B3D201956885A0085CE5F /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 773B3D1E1956885A0085CE5F /* Credits.rtf */; }; @@ -354,7 +355,6 @@ dstPath = ./disks; dstSubfolderSpec = 16; files = ( - 4E1733F01C2E958B00CDF9DF /* speedtest.dsk.gz in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -378,7 +378,6 @@ 4ADC523219E8D3F600186B36 /* etc.dsk.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = etc.dsk.gz; sourceTree = ""; }; 4ADC523319E8D3F600186B36 /* mystery.dsk.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = mystery.dsk.gz; sourceTree = ""; }; 4ADC523419E8D3F600186B36 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; - 4ADC523519E8D3F600186B36 /* speedtest.dsk.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = speedtest.dsk.gz; sourceTree = ""; }; 4ADC523619E8D3F600186B36 /* speedtest.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = speedtest.txt; sourceTree = ""; }; 4ADC523719E8D3F600186B36 /* testdisplay1.dsk.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = testdisplay1.dsk.gz; sourceTree = ""; }; 4ADC523819E8D3F600186B36 /* testvm1.dsk.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = testvm1.dsk.gz; sourceTree = ""; }; @@ -400,6 +399,8 @@ 4E4586061C29F39A003E74A1 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Apple2iOS.strings; sourceTree = ""; }; 4E4E629F1C2C5B56002E324F /* iosPrefControllerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iosPrefControllerViewController.h; sourceTree = ""; }; 4E4E62A01C2C5B56002E324F /* iosPrefControllerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iosPrefControllerViewController.m; sourceTree = ""; }; + 4ECBEADD1C3432010046F537 /* speedtest.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; path = speedtest.dsk; sourceTree = ""; }; + 4ECBEADE1C3432010046F537 /* testvm1.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; path = testvm1.dsk; sourceTree = ""; }; 773B3D0C1956885A0085CE5F /* Apple2Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Apple2Mac.app; sourceTree = BUILT_PRODUCTS_DIR; }; 773B3D0F1956885A0085CE5F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 773B3D121956885A0085CE5F /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; @@ -598,6 +599,8 @@ isa = PBXGroup; children = ( 4AFC170F1AAE9CC000B215FA /* testdisplay1.nib.gz */, + 4ECBEADD1C3432010046F537 /* speedtest.dsk */, + 4ECBEADE1C3432010046F537 /* testvm1.dsk */, 4AFC17101AAE9CC000B215FA /* testvm1.nib.gz */, 4A6111A21A6A1DFC0035F7DE /* flapple140.po.gz */, 4A61119B1A6A1DE60035F7DE /* blank.po.gz */, @@ -606,7 +609,6 @@ 4ADC523219E8D3F600186B36 /* etc.dsk.gz */, 4ADC523319E8D3F600186B36 /* mystery.dsk.gz */, 4ADC523419E8D3F600186B36 /* README */, - 4ADC523519E8D3F600186B36 /* speedtest.dsk.gz */, 4ADC523619E8D3F600186B36 /* speedtest.txt */, 4ADC523719E8D3F600186B36 /* testdisplay1.dsk.gz */, 4ADC523819E8D3F600186B36 /* testvm1.dsk.gz */, @@ -1251,7 +1253,9 @@ 935C55461C12BE110013166D /* LaunchScreen.xib in Resources */, 935C55351C12BA5F0013166D /* Main.storyboard in Resources */, 935C55921C1371AD0013166D /* Basic.vsh in Resources */, + 4ECBEAE01C3432010046F537 /* testvm1.dsk in Resources */, 935C55911C1371AD0013166D /* Basic.fsh in Resources */, + 4ECBEADF1C3432010046F537 /* speedtest.dsk in Resources */, 93206C781C14E14000668153 /* Apple2iOS.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Apple2Mac/Apple2Mac/AppleViewController.h b/Apple2Mac/Apple2Mac/AppleViewController.h index 58555bae..71005b50 100644 --- a/Apple2Mac/Apple2Mac/AppleViewController.h +++ b/Apple2Mac/Apple2Mac/AppleViewController.h @@ -18,5 +18,6 @@ -(IBAction)prefsItemSelected:(id)sender; -(IBAction)toggleCPUSpeedItemSelected:(id)sender; -(IBAction)togglePauseItemSelected:(id)sender; +-(IBAction)diskInsert:(id)sender; @end diff --git a/Apple2Mac/Apple2Mac/AppleViewController.m b/Apple2Mac/Apple2Mac/AppleViewController.m index 4782c9df..82464960 100644 --- a/Apple2Mac/Apple2Mac/AppleViewController.m +++ b/Apple2Mac/Apple2Mac/AppleViewController.m @@ -42,6 +42,21 @@ - (IBAction)unwindToMainViewController:(UIStoryboardSegue*)sender { } +- (IBAction)diskInsert:(id)sender +{ + NSLog(@"LISTING ALL FILES FOUND"); + + int Count; + NSString *path; + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + path = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"Disks"]; + NSArray *directoryContent = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:NULL]; + for (Count = 0; Count < (int)[directoryContent count]; Count++) + { + NSLog(@"File %d: %@", (Count + 1), [directoryContent objectAtIndex:Count]); + } +} + -(IBAction)rebootItemSelected:(id)sender{ cpu65_reboot(); } diff --git a/Apple2Mac/Classes/OSX/EmulatorWindowController.m b/Apple2Mac/Classes/OSX/EmulatorWindowController.m index 79367081..bca5c5e0 100644 --- a/Apple2Mac/Classes/OSX/EmulatorWindowController.m +++ b/Apple2Mac/Classes/OSX/EmulatorWindowController.m @@ -65,6 +65,7 @@ { [[self disksWindow] close]; cpu65_reboot(); + } - (IBAction)showDisksWindow:(id)sender diff --git a/disks/speedtest.dsk b/disks/speedtest.dsk new file mode 100644 index 00000000..c10dd95c Binary files /dev/null and b/disks/speedtest.dsk differ diff --git a/disks/speedtest.dsk.gz b/disks/speedtest.dsk.gz deleted file mode 100644 index eacf34bc..00000000 Binary files a/disks/speedtest.dsk.gz and /dev/null differ diff --git a/disks/testvm1.dsk b/disks/testvm1.dsk new file mode 100644 index 00000000..8ca7fbd1 Binary files /dev/null and b/disks/testvm1.dsk differ