nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2026-02-01 11:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Populate Action menu with the same copy actions as the entry table context menü

Browse Source
This commit is contained in:
Michael Starke
2019-02-13 18:25:46 +01:00
parent 88e4faae98
commit 98f99f6cbf
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MacPass/MPToolbarDelegate.m
View File

@@ -26,6 +26,7 @@
#import "MPToolbarItem.h" #import "MPToolbarItem.h"
#import "MPContextButton.h" #import "MPContextButton.h"
#import "MPAddEntryContextMenuDelegate.h" #import "MPAddEntryContextMenuDelegate.h"
#import "MPEntryContextMenuDelegate.h"
#import "MPActionHelper.h" #import "MPActionHelper.h"
#import "MPContextMenuHelper.h" #import "MPContextMenuHelper.h"
@@ -47,7 +48,8 @@ NSString *const MPToolbarItemHistory = @"TOOLBAR_HISTORY";
NSString *const MPToolbarItemAutotype = @"TOOLBAR_AUTOTYPE"; NSString *const MPToolbarItemAutotype = @"TOOLBAR_AUTOTYPE";
@interface MPToolbarDelegate() { @interface MPToolbarDelegate() {
MPAddEntryContextMenuDelegate *_entryMenuDelegate; MPAddEntryContextMenuDelegate *_addEntryMenuDelegate;
MPEntryContextMenuDelegate * _entryActionContextMenuDelegate;
BOOL _didShowToolbarForSearch; BOOL _didShowToolbarForSearch;
BOOL _didAddSearchfieldForSearch; BOOL _didAddSearchfieldForSearch;
NSToolbarDisplayMode _displayModeBeforeSearch; NSToolbarDisplayMode _displayModeBeforeSearch;
@@ -91,7 +93,8 @@ NSString *const MPToolbarItemAutotype = @"TOOLBAR_AUTOTYPE";
MPToolbarItemInspector ]; MPToolbarItemInspector ];
_toolbarImages = [self createToolbarImages]; _toolbarImages = [self createToolbarImages];
_toolbarItems = [[NSMutableDictionary alloc] initWithCapacity:[self.toolbarIdentifiers count]]; _toolbarItems = [[NSMutableDictionary alloc] initWithCapacity:[self.toolbarIdentifiers count]];
_entryMenuDelegate = [[MPAddEntryContextMenuDelegate alloc] init]; _addEntryMenuDelegate = [[MPAddEntryContextMenuDelegate alloc] init];
_entryActionContextMenuDelegate = [[MPEntryContextMenuDelegate alloc] init];
} }
return self; return self;
} }
@@ -134,6 +137,7 @@ NSString *const MPToolbarItemAutotype = @"TOOLBAR_AUTOTYPE";
popupButton.frame = newFrame; popupButton.frame = newFrame;
popupButton.menu = menu; popupButton.menu = menu;
menu.delegate = _entryActionContextMenuDelegate;
item.menuFormRepresentation = menuRepresentation; item.menuFormRepresentation = menuRepresentation;
item.view = popupButton; item.view = popupButton;
} }
@@ -147,7 +151,7 @@ NSString *const MPToolbarItemAutotype = @"TOOLBAR_AUTOTYPE";
NSMenu *menu = [[NSMenu alloc] init]; NSMenu *menu = [[NSMenu alloc] init];
[menu addItemWithTitle:NSLocalizedString(@"UNKNOWN_TOOLBAR_ITEM", @"") action:NULL keyEquivalent:@""]; [menu addItemWithTitle:NSLocalizedString(@"UNKNOWN_TOOLBAR_ITEM", @"") action:NULL keyEquivalent:@""];
menu.delegate = _entryMenuDelegate; menu.delegate = _addEntryMenuDelegate;
button.contextMenu = menu; button.contextMenu = menu;