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

Reordered entries in context menu and always add separator before copy actions

Browse Source
This commit is contained in:
Michael Starke
2019-02-13 18:24:57 +01:00
parent e38925d0ef
commit 88e4faae98
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MacPass/MPEntryContextMenuDelegate.m
View File

@@ -56,23 +56,8 @@ static NSUInteger const kMPCopyAsReferenceMenuItem = 3000;
return; return;
} }
KPKEntry *entry = entries.lastObject; KPKEntry *entry = entries.lastObject;
if(entry.customAttributes.count > 0) {
[menu addItem:[NSMenuItem separatorItem]];
NSMenuItem *attributeItem = [[NSMenuItem alloc] init];
NSMenu *submenu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"COPY_CUSTOM_FIELDS_MENU", @"Context menu sub-menu to copy custom fields to clipboard")];
attributeItem.title = NSLocalizedString(@"COPY_CUSTOM_FIELDS", "Submenu to Copy custom fields");
attributeItem.tag = kMPCustomFieldMenuItem;
for (KPKAttribute *attribute in entry.customAttributes) {
NSString *title = [NSString stringWithFormat:NSLocalizedString(@"COPY_FIELD_%@", "Mask for title to copy field value"), attribute.key];
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:title action:@selector(copyCustomAttribute:) keyEquivalent:@""];
item.tag = [entry.customAttributes indexOfObject:attribute];
[submenu addItem:item];
}
attributeItem.submenu = submenu;
[menu addItem:attributeItem];
}
if(entry) { if(entry) {
[menu addItem:[NSMenuItem separatorItem]];
NSMenuItem *copyReferenceItem = [[NSMenuItem alloc] init]; NSMenuItem *copyReferenceItem = [[NSMenuItem alloc] init];
copyReferenceItem.title = NSLocalizedString(@"COPY_AS_REFERENCE", "Submenu to copy attributes as reference"); copyReferenceItem.title = NSLocalizedString(@"COPY_AS_REFERENCE", "Submenu to copy attributes as reference");
copyReferenceItem.tag = kMPCopyAsReferenceMenuItem; copyReferenceItem.tag = kMPCopyAsReferenceMenuItem;
@@ -94,6 +79,20 @@ static NSUInteger const kMPCopyAsReferenceMenuItem = 3000;
copyReferenceItem.submenu = subMenu; copyReferenceItem.submenu = subMenu;
[menu addItem:copyReferenceItem]; [menu addItem:copyReferenceItem];
} }
if(entry.customAttributes.count > 0) {
NSMenuItem *attributeItem = [[NSMenuItem alloc] init];
NSMenu *submenu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"COPY_CUSTOM_FIELDS_MENU", @"Context menu sub-menu to copy custom fields to clipboard")];
attributeItem.title = NSLocalizedString(@"COPY_CUSTOM_FIELDS", "Submenu to Copy custom fields");
attributeItem.tag = kMPCustomFieldMenuItem;
for (KPKAttribute *attribute in entry.customAttributes) {
NSString *title = [NSString stringWithFormat:NSLocalizedString(@"COPY_FIELD_%@", "Mask for title to copy field value"), attribute.key];
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:title action:@selector(copyCustomAttribute:) keyEquivalent:@""];
item.tag = [entry.customAttributes indexOfObject:attribute];
[submenu addItem:item];
}
attributeItem.submenu = submenu;
[menu addItem:attributeItem];
}
} }
@end @end