From 774db1c6816e4894fe8d339f006c7628b9aa36d4 Mon Sep 17 00:00:00 2001 From: emufreak Date: Sun, 9 Nov 2014 16:22:13 +0100 Subject: [PATCH] V 1.0.6 final commit --- Classes/SettingsController.mm | 7 +++++-- Info.plist | 2 +- LatestBuild | 2 +- .../SingleView/BaseEmulationViewController.mm | 10 ++++++++++ .../SingleView/BaseNavigationController.mm | 11 +++++++++++ .../SingleView/MainWindow-Single-iPad.xib | 4 ++-- .../SingleView/SingleWindowAppDelegate.mm | 11 ++++++++--- iUAE.xcodeproj/project.pbxproj | 14 +++----------- .../xcshareddata/iUAE.xccheckout | 2 +- iUAEParents/EmulationView-iPad.xib | 17 +++++------------ iUAEParents/EmulationView-iPhone.xib | 6 +++--- 11 files changed, 50 insertions(+), 36 deletions(-) diff --git a/Classes/SettingsController.mm b/Classes/SettingsController.mm index ff412bd..258a939 100644 --- 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 index 9a784f7..35b48f9 100644 --- a/Info.plist +++ b/Info.plist @@ -5,7 +5,7 @@ UIStatusBarStyle UIStatusBarStyleBlackOpaque UIViewControllerBasedStatusBarAppearance - + Initial Interface Orientation Landscape (left home button) CFBundleDevelopmentRegion diff --git a/LatestBuild b/LatestBuild index 58c1a91..2f3d0da 120000 --- a/LatestBuild +++ b/LatestBuild @@ -1 +1 @@ -/Users/urs/Library/Developer/Xcode/DerivedData/iUAE-dupxxuyxwglotactjjdhbzdhrgjk/Build/Products/Debug-iphonesimulator \ No newline at end of file +/Users/urs/Library/Developer/Xcode/DerivedData/iUAE-dupxxuyxwglotactjjdhbzdhrgjk/Build/Products/Debug-iphoneos \ No newline at end of file diff --git a/TargetSpecific/SingleView/BaseEmulationViewController.mm b/TargetSpecific/SingleView/BaseEmulationViewController.mm index 6c27b34..23b4ccd 100644 --- 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 index ae945a6..dbcd726 100644 --- 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 index 7eaf58e..c0784e5 100644 --- a/TargetSpecific/SingleView/MainWindow-Single-iPad.xib +++ b/TargetSpecific/SingleView/MainWindow-Single-iPad.xib @@ -11,7 +11,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/TargetSpecific/SingleView/SingleWindowAppDelegate.mm b/TargetSpecific/SingleView/SingleWindowAppDelegate.mm index c01a1e8..854a23d 100644 --- 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 index aa67152..757597e 100755 --- a/iUAE.xcodeproj/project.pbxproj +++ b/iUAE.xcodeproj/project.pbxproj @@ -200,8 +200,6 @@ 7E1B8C4E19FAE04700B6136B /* unsticky@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E1B8C4A19FAE04700B6136B /* unsticky@2x.png */; }; 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 /* chrome-top@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E4B18D6188B1CAB0019E82B /* chrome-top@2x.png */; }; 7E4B18D9188B1CAB0019E82B /* chrome-top~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E4B18D7188B1CAB0019E82B /* chrome-top~ipad.png */; }; @@ -1583,8 +1581,6 @@ 7E1B8C4A19FAE04700B6136B /* unsticky@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unsticky@2x.png"; sourceTree = ""; }; 7E1B8C4F19FAE53800B6136B /* SettingsController-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "SettingsController-ipad.xib"; sourceTree = ""; }; 7E1B8C5119FAE98200B6136B /* EMUROMBrowserView-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "EMUROMBrowserView-ipad.xib"; sourceTree = ""; }; - 7E3C92CE1A06B4D200A818B6 /* Kick13.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = Kick13.rom; path = ../../../Archiv/emus/amiga/Roms/Kick13.rom; sourceTree = ""; }; - 7E3C92D01A06B50E00A818B6 /* Northsou.adf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Northsou.adf; path = ../../../Archiv/emus/amiga/Spiele/Northsou.adf; sourceTree = ""; }; 7E4B18D4188B1C720019E82B /* chrome-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "chrome-bottom.png"; path = "TargetSpecific/DotC/chrome-bottom.png"; sourceTree = SOURCE_ROOT; }; 7E4B18D6188B1CAB0019E82B /* chrome-top@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "chrome-top@2x.png"; path = "TargetSpecific/DotC/chrome-top@2x.png"; 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,7 +2599,6 @@ 057440D40FC2A4A7003BE251 /* roms */ = { isa = PBXGroup; children = ( - 7E3C92CE1A06B4D200A818B6 /* Kick13.rom */, ); path = roms; sourceTree = ""; @@ -2611,7 +2606,6 @@ 057443530FC3CA04003BE251 /* disks */ = { isa = PBXGroup; children = ( - 7E3C92D01A06B50E00A818B6 /* Northsou.adf */, ); path = disks; sourceTree = ""; @@ -4066,14 +4060,12 @@ 05E8A04612B2C884005532AF /* amiga-beige-dark-center.png in Resources */, 7E1B8C4619FADFD400B6136B /* options@2x.png 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 /* landbarblank@2x.png in Resources */, - 7E3C92D11A06B50E00A818B6 /* Northsou.adf in Resources */, 7E1B8C3E19FADFD400B6136B /* modejoy@2x.png 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 index fc87dd8..02dc0fb 100644 --- a/iUAE.xcodeproj/project.xcworkspace/xcshareddata/iUAE.xccheckout +++ b/iUAE.xcodeproj/project.xcworkspace/xcshareddata/iUAE.xccheckout @@ -14,7 +14,7 @@ https://github.com/emufreak/iAmiga.git IDESourceControlProjectPath - iUAE.xcodeproj/project.xcworkspace + iUAE.xcodeproj IDESourceControlProjectRelativeInstallPathDictionary BB077C81096E34247CCFED268F63A8050DE3ACEE diff --git a/iUAEParents/EmulationView-iPad.xib b/iUAEParents/EmulationView-iPad.xib index 60dd304..108f972 100644 --- a/iUAEParents/EmulationView-iPad.xib +++ b/iUAEParents/EmulationView-iPad.xib @@ -18,7 +18,7 @@ - + @@ -28,25 +28,20 @@ - - + - + - + @@ -60,11 +55,9 @@ + - - - diff --git a/iUAEParents/EmulationView-iPhone.xib b/iUAEParents/EmulationView-iPhone.xib index 1379d7b..02c8bda 100644 --- a/iUAEParents/EmulationView-iPhone.xib +++ b/iUAEParents/EmulationView-iPhone.xib @@ -35,17 +35,17 @@ - + - + - +