From 97700bbff6f3573067503afef785b32009ad63c4 Mon Sep 17 00:00:00 2001
From: jvernet <jeromevernet@hotmail.com>
Date: Sun, 27 Dec 2015 19:16:47 +0100
Subject: [PATCH] More IOS work
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

but it doesn’t work better.
---
 Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj | 20 ++++++++++++++-----
 Apple2Mac/Apple2Mac/AppleViewController.h     |  7 +++++--
 Apple2Mac/Apple2Mac/AppleViewController.m     |  6 ++++--
 .../Apple2iOS/Base.lproj/Main.storyboard      | 12 +++++++----
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj b/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj
index 62ae983e..fb5dd90e 100644
--- a/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj
+++ b/Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj
@@ -124,7 +124,7 @@
 		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 */; };
-		4E1733EA1C2CA71100CDF9DF /* speedtest.dsk.gz in Resources */ = {isa = PBXBuildFile; fileRef = 4ADC523519E8D3F600186B36 /* speedtest.dsk.gz */; };
+		4E1733F01C2E958B00CDF9DF /* speedtest.dsk.gz in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ADC523519E8D3F600186B36 /* speedtest.dsk.gz */; };
 		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 */; };
@@ -348,6 +348,16 @@
 			name = "Copy Files (1 item)";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4E1733EF1C2E955700CDF9DF /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = ./disks;
+			dstSubfolderSpec = 16;
+			files = (
+				4E1733F01C2E958B00CDF9DF /* speedtest.dsk.gz in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -584,7 +594,7 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		4ADC522F19E8D3F600186B36 /* disks */ = {
+		4ADC522F19E8D3F600186B36 /* Documents */ = {
 			isa = PBXGroup;
 			children = (
 				4AFC170F1AAE9CC000B215FA /* testdisplay1.nib.gz */,
@@ -601,7 +611,7 @@
 				4ADC523719E8D3F600186B36 /* testdisplay1.dsk.gz */,
 				4ADC523819E8D3F600186B36 /* testvm1.dsk.gz */,
 			);
-			name = disks;
+			name = Documents;
 			path = ../disks;
 			sourceTree = "<group>";
 		};
@@ -616,7 +626,7 @@
 				773B3D431956897D0085CE5F /* Classes */,
 				773B3D4519568A570085CE5F /* src */,
 				935C55A51C1389000013166D /* externals */,
-				4ADC522F19E8D3F600186B36 /* disks */,
+				4ADC522F19E8D3F600186B36 /* Documents */,
 				773B3D0E1956885A0085CE5F /* Frameworks */,
 				773B3D0D1956885A0085CE5F /* Products */,
 			);
@@ -1055,6 +1065,7 @@
 				935C55251C12BA5F0013166D /* Frameworks */,
 				935C55901C13715A0013166D /* ShellScript */,
 				935C55261C12BA5F0013166D /* Resources */,
+				4E1733EF1C2E955700CDF9DF /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -1235,7 +1246,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4E1733EA1C2CA71100CDF9DF /* speedtest.dsk.gz in Resources */,
 				935C55371C12BA5F0013166D /* Assets.xcassets in Resources */,
 				935C55431C12BCFD0013166D /* Apple2iOS-Info.plist in Resources */,
 				935C55461C12BE110013166D /* LaunchScreen.xib in Resources */,
diff --git a/Apple2Mac/Apple2Mac/AppleViewController.h b/Apple2Mac/Apple2Mac/AppleViewController.h
index 395c8b19..274f36cd 100644
--- a/Apple2Mac/Apple2Mac/AppleViewController.h
+++ b/Apple2Mac/Apple2Mac/AppleViewController.h
@@ -7,12 +7,15 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "iosPrefControllerViewController.h"
 
 @interface AppleViewController : UIViewController
 
 @property (assign) IBOutlet UIToolbar *mainToolBar;
+@property (assign) IBOutlet iosPrefControllerViewController *viewPrefs;
 
--(IBAction)rebootItem:(id)sender;
--(IBAction)prefsItem:(id)sender;
+-(IBAction)rebootItemSelected:(id)sender;
+-(IBAction)prefsItemSelected:(id)sender;
+-(IBAction)toggleCPUSpeedItemSelected:(id)sender;
 
 @end
diff --git a/Apple2Mac/Apple2Mac/AppleViewController.m b/Apple2Mac/Apple2Mac/AppleViewController.m
index b5ece9aa..5fdce5e1 100644
--- a/Apple2Mac/Apple2Mac/AppleViewController.m
+++ b/Apple2Mac/Apple2Mac/AppleViewController.m
@@ -36,13 +36,15 @@
     // Pass the selected object to the new view controller.
 }
 */
--(IBAction)rebootItem:(id)sender{
+-(IBAction)rebootItemSelected:(id)sender{
     cpu65_reboot();
 }
 
--(IBAction)prefsItem:(id)sender{
+-(IBAction)prefsItemSelected:(id)sender{
+    cpu_pause();
     //pause
     //show pref windows
+    cpu_resume();
 }
 
 - (IBAction)toggleCPUSpeedItem:(id)sender
diff --git a/Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard b/Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard
index cfaf4c0c..0e8f0be2 100644
--- a/Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard
+++ b/Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard
@@ -24,15 +24,19 @@
                                 <items>
                                     <barButtonItem title="Reboot" id="pwr-c0-7tW">
                                         <connections>
-                                            <action selector="rebootItem:" destination="dkx-z0-nzr" id="Unl-Y2-Wio"/>
+                                            <action selector="rebootItemSelected:" destination="dkx-z0-nzr" id="O17-ef-Kc9"/>
                                         </connections>
                                     </barButtonItem>
                                     <barButtonItem title="CPU Togle" id="d5g-uX-Ssk">
                                         <connections>
-                                            <action selector="toggleCPUSpeedItem:" destination="dkx-z0-nzr" id="OmN-nk-Tda"/>
+                                            <action selector="toggleCPUSpeedItem:" destination="dkx-z0-nzr" id="TRp-OQ-bk2"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem title="Prefs" id="80q-oc-naJ">
+                                        <connections>
+                                            <action selector="prefsItemSelected:" destination="dkx-z0-nzr" id="dWF-4y-caU"/>
                                         </connections>
                                     </barButtonItem>
-                                    <barButtonItem title="Prefs" id="80q-oc-naJ"/>
                                 </items>
                                 <variation key="heightClass=compact-widthClass=regular" ambiguous="YES" misplaced="YES">
                                     <rect key="frame" x="0.0" y="356" width="600" height="44"/>
@@ -88,7 +92,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="tqd-Zi-o6N" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="961" y="-60"/>
+            <point key="canvasLocation" x="954" y="-60"/>
         </scene>
         <!--View Controller-->
         <scene sceneID="7d6-Zt-X84">