V 1.0.6 final commit

emufreak · Nov 9, 2014 · 774db1c · 774db1c
1 parent 9346df2
commit 774db1c
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 36 deletions.
diff --git a/Classes/SettingsController.mm b/Classes/SettingsController.mm
@@ -60,8 +60,11 @@ - (void)viewWillAppear:(BOOL)animated {
 	logging.on = do_disa == 0 ? NO : YES;
 #endif
 
-    [df0 setTitle:[Filename objectAtIndex:0] forState:UIControlStateNormal];
-    [df1 setTitle:[Filename objectAtIndex:1] forState:UIControlStateNormal];
+    NSString *df0title = [[Filename objectAtIndex:0] length] == 0 ? @"Empty" : [Filename objectAtIndex:0];
+    NSString *df1title = [[Filename objectAtIndex:1] length] == 0 ? @"Empty" : [Filename objectAtIndex:0];
+
+    [df0 setTitle:df0title forState:UIControlStateNormal];
+    [df1 setTitle:df1title forState:UIControlStateNormal];
 }
 
 - (IBAction)selectDrive:(UIButton*)sender {

diff --git a/Info.plist b/Info.plist
@@ -5,7 +5,7 @@
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleBlackOpaque</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<true/>
 	<key>Initial Interface Orientation</key>
 	<string>Landscape (left home button)</string>
 	<key>CFBundleDevelopmentRegion</key>

diff --git a/LatestBuild b/LatestBuild
@@ -1 +1 @@
-/Users/urs/Library/Developer/Xcode/DerivedData/iUAE-dupxxuyxwglotactjjdhbzdhrgjk/Build/Products/Debug-iphonesimulator
+/Users/urs/Library/Developer/Xcode/DerivedData/iUAE-dupxxuyxwglotactjjdhbzdhrgjk/Build/Products/Debug-iphoneos
diff --git a/TargetSpecific/SingleView/BaseEmulationViewController.mm b/TargetSpecific/SingleView/BaseEmulationViewController.mm
@@ -102,6 +102,7 @@ - (void)viewDidAppear:(BOOL)animated {
 	[self startEmulator];
     iAmigaAppDelegate *appDelegate = (iAmigaAppDelegate *)[[UIApplication sharedApplication] delegate];
     [appDelegate configureScreens];
+
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -238,4 +239,13 @@ -(NSUInteger)supportedInterfaceOrientations{
     return UIInterfaceOrientationMaskLandscape;
 }
 
+- (UIStatusBarStyle) preferredStatusBarStyle {
+    return UIBarStyleBlackOpaque;
+}
+
+- (BOOL)prefersStatusBarHidden
+{
+    return NO;
+}
+
 @end
diff --git a/TargetSpecific/SingleView/BaseNavigationController.mm b/TargetSpecific/SingleView/BaseNavigationController.mm
@@ -40,10 +40,21 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 
 - (void)viewDidLoad
 {
+
     [super viewDidLoad];
 	// Do any additional setup after loading the view.
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+
+    if ([self respondsToSelector:@selector(setNeedsStatusBarAppearanceUpdate)]) {
+        [self prefersStatusBarHidden];
+        [self performSelector:@selector(setNeedsStatusBarAppearanceUpdate)];
+    }
+}
+
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];

diff --git a/TargetSpecific/SingleView/MainWindow-Single-iPad.xib b/TargetSpecific/SingleView/MainWindow-Single-iPad.xib
@@ -11,7 +11,7 @@
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <window opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="3">
+        <window autoresizesSubviews="NO" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="3">
             <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
             <autoresizingMask key="autoresizingMask"/>
             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -28,7 +28,7 @@
                 <autoresizingMask key="autoresizingMask"/>
             </navigationBar>
             <viewControllers>
-                <viewController title="Emulation View" nibName="EmulationView-iPad" wantsFullScreenLayout="YES" id="6" userLabel="Emulation View" customClass="EmulationViewiPad">
+                <viewController title="Emulation View" nibName="EmulationView-iPad" id="6" userLabel="Emulation View" customClass="EmulationViewiPad">
                     <extendedEdge key="edgesForExtendedLayout"/>
                     <navigationItem key="navigationItem" title="Item" id="cGR-Az-8qU"/>
                 </viewController>

diff --git a/TargetSpecific/SingleView/SingleWindowAppDelegate.mm b/TargetSpecific/SingleView/SingleWindowAppDelegate.mm
@@ -55,10 +55,13 @@ - (void)applicationDidBecomeActive:(UIApplication *)application {
     // Override point for customization after application launch
     [window makeKeyAndVisible];
 
-    if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
-    {
+    /*if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+    {*/
         window.frame = [[UIScreen mainScreen] bounds];
-    }
+    /*}*/
+
+    //[window.rootViewController setNeedsStatusBarAppearanceUpdate];
+
 
     OSStatus res = AudioSessionInitialize(NULL, NULL, NULL, NULL);
     UInt32 sessionCategory = kAudioSessionCategory_AmbientSound;
@@ -91,6 +94,8 @@ - (void)screenDidDisconnect:(NSNotification*)aNotification {
 
 - (void)configureScreens {
 
+    [window.rootViewController setNeedsStatusBarAppearanceUpdate];
+
 	if ([[UIScreen screens] count] == 1) {
 		NSLog(@"Device display");
 		// disable extras		

diff --git a/iUAE.xcodeproj/project.pbxproj b/iUAE.xcodeproj/project.pbxproj
@@ -200,8 +200,6 @@
 		7E1B8C4E19FAE04700B6136B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7E1B8C4A19FAE04700B6136B /* [email protected] */; };
 		7E1B8C5019FAE53800B6136B /* SettingsController-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E1B8C4F19FAE53800B6136B /* SettingsController-ipad.xib */; };
 		7E1B8C5219FAE98200B6136B /* EMUROMBrowserView-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E1B8C5119FAE98200B6136B /* EMUROMBrowserView-ipad.xib */; };
-		7E3C92CF1A06B4D200A818B6 /* Kick13.rom in Resources */ = {isa = PBXBuildFile; fileRef = 7E3C92CE1A06B4D200A818B6 /* Kick13.rom */; };
-		7E3C92D11A06B50E00A818B6 /* Northsou.adf in Resources */ = {isa = PBXBuildFile; fileRef = 7E3C92D01A06B50E00A818B6 /* Northsou.adf */; };
 		7E4B18D5188B1C720019E82B /* chrome-bottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E4B18D4188B1C720019E82B /* chrome-bottom.png */; };
 		7E4B18D8188B1CAB0019E82B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7E4B18D6188B1CAB0019E82B /* [email protected] */; };
 		7E4B18D9188B1CAB0019E82B /* chrome-top~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E4B18D7188B1CAB0019E82B /* chrome-top~ipad.png */; };
@@ -1583,8 +1581,6 @@
 		7E1B8C4A19FAE04700B6136B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		7E1B8C4F19FAE53800B6136B /* SettingsController-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "SettingsController-ipad.xib"; sourceTree = "<group>"; };
 		7E1B8C5119FAE98200B6136B /* EMUROMBrowserView-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "EMUROMBrowserView-ipad.xib"; sourceTree = "<group>"; };
-		7E3C92CE1A06B4D200A818B6 /* Kick13.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = Kick13.rom; path = ../../../Archiv/emus/amiga/Roms/Kick13.rom; sourceTree = "<group>"; };
-		7E3C92D01A06B50E00A818B6 /* Northsou.adf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Northsou.adf; path = ../../../Archiv/emus/amiga/Spiele/Northsou.adf; sourceTree = "<group>"; };
 		7E4B18D4188B1C720019E82B /* chrome-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "chrome-bottom.png"; path = "TargetSpecific/DotC/chrome-bottom.png"; sourceTree = SOURCE_ROOT; };
 		7E4B18D6188B1CAB0019E82B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "TargetSpecific/DotC/[email protected]"; sourceTree = SOURCE_ROOT; };
 		7E4B18D7188B1CAB0019E82B /* chrome-top~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "chrome-top~ipad.png"; path = "TargetSpecific/DotC/chrome-top~ipad.png"; sourceTree = SOURCE_ROOT; };
@@ -2603,15 +2599,13 @@
 		057440D40FC2A4A7003BE251 /* roms */ = {
 			isa = PBXGroup;
 			children = (
-				7E3C92CE1A06B4D200A818B6 /* Kick13.rom */,
 			);
 			path = roms;
 			sourceTree = "<group>";
 		};
 		057443530FC3CA04003BE251 /* disks */ = {
 			isa = PBXGroup;
 			children = (
-				7E3C92D01A06B50E00A818B6 /* Northsou.adf */,
 			);
 			path = disks;
 			sourceTree = "<group>";
@@ -4066,14 +4060,12 @@
 				05E8A04612B2C884005532AF /* amiga-beige-dark-center.png in Resources */,
 				7E1B8C4619FADFD400B6136B /* [email protected] in Resources */,
 				05E8A04712B2C884005532AF /* amiga-beige-dark-left.png in Resources */,
-				7E3C92CF1A06B4D200A818B6 /* Kick13.rom in Resources */,
 				05E8A04812B2C884005532AF /* amiga-beige-dark-right.png in Resources */,
 				7EA2BC9F188B0DF3003DCE10 /* MainWindow-Single.xib in Resources */,
 				7E1B8C4319FADFD400B6136B /* modekeyon.png in Resources */,
 				05E8A04A12B2C8E9005532AF /* amiga-beige-dark.png in Resources */,
 				7E1B8C2E19FAD4D000B6136B /* landbarblank.png in Resources */,
 				7E1B8C2F19FAD4D000B6136B /* [email protected] in Resources */,
-				7E3C92D11A06B50E00A818B6 /* Northsou.adf in Resources */,
 				7E1B8C3E19FADFD400B6136B /* [email protected] in Resources */,
 				7EA4D6611923ED0800C58BB9 /* EmulationView-iPad.xib in Resources */,
 				05D5233812E8030E007912AE /* SelectEffectController.xib in Resources */,
@@ -5421,7 +5413,7 @@
 				iOSOpenDevBuildPackageOnAnyBuild = NO;
 				iOSOpenDevCopyOnBuild = NO;
 				iOSOpenDevDevice = 192.168.0.13;
-				iOSOpenDevInstallOnAnyBuild = NO;
+				iOSOpenDevInstallOnAnyBuild = YES;
 				iOSOpenDevInstallOnProfiling = YES;
 				iOSOpenDevRespringOnInstall = YES;
 				iOSOpenDevUsePackageVersionPList = NO;
@@ -5444,7 +5436,7 @@
 				iOSOpenDevBuildPackageOnAnyBuild = NO;
 				iOSOpenDevCopyOnBuild = NO;
 				iOSOpenDevDevice = 192.168.0.13;
-				iOSOpenDevInstallOnAnyBuild = NO;
+				iOSOpenDevInstallOnAnyBuild = YES;
 				iOSOpenDevInstallOnProfiling = YES;
 				iOSOpenDevRespringOnInstall = YES;
 				iOSOpenDevUsePackageVersionPList = NO;
@@ -5465,7 +5457,7 @@
 				iOSOpenDevBuildPackageOnAnyBuild = NO;
 				iOSOpenDevCopyOnBuild = NO;
 				iOSOpenDevDevice = 192.168.0.13;
-				iOSOpenDevInstallOnAnyBuild = NO;
+				iOSOpenDevInstallOnAnyBuild = YES;
 				iOSOpenDevInstallOnProfiling = YES;
 				iOSOpenDevRespringOnInstall = YES;
 				iOSOpenDevUsePackageVersionPList = NO;

diff --git a/iUAE.xcodeproj/project.xcworkspace/xcshareddata/iUAE.xccheckout b/iUAE.xcodeproj/project.xcworkspace/xcshareddata/iUAE.xccheckout
@@ -14,7 +14,7 @@
 		<string>https://github.com/emufreak/iAmiga.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>iUAE.xcodeproj/project.xcworkspace</string>
+	<string>iUAE.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
 		<key>BB077C81096E34247CCFED268F63A8050DE3ACEE</key>

diff --git a/iUAEParents/EmulationView-iPad.xib b/iUAEParents/EmulationView-iPad.xib
@@ -18,7 +18,7 @@
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="2">
             <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <autoresizingMask key="autoresizingMask"/>
             <userGuides>
                 <userLayoutGuide location="60" affinity="minY"/>
                 <userLayoutGuide location="700" affinity="minY"/>
@@ -28,25 +28,20 @@
                     <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <imageView hidden="YES" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="chrome-top.png" id="7">
-                            <rect key="frame" x="0.0" y="0.0" width="1024" height="75"/>
-                            <autoresizingMask key="autoresizingMask"/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        </imageView>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="Iis-uB-ySx">
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits"/>
+                            <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                         </textField>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="7f7-a4-dv2">
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits"/>
+                            <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                         </textField>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="dAY-QN-2Jg">
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits"/>
+                            <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                         </textField>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -60,11 +55,9 @@
             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
             <nil key="simulatedStatusBarMetrics"/>
             <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+            <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
         </view>
     </objects>
-    <resources>
-        <image name="chrome-top.png" width="1024" height="75"/>
-    </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>

diff --git a/iUAEParents/EmulationView-iPhone.xib b/iUAEParents/EmulationView-iPhone.xib
@@ -35,17 +35,17 @@
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="0jF-Nj-mNg">
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits"/>
+                            <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                         </textField>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="CIa-hB-9Hj">
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits"/>
+                            <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                         </textField>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="IxB-Hl-5ap">
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits"/>
+                            <textInputTraits key="textInputTraits" autocorrectionType="no"/>
                         </textField>
                     </subviews>
                     <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/Users/urs/Library/Developer/Xcode/DerivedData/iUAE-dupxxuyxwglotactjjdhbzdhrgjk/Build/Products/Debug-iphonesimulator
		/Users/urs/Library/Developer/Xcode/DerivedData/iUAE-dupxxuyxwglotactjjdhbzdhrgjk/Build/Products/Debug-iphoneos