Added duplicate group as context menu action

2025-12-13 08:52:20 +00:00 · 2019-08-16 17:24:54 +02:00
parent 245a58d81b
commit 7d8bb85d9b
16 changed files with 55 additions and 16 deletions
--- a/MacPass/MPActionHelper.h
+++ b/MacPass/MPActionHelper.h
@@ -28,6 +28,7 @@ typedef NS_ENUM(NSUInteger, MPActionType) {
  MPActionAddGroup, // Add a new group
  MPActionDuplicateEntry, // Simply duplicate an entry (including history)
  MPActionDuplicateEntryWithOptions, // Request user input on what to duplicate
+  MPActionDuplicateGroup, // Duplicate the group and all it's children
  MPActionReverToHistoryEntry, // Restore an entry to an older state in history
  MPActionDelete, // Delete entry or group
  MPActionCopyUsername, // copy username to pasteboard
--- a/MacPass/MPActionHelper.m
+++ b/MacPass/MPActionHelper.m
@@ -38,6 +38,7 @@
                   @(MPActionAddGroup):                         NSStringFromSelector(@selector(createGroup:)),
                   @(MPActionDuplicateEntry):                   NSStringFromSelector(@selector(duplicateEntry:)),
                   @(MPActionDuplicateEntryWithOptions):        NSStringFromSelector(@selector(duplicateEntryWithOptions:)),
+                   @(MPActionDuplicateGroup):                   NSStringFromSelector(@selector(duplicateGroup:)),
                   @(MPActionReverToHistoryEntry):              NSStringFromSelector(@selector(revertToHistoryEntry:)),
                   @(MPActionCopyPassword):                     NSStringFromSelector(@selector(copyPassword:)),
                   @(MPActionCopyURL):                          NSStringFromSelector(@selector(copyURL:)),
--- a/MacPass/MPContextMenuHelper.h
+++ b/MacPass/MPContextMenuHelper.h
@@ -31,7 +31,7 @@ typedef NS_OPTIONS(NSUInteger, MPContextMenuItemsFlags) {
  MPContextMenuAutotype           = 1 << 5,
  MPContextMenuHistory            = 1 << 6,
  MPContextMenuShowGroupInOutline = 1 << 7,
-  MPContextMenuMinimal            = MPContextMenuCreate | MPContextMenuDelete,
+  MPContextMenuMinimal            = MPContextMenuCreate | MPContextMenuDelete | MPContextMenuDuplicate,
  MPContextMenuFull               = MPContextMenuMinimal | MPContextMenuCopy | MPContextMenuDuplicate | MPContextMenuAutotype | MPContextMenuHistory,
  MPContextMenuExtended           = MPContextMenuFull | MPContextMenuTrash
 };
--- a/MacPass/MPContextMenuHelper.m
+++ b/MacPass/MPContextMenuHelper.m
@@ -64,8 +64,11 @@ static void MPContextmenuHelperBeginSection(NSMutableArray *items) {
    NSMenuItem *duplicateEntyWithOptions = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"DUPLICATE_ENTRY_WITH_OPTIONS", @"Menu item to duplicate an entry with options how to duplicate. Will present a dialog.")
                                                                      action:[MPActionHelper actionOfType:MPActionDuplicateEntryWithOptions]
                                                               keyEquivalent:@""];
-    
-    [items addObjectsFromArray:@[ duplicateEntry, duplicateEntyWithOptions ]];
+    NSMenuItem *duplicateGroup = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"DUPLICATE_GROUP", @"Menu item to directly diplicate a group")
+                                                            action:[MPActionHelper actionOfType:MPActionDuplicateGroup]
+                                                     keyEquivalent:@""];
+
+    [items addObjectsFromArray:@[ duplicateEntry, duplicateEntyWithOptions, duplicateGroup ]];
    
  }
  if(insertDelete || insertTrash) {
--- a/MacPass/MPDocument.h
+++ b/MacPass/MPDocument.h
@@ -165,7 +165,6 @@ FOUNDATION_EXPORT NSString *const MPDocumentGroupKey;
 - (void)deleteNode:(KPKNode *)node;
 - (void)duplicateEntryWithOptions:(KPKCopyOptions)options;

-
 #pragma mark Actions
 /**
 *  Empties the Trash group. Removing all Groups and Entries inside. This action is not undo-able
@@ -179,6 +178,7 @@ FOUNDATION_EXPORT NSString *const MPDocumentGroupKey;
 */
 - (IBAction)createEntryFromTemplate:(id)sender;
 - (IBAction)duplicateEntry:(id)sender;
+- (IBAction)duplicateGroup:(id)sender;

@end

--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -828,7 +828,16 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
    KPKEntry *duplicate = [entry copyWithTitle:nil options:options];
    [duplicate addToGroup:entry.parent];
  }
-  [self.undoManager setActionName:[NSString stringWithFormat:NSLocalizedString(@"DUPLICATE_ENTRIES_%ld", @"Action name for duplicating entries"), self.selectedEntries.count]];
+  [self.undoManager setActionName:[NSString stringWithFormat:NSLocalizedString(@"DUPLICATE_ENTRIES_ACTION_NAME", @"Action name for duplicating entries"), self.selectedEntries.count]];
+}
+
+- (void)duplicateGroup:(id)sender {
+  for(KPKGroup *group in self.selectedGroups) {
+    KPKGroup *duplicate = [group copyWithTitle:nil options:kKPKCopyOptionNone];
+    /* if group is root group, add the duplicate below */
+    [duplicate addToGroup:(group.parent ? group.parent : group)];
+  }
+  [self.undoManager setActionName:[NSString stringWithFormat:NSLocalizedString(@"DUPLICATE_GROUPS_ACTION_NAME", @"Action name for duplicating groups"), self.selectedGroups.count]];
 }

 #pragma mark Validation
@@ -886,6 +895,9 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
      valid &= targetEntries.count > 0;
      valid &= !self.historyEntry;
      break;
+    case MPActionDuplicateGroup:
+      valid &= targetGroups.count > 0;
+      break;
    case MPActionEmptyTrash:
      valid &= (self.trash.groups.count + self.trash.entries.count) > 0;
      break;
--- a/MacPass/MPOutlineContextMenuDelegate.m
+++ b/MacPass/MPOutlineContextMenuDelegate.m
@@ -57,7 +57,7 @@ NSString *const _MPOutlineMenuTemplate = @"Template";
  
  if( [item isKindOfClass:KPKGroup.class]) {
    KPKGroup *group = (KPKGroup *)item;
-    MPDocument *document = [NSDocumentController sharedDocumentController].currentDocument;
+    MPDocument *document = NSDocumentController.sharedDocumentController.currentDocument;
    if(group && document.root == group ) {
      
    }
--- a/MacPass/de.lproj/Localizable.stringsdict
+++ b/MacPass/de.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>alle Zeichen ausgewählt</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
--- a/MacPass/en.lproj/Localizable.strings
+++ b/MacPass/en.lproj/Localizable.strings
@@ -304,7 +304,7 @@
 "DRAG_GROUP" = "Drag Group";

 /* Action name for duplicating entries */
-"DUPLICATE_ENTRIES_%ld" = "Duplicate Entries %ld";
+"DUPLICATE_ENTRIES_ACTION_NAME" = "Duplicate Entries";

 /* Menu item to directly diplicate an entry */
 "DUPLICATE_ENTRY" = "Duplicate Entry";
@@ -312,6 +312,12 @@
 /* Menu item to duplicate an entry with options how to duplicate. Will present a dialog. */
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Duplicate Entry…";

+/* Menu item to directly diplicate a group */
+"DUPLICATE_GROUP" = "Duplicate Group";
+
+/* Action name for duplicating groups */
+"DUPLICATE_GROUPS_ACTION_NAME" = "Duplicate Group";
+
 /* Menu item in the database outline context menu to change the template group
   Menu item on the add entry context menu to edit template groups */
 "EDIT_TEMPLATE_GROUP" = "Edit Entry Template Group";
--- a/MacPass/en.lproj/Localizable.stringsdict
+++ b/MacPass/en.lproj/Localizable.stringsdict
@@ -2,6 +2,22 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>DUPLICATE_GROUPS_ACTION_NAME</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@groups@</string>
+		<key>groups</key>
+		<dict>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>one</key>
+			<string>Duplicate Group</string>
+			<key>other</key>
+			<string>Duplicate Groups</string>
+		</dict>
+	</dict>
 	<key>%ld_CHARACTERS_TO_PICK_REMAINING</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -20,7 +36,7 @@
 			<string>All characters picked</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
--- a/MacPass/es.lproj/Localizable.stringsdict
+++ b/MacPass/es.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>Todos los caracteres seleccionados</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
--- a/MacPass/fr.lproj/Localizable.stringsdict
+++ b/MacPass/fr.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>Tous les caractères ont été choisis</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
@@ -31,7 +31,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>ld</string>
 			<key>one</key>
-			<string>Dupliquer l'entrée</string>
+			<string>Dupliquer l&apos;entrée</string>
 			<key>other</key>
 			<string>Dupliquer les entrées</string>
 			<key>zero</key>
--- a/MacPass/nl.lproj/Localizable.stringsdict
+++ b/MacPass/nl.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>Alle tekens gekozen</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
--- a/MacPass/pl.lproj/Localizable.stringsdict
+++ b/MacPass/pl.lproj/Localizable.stringsdict
@@ -24,7 +24,7 @@
 			<string>Wybrano wszystkie znaki</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@wpisów@</string>
--- a/MacPass/ru.lproj/Localizable.stringsdict
+++ b/MacPass/ru.lproj/Localizable.stringsdict
@@ -24,7 +24,7 @@
 			<string>Выбраны все символы</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
--- a/MacPass/sv-SE.lproj/Localizable.stringsdict
+++ b/MacPass/sv-SE.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>Alla tecken valda</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>