nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-20 10:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use itemDelgate for item menu and remove special treatment in app delegate

Browse Source
This commit is contained in:
Michael Starke
2019-02-14 17:49:43 +01:00
parent 4d927ad7ab
commit 51c486fb82
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MacPass/MPAppDelegate.m
View File

@@ -41,6 +41,7 @@
#import "MPUserNotificationCenterDelegate.h"
#import "MPWelcomeViewController.h"
#import "MPPlugin.h"
#import "MPEntryContextMenuDelegate.h"
#import "NSApplication+MPAdditions.h"
@@ -54,6 +55,8 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
@private
MPDockTileHelper *_dockTileHelper;
MPUserNotificationCenterDelegate *_userNotificationCenterDelegate;
MPEntryContextMenuDelegate *_entryContextMenuDelegate;
BOOL _shouldOpenFile; // YES if app was started to open a
}
@@ -78,6 +81,7 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
self = [super init];
if(self) {
_userNotificationCenterDelegate = [[MPUserNotificationCenterDelegate alloc] init];
_entryContextMenuDelegate = [[MPEntryContextMenuDelegate alloc] init];
/* We know that we do not use the variable after instantiation */
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable"
@@ -122,6 +126,11 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
for(NSMenuItem *item in items.reverseObjectEnumerator) {
[fileMenu insertItem:item atIndex:insertIndex];
}
[self.itemMenu removeAllItems];
for(NSMenuItem *item in [MPContextMenuHelper contextMenuItemsWithItems:MPContextMenuFull]) {
[self.itemMenu addItem:item];
}
self.itemMenu.delegate = _entryContextMenuDelegate;
}
#pragma mark -
@@ -206,12 +215,6 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
if(menu == self.fixAutotypeMenuItem.menu) {
self.fixAutotypeMenuItem.hidden = !(NSEvent.modifierFlags & NSAlternateKeyMask);
}
if(menu == self.itemMenu) {
[menu removeAllItems];
for(NSMenuItem *item in [MPContextMenuHelper contextMenuItemsWithItems:MPContextMenuFull]) {
[menu addItem:item];
}
}
if(menu == self.importMenu) {
NSMenuItem *exportXML = menu.itemArray.firstObject;
[menu removeAllItems];