nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 11:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up password creator display in appdelegate

Browse Source
This commit is contained in:
michael starke
2016-08-25 13:01:54 +02:00
parent e06ade6a8f
commit b7357e2e43
5 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MacPass/MPAppDelegate.m
View File

@@ -195,9 +195,7 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
} }
if(!self.passwordCreatorController) { if(!self.passwordCreatorController) {
self.passwordCreatorController = [[MPPasswordCreatorViewController alloc] init]; self.passwordCreatorController = [[MPPasswordCreatorViewController alloc] init];
self.passwordCreatorController.closeTarget = self.passwordCreatorWindow; self.passwordCreatorWindow.contentView = self.passwordCreatorController.view;
NSView *creatorView = [_passwordCreatorController view];
[self.passwordCreatorWindow setContentView:creatorView];
[self.passwordCreatorController updateResponderChain]; [self.passwordCreatorController updateResponderChain];
} }
[self.passwordCreatorController reset]; [self.passwordCreatorController reset];

25
MacPass/MPEntryInspectorViewController.m
View File

@@ -272,25 +272,22 @@ static NSString *kMPContentBindingString3 = @"content.%@.%@.%@";
} }
- (void)_showPopopver:(NSViewController *)viewController atView:(NSView *)view onEdge:(NSRectEdge)edge { - (void)_showPopopver:(NSViewController *)viewController atView:(NSView *)view onEdge:(NSRectEdge)edge {
if(_activePopover.contentViewController == viewController) { if(self.activePopover.contentViewController == viewController) {
return; // Do nothing, we already did show the controller return; // Do nothing, we already did show the controller
} }
[_activePopover close]; [self.activePopover close];
NSAssert(_activePopover == nil, @"Popover hast to be niled out"); NSAssert(self.activePopover == nil, @"Popover hast to be niled out");
_activePopover = [[NSPopover alloc] init]; self.activePopover = [[NSPopover alloc] init];
_activePopover.delegate = self; self.activePopover.delegate = self;
_activePopover.behavior = NSPopoverBehaviorTransient; self.activePopover.behavior = NSPopoverBehaviorTransient;
if([viewController respondsToSelector:@selector(setCloseTarget:)]) { self.activePopover.contentViewController = viewController;
[(id)viewController setCloseTarget:_activePopover]; [self.activePopover showRelativeToRect:NSZeroRect ofView:view preferredEdge:edge];
}
_activePopover.contentViewController = viewController;
[_activePopover showRelativeToRect:NSZeroRect ofView:view preferredEdge:edge];
} }
- (void)popoverDidClose:(NSNotification *)notification { - (void)popoverDidClose:(NSNotification *)notification {
/* We do not enable the button all the time, but it's working find this way */ /* We do not enable the button all the time, but it's working find this way */
[self.generatePasswordButton setEnabled:YES]; [self.generatePasswordButton setEnabled:YES];
NSPopover *popover = notification.object;
id controller = _activePopover.contentViewController; id controller = _activePopover.contentViewController;
/* Check for password wizzard */ /* Check for password wizzard */
if([controller respondsToSelector:@selector(generatedPassword)]) { if([controller respondsToSelector:@selector(generatedPassword)]) {
@@ -300,9 +297,7 @@ static NSString *kMPContentBindingString3 = @"content.%@.%@.%@";
self.representedEntry.password = [controller generatedPassword]; self.representedEntry.password = [controller generatedPassword];
} }
} }
/* TODO: Check for Icon wizard */ self.activePopover = nil;
_activePopover = nil;
} }
#pragma mark - #pragma mark -

2
MacPass/MPPasswordCreatorViewController.h
View File

@@ -12,7 +12,7 @@
@interface MPPasswordCreatorViewController : MPViewController <NSTextFieldDelegate> @interface MPPasswordCreatorViewController : MPViewController <NSTextFieldDelegate>
@property (copy, readonly) NSString *generatedPassword; @property (copy, readonly) NSString *generatedPassword;
@property (weak) id closeTarget; //@property (weak) id closeTarget;
@property (assign) BOOL allowsEntryDefaults; @property (assign) BOOL allowsEntryDefaults;
/** /**

11
MacPass/MPPasswordCreatorViewController.m
View File

@@ -175,11 +175,11 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
if(self.shouldCopyPasswordToPasteboardButton.state == NSOnState) { if(self.shouldCopyPasswordToPasteboardButton.state == NSOnState) {
[[MPPasteBoardController defaultController] copyObjects:@[self.password]]; [[MPPasteBoardController defaultController] copyObjects:@[self.password]];
} }
[[self _findCloseTarget] performClose:nil]; [self.view.window performClose:sender];
} }
- (IBAction)_cancel:(id)sender { - (IBAction)_cancel:(id)sender {
[[self _findCloseTarget] performClose:nil]; [self.view.window performClose:sender];
} }
- (IBAction)_setDefault:(id)sender { - (IBAction)_setDefault:(id)sender {
@@ -344,11 +344,4 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
self.numbersButton.state = (useNumbers ? NSOnState : NSOffState); self.numbersButton.state = (useNumbers ? NSOnState : NSOffState);
self.symbolsButton.state = (useSymbols ? NSOnState : NSOffState); self.symbolsButton.state = (useSymbols ? NSOnState : NSOffState);
} }
- (id)_findCloseTarget {
if([self.closeTarget respondsToSelector:@selector(performClose:)]) {
return self.closeTarget;
}
return [NSApp targetForAction:@selector(performClose:)];
}
@end @end

12
MacPass/PasswordCreatorWindow.xib
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment defaultVersion="1080" identifier="macosx"/> <deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
</dependencies> </dependencies>
<objects> <objects>
<customObject id="-2" userLabel="File's Owner" customClass="MPAppDelegate"> <customObject id="-2" userLabel="File's Owner" customClass="MPAppDelegate">
@@ -11,11 +11,11 @@
</connections> </connections>
</customObject> </customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/> <customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="1"> <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<rect key="contentRect" x="196" y="240" width="338" height="216"/> <rect key="contentRect" x="196" y="240" width="338" height="216"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/> <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<view key="contentView" id="2"> <view key="contentView" id="2">
<rect key="frame" x="0.0" y="0.0" width="338" height="216"/> <rect key="frame" x="0.0" y="0.0" width="338" height="216"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>