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

Added merge action to file menu

Browse Source
This commit is contained in:
michael starke
2017-09-02 10:00:10 +02:00
parent f8b86a386a
commit 76383d6d9d
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,6 +143,12 @@
<menuItem isSeparatorItem="YES" id="79"> <menuItem isSeparatorItem="YES" id="79">
<modifierMask key="keyEquivalentModifierMask" command="YES"/> <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem> </menuItem>
<menuItem title="Merge…" id="zvE-0h-UxI">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="mergeWithOther:" target="-1" id="OyM-CZ-TDD"/>
</connections>
</menuItem>
<menuItem title="Import XML…" id="rW0-r1-QYL"> <menuItem title="Import XML…" id="rW0-r1-QYL">
<modifierMask key="keyEquivalentModifierMask"/> <modifierMask key="keyEquivalentModifierMask"/>
<connections> <connections>

1
MacPass/MPDocumentWindowController.m
View File

@@ -301,6 +301,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
openPanel.allowsMultipleSelection = NO; openPanel.allowsMultipleSelection = NO;
openPanel.canChooseDirectories = NO; openPanel.canChooseDirectories = NO;
openPanel.canChooseFiles = YES; openPanel.canChooseFiles = YES;
openPanel.message = NSLocalizedString(@"SELECT_FILE_TO_MERGE", @"Message for the dialog to open a file for merge");
//openPanel.allowedFileTypes = @[(id)kUTTypeXML]; //openPanel.allowedFileTypes = @[(id)kUTTypeXML];
[openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) { [openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
if(result == NSFileHandlingPanelOKButton) { if(result == NSFileHandlingPanelOKButton) {