diff --git a/External/Pearl b/External/Pearl index 83e3366c..adcbc1f1 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit 83e3366c357e65fb4283ea10ee2ec12bf2afbb66 +Subproject commit adcbc1f10abd55199130b02280fccdfaa8ce4211 diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.h b/MasterPassword/ObjC/Mac/MPPasswordWindowController.h index 62581bff..71c59d34 100644 --- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.h +++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.h @@ -37,6 +37,7 @@ @property(nonatomic, weak) IBOutlet NSTextField *inputLabel; @property(nonatomic, weak) IBOutlet NSTextField *securePasswordField; @property(nonatomic, weak) IBOutlet NSTextField *revealPasswordField; +@property(nonatomic, weak) IBOutlet NSTextField *sitePasswordTipField; @property(nonatomic, weak) IBOutlet NSSearchField *siteField; @property(nonatomic, weak) IBOutlet MPSitesTableView *siteTable; @property(nonatomic, weak) IBOutlet NSProgressIndicator *progressView; diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m index 70ed30bb..37dd0c82 100644 --- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m +++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m @@ -43,7 +43,7 @@ - (void)windowDidLoad { - prof_new(@"windowDidLoad"); + prof_new( @"windowDidLoad" ); [super windowDidLoad]; prof_rewind( @"super" ); @@ -60,8 +60,11 @@ // }]; [[NSNotificationCenter defaultCenter] addObserverForName:NSWindowDidBecomeKeyNotification object:self.window queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) { + prof_new( @"didBecomeKey" ); [self fadeIn]; + prof_rewind( @"fadeIn" ); [self updateUser]; + prof_finish( @"updateUser" ); }]; [[NSNotificationCenter defaultCenter] addObserverForName:NSWindowWillCloseNotification object:self.window queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) { @@ -72,7 +75,7 @@ [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationWillResignActiveNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) { #ifndef DEBUG - [self fadeOut]; + [self fadeOut]; #endif }]; [[NSNotificationCenter defaultCenter] addObserverForName:MPSignedInNotification object:nil @@ -85,7 +88,9 @@ }]; [self observeKeyPath:@"sitesController.selection" withBlock:^(id from, id to, NSKeyValueChange cause, id _self) { + prof_new( @"sitesController.selection" ); [_self updateSelection]; + prof_finish( @"updateSelection" ); }]; prof_rewind( @"observers" ); @@ -597,6 +602,7 @@ ]; self.showVersionContainer = self.alternatePressed || self.selectedSite.outdated; + [self.sitePasswordTipField setAttributedStringValue:straf( @"Your password for %@:", self.selectedSite.displayedName )]; } - (void)createNewSite:(NSString *)siteName { @@ -628,7 +634,7 @@ - (void)fadeIn { - prof_new(@"fadeIn"); + prof_new( @"fadeIn" ); if ([self.window isOnActiveSpace] && self.window.alphaValue > FLT_EPSILON) { prof_finish( @"showing" ); return; diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib index 1a06a52f..857e5018 100644 --- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib +++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib @@ -4,6 +4,7 @@ + @@ -16,6 +17,7 @@ + @@ -24,9 +26,9 @@ - + - + @@ -209,7 +211,7 @@ - + @@ -224,7 +226,7 @@ - + @@ -238,6 +240,35 @@ + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + NSNegateBoolean + + + + @@ -275,7 +306,7 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - + @@ -921,24 +851,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + NSNegateBoolean + + + + - - + - + + @@ -950,14 +979,14 @@ - + + - @@ -969,7 +998,6 @@ - @@ -979,6 +1007,7 @@ +