From e0d1ad5f22766f1bc06cc23b109ee9e5eba33c87 Mon Sep 17 00:00:00 2001 From: michael starke Date: Wed, 29 Oct 2014 18:41:25 +0100 Subject: [PATCH] Renamed clone entry to duplicate entry. Using NSStringFromSelector in MPActionHelper --- MacPass.xcodeproj/project.pbxproj | 24 ++++---- MacPass/CloneEntryWindow.xib | 69 ---------------------- MacPass/DuplicateEntryOptionsWindow.xib | 69 ++++++++++++++++++++++ MacPass/MPActionHelper.h | 4 +- MacPass/MPActionHelper.m | 42 ++++++------- MacPass/MPContextMenuHelper.h | 4 +- MacPass/MPContextMenuHelper.m | 14 ++--- MacPass/MPDocument.h | 4 +- MacPass/MPDocument.m | 13 ++-- MacPass/de.lproj/Localizable.strings | Bin 10284 -> 10300 bytes MacPass/en.lproj/Localizable.strings | Bin 11016 -> 11048 bytes MacPass/fr.lproj/Localizable.strings | Bin 10370 -> 10402 bytes MacPass/nl.lproj/Localizable.strings | Bin 10290 -> 10306 bytes MacPass/zh-Hans.lproj/Localizable.strings | Bin 7962 -> 7978 bytes 14 files changed, 123 insertions(+), 120 deletions(-) delete mode 100644 MacPass/CloneEntryWindow.xib create mode 100644 MacPass/DuplicateEntryOptionsWindow.xib diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 1241bfe0..e2927f51 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -239,6 +239,7 @@ 4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; }; 4CAF62FC1763604000CD7084 /* HNHBadgedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAF62FB1763604000CD7084 /* HNHBadgedTextFieldCell.m */; }; 4CB4AA0D17C2274200454CAD /* KeePass1_native_test.kdb in Resources */ = {isa = PBXBuildFile; fileRef = 4CB4AA0C17C2274200454CAD /* KeePass1_native_test.kdb */; }; + 4CB915941A0159A20089CE5B /* DuplicateEntryOptionsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CB915931A0159A20089CE5B /* DuplicateEntryOptionsWindow.xib */; }; 4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4CB9339716D3A0DD00A13B5D /* Credits.rtf */; }; 4CBA2ABA17074C07006D8139 /* MPSettingsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */; }; 4CBA561617C2EA4900CE13D3 /* KPKTestXmlWriting.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA561517C2EA4900CE13D3 /* KPKTestXmlWriting.m */; }; @@ -262,7 +263,6 @@ 4CD3ABBF178F72610073F5C5 /* KPKEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABBE178F72610073F5C5 /* KPKEntry.m */; }; 4CD3ABC2178F72720073F5C5 /* KPKGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABC1178F72720073F5C5 /* KPKGroup.m */; }; 4CD4901018513C180017397F /* KPKXmlElements.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD4900F18513C180017397F /* KPKXmlElements.m */; }; - 4CD5A79118BFE17900162DCB /* CloneEntryWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CD5A79018BFE17900162DCB /* CloneEntryWindow.xib */; }; 4CD5D705177A5F3300100649 /* MPDatabaseSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD5D704177A5F3300100649 /* MPDatabaseSettingsWindowController.m */; }; 4CD6C5AE1789FDE6000891F6 /* HNHRoundedSecureTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD6C5AD1789FDE6000891F6 /* HNHRoundedSecureTextField.m */; }; 4CD7223B17A7CB0700F5A1E1 /* MPWorkflowSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7223A17A7CB0700F5A1E1 /* MPWorkflowSettingsController.m */; }; @@ -378,8 +378,8 @@ 4C0104BC17C37C2B00173EF3 /* KPKXmlUtilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKXmlUtilities.h; sourceTree = ""; }; 4C0104BD17C37DA400173EF3 /* KPKXmlUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKXmlUtilities.m; sourceTree = ""; }; 4C0104BF17C37DFC00173EF3 /* KPKTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKTypes.h; sourceTree = ""; }; - 4C01C2401764D8980016D5D0 /* MPContextMenuHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPContextMenuHelper.h; sourceTree = ""; }; - 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPContextMenuHelper.m; sourceTree = ""; }; + 4C01C2401764D8980016D5D0 /* MPContextMenuHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = MPContextMenuHelper.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MPContextMenuHelper.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 4C01C243176500C40016D5D0 /* HNHLevelIndicatorCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHLevelIndicatorCell.h; sourceTree = ""; }; 4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHLevelIndicatorCell.m; sourceTree = ""; }; 4C0728BB17B5B7F7005A7DD9 /* MPPasswordEditWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordEditWindowController.h; sourceTree = ""; }; @@ -617,7 +617,7 @@ 4C5AA590179549A1008ECAD7 /* KPKXmlTreeWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKXmlTreeWriter.m; sourceTree = ""; }; 4C5ADC2E17830AFB004E1E8D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InspectorView.strings; sourceTree = ""; }; 4C5ADC3017830B09004E1E8D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InspectorView.strings; sourceTree = ""; }; - 4C5CD34017D158DE000B7F38 /* fr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; + 4C5CD34017D158DE000B7F38 /* fr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; }; 4C5CD34117D158DE000B7F38 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = fr; path = fr.lproj/Credits.rtf; sourceTree = ""; }; 4C5CD34217D158DE000B7F38 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = ""; }; 4C5CD34417D158DE000B7F38 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -698,7 +698,7 @@ 4C76156C1764C0CC0015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PasswordInputView.strings; sourceTree = ""; }; 4C7615701764C0E80015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/InspectorView.xib; sourceTree = ""; }; 4C7615751764C4A40015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PasswordInputView.strings; sourceTree = ""; }; - 4C7615771764C4A40015A1A6 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; + 4C7615771764C4A40015A1A6 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; }; 4C7615781764C4A50015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = de; path = de.lproj/Credits.rtf; sourceTree = ""; }; 4C7615791764C4A50015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = ""; }; 4C7714A9176C998F00549F2A /* 43_TrashTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 43_TrashTemplate.pdf; sourceTree = ""; }; @@ -737,7 +737,7 @@ 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPKeyfilePathControlDelegate.m; sourceTree = ""; }; 4C83814015BF4677001AE468 /* MPDocumentWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDocumentWindowController.h; sourceTree = ""; }; 4C83814115BF4677001AE468 /* MPDocumentWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDocumentWindowController.m; sourceTree = ""; }; - 4C888C8F16EB6C91003D34A1 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; + 4C888C8F16EB6C91003D34A1 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; }; 4C888C9116EB6F5E003D34A1 /* MPToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPToolbarItem.h; sourceTree = ""; }; 4C888C9216EB6F5E003D34A1 /* MPToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarItem.m; sourceTree = ""; }; 4C888C9516EB754B003D34A1 /* MPActionHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPActionHelper.h; sourceTree = ""; }; @@ -800,6 +800,7 @@ 4CAF62FB1763604000CD7084 /* HNHBadgedTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHBadgedTextFieldCell.m; sourceTree = ""; }; 4CB4AA0C17C2274200454CAD /* KeePass1_native_test.kdb */ = {isa = PBXFileReference; lastKnownFileType = file; name = KeePass1_native_test.kdb; path = Databases/KeePass1_native_test.kdb; sourceTree = ""; }; 4CB63A6018986530002DEC4C /* MPFlagsHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPFlagsHelper.h; sourceTree = ""; }; + 4CB915931A0159A20089CE5B /* DuplicateEntryOptionsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DuplicateEntryOptionsWindow.xib; sourceTree = ""; }; 4CB9339816D3A0DD00A13B5D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = ""; }; 4CBA2AB617074B59006D8139 /* MPSettingsHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSettingsHelper.h; sourceTree = ""; }; 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSettingsHelper.m; sourceTree = ""; }; @@ -844,7 +845,6 @@ 4CD3ABC1178F72720073F5C5 /* KPKGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKGroup.m; sourceTree = ""; }; 4CD4900E18513C180017397F /* KPKXmlElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KPKXmlElements.h; path = Format/KPKXmlElements.h; sourceTree = ""; }; 4CD4900F18513C180017397F /* KPKXmlElements.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KPKXmlElements.m; path = Format/KPKXmlElements.m; sourceTree = ""; }; - 4CD5A79018BFE17900162DCB /* CloneEntryWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CloneEntryWindow.xib; sourceTree = ""; }; 4CD5D703177A5F3300100649 /* MPDatabaseSettingsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabaseSettingsWindowController.h; sourceTree = ""; }; 4CD5D704177A5F3300100649 /* MPDatabaseSettingsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseSettingsWindowController.m; sourceTree = ""; }; 4CD6C5AC1789FDE6000891F6 /* HNHRoundedSecureTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHRoundedSecureTextField.h; sourceTree = ""; }; @@ -878,7 +878,7 @@ 4CE3E62517AB0D2D00D9E4B4 /* MPAttachmentTableDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAttachmentTableDataSource.m; sourceTree = ""; }; 4CE5299F194847150078C2FF /* MPDocument+EditingSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPDocument+EditingSession.h"; sourceTree = ""; }; 4CE5B548173AFBA700207B39 /* MPDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDocument.h; sourceTree = ""; }; - 4CE5B549173AFBA700207B39 /* MPDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDocument.m; sourceTree = ""; }; + 4CE5B549173AFBA700207B39 /* MPDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MPDocument.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 4CE76DAC17B3AD010043B82B /* KPKHashedDataTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKHashedDataTest.m; sourceTree = ""; }; 4CE8246D16E2E93400573141 /* MPOverlayWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOverlayWindowController.h; sourceTree = ""; }; 4CE8246E16E2E93400573141 /* MPOverlayWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOverlayWindowController.m; sourceTree = ""; }; @@ -928,7 +928,7 @@ 601F811218E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/MainMenu.strings"; sourceTree = ""; }; 601F811318E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/PasswordInputView.strings"; sourceTree = ""; }; 601F811418E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InspectorView.strings"; sourceTree = ""; }; - 601F811818E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; + 601F811818E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; }; 601F811918E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "zh-Hans"; path = "zh-Hans.lproj/Credits.rtf"; sourceTree = ""; }; 601F811A18E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; 601F811B18E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/KPKLocalizable.strings"; sourceTree = ""; }; @@ -992,7 +992,7 @@ BD6C366019484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/GroupInspectorView.strings; sourceTree = ""; }; BD6C366119484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/EntryInspectorView.strings; sourceTree = ""; }; BD6C366219484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/DatePickingView.strings; sourceTree = ""; }; - BD6C366319484CF40089EB37 /* nl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; }; + BD6C366319484CF40089EB37 /* nl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; }; BD6C366419484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = nl; path = nl.lproj/Credits.rtf; sourceTree = ""; }; BD6C366519484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = ""; }; BD6C366619484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/KPKLocalizable.strings; sourceTree = ""; }; @@ -1985,7 +1985,7 @@ 6021FE8418E160BC00C3BC51 /* PasswordEditWindow.xib */, 4C68456E17BC2A0700FCDBFC /* WelcomeWindow.xib */, 4C0DD6C518B2A44700FCB193 /* AutotypeCandidateSelectionWindow.xib */, - 4CD5A79018BFE17900162DCB /* CloneEntryWindow.xib */, + 4CB915931A0159A20089CE5B /* DuplicateEntryOptionsWindow.xib */, ); name = Windows; sourceTree = ""; @@ -2208,7 +2208,6 @@ 6021FE8D18E1617300C3BC51 /* PasswordCreatorView.xib in Resources */, 4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */, 4C7714AA176C998F00549F2A /* 43_TrashTemplate.pdf in Resources */, - 4CD5A79118BFE17900162DCB /* CloneEntryWindow.xib in Resources */, 4C7714AC176C9D4600549F2A /* 99_InfoTemplate.pdf in Resources */, 6021FE5618E1429500C3BC51 /* IntegrationSettings.xib in Resources */, 4CA3531218A5577300839B0F /* dsa_sparkle_pub.pem in Resources */, @@ -2220,6 +2219,7 @@ 4C2C8B341787500E009649F3 /* UnprotectedWarningView.xib in Resources */, 4CF29BF417879D0000851B60 /* 26_FileSaveTemplate.pdf in Resources */, 4C7BD07619FE94C900C7AA5C /* MacPassImages.xcassets in Resources */, + 4CB915941A0159A20089CE5B /* DuplicateEntryOptionsWindow.xib in Resources */, 4C52A88E1788628B00868229 /* 06_BlockDeviceTemplate.pdf in Resources */, 4C52A88F1788628B00868229 /* 13_KeysTemplate.pdf in Resources */, 4C52A8901788628B00868229 /* 18_DisplayTemplate.pdf in Resources */, diff --git a/MacPass/CloneEntryWindow.xib b/MacPass/CloneEntryWindow.xib deleted file mode 100644 index b8f7192d..00000000 --- a/MacPass/CloneEntryWindow.xib +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MacPass/DuplicateEntryOptionsWindow.xib b/MacPass/DuplicateEntryOptionsWindow.xib new file mode 100644 index 00000000..62a28200 --- /dev/null +++ b/MacPass/DuplicateEntryOptionsWindow.xib @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MacPass/MPActionHelper.h b/MacPass/MPActionHelper.h index 1558244d..b2347152 100644 --- a/MacPass/MPActionHelper.h +++ b/MacPass/MPActionHelper.h @@ -12,8 +12,8 @@ typedef NS_ENUM(NSUInteger, MPActionType) { MPUnkownAction, // Neutral element to be used for returns MPActionAddEntry, // Add an new entry MPActionAddGroup, // Add a new group - MPActionCloneEntry, // Simply clone an entry (inlcuding history) - MPActionCloneEntryWithOptions, // Request user inptu what clone + MPActionDuplicateEntry, // Simply duplicate an entry (inlcuding history) + MPActionDuplicateEntryWithOptions, // Request user inptu on what to duplicate MPActionDelete, // Delete entry or group MPActionCopyUsername, // copy username to pasteboard MPActionCopyPassword, // copy password to pasteboard diff --git a/MacPass/MPActionHelper.m b/MacPass/MPActionHelper.m index 26d0b02b..557dbff8 100644 --- a/MacPass/MPActionHelper.m +++ b/MacPass/MPActionHelper.m @@ -9,6 +9,8 @@ #import "MPActionHelper.h" #import "MPDocument+HistoryBrowsing.h" #import "MPEntryInspectorViewController.h" +#import "MPEntryViewController.h" +#import "MPDocumentWindowController.h" @implementation MPActionHelper @@ -17,26 +19,26 @@ static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ actionDict = @{ - @(MPActionAddEntry): @"createEntry:", - @(MPActionAddGroup): @"createGroup:", - @(MPActionCloneEntry): @"cloneEntry:", - @(MPActionCloneEntryWithOptions): @"cloneEntryWithOptions:", - @(MPActionCopyPassword): @"copyPassword:", - @(MPActionCopyURL): @"copyURL:", - @(MPActionCopyUsername): @"copyUsername:", - @(MPActionDelete): @"delete:", - @(MPActionEditPassword): @"editPassword:", - @(MPActionOpenURL): @"openURL:", - @(MPActionToggleInspector): @"toggleInspector:", - @(MPActionLock): @"lock:", - @(MPActionEmptyTrash): @"emptyTrash:", - @(MPActionDatabaseSettings): @"showDatabaseSettings:", - @(MPActionEditTemplateGroup): @"editTemplateGroup:", - @(MPActionExportXML): @"exportAsXML:", - @(MPActionImportXML): @"importFromXMl:", - @(MPActionToggleQuicklook): NSStringFromSelector(@selector(toggleQuicklookPreview:)), - @(MPActionShowHistory): NSStringFromSelector(@selector(showHistory:)), - @(MPActionExitHistory): NSStringFromSelector(@selector(exitHistory:)) + @(MPActionAddEntry): NSStringFromSelector(@selector(createEntry:)), + @(MPActionAddGroup): NSStringFromSelector(@selector(createGroup:)), + @(MPActionDuplicateEntry): NSStringFromSelector(@selector(duplicateEntry:)), + @(MPActionDuplicateEntryWithOptions): NSStringFromSelector(@selector(duplicateEntryWithOptions:)), + @(MPActionCopyPassword): NSStringFromSelector(@selector(copyPassword:)), + @(MPActionCopyURL): NSStringFromSelector(@selector(copyURL:)), + @(MPActionCopyUsername): NSStringFromSelector(@selector(copyUsername:)), + @(MPActionDelete): NSStringFromSelector(@selector(delete:)), + @(MPActionEditPassword): NSStringFromSelector(@selector(editPassword:)), + @(MPActionOpenURL): NSStringFromSelector(@selector(openURL:)), + @(MPActionToggleInspector): NSStringFromSelector(@selector(toggleInspector:)), + @(MPActionLock): NSStringFromSelector(@selector(lock:)), + @(MPActionEmptyTrash): NSStringFromSelector(@selector(emptyTrash:)), + @(MPActionDatabaseSettings): NSStringFromSelector(@selector(showDatabaseSettings:)), + @(MPActionEditTemplateGroup): NSStringFromSelector(@selector(editTemplateGroup:)), + @(MPActionExportXML): NSStringFromSelector(@selector(exportAsXML:)), + @(MPActionImportXML): NSStringFromSelector(@selector(importFromXML:)), + @(MPActionToggleQuicklook): NSStringFromSelector(@selector(toggleQuicklookPreview:)), + @(MPActionShowHistory): NSStringFromSelector(@selector(showHistory:)), + @(MPActionExitHistory): NSStringFromSelector(@selector(exitHistory:)) }; }); return actionDict; diff --git a/MacPass/MPContextMenuHelper.h b/MacPass/MPContextMenuHelper.h index 6c94a152..8e1682c1 100644 --- a/MacPass/MPContextMenuHelper.h +++ b/MacPass/MPContextMenuHelper.h @@ -13,9 +13,9 @@ typedef NS_OPTIONS(NSUInteger, MPContextMenuItemsFlags) { MPContextMenuDelete = 1 << 1, MPContextMenuCopy = 1 << 2, MPContextMenuTrash = 1 << 3, - MPContextMenuClone = 1 << 4, + MPContextMenuDuplicate = 1 << 4, MPContextMenuMinimal = MPContextMenuCreate | MPContextMenuDelete, - MPContextMenuFull = MPContextMenuMinimal | MPContextMenuCopy | MPContextMenuClone, + MPContextMenuFull = MPContextMenuMinimal | MPContextMenuCopy | MPContextMenuDuplicate, MPContextMenuExtended = MPContextMenuFull | MPContextMenuTrash }; diff --git a/MacPass/MPContextMenuHelper.m b/MacPass/MPContextMenuHelper.m index 5a816fa7..f2269992 100644 --- a/MacPass/MPContextMenuHelper.m +++ b/MacPass/MPContextMenuHelper.m @@ -25,7 +25,7 @@ static void MPContextmenuHelperBeginSection(NSMutableArray *items) { BOOL const insertDelete = MPIsFlagSetInOptions(MPContextMenuDelete, flags); BOOL const insertCopy = MPIsFlagSetInOptions(MPContextMenuCopy, flags); BOOL const insertTrash = MPIsFlagSetInOptions(MPContextMenuTrash, flags); - BOOL const insertClone = MPIsFlagSetInOptions(MPContextMenuClone, flags); + BOOL const insertDuplicate = MPIsFlagSetInOptions(MPContextMenuDuplicate, flags); NSMutableArray *items = [NSMutableArray arrayWithCapacity:10]; if(insertCreate) { @@ -39,16 +39,16 @@ static void MPContextmenuHelperBeginSection(NSMutableArray *items) { [items addObjectsFromArray:@[ newGroup, newEntry ]]; } - if(insertClone) { + if(insertDuplicate) { MPContextmenuHelperBeginSection(items); - NSMenuItem *cloneEntry = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"CLONE_ENTRY", @"") - action:[MPActionHelper actionOfType:MPActionCloneEntry] + NSMenuItem *duplicateEntry = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"DUPLICATE_ENTRY", @"") + action:[MPActionHelper actionOfType:MPActionDuplicateEntry] keyEquivalent:@"D"]; - NSMenuItem *cloneEntyWithOptions = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"CLONE_ENTRY_WITH_OPTIONS", @"") - action:[MPActionHelper actionOfType:MPActionCloneEntryWithOptions] + NSMenuItem *duplicateEntyWithOptions = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"DUPLICATE_ENTRY_WITH_OPTIONS", @"") + action:[MPActionHelper actionOfType:MPActionDuplicateEntryWithOptions] keyEquivalent:@""]; - [items addObjectsFromArray:@[ cloneEntry, cloneEntyWithOptions ]]; + [items addObjectsFromArray:@[ duplicateEntry, duplicateEntyWithOptions ]]; } if(insertDelete || insertTrash) { diff --git a/MacPass/MPDocument.h b/MacPass/MPDocument.h index f67be43c..5203c30b 100644 --- a/MacPass/MPDocument.h +++ b/MacPass/MPDocument.h @@ -182,8 +182,8 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey; */ - (IBAction)createEntryFromTemplate:(id)sender; -- (IBAction)cloneEntry:(id)sender; +- (IBAction)duplicateEntry:(id)sender; -- (IBAction)cloneEntryWithOptions:(id)sender; +- (IBAction)duplicateEntryWithOptions:(id)sender; @end diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index bfb1f558..c2a7be82 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -606,14 +606,15 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey } } -- (void)cloneEntry:(id)sender { - KPKEntry *clone = [self.selectedEntry copyWithTitle:nil]; +- (void)duplicateEntry:(id)sender { + KPKEntry *duplicate = [self.selectedEntry copyWithTitle:nil]; NSInteger index = [self.selectedEntry.parent.entries indexOfObject:self.selectedEntry]; - [self.selectedEntry.parent addEntry:clone atIndex:index+1]; - [self.undoManager setActionName:NSLocalizedString(@"CLONE_ENTRY", "")]; + [self.selectedEntry.parent addEntry:duplicate atIndex:index+1]; + [self.undoManager setActionName:NSLocalizedString(@"DUPLICATE_ENTRY", "")]; } -- (void)cloneEntryWithOptions:(id)sender { +- (void)duplicateEntryWithOptions:(id)sender { + } @@ -672,7 +673,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey valid &= (self.trash != targetNode); valid &= ![self isItemTrashed:targetNode]; break; - case MPActionCloneEntry: + case MPActionDuplicateEntry: valid &= (nil != targetEntry); break; case MPActionEmptyTrash: diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings index 030aba8ad418c223d6575173f7a89fc1ad82ba05..153f3de454f153327dc34c12393a914a1fdfe612 100644 GIT binary patch delta 52 ucmZ1zuqR-H3oE}1LnuQ4gAaozgENC8L&#)#4(Z8htP1Gjn|oR3D**sVR13ub delta 36 lcmdlJuqI%G3oE-bgAap0gWqI*4(Z8xtO_vx=DDo%l>oYZ35fsz diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings index e61f4d3f08360f2734e7995595471a98fb55ab21..ef0e80460bdb7728d817967c01f60ab494ed4390 100644 GIT binary patch delta 48 ycmeAOTM@Q_k9G1P9+AmrY$B6;gheK20qG+=LX%ZE#3tvlN2e4Lq0TXXID_kCM-Iu!ZLAVNm0V!Z diff --git a/MacPass/fr.lproj/Localizable.strings b/MacPass/fr.lproj/Localizable.strings index b37b4eb2deecac1acabd801b2f8339778dfb3df6..924cc20fe3945d65750ee7273de05ba2c1c82bbf 100644 GIT binary patch delta 86 zcmZn)Toky$g_YZdA(SD2!H2<90j fA!KqVt1-U|Ln%W6Lk>eSLncEaL&@gDtoxM!8*vhx delta 74 zcmZ1!*c7eeLmopag93vqkS<{;VyI+LVz6f50+KM5 R3t5eUy1*(oKW5#p1OQbd5K906 diff --git a/MacPass/nl.lproj/Localizable.strings b/MacPass/nl.lproj/Localizable.strings index 77acbfd9cf6a0ef13bd506b9ff35d3f2eb10d42e..746e584b8b5fb2e080b9aaa18e03a39a3db44e8c 100644 GIT binary patch delta 52 ucmdlKa429y0xQ1@LnuQ4gAaozgENC8L&#)(4#~+4tSac@n^&{8D**shcnlu^ delta 32 hcmX>Uuqj|e0xP>SgAap0gWu$QR$CZ*^KRC5B>)9kX*Rjlz0sw2) B44VJ| delta 42 scmZ2wH_L8=4hy?8gAap0gWu$SR>{dBECQTRK7;Gzem2R?eJpdN0P4{S#Q*>R