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

centralize all the UI validation in MPDocument

Browse Source
This commit is contained in:
Andrew Schleifer
2013-11-22 22:31:11 -06:00
parent 4290e92535
commit 62a4f9f3e3
3 changed files with 33 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
MacPass/MPDocument.m
View File

@@ -509,13 +509,41 @@ typedef NS_ENUM(NSUInteger, MPAlertType) {
return;
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
return [self validateUserInterfaceItem:menuItem];
}
- (BOOL)validateToolbarItem:(NSToolbarItem *)theItem {
return [self validateUserInterfaceItem:theItem];
}
- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)anItem {
if([anItem action] == [MPActionHelper actionOfType:MPActionEmptyTrash]) {
BOOL hasGroups = [self.trash.groups count] > 0;
BOOL hasEntries = [self.trash.entries count] > 0;
return (hasEntries || hasGroups);
if(self.encrypted || self.isReadOnly) { return NO; }
switch([MPActionHelper typeForAction:[anItem action]]) {
case MPActionDelete: {
BOOL valid = (nil != self.selectedItem);
valid &= (self.selectedItem != self.trash);
valid &= ![self isItemTrashed:self.selectedItem];
return valid;
}
case MPActionEmptyTrash: {
BOOL hasGroups = [self.trash.groups count] > 0;
BOOL hasEntries = [self.trash.entries count] > 0;
return (hasEntries || hasGroups);
}
case MPActionDatabaseSettings:
case MPActionEditPassword:
return !self.encrypted;
case MPActionAddGroup:
case MPActionAddEntry:
return (nil != self.selectedGroup);
case MPActionLock:
return self.compositeKey.hasPasswordOrKeyFile;
default:
return YES;
}
return [super validateUserInterfaceItem:anItem];
}

7
MacPass/MPDocumentWindowController.h
View File

@@ -22,13 +22,6 @@
@property (readonly, strong) MPOutlineViewController *outlineViewController;
@property (readonly, strong) MPInspectorViewController *inspectorViewController;
/**
@param action The action that should be validatet
@param item The item that the action affects. Pass nil to fall back for default item
@returns YES if the action is valid, NO otherwise
*/
- (BOOL)validateAction:(SEL)action forItem:(id)item;
- (void)showEntries;
- (void)showPasswordInput;
- (void)performFindPanelAction:(id)sender;

74
MacPass/MPDocumentWindowController.m
View File

@@ -206,80 +206,6 @@ typedef NS_ENUM(NSUInteger, MPAlertContext) {
[self.entryViewController showFilter:sender];
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
MPDocument *document = [self document];
SEL itemAction = [menuItem action];
if(itemAction == @selector(showDatabaseSettings:)
|| itemAction == @selector(editPassword:)) {
return !document.encrypted;
}
BOOL enabled = YES;
if(itemAction == [MPActionHelper actionOfType:MPActionDelete]) {
enabled &= (nil != document.selectedItem) && (document.selectedItem != document.trash);
}
enabled &= !( document.encrypted || document.isReadOnly );
return enabled;
}
- (BOOL)validateToolbarItem:(NSToolbarItem *)theItem {
MPDocument *document = [self document];
if(document.encrypted || document.isReadOnly) {
return NO;
}
MPActionType actionType = [MPActionHelper typeForAction:[theItem action]];
switch (actionType) {
case MPActionAddGroup:
case MPActionAddEntry:
return (nil != document.selectedGroup);
case MPActionDelete: {
BOOL valid = (nil != document.selectedItem);
valid &= (document.selectedItem != document.trash);
valid &= ![document isItemTrashed:document.selectedItem];
return valid;
}
case MPActionLock:
return document.compositeKey.hasPasswordOrKeyFile;
case MPActionToggleInspector:
return (nil != [_splitView superview]);
default:
return YES;
}
return YES;
}
- (BOOL)validateAction:(SEL)action forItem:(id)item {
MPDocument *document = [self document];
if(document.encrypted || document.isReadOnly) {
return NO;
}
MPActionType actionType = [MPActionHelper typeForAction:action];
switch (actionType) {
case MPActionAddGroup:
case MPActionAddEntry:
// test if Group is in trash
return (nil != document.selectedGroup);
case MPActionDelete: {
BOOL valid = (nil != document.selectedItem);
valid &= (document.selectedItem != document.trash);
valid &= ![document isItemTrashed:document.selectedItem];
return valid;
}
case MPActionLock:
return document.compositeKey.hasPasswordOrKeyFile;
case MPActionToggleInspector:
return (nil != [_splitView superview]);
default:
return YES;
}
return YES;
}
- (void)showPasswordInput {
if(!self.passwordInputController) {
self.passwordInputController = [[MPPasswordInputController alloc] init];