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

Merge button is default action

Browse Source
This commit is contained in:
michael starke
2017-05-18 12:16:13 +02:00
parent 10556d6c08
commit 9e67d0a1ef
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MacPass/MPDocument.m
View File

@@ -290,20 +290,23 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
alert.alertStyle = NSWarningAlertStyle; alert.alertStyle = NSWarningAlertStyle;
alert.messageText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT", @"Message displayed when an open file was changed from another application"); alert.messageText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT", @"Message displayed when an open file was changed from another application");
alert.informativeText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_INFO_TEXT", @"Informative text displayed when the file was change from another application"); alert.informativeText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_INFO_TEXT", @"Informative text displayed when the file was change from another application");
[alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE", @"Ignore the changes to an open file!")];
[alert addButtonWithTitle:NSLocalizedString(@"LOAD_CHANGES", @"Reopen the file!")];
[alert addButtonWithTitle:NSLocalizedString(@"MERGE_CHANGES", @"Merge changes into file!")]; [alert addButtonWithTitle:NSLocalizedString(@"MERGE_CHANGES", @"Merge changes into file!")];
[alert addButtonWithTitle:NSLocalizedString(@"LOAD_CHANGES", @"Reopen the file!")];
[alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE", @"Ignore the changes to an open file!")];
[alert beginSheetModalForWindow:welf.windowForSheet completionHandler:^(NSModalResponse returnCode) { [alert beginSheetModalForWindow:welf.windowForSheet completionHandler:^(NSModalResponse returnCode) {
welf.fileChangeDialogOpen = NO; welf.fileChangeDialogOpen = NO;
switch(returnCode) { switch(returnCode) {
case NSAlertFirstButtonReturn: {
[welf mergeWithContentsFromURL:self.fileURL];
break;
}
case NSAlertSecondButtonReturn: case NSAlertSecondButtonReturn:
[welf revertToContentsOfURL:welf.fileURL ofType:welf.fileType error:nil]; [welf revertToContentsOfURL:welf.fileURL ofType:welf.fileType error:nil];
break; break;
case NSAlertThirdButtonReturn: { case NSAlertThirdButtonReturn:
[welf mergeWithContentsFromURL:self.fileURL]; // do not change anything
}
default: default:
break; break;
} }