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

Merged deleteGroup and deleteEntry call into delteNode

Browse Source
This commit is contained in:
michael starke
2015-12-14 20:06:41 +01:00
parent acbb5605f4
commit c7a6ad19dc
3 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MacPass/MPDocument.h
View File

@@ -150,8 +150,6 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
- (KPKAttribute *)createCustomAttribute:(KPKEntry *)entry; - (KPKAttribute *)createCustomAttribute:(KPKEntry *)entry;
- (void)deleteNode:(KPKNode *)node; - (void)deleteNode:(KPKNode *)node;
- (void)deleteGroup:(KPKGroup *)group;
- (void)deleteEntry:(KPKEntry *)entry;
#pragma mark Actions #pragma mark Actions
/** /**

77
MacPass/MPDocument.m
View File

@@ -508,57 +508,41 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
} }
- (void)deleteNode:(KPKNode *)node { - (void)deleteNode:(KPKNode *)node {
if(!node.asEntry && !node.asGroup) {
return; // Nothing do
}
if(node.isTrashed) {
[self _presentTrashAlertForItem:node];
return;
}
[node trashOrRemove];
BOOL permanent = (nil == self.trash);
if(node.asGroup) { if(node.asGroup) {
[self deleteGroup:node.asGroup]; [self.undoManager setActionName:permanent ? NSLocalizedString(@"DELETE_GROUP", "Delete Group") : NSLocalizedString(@"TRASH_GROUP", "Move Group to Trash")];
if(self.selectedGroup == node) {
self.selectedGroup = nil;
}
} }
else if(node.asEntry) { else if(node.asEntry) {
[self deleteEntry:node.asEntry]; [self.undoManager setActionName:permanent ? NSLocalizedString(@"DELETE_ENTRY", "") : NSLocalizedString(@"TRASH_ENTRY", "Move Entry to Trash")];
if(self.selectedEntry == node) {
self.selectedEntry = nil;
}
} }
} }
- (void)deleteEntry:(KPKEntry *)entry {
if(!entry) {
return; // Nothing to do;
}
if(entry.isTrashed) {
[self _presentTrashAlertForItem:entry];
return;
}
[entry trashOrRemove];
BOOL permanent = (nil == self.trash);
[self.undoManager setActionName:permanent ? NSLocalizedString(@"DELETE_ENTRY", "") : NSLocalizedString(@"TRASH_ENTRY", "Move Entry to Trash")];
if(self.selectedEntry == entry) {
self.selectedEntry = nil;
}
}
- (void)deleteGroup:(KPKGroup *)group {
if(!group) {
return; // Nothing to do;
}
if(group.isTrashed) {
[self _presentTrashAlertForItem:group];
return;
}
[group trashOrRemove];
BOOL permanent = (nil == self.trash);
[self.undoManager setActionName:permanent ? NSLocalizedString(@"DELETE_GROUP", "Delete Group") : NSLocalizedString(@"TRASH_GROUP", "Move Group to Trash")];
}
#pragma mark Actions #pragma mark Actions
- (void)emptyTrash:(id)sender { - (void)emptyTrash:(id)sender {
NSAlert *alert = [[NSAlert alloc] init]; NSAlert *alert = [[NSAlert alloc] init];
[alert setAlertStyle:NSWarningAlertStyle]; alert.alertStyle = NSWarningAlertStyle;
[alert setMessageText:NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_TITLE", "")]; alert.messageText = NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_TITLE", "");
[alert setInformativeText:NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_DESCRIPTION", "Informative Text displayed when clearing the Trash")]; alert.informativeText = NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_DESCRIPTION", "Informative Text displayed when clearing the Trash");
[alert addButtonWithTitle:NSLocalizedString(@"EMPTY_TRASH", "Empty Trash")]; [alert addButtonWithTitle:NSLocalizedString(@"EMPTY_TRASH", "Empty Trash")];
[alert addButtonWithTitle:NSLocalizedString(@"CANCEL", "Cancel")]; [alert addButtonWithTitle:NSLocalizedString(@"CANCEL", "Cancel")];
alert.buttons.lastObject.keyEquivalent = [NSString stringWithFormat:@"%c", 0x1b];
[[alert buttons][1] setKeyEquivalent:[NSString stringWithFormat:@"%c", 0x1b]]; [alert beginSheetModalForWindow:self.windowForSheet modalDelegate:self didEndSelector:@selector(_emptyTrashAlertDidEnd:returnCode:contextInfo:) contextInfo:NULL];
NSWindow *window = [[self windowControllers][0] window];
[alert beginSheetModalForWindow:window modalDelegate:self didEndSelector:@selector(_emptyTrashAlertDidEnd:returnCode:contextInfo:) contextInfo:NULL];
} }
- (void)_emptyTrashAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - (void)_emptyTrashAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
@@ -571,17 +555,16 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
KPKEntry *entry = node.asEntry; KPKEntry *entry = node.asEntry;
NSAlert *alert = [[NSAlert alloc] init]; NSAlert *alert = [[NSAlert alloc] init];
[alert setAlertStyle:NSWarningAlertStyle]; alert.alertStyle = NSWarningAlertStyle;
[alert setMessageText:NSLocalizedString(@"WARNING_ON_DELETE_TRASHED_NODE_TITLE", "")]; alert.messageText = NSLocalizedString(@"WARNING_ON_DELETE_TRASHED_NODE_TITLE", "");
[alert setInformativeText:NSLocalizedString(@"WARNING_ON_DELETE_TRASHED_NODE_DESCRIPTION", "Informative Text displayed when clearing the Trash")]; alert.informativeText = NSLocalizedString(@"WARNING_ON_DELETE_TRASHED_NODE_DESCRIPTION", "Informative Text displayed when clearing the Trash");
NSString *okButtonText = entry ? NSLocalizedString(@"DELETE_TRASHED_ENTRY", "Empty Trash") : NSLocalizedString(@"DELETE_TRASHED_GROUP", "Empty Trash"); NSString *okButtonText = entry ? NSLocalizedString(@"DELETE_TRASHED_ENTRY", "Empty Trash") : NSLocalizedString(@"DELETE_TRASHED_GROUP", "Empty Trash");
[alert addButtonWithTitle:okButtonText]; [alert addButtonWithTitle:okButtonText];
[alert addButtonWithTitle:NSLocalizedString(@"CANCEL", "Cancel")]; [alert addButtonWithTitle:NSLocalizedString(@"CANCEL", "Cancel")];
alert.buttons.lastObject.keyEquivalent = [NSString stringWithFormat:@"%c", 0x1b];
[[alert buttons][1] setKeyEquivalent:[NSString stringWithFormat:@"%c", 0x1b]];
[alert beginSheetModalForWindow:self.windowForSheet modalDelegate:self didEndSelector:@selector(_deleteTrashedItemAlertDidEnd:returnCode:contextInfo:) contextInfo:(__bridge void *)(node)];
NSWindow *window = [[self windowControllers][0] window];
[alert beginSheetModalForWindow:window modalDelegate:self didEndSelector:@selector(_deleteTrashedItemAlertDidEnd:returnCode:contextInfo:) contextInfo:(__bridge void *)(node)];
} }
- (void)_deleteTrashedItemAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - (void)_deleteTrashedItemAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {

7
MacPass/MPEntryViewController.m
View File

@@ -382,7 +382,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
if(entry) { if(entry) {
return entry; return entry;
} }
MPDocument *document = [[self windowController] document]; MPDocument *document = self.windowController.document;
return document.selectedItem; return document.selectedItem;
} }
@@ -702,8 +702,9 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
if(!entry) { if(!entry) {
return; return;
} }
MPDocument *document = [[self windowController] document];
[document deleteEntry:entry]; MPDocument *document = self.windowController.document;
[document deleteNode:entry];
} }