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

added item menu to MainMenu. Enabled copy actions in main menu if no focus is on entryView

Browse Source
This commit is contained in:
Michael Starke
2018-03-02 15:41:59 +01:00
parent 24f11dccfd
commit 0028684e5c
5 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MacPass/Base.lproj/MainMenu.xib
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment identifier="macosx"/> <deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
</dependencies> </dependencies>
<objects> <objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication"> <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -250,6 +250,14 @@ CA
</items> </items>
</menu> </menu>
</menuItem> </menuItem>
<menuItem title="Item" id="3st-rv-EeQ">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Item" id="Ttt-tR-emo">
<connections>
<outlet property="delegate" destination="494" id="8Tk-fd-paV"/>
</connections>
</menu>
</menuItem>
<menuItem title="View" id="295"> <menuItem title="View" id="295">
<menu key="submenu" title="View" id="296"> <menu key="submenu" title="View" id="296">
<items> <items>
@@ -336,12 +344,13 @@ CA
</menu> </menu>
</menuItem> </menuItem>
</items> </items>
<point key="canvasLocation" x="-452" y="80"/> <point key="canvasLocation" x="-600" y="98"/>
</menu> </menu>
<customObject id="494" customClass="MPAppDelegate"> <customObject id="494" customClass="MPAppDelegate">
<connections> <connections>
<outlet property="fileNewMenuItem" destination="82" id="BUX-dy-HS2"/> <outlet property="fileNewMenuItem" destination="82" id="BUX-dy-HS2"/>
<outlet property="fixAutotypeMenuItem" destination="nx7-Vf-LiD" id="5n1-bG-JxJ"/> <outlet property="fixAutotypeMenuItem" destination="nx7-Vf-LiD" id="5n1-bG-JxJ"/>
<outlet property="itemMenu" destination="Ttt-tR-emo" id="cdF-dt-2h9"/>
<outlet property="saveMenuItem" destination="75" id="dsN-Im-4eZ"/> <outlet property="saveMenuItem" destination="75" id="dsN-Im-4eZ"/>
</connections> </connections>
</customObject> </customObject>

1
MacPass/MPAppDelegate.h
View File

@@ -33,6 +33,7 @@ APPKIT_EXTERN NSString *const MPDidChangeStoredKeyFilesSettings;
@property (weak) IBOutlet NSMenuItem *saveMenuItem; @property (weak) IBOutlet NSMenuItem *saveMenuItem;
@property (weak) IBOutlet NSMenuItem *fixAutotypeMenuItem; @property (weak) IBOutlet NSMenuItem *fixAutotypeMenuItem;
@property (weak) IBOutlet NSMenuItem *fileNewMenuItem; @property (weak) IBOutlet NSMenuItem *fileNewMenuItem;
@property (weak) IBOutlet NSMenu *itemMenu;
@property (nonatomic, assign) BOOL isAllowedToStoreKeyFile; @property (nonatomic, assign) BOOL isAllowedToStoreKeyFile;

6
MacPass/MPAppDelegate.m
View File

@@ -197,6 +197,12 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
if(menu == self.fixAutotypeMenuItem.menu) { if(menu == self.fixAutotypeMenuItem.menu) {
self.fixAutotypeMenuItem.hidden = !(NSEvent.modifierFlags & NSAlternateKeyMask); self.fixAutotypeMenuItem.hidden = !(NSEvent.modifierFlags & NSAlternateKeyMask);
} }
if(menu == self.itemMenu) {
[menu removeAllItems];
for(NSMenuItem *item in [MPContextMenuHelper contextMenuItemsWithItems:MPContextMenuFull]) {
[menu addItem:item];
}
}
} }
#pragma mark - #pragma mark -

9
MacPass/MPDocumentWindowController.h
View File

@@ -44,9 +44,8 @@
- (void)showEntries; - (void)showEntries;
- (void)showPasswordInput; - (void)showPasswordInput;
- (void)editPasswordWithCompetionHandler:(void (^)(NSInteger result))handler; - (void)editPasswordWithCompetionHandler:(void (^)(NSInteger result))handler;
#pragma mark Actions #pragma mark Actions
- (IBAction)saveDocument:(id)sender; - (IBAction)saveDocument:(id)sender;
- (IBAction)saveDocumentAs:(id)sender; - (IBAction)saveDocumentAs:(id)sender;
@@ -71,6 +70,12 @@
- (IBAction)performAutotypeForEntry:(id)sender; - (IBAction)performAutotypeForEntry:(id)sender;
- (IBAction)copyUsername:(id)sender;
- (IBAction)copyPassword:(id)sender;
- (IBAction)copyCustomAttribute:(id)sender;
- (IBAction)copyURL:(id)sender;
- (IBAction)openURL:(id)sender;
#pragma mark Helper #pragma mark Helper
- (IBAction)fixAutotype:(id)sender; - (IBAction)fixAutotype:(id)sender;

22
MacPass/MPDocumentWindowController.m
View File

@@ -514,6 +514,28 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
[contentView layoutSubtreeIfNeeded]; [contentView layoutSubtreeIfNeeded];
} }
- (void)copyUsername:(id)sender {
[self.entryViewController copyUsername:sender];
}
- (void)copyPassword:(id)sender {
[self.entryViewController copyPassword:sender];
}
- (void)copyCustomAttribute:(id)sender {
[self.entryViewController copyCustomAttribute:sender];
}
- (void)copyURL:(id)sender {
[self.entryViewController copyURL:sender];
}
- (void)openURL:(id)sender {
[self.entryViewController openURL:sender];
}
#pragma mark Validation #pragma mark Validation
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem { - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
return ([self.document validateMenuItem:menuItem]); return ([self.document validateMenuItem:menuItem]);