From 76f4a007389711536902193714d2b3a57c10c440 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sat, 10 Aug 2013 23:32:33 -0400 Subject: [PATCH] Revert Storyboard back to Xcode 4 compatible format. --- .../src/main/resources/logback.xml | 4 - MasterPassword/ObjC/iOS/MPiOSAppDelegate.m | 7 +- .../ObjC/iOS/MainStoryboard_iPhone.storyboard | 267 +++++++++++++++--- 3 files changed, 227 insertions(+), 51 deletions(-) diff --git a/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml b/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml index 199740fd..a5c492fa 100644 --- a/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml +++ b/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml @@ -8,10 +8,6 @@ - - diff --git a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m index 55ede2c4..ec173831 100644 --- a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m +++ b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m @@ -632,13 +632,14 @@ } -#pragma mark - Google+ +#pragma mark - UbiquityStoreManager + - (void)ubiquityStoreManager:(UbiquityStoreManager *)manager willLoadStoreIsCloud:(BOOL)isCloudStore { dispatch_async( dispatch_get_main_queue(), ^{ [self.handleCloudContentAlert cancelAlertAnimated:YES]; if (![self.storeLoading isVisible]) - self.storeLoading = [PearlOverlay showOverlayWithTitle:@"Opening Your Data"]; + self.storeLoading = [PearlOverlay showOverlayWithTitle:@"Loading Sites"]; } ); [super ubiquityStoreManager:manager willLoadStoreIsCloud:isCloudStore]; @@ -679,7 +680,7 @@ self.handleCloudContentAlert.tappedButtonBlock = ^(UIAlertView *alert, NSInteger buttonIndex) { wSelf.fixCloudContentAlert = [PearlAlert showAlertWithTitle:@"Fix iCloud Now" message: - @"This problem can usually be auto‑corrected by opening the app on another device where you recently made changes.\n" + @"This problem can be auto‑corrected by opening the app on another device where you recently made changes.\n" @"You can correct the problem from this device anyway, but recent changes made on another device might get lost." viewStyle:UIAlertViewStyleDefault initAlert:nil tappedButtonBlock: ^(UIAlertView *alert_, NSInteger buttonIndex_) { diff --git a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard index 7bdc81d2..94fe5514 100644 --- a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard +++ b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard @@ -1,8 +1,7 @@ - + - - + @@ -471,7 +470,6 @@ Your passwords will be AES-encrypted with your master password. - @@ -539,7 +537,6 @@ Your passwords will be AES-encrypted with your master password. - @@ -556,7 +553,6 @@ Your passwords will be AES-encrypted with your master password. - @@ -1052,7 +1048,6 @@ L4m3P4sSw0rD - @@ -1061,7 +1056,7 @@ L4m3P4sSw0rD - + @@ -1171,7 +1166,6 @@ L4m3P4sSw0rD - @@ -1454,7 +1448,7 @@ You can use the words in the background for inspiration in finding a memorable m - + - + @@ -2264,7 +2251,6 @@ If you set a custom password, it will be encrypted before it is saved to the clo - @@ -2296,10 +2282,10 @@ If you set a custom password, it will be encrypted before it is saved to the clo - + - + @@ -2310,7 +2296,6 @@ If you set a custom password, it will be encrypted before it is saved to the clo - @@ -2364,7 +2349,6 @@ If you set a custom password, it will be encrypted before it is saved to the clo - @@ -2377,11 +2361,11 @@ If you set a custom password, it will be encrypted before it is saved to the clo - + - + - + @@ -2482,7 +2466,6 @@ You can make passwords for anything, like email addresses, sites or real-world t - @@ -2505,11 +2488,11 @@ You can make passwords for anything, like email addresses, sites or real-world t - + - + @@ -2649,7 +2632,7 @@ You can make passwords for anything, like email addresses, sites or real-world t - + - + @@ -2804,7 +2787,6 @@ You can make passwords for anything, like email addresses, sites or real-world t - @@ -2841,11 +2823,11 @@ You can make passwords for anything, like email addresses, sites or real-world t - + - + @@ -2873,14 +2855,13 @@ However, it means that anyone who finds your device unlocked can do the same. - + - @@ -2935,6 +2916,204 @@ However, it means that anyone who finds your device unlocked can do the same. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2942,6 +3121,6 @@ However, it means that anyone who finds your device unlocked can do the same. - + \ No newline at end of file