From 44b4e5430a3b1a0a7a9a2e2837e6346505c66f20 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Wed, 24 Apr 2013 00:25:51 -0400 Subject: [PATCH] Password window style. [ADDED] Ability to change style of password window. [FIXED] Some window activation oddities (WIP). [UPDATED] Renamed executable iOS/Mac specific in the hopes of helping with IDE conflicts. --- External/UbiquityStoreManager | 2 +- .../contents.xcworkspacedata | 3 - MasterPassword/ObjC/Mac/MPAppDelegate.h | 3 +- MasterPassword/ObjC/Mac/MPAppDelegate.m | 56 ++--- MasterPassword/ObjC/Mac/MPMacConfig.h | 1 + MasterPassword/ObjC/Mac/MPMacConfig.m | 6 +- .../ObjC/Mac/MPPasswordWindowController.m | 11 + .../ObjC/Mac/MPPasswordWindowController.xib | 54 +++-- .../ObjC/Mac/MasterPassword-Info.plist | 4 +- .../project.pbxproj | 18 +- .../MasterPassword Mac (App Store).xcscheme | 8 +- .../MasterPassword Mac (Development).xcscheme | 12 +- MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib | 211 +++++++++++++++++- .../ObjC/iOS/MasterPassword-Info.plist | 4 +- .../project.pbxproj | 18 +- .../MasterPassword iOS (App Store).xcscheme | 8 +- .../MasterPassword iOS (Development).xcscheme | 16 +- 17 files changed, 329 insertions(+), 106 deletions(-) diff --git a/External/UbiquityStoreManager b/External/UbiquityStoreManager index 84473020..25a30fad 160000 --- a/External/UbiquityStoreManager +++ b/External/UbiquityStoreManager @@ -1 +1 @@ -Subproject commit 844730201c5dd6fba266e229146ec28e4d50c2c2 +Subproject commit 25a30fadcb80e337a664127c6c86c4fc46e96e5f diff --git a/MasterPassword.xcworkspace/contents.xcworkspacedata b/MasterPassword.xcworkspace/contents.xcworkspacedata index 643b3ca2..19aa6fdd 100644 --- a/MasterPassword.xcworkspace/contents.xcworkspacedata +++ b/MasterPassword.xcworkspace/contents.xcworkspacedata @@ -1,9 +1,6 @@ - - diff --git a/MasterPassword/ObjC/Mac/MPAppDelegate.h b/MasterPassword/ObjC/Mac/MPAppDelegate.h index b1f14436..9c039d0a 100644 --- a/MasterPassword/ObjC/Mac/MPAppDelegate.h +++ b/MasterPassword/ObjC/Mac/MPAppDelegate.h @@ -22,11 +22,12 @@ @property(nonatomic, weak) IBOutlet NSMenuItem *savePasswordItem; @property(nonatomic, weak) IBOutlet NSMenuItem *createUserItem; @property(nonatomic, weak) IBOutlet NSMenuItem *usersItem; +@property(nonatomic, weak) IBOutlet NSMenuItem *dialogStyleRegular; +@property(nonatomic, weak) IBOutlet NSMenuItem *dialogStyleHUD; - (IBAction)activate:(id)sender; - (IBAction)togglePreference:(NSMenuItem *)sender; - (IBAction)newUser:(NSMenuItem *)sender; -- (IBAction)signOut:(id)sender; - (IBAction)lock:(id)sender; @end diff --git a/MasterPassword/ObjC/Mac/MPAppDelegate.m b/MasterPassword/ObjC/Mac/MPAppDelegate.m index 10034dde..8585e9d0 100644 --- a/MasterPassword/ObjC/Mac/MPAppDelegate.m +++ b/MasterPassword/ObjC/Mac/MPAppDelegate.m @@ -19,17 +19,6 @@ @implementation MPAppDelegate -@synthesize statusItem; -@synthesize lockItem; -@synthesize showItem; -@synthesize statusMenu; -@synthesize useICloudItem; -@synthesize rememberPasswordItem; -@synthesize savePasswordItem; -@synthesize passwordWindow; - -@synthesize key; - #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wfour-char-constants" static EventHotKeyID MPShowHotKey = { .signature = 'show', .id = 1 }; @@ -145,11 +134,11 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven - (IBAction)togglePreference:(NSMenuItem *)sender { - if (sender == useICloudItem) + if (sender == self.useICloudItem) [self storeManager].cloudEnabled = sender.state == NSOnState; - if (sender == rememberPasswordItem) + if (sender == self.rememberPasswordItem) [MPConfig get].rememberLogin = [NSNumber numberWithBool:![[MPConfig get].rememberLogin boolValue]]; - if (sender == savePasswordItem) { + if (sender == self.savePasswordItem) { MPUserEntity *activeUser = [[MPAppDelegate get] activeUserForThread]; if ((activeUser.saveKey = !activeUser.saveKey)) [[MPAppDelegate get] storeSavedKeyFor:activeUser]; @@ -157,6 +146,10 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven [[MPAppDelegate get] forgetSavedKeyFor:activeUser]; [activeUser.managedObjectContext saveToStore]; } + if (sender == self.dialogStyleRegular) + [MPMacConfig get].dialogStyleHUD = @NO; + if (sender == self.dialogStyleHUD) + [MPMacConfig get].dialogStyleHUD = @YES; } - (IBAction)newUser:(NSMenuItem *)sender { @@ -181,7 +174,8 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven #pragma mark - NSApplicationDelegate - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - + + [[NSUbiquitousKeyValueStore defaultStore] setString:@"0B3CA2DF-5796-44DF-B5E0-121EC3846464" forKey:@"USMStoreUUIDKey"]; // Setup delegates and listeners. [MPConfig get].delegate = self; __weak id weakSelf = self; @@ -212,6 +206,17 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven ^(NSNotification *note) { self.rememberPasswordItem.state = [[MPConfig get].rememberLogin boolValue]? NSOnState: NSOffState; self.savePasswordItem.state = [[MPAppDelegate get] activeUserForThread].saveKey? NSOnState: NSOffState; + self.dialogStyleRegular.state = ![[MPMacConfig get].dialogStyleHUD boolValue]? NSOnState: NSOffState; + self.dialogStyleHUD.state = [[MPMacConfig get].dialogStyleHUD boolValue]? NSOnState: NSOffState; + if ([note.object isEqual:NSStringFromSelector( @selector(dialogStyleHUD) )]) { + if (![self.passwordWindow.window isVisible]) + self.passwordWindow = nil; + else { + [self.passwordWindow close]; + self.passwordWindow = nil; + [self showPasswordWindow]; + } + } }]; [self updateUsers]; @@ -233,6 +238,8 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven - (void)setActiveUser:(MPUserEntity *)activeUser { + [self.passwordWindow close]; + [super setActiveUser:activeUser]; [[[self.usersItem submenu] itemArray] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { @@ -303,21 +310,20 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven } } -- (void)applicationWillBecomeActive:(NSNotification *)notification { - - if (!self.passwordWindow) - self.passwordWindow = [[MPPasswordWindowController alloc] initWithWindowNibName:@"MPPasswordWindowController"]; -} - - (void)applicationDidBecomeActive:(NSNotification *)notification { + [self showPasswordWindow]; +} + +- (void)showPasswordWindow { + // Don't show window if we weren't already running (ie. if we haven't been activated before). - if (!self.wasRunning) { - dbg(@"Wasn't running yet, not activating."); + if (!self.wasRunning) self.wasRunning = YES; - } else { - dbg(@"Was running already, activating."); + if (!self.passwordWindow) + self.passwordWindow = [[MPPasswordWindowController alloc] initWithWindowNibName:@"MPPasswordWindowController"]; + [self.passwordWindow showWindow:self]; } } diff --git a/MasterPassword/ObjC/Mac/MPMacConfig.h b/MasterPassword/ObjC/Mac/MPMacConfig.h index c3a208fa..9540e648 100644 --- a/MasterPassword/ObjC/Mac/MPMacConfig.h +++ b/MasterPassword/ObjC/Mac/MPMacConfig.h @@ -11,5 +11,6 @@ @interface MPMacConfig : MPConfig @property(nonatomic, retain) NSString *usedUserName; +@property(nonatomic, retain) NSNumber *dialogStyleHUD; @end diff --git a/MasterPassword/ObjC/Mac/MPMacConfig.m b/MasterPassword/ObjC/Mac/MPMacConfig.m index b555d4d0..6e1e0e20 100644 --- a/MasterPassword/ObjC/Mac/MPMacConfig.m +++ b/MasterPassword/ObjC/Mac/MPMacConfig.m @@ -9,13 +9,17 @@ @implementation MPMacConfig @dynamic usedUserName; +@dynamic dialogStyleHUD; - (id)init { if (!(self = [super init])) return self; - [self.defaults registerDefaults:@{ NSStringFromSelector( @selector(iTunesID) ) : @"510296984" }]; + [self.defaults registerDefaults:@{ + NSStringFromSelector( @selector(iTunesID) ) : @"510296984", + NSStringFromSelector( @selector(dialogStyleHUD) ) : @NO + }]; return self; } diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m index 6a2250c4..73a553f3 100644 --- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m +++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m @@ -26,6 +26,7 @@ - (void)windowDidLoad { + [self updateDialogStyle]; [self setContent:@""]; [self.tipField setStringValue:@""]; @@ -60,6 +61,16 @@ [super windowDidLoad]; } +- (void)updateDialogStyle { + + if ([[MPMacConfig get].dialogStyleHUD boolValue]) { + self.window.styleMask = NSHUDWindowMask | NSTitledWindowMask | NSUtilityWindowMask | NSClosableWindowMask; + } + else { + self.window.styleMask = NSTexturedBackgroundWindowMask | NSResizableWindowMask | NSTitledWindowMask | NSClosableWindowMask; + } +} + - (void)unlock { MPUserEntity *activeUser = [[MPAppDelegate get] activeUserForThread]; diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib index 93ff4af4..863cbfd4 100644 --- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib +++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib @@ -38,7 +38,7 @@ NSApplication - 287 + 267 2 {{600, 530}, {480, 200}} 611845120 @@ -59,20 +59,20 @@ 268 - {{131, 163}, {219, 17}} + {{129, 163}, {223, 17}} _NS:1535 YES - 68157504 - 272630784 + 67108928 + 138414144 Maarten Billemont's password for: - + LucidaGrande 13 - 1044 + 787 _NS:1535 @@ -86,13 +86,8 @@ - 6 - System - controlTextColor - - 3 - MAA - + 1 + MSAxIDEAA NO @@ -107,10 +102,14 @@ _NS:1505 YES - 68157504 - 138413056 + 67108928 + 138414144 Hit enter to copy the password. - + + LucidaGrande + 13 + 1558 + _NS:1505 @@ -139,7 +138,11 @@ -1804599231 138413120 apple.com - + + LucidaGrande + 12 + 2586 + Site name _NS:9 @@ -154,7 +157,10 @@ 6 System textColor - + + 3 + MAA + NO @@ -181,7 +187,7 @@ 67108864 138412032 - S3cretP4s$w0rD + Getx2?QazuRicj SourceCodePro-Black 48 @@ -225,8 +231,8 @@ _NS:21 {{0, 0}, {1920, 1058}} - {480, 150} - {480, 336} + {480, 156} + {480, 342} YES @@ -646,7 +652,7 @@ - + 8 0 @@ -792,7 +798,7 @@ 231 - + @@ -820,7 +826,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Info.plist b/MasterPassword/ObjC/Mac/MasterPassword-Info.plist index 10034884..203b0e96 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Info.plist +++ b/MasterPassword/ObjC/Mac/MasterPassword-Info.plist @@ -9,11 +9,11 @@ CFBundleIconFile MasterPassword CFBundleIdentifier - com.lyndir.lhunath.${PRODUCT_NAME:rfc1034identifier}.Mac + com.lyndir.lhunath.MasterPassword.Mac CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + MasterPassword CFBundlePackageType APPL CFBundleShortVersionString diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj index 97edca06..e5112c6d 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj @@ -201,7 +201,7 @@ DA3EF17915A47744003ABF4E /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; DA3EF17A15A47744003ABF4E /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libUbiquityStoreManager.a; sourceTree = BUILT_PRODUCTS_DIR; }; - DA5BFA44147E415C00F98B1E /* MasterPassword.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MasterPassword.app; sourceTree = BUILT_PRODUCTS_DIR; }; + DA5BFA44147E415C00F98B1E /* MasterPassword-Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "MasterPassword-Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; DA5BFA4E147E415C00F98B1E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; @@ -440,7 +440,7 @@ DA5BFA45147E415C00F98B1E /* Products */ = { isa = PBXGroup; children = ( - DA5BFA44147E415C00F98B1E /* MasterPassword.app */, + DA5BFA44147E415C00F98B1E /* MasterPassword-Mac.app */, DAC77CAD148291A600BCF976 /* libPearl.a */, DAC6326C148680650075AEA5 /* libjrswizzle.a */, DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */, @@ -893,9 +893,9 @@ productReference = DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */; productType = "com.apple.product-type.library.static"; }; - DA5BFA43147E415C00F98B1E /* MasterPassword */ = { + DA5BFA43147E415C00F98B1E /* MasterPassword-Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */; + buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-Mac" */; buildPhases = ( DA5BFA40147E415C00F98B1E /* Sources */, DA5BFA41147E415C00F98B1E /* Frameworks */, @@ -907,9 +907,9 @@ ); dependencies = ( ); - name = MasterPassword; + name = "MasterPassword-Mac"; productName = MasterPassword; - productReference = DA5BFA44147E415C00F98B1E /* MasterPassword.app */; + productReference = DA5BFA44147E415C00F98B1E /* MasterPassword-Mac.app */; productType = "com.apple.product-type.application"; }; DAC6326B148680650075AEA5 /* jrswizzle */ = { @@ -971,7 +971,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - DA5BFA43147E415C00F98B1E /* MasterPassword */, + DA5BFA43147E415C00F98B1E /* MasterPassword-Mac */, DAC77CAC148291A600BCF976 /* Pearl */, DAC6326B148680650075AEA5 /* jrswizzle */, DA4425CA1557BED40052177D /* UbiquityStoreManager */, @@ -1190,7 +1190,7 @@ /* Begin PBXTargetDependency section */ DA3EF19E15A47AEB003ABF4E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DA5BFA43147E415C00F98B1E /* MasterPassword */; + target = DA5BFA43147E415C00F98B1E /* MasterPassword-Mac */; targetProxy = DA3EF19D15A47AEB003ABF4E /* PBXContainerItemProxy */; }; DAC63286148681200075AEA5 /* PBXTargetDependency */ = { @@ -1717,7 +1717,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "AdHoc-Mac"; }; - DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */ = { + DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( DA5BFA6E147E415C00F98B1E /* Debug-Mac */, diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme index a4f86a0a..36e910b7 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme @@ -15,8 +15,8 @@ @@ -43,8 +43,8 @@ diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme index 0ae08aea..4a1abf8b 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme @@ -15,8 +15,8 @@ @@ -43,8 +43,8 @@ @@ -61,8 +61,8 @@ diff --git a/MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib b/MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib index 311b66c3..f6817973 100644 --- a/MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib +++ b/MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib @@ -2,13 +2,13 @@ 1070 - 12C60 - 2844 - 1187.34 - 625.00 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 2844 + 3084 NSCustomObject @@ -170,6 +170,37 @@ + + + Password Dialog Style + + 2147483647 + + + submenuAction: + + Password Dialog Style + + + + Regular + + 2147483647 + + + + + + HUD + + 2147483647 + + + 1 + + + + YES @@ -345,6 +376,38 @@ 764 + + + dialogStyleHUD + + + + 771 + + + + dialogStyleRegular + + + + 772 + + + + togglePreference: + + + + 773 + + + + togglePreference: + + + + 774 + @@ -439,6 +502,7 @@ + @@ -499,6 +563,33 @@ + + 765 + + + + + + + + 766 + + + + + + + + + 767 + + + + + 768 + + + @@ -533,14 +624,120 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 764 + 774 + + + + + MPAppDelegate + MPAppDelegate_Shared + + id + id + NSMenuItem + id + NSMenuItem + + + + activate: + id + + + lock: + id + + + newUser: + NSMenuItem + + + signOut: + id + + + togglePreference: + NSMenuItem + + + + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenu + NSMenuItem + NSMenuItem + + + + createUserItem + NSMenuItem + + + dialogStyleHUD + NSMenuItem + + + dialogStyleRegular + NSMenuItem + + + lockItem + NSMenuItem + + + rememberPasswordItem + NSMenuItem + + + savePasswordItem + NSMenuItem + + + showItem + NSMenuItem + + + statusMenu + NSMenu + + + useICloudItem + NSMenuItem + + + usersItem + NSMenuItem + + + + IBProjectSource + ./Classes/MPAppDelegate.h + + + + MPAppDelegate_Shared + NSObject + + IBProjectSource + ./Classes/MPAppDelegate_Shared.h + + + - 0 IBCocoaFramework diff --git a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist index baf2d721..2d7ecce7 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist +++ b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist @@ -54,11 +54,11 @@ CFBundleIdentifier - com.lyndir.lhunath.${PRODUCT_NAME:rfc1034identifier} + com.lyndir.lhunath.MasterPassword CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + MasterPassword CFBundlePackageType APPL CFBundleShortVersionString diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj index d5a6126e..1d90f55e 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -1003,7 +1003,7 @@ DA5A09DE171A70E4005284AB /* play@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play@2x.png"; sourceTree = ""; }; DA5A09E8171BB0F7005284AB /* unlocked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unlocked.png; sourceTree = ""; }; DA5A09E9171BB0F7005284AB /* unlocked@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unlocked@2x.png"; sourceTree = ""; }; - DA5BFA44147E415C00F98B1E /* MasterPassword.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MasterPassword.app; sourceTree = BUILT_PRODUCTS_DIR; }; + DA5BFA44147E415C00F98B1E /* MasterPassword-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "MasterPassword-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DA5BFA48147E415C00F98B1E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -2127,7 +2127,7 @@ DA5BFA45147E415C00F98B1E /* Products */ = { isa = PBXGroup; children = ( - DA5BFA44147E415C00F98B1E /* MasterPassword.app */, + DA5BFA44147E415C00F98B1E /* MasterPassword-iOS.app */, DAC77CAD148291A600BCF976 /* libPearl.a */, DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */, DAC6326C148680650075AEA5 /* libjrswizzle.a */, @@ -3695,9 +3695,9 @@ productReference = DA497B9715E8C90E00B52167 /* libGoogle+.a */; productType = "com.apple.product-type.library.static"; }; - DA5BFA43147E415C00F98B1E /* MasterPassword */ = { + DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */; + buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-iOS" */; buildPhases = ( DA5BFA40147E415C00F98B1E /* Sources */, DA5BFA41147E415C00F98B1E /* Frameworks */, @@ -3709,9 +3709,9 @@ ); dependencies = ( ); - name = MasterPassword; + name = "MasterPassword-iOS"; productName = MasterPassword; - productReference = DA5BFA44147E415C00F98B1E /* MasterPassword.app */; + productReference = DA5BFA44147E415C00F98B1E /* MasterPassword-iOS.app */; productType = "com.apple.product-type.application"; }; DA829E50159847E0002417D3 /* FontReplacer */ = { @@ -3840,7 +3840,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - DA5BFA43147E415C00F98B1E /* MasterPassword */, + DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */, DAC77CAC148291A600BCF976 /* Pearl */, DAC6325C1486805C0075AEA5 /* uicolor-utilities */, DAC6326B148680650075AEA5 /* jrswizzle */, @@ -4809,7 +4809,7 @@ /* Begin PBXTargetDependency section */ DA3EF19E15A47AEB003ABF4E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DA5BFA43147E415C00F98B1E /* MasterPassword */; + target = DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */; targetProxy = DA3EF19D15A47AEB003ABF4E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -5458,7 +5458,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "AdHoc-iOS"; }; - DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */ = { + DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( DA5BFA6E147E415C00F98B1E /* Debug-iOS */, diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme index f4fd5fda..b1f1f0a7 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme @@ -15,8 +15,8 @@ @@ -43,8 +43,8 @@ diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme index bcd6e81a..6fe6de2c 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme @@ -15,8 +15,8 @@ @@ -33,8 +33,8 @@ @@ -52,8 +52,8 @@ @@ -76,8 +76,8 @@