diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 2942ad1c..dbab76bb 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 4C01C23C1764D1AA0016D5D0 /* KdbKeyPaths.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C23B1764D1460016D5D0 /* KdbKeyPaths.m */; }; 4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */; }; 4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */; }; 4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58616CF0FAA00F6806C /* EntryView.xib */; }; @@ -76,9 +77,11 @@ 4C669BA116760ED100DD0774 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7916760ED100DD0774 /* Utils.m */; }; 4C669BA216760ED100DD0774 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7B16760ED100DD0774 /* UUID.m */; }; 4C69A73A16D589DF00EC1B1A /* HNHGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C69A73916D589DF00EC1B1A /* HNHGradientView.m */; }; - 4C6B0E8C16C9B99B00A9ED23 /* PasswordInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */; }; + 4C76155C1764C04C0015A1A6 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */; }; + 4C7615631764C08C0015A1A6 /* PasswordEditView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C7615651764C08C0015A1A6 /* PasswordEditView.xib */; }; + 4C7615681764C0C40015A1A6 /* PasswordInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76156A1764C0C40015A1A6 /* PasswordInputView.xib */; }; + 4C76156D1764C0E20015A1A6 /* InspectorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76156F1764C0E20015A1A6 /* InspectorView.xib */; }; 4C77547516E55FE800970E02 /* MPInspectorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77547416E55FE800970E02 /* MPInspectorViewController.m */; }; - 4C77547716E55FFC00970E02 /* InspectorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C77547616E55FFC00970E02 /* InspectorView.xib */; }; 4C77E36715B84A240093A587 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77E36615B84A240093A587 /* Cocoa.framework */; }; 4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E36F15B84A240093A587 /* InfoPlist.strings */; }; 4C77E37315B84A240093A587 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77E37215B84A240093A587 /* main.m */; }; @@ -94,7 +97,6 @@ 4C920E2A16DCDFA00083839B /* MPLoggerProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C920E2916DCDFA00083839B /* MPLoggerProxy.m */; }; 4C9D6AA917615199001C660C /* HNHRoundedSecureTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */; }; 4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; }; - 4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */; }; 4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */; }; 4CA0B2FC15BCAF8600654E32 /* MPSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2FB15BCAF8600654E32 /* MPSettingsWindowController.m */; }; 4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; @@ -107,11 +109,9 @@ 4CAF62FC1763604000CD7084 /* HNHBadgedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAF62FB1763604000CD7084 /* HNHBadgedTextFieldCell.m */; }; 4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4CB9339716D3A0DD00A13B5D /* Credits.rtf */; }; 4CBA2ABA17074C07006D8139 /* MPSettingsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */; }; - 4CBFA240172B385D006090DF /* PasswordEditView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CBFA23F172B385D006090DF /* PasswordEditView.xib */; }; 4CC1AEBE16D4467C006D2AAB /* KdbTree+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC1AEBD16D4467C006D2AAB /* KdbTree+MPAdditions.m */; }; 4CC3AABD175F4983003EF01B /* HNHRoundedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC3AAB9175F4983003EF01B /* HNHRoundedTextFieldCell.m */; }; 4CC6259115BA1C99002F5B11 /* MPOutlineViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6259015BA1C99002F5B11 /* MPOutlineViewDelegate.m */; }; - 4CCF9754173EFBA500460BD2 /* KdbEntry+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCF9753173EFBA500460BD2 /* KdbEntry+Undo.m */; }; 4CD78ABC16D155FF00768A1D /* 07_NotepadTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78AB716D155FF00768A1D /* 07_NotepadTemplate.pdf */; }; 4CD78ABD16D155FF00768A1D /* 08_SocketTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78AB816D155FF00768A1D /* 08_SocketTemplate.pdf */; }; 4CD78ABE16D155FF00768A1D /* 09_IdentityTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78AB916D155FF00768A1D /* 09_IdentityTemplate.pdf */; }; @@ -129,6 +129,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 4C01C23A1764CDA20016D5D0 /* KdbKeyPaths.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KdbKeyPaths.h; sourceTree = ""; }; + 4C01C23B1764D1460016D5D0 /* KdbKeyPaths.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KdbKeyPaths.m; sourceTree = ""; }; 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorWindow.xib; sourceTree = ""; }; 4C22040B1746ED160054C916 /* KdbGroup+Undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+Undo.h"; sourceTree = ""; }; 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+Undo.m"; sourceTree = ""; }; @@ -258,10 +260,26 @@ 4C669B7B16760ED100DD0774 /* UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UUID.m; sourceTree = ""; }; 4C69A73816D589DF00EC1B1A /* HNHGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHGradientView.h; sourceTree = ""; }; 4C69A73916D589DF00EC1B1A /* HNHGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHGradientView.m; sourceTree = ""; }; - 4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordInputView.xib; sourceTree = ""; }; + 4C76155F1764C0590015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/GeneralSettings.xib; sourceTree = ""; }; + 4C7615601764C05A0015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 4C7615621764C0770015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralSettings.strings; sourceTree = ""; }; + 4C7615661764C08F0015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PasswordEditView.xib; sourceTree = ""; }; + 4C7615671764C09E0015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PasswordEditView.strings; sourceTree = ""; }; + 4C76156B1764C0C80015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PasswordInputView.xib; sourceTree = ""; }; + 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 = ""; }; + 4C7615721764C4A40015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/GeneralSettings.strings; sourceTree = ""; }; + 4C7615731764C4A40015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainMenu.strings; sourceTree = ""; }; + 4C7615741764C4A40015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PasswordEditView.strings; sourceTree = ""; }; + 4C7615751764C4A40015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PasswordInputView.strings; sourceTree = ""; }; + 4C7615771764C4A40015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; + 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 = ""; }; + 4C76157B1764C5450015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = ""; }; + 4C76157C1764C8B40015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InspectorView.strings; sourceTree = ""; }; + 4C76157D1764C8B90015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InspectorView.strings; sourceTree = ""; }; 4C77547316E55FE800970E02 /* MPInspectorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPInspectorViewController.h; sourceTree = ""; }; 4C77547416E55FE800970E02 /* MPInspectorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPInspectorViewController.m; sourceTree = ""; }; - 4C77547616E55FFC00970E02 /* InspectorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = InspectorView.xib; sourceTree = ""; }; 4C77E36215B84A240093A587 /* MacPass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacPass.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4C77E36615B84A240093A587 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 4C77E36915B84A240093A587 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; @@ -273,7 +291,6 @@ 4C77E37415B84A240093A587 /* MacPass-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MacPass-Prefix.pch"; sourceTree = ""; }; 4C77E37815B84A240093A587 /* MPAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAppDelegate.h; sourceTree = ""; }; 4C77E37915B84A240093A587 /* MPAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate.m; sourceTree = ""; }; - 4C77E37C15B84A240093A587 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; 4C7E8328172DE2F2002493D8 /* MPPasswordEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordEditViewController.h; sourceTree = ""; }; 4C7E8329172DE2F2002493D8 /* MPPasswordEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordEditViewController.m; sourceTree = ""; }; 4C811C8116ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPKeyfilePathControlDelegate.h; sourceTree = ""; }; @@ -291,7 +308,6 @@ 4C9D6AA717615199001C660C /* HNHRoundedSecureTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHRoundedSecureTextFieldCell.h; sourceTree = ""; }; 4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHRoundedSecureTextFieldCell.m; sourceTree = ""; }; 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsWindow.xib; sourceTree = ""; }; - 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GeneralSettings.xib; sourceTree = ""; }; 4CA0B2F715BCAF6700654E32 /* MPGeneralSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPGeneralSettingsController.h; sourceTree = ""; }; 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPGeneralSettingsController.m; sourceTree = ""; }; 4CA0B2FA15BCAF8600654E32 /* MPSettingsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSettingsWindowController.h; sourceTree = ""; }; @@ -316,15 +332,12 @@ 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 = ""; }; - 4CBFA23F172B385D006090DF /* PasswordEditView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordEditView.xib; sourceTree = ""; }; 4CC1AEBC16D4467C006D2AAB /* KdbTree+MPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbTree+MPAdditions.h"; sourceTree = ""; }; 4CC1AEBD16D4467C006D2AAB /* KdbTree+MPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbTree+MPAdditions.m"; sourceTree = ""; }; 4CC3AAB8175F4983003EF01B /* HNHRoundedTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHRoundedTextFieldCell.h; sourceTree = ""; }; 4CC3AAB9175F4983003EF01B /* HNHRoundedTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHRoundedTextFieldCell.m; sourceTree = ""; }; 4CC6258F15BA1C99002F5B11 /* MPOutlineViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineViewDelegate.h; sourceTree = ""; }; 4CC6259015BA1C99002F5B11 /* MPOutlineViewDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineViewDelegate.m; sourceTree = ""; }; - 4CCF9752173EFBA500460BD2 /* KdbEntry+Undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbEntry+Undo.h"; sourceTree = ""; }; - 4CCF9753173EFBA500460BD2 /* KdbEntry+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbEntry+Undo.m"; sourceTree = ""; }; 4CD78AB716D155FF00768A1D /* 07_NotepadTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 07_NotepadTemplate.pdf; sourceTree = ""; }; 4CD78AB816D155FF00768A1D /* 08_SocketTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 08_SocketTemplate.pdf; sourceTree = ""; }; 4CD78AB916D155FF00768A1D /* 09_IdentityTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 09_IdentityTemplate.pdf; sourceTree = ""; }; @@ -368,15 +381,14 @@ isa = PBXGroup; children = ( 4C25D58616CF0FAA00F6806C /* EntryView.xib */, - 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */, + 4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */, 4C77E37B15B84A240093A587 /* MainMenu.xib */, 4C61EA0416D2FFE200AC519E /* OutlineView.xib */, - 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */, - 4CBFA23F172B385D006090DF /* PasswordEditView.xib */, - 4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */, + 4C7615651764C08C0015A1A6 /* PasswordEditView.xib */, + 4C76156A1764C0C40015A1A6 /* PasswordInputView.xib */, 4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */, 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */, - 4C77547616E55FFC00970E02 /* InspectorView.xib */, + 4C76156F1764C0E20015A1A6 /* InspectorView.xib */, 4CE39AC016ECE359000FE29D /* IconSelection.xib */, 4CE8247316E2F2B900573141 /* MPOverlayView.h */, 4CE8247416E2F2B900573141 /* MPOverlayView.m */, @@ -397,12 +409,12 @@ 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPAdditions.m */, 4CC1AEBC16D4467C006D2AAB /* KdbTree+MPAdditions.h */, 4CC1AEBD16D4467C006D2AAB /* KdbTree+MPAdditions.m */, - 4CCF9752173EFBA500460BD2 /* KdbEntry+Undo.h */, - 4CCF9753173EFBA500460BD2 /* KdbEntry+Undo.m */, 4C22040B1746ED160054C916 /* KdbGroup+Undo.h */, 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */, 4C4A101017629DA900BBF2CA /* KdbGroup+KVOAdditions.h */, 4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */, + 4C01C23A1764CDA20016D5D0 /* KdbKeyPaths.h */, + 4C01C23B1764D1460016D5D0 /* KdbKeyPaths.m */, ); name = KeePassLibAdditions; sourceTree = ""; @@ -807,6 +819,7 @@ 4CE8247216E2E99F00573141 /* Windows */ = { isa = PBXGroup; children = ( + 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */, 4CD884B615BD47080042BBF8 /* DocumentWindow.xib */, 4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */, 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */, @@ -853,6 +866,7 @@ en, English, de, + Base, ); mainGroup = 4C77E35715B84A240093A587; productRefGroup = 4C77E36315B84A240093A587 /* Products */; @@ -872,9 +886,9 @@ 4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */, 4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */, 4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */, - 4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */, + 4C76155C1764C04C0015A1A6 /* GeneralSettings.xib in Resources */, 4CD884B715BD47080042BBF8 /* DocumentWindow.xib in Resources */, - 4C6B0E8C16C9B99B00A9ED23 /* PasswordInputView.xib in Resources */, + 4C7615681764C0C40015A1A6 /* PasswordInputView.xib in Resources */, 4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */, 4C586F9E16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf in Resources */, 4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */, @@ -891,12 +905,12 @@ 4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */, 4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */, 4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */, - 4C77547716E55FFC00970E02 /* InspectorView.xib in Resources */, + 4C76156D1764C0E20015A1A6 /* InspectorView.xib in Resources */, 4C888C9016EB6C91003D34A1 /* Localizable.strings in Resources */, 4CE39AC116ECE359000FE29D /* IconSelection.xib in Resources */, 4C5A11FF1708DE8800223D8A /* PasswordCreatorView.xib in Resources */, 4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */, - 4CBFA240172B385D006090DF /* PasswordEditView.xib in Resources */, + 4C7615631764C08C0015A1A6 /* PasswordEditView.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -923,6 +937,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 4C01C23C1764D1AA0016D5D0 /* KdbKeyPaths.m in Sources */, 4C77E37315B84A240093A587 /* main.m in Sources */, 4CBA2ABA17074C07006D8139 /* MPSettingsHelper.m in Sources */, 4C77E37A15B84A240093A587 /* MPAppDelegate.m in Sources */, @@ -999,7 +1014,6 @@ 4C5A11FE1708DE8700223D8A /* MPPasswordCreatorViewController.m in Sources */, 4C7E832A172DE2F2002493D8 /* MPPasswordEditViewController.m in Sources */, 4CE5B54B173AFBA700207B39 /* MPDocument.m in Sources */, - 4CCF9754173EFBA500460BD2 /* KdbEntry+Undo.m in Sources */, 4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */, 4C3CD2A8175570C9005F911C /* DMSplitView.m in Sources */, 4C3D4C0817594CA40038DAAC /* HNHSeparator.m in Sources */, @@ -1016,10 +1030,51 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ + 4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */ = { + isa = PBXVariantGroup; + children = ( + 4C76155F1764C0590015A1A6 /* Base */, + 4C7615621764C0770015A1A6 /* en */, + 4C7615721764C4A40015A1A6 /* de */, + ); + name = GeneralSettings.xib; + sourceTree = ""; + }; + 4C7615651764C08C0015A1A6 /* PasswordEditView.xib */ = { + isa = PBXVariantGroup; + children = ( + 4C7615661764C08F0015A1A6 /* Base */, + 4C7615671764C09E0015A1A6 /* en */, + 4C7615741764C4A40015A1A6 /* de */, + ); + name = PasswordEditView.xib; + sourceTree = ""; + }; + 4C76156A1764C0C40015A1A6 /* PasswordInputView.xib */ = { + isa = PBXVariantGroup; + children = ( + 4C76156B1764C0C80015A1A6 /* Base */, + 4C76156C1764C0CC0015A1A6 /* en */, + 4C7615751764C4A40015A1A6 /* de */, + ); + name = PasswordInputView.xib; + sourceTree = ""; + }; + 4C76156F1764C0E20015A1A6 /* InspectorView.xib */ = { + isa = PBXVariantGroup; + children = ( + 4C7615701764C0E80015A1A6 /* Base */, + 4C76157C1764C8B40015A1A6 /* en */, + 4C76157D1764C8B90015A1A6 /* de */, + ); + name = InspectorView.xib; + sourceTree = ""; + }; 4C77E36F15B84A240093A587 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( 4C77E37015B84A240093A587 /* en */, + 4C7615791764C4A50015A1A6 /* de */, ); name = InfoPlist.strings; sourceTree = ""; @@ -1027,7 +1082,9 @@ 4C77E37B15B84A240093A587 /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( - 4C77E37C15B84A240093A587 /* en */, + 4C7615601764C05A0015A1A6 /* Base */, + 4C7615731764C4A40015A1A6 /* de */, + 4C76157B1764C5450015A1A6 /* en */, ); name = MainMenu.xib; sourceTree = ""; @@ -1036,6 +1093,7 @@ isa = PBXVariantGroup; children = ( 4C888C8F16EB6C91003D34A1 /* en */, + 4C7615771764C4A40015A1A6 /* de */, ); name = Localizable.strings; sourceTree = ""; @@ -1044,6 +1102,7 @@ isa = PBXVariantGroup; children = ( 4CB9339816D3A0DD00A13B5D /* en */, + 4C7615781764C4A50015A1A6 /* de */, ); name = Credits.rtf; sourceTree = ""; diff --git a/MacPass/GeneralSettings.xib b/MacPass/Base.lproj/GeneralSettings.xib similarity index 73% rename from MacPass/GeneralSettings.xib rename to MacPass/Base.lproj/GeneralSettings.xib index 66b284d7..b0fa1bbc 100644 --- a/MacPass/GeneralSettings.xib +++ b/MacPass/Base.lproj/GeneralSettings.xib @@ -2,9 +2,9 @@ 1080 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -42,9 +42,74 @@ NSApplication - + 268 + + + 268 + {{18, 120}, {233, 18}} + + + + _NS:9 + {250, 252} + YES + + -1543503872 + 268435456 + Open empty database on activate + + LucidaGrande + 13 + 1044 + + _NS:9 + + 1211912448 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + NO + + + + 268 + {{18, 140}, {226, 18}} + + + + _NS:9 + {250, 253} + YES + + -1543503872 + 268435456 + Open empty database on launch + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + 12 @@ -58,6 +123,7 @@ 268 {{15, 42}, {124, 17}} + _NS:1535 YES @@ -65,11 +131,7 @@ 68157504 272630784 Clear Copied Items - - LucidaGrande - 13 - 1044 - + _NS:1535 @@ -98,6 +160,7 @@ 268 {{191, 36}, {112, 26}} + _NS:9 YES @@ -187,8 +250,9 @@ 268 {{16, 12}, {172, 18}} + _NS:9 - {250, 150} + {250, 251} YES -2080374784 @@ -199,13 +263,8 @@ 1211912448 2 - - NSImage - NSSwitch - - - NSSwitch - + + 200 @@ -216,14 +275,17 @@ {{1, 1}, {318, 70}} + _NS:11 - {{17, 121}, {320, 86}} + {{17, 16}, {320, 86}} + _NS:9 + {250, 251} {0, 0} 67108864 @@ -255,8 +317,10 @@ NO - {350, 227} - + {354, 176} + + + NSView @@ -317,28 +381,44 @@ 1 - + 3 0 - - 3 + + 4 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + + + 6 + 0 + + 6 1 20 1000 - 8 - 29 + 9 + 40 3 - - - 3 - 1 - - 3 + + + 4 + 0 + + 4 1 20 @@ -381,7 +461,73 @@ 40 3 + + + 3 + 0 + + 4 + 1 + + 6 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + @@ -465,8 +611,8 @@ 1000 - 8 - 29 + 9 + 40 3 @@ -501,21 +647,21 @@ 40 3 - + - 11 + 3 0 - - 11 + + 3 1 - 0.0 + 26 1000 - 6 - 24 - 2 + 9 + 40 + 3 @@ -653,16 +799,6 @@ - - 496 - - - - - 498 - - - 499 @@ -694,8 +830,69 @@ - 507 - + 523 + + + + + 525 + + + + + 526 + + + + + + + + 527 + + + + + 528 + + + + + 530 + + + + + + + + 531 + + + + + 532 + + + + + 535 + + + + + 536 + + + + + 537 + + + + + 559 + @@ -705,11 +902,18 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + - - + + + + + com.apple.InterfaceBuilder.CocoaPlugin @@ -731,7 +935,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - + @@ -746,21 +950,32 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 521 + 559 @@ -776,19 +991,19 @@ MPGeneralSettingsController MPAbstractSettingsViewController - NSPopUpButton - NSButton + NSButton + NSPopUpButton NSImageView - - ClearClipboardTimeoutPopup - NSPopUpButton - - - clearClipboardOnQuitCheckButton + + clearPasteboardOnQuitCheckButton NSButton + + clearPasteboardTimeoutPopup + NSPopUpButton + imageView NSImageView diff --git a/MacPass/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib similarity index 99% rename from MacPass/InspectorView.xib rename to MacPass/Base.lproj/InspectorView.xib index 822d74bf..402b7847 100644 --- a/MacPass/InspectorView.xib +++ b/MacPass/Base.lproj/InspectorView.xib @@ -239,7 +239,6 @@ {{212, 286}, {32, 25}} - _NS:22 YES @@ -1509,17 +1508,6 @@ MPInspectorViewController MPViewController - - togglePasswordDisplay: - id - - - togglePasswordDisplay: - - togglePasswordDisplay: - id - - NSTextField MPPopupImageView diff --git a/MacPass/en.lproj/MainMenu.xib b/MacPass/Base.lproj/MainMenu.xib similarity index 99% rename from MacPass/en.lproj/MainMenu.xib rename to MacPass/Base.lproj/MainMenu.xib index c8c5617f..1741a221 100644 --- a/MacPass/en.lproj/MainMenu.xib +++ b/MacPass/Base.lproj/MainMenu.xib @@ -1,7 +1,7 @@ - 1070 + 1080 12E55 3084 1187.39 @@ -1275,7 +1275,7 @@ - 1206 + 1230 @@ -1364,10 +1364,6 @@ 0 IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - YES 3 diff --git a/MacPass/PasswordEditView.xib b/MacPass/Base.lproj/PasswordEditView.xib similarity index 100% rename from MacPass/PasswordEditView.xib rename to MacPass/Base.lproj/PasswordEditView.xib diff --git a/MacPass/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib similarity index 99% rename from MacPass/PasswordInputView.xib rename to MacPass/Base.lproj/PasswordInputView.xib index 2cb9bae2..8eeee9b1 100644 --- a/MacPass/PasswordInputView.xib +++ b/MacPass/Base.lproj/PasswordInputView.xib @@ -51,6 +51,7 @@ 268 {{125, 175}, {113, 17}} + _NS:1535 YES @@ -99,6 +100,7 @@ {{157, 200}, {48, 48}} + _NS:9 YES @@ -127,6 +129,7 @@ {{83, 94}, {197, 22}} + _NS:9 YES @@ -151,6 +154,7 @@ 268 {{86, 123}, {191, 22}} + _NS:9 YES @@ -188,6 +192,7 @@ 268 {{17, 126}, {64, 17}} + _NS:1535 YES @@ -208,6 +213,7 @@ 268 {{35, 99}, {46, 17}} + _NS:1535 YES @@ -228,7 +234,7 @@ 268 {{200, 50}, {83, 32}} - + _NS:9 {250, 250} YES @@ -251,6 +257,7 @@ {362, 268} + {751, 750} NSView diff --git a/MacPass/KdbKeyPaths.h b/MacPass/KdbKeyPaths.h new file mode 100644 index 00000000..cbcee230 --- /dev/null +++ b/MacPass/KdbKeyPaths.h @@ -0,0 +1,20 @@ +// +// KdbKeyPaths.h +// MacPass +// +// Created by Michael Starke on 09.06.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#ifndef MacPass_KdbKeyPaths_h +#define MacPass_KdbKeyPaths_h + +#import + +FOUNDATION_EXPORT NSString *const MPEntryKeyForTitle;// = @"title"; +FOUNDATION_EXPORT NSString *const MPEntryKeyForUsername;// = @"username"; +FOUNDATION_EXPORT NSString *const MPEntryKeyForUrl;// = @"url"; +FOUNDATION_EXPORT NSString *const MPEntryKeyForPassword;// = @"password"; +FOUNDATION_EXPORT NSString *const MPEntryKeyForNotes;// = @"notes"; + +#endif diff --git a/MacPass/KdbKeyPaths.m b/MacPass/KdbKeyPaths.m new file mode 100644 index 00000000..e0bb46de --- /dev/null +++ b/MacPass/KdbKeyPaths.m @@ -0,0 +1,15 @@ +// +// KdbKeyPaths.m +// MacPass +// +// Created by Michael Starke on 09.06.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import "KdbKeyPaths.h" + +NSString *const MPEntryKeyForTitle = @"title"; +NSString *const MPEntryKeyForUsername = @"username"; +NSString *const MPEntryKeyForUrl = @"url"; +NSString *const MPEntryKeyForPassword = @"password"; +NSString *const MPEntryKeyForNotes = @"notes"; diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m index 9b24b956..a4839fcd 100644 --- a/MacPass/MPAppDelegate.m +++ b/MacPass/MPAppDelegate.m @@ -32,8 +32,8 @@ [MPUppercaseStringValueTransformer registerTransformer]; } -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - +- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender { + return [[NSUserDefaults standardUserDefaults] boolForKey:kMPSettingsKeyOpenEmptyDatabaseOnLaunch]; } - (void)dealloc { diff --git a/MacPass/MPInspectorViewController.h b/MacPass/MPInspectorViewController.h index 3644cf45..25a697fe 100644 --- a/MacPass/MPInspectorViewController.h +++ b/MacPass/MPInspectorViewController.h @@ -25,7 +25,6 @@ @property (assign) IBOutlet NSButton *showPasswordCreator; - (BOOL)isVisible; -- (IBAction)togglePasswordDisplay:(id)sender; - (void)hideImagePopup:(id)sender; @end diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m index 9429fd68..c45a660f 100644 --- a/MacPass/MPInspectorViewController.m +++ b/MacPass/MPInspectorViewController.m @@ -14,8 +14,8 @@ #import "MPPopupImageView.h" #import "MPIconSelectViewController.h" #import "KdbLib.h" -#import "KdbEntry+Undo.h" #import "KdbGroup+Undo.h" +#import "KdbKeyPaths.h" @interface MPInspectorViewController () { BOOL _visible; @@ -96,13 +96,13 @@ } - (void)_showEntry { - [self.itemNameTextfield bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryTitleUndoableKey options:nil]; + [self.itemNameTextfield bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryKeyForTitle options:nil]; [self.itemImageView setImage:[MPIconHelper icon:(MPIconType)self.selectedEntry.image ]]; - [self.passwordTextField bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryPasswordUndoableKey options:nil]; - [self.usernameTextField bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryUsernameUndoableKey options:nil]; + [self.passwordTextField bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryKeyForPassword options:nil]; + [self.usernameTextField bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryKeyForUsername options:nil]; [self.titleOrNameLabel setStringValue:NSLocalizedString(@"TITLE",@"")]; - [self.titleTextField bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryTitleUndoableKey options:nil]; - [self.URLTextField bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryUrlUndoableKey options:nil]; + [self.titleTextField bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryKeyForTitle options:nil]; + [self.URLTextField bind:NSValueBinding toObject:self.selectedEntry withKeyPath:MPEntryKeyForUrl options:nil]; [self _setInputEnabled:YES]; } @@ -212,35 +212,4 @@ } } - -- (IBAction)togglePasswordDisplay:(id)sender { - NSTextFieldCell *cell = nil; - NSFont *font = [[self.passwordTextField font] retain]; - if([sender respondsToSelector:@selector(state)]) { - switch([sender state]) { - case NSOnState: - cell = [[NSTextFieldCell alloc] init]; - break; - case NSOffState: - cell = [[NSSecureTextFieldCell alloc] init]; - break; - case NSMixedState: - break; - } - } - if(cell) { - [cell setBezelStyle:NSTextFieldSquareBezel]; - [cell setBordered:YES]; - [cell setBezeled:YES]; - [cell setDrawsBackground:YES]; - [cell setFont:font]; - [cell setEditable:YES]; - [self.passwordTextField setCell:cell]; - [self.passwordTextField setNeedsDisplay:YES]; - //[self.passwordTextField setStringValue:[self.passwordTextField stringValue]]; - [cell release]; - } - [font release]; -} - @end diff --git a/MacPass/MPSettingsHelper.h b/MacPass/MPSettingsHelper.h index 6469fdd9..2cf8dadd 100644 --- a/MacPass/MPSettingsHelper.h +++ b/MacPass/MPSettingsHelper.h @@ -11,6 +11,7 @@ APPKIT_EXTERN NSString *const kMPSettingsKeyPasteboardClearTimeout; APPKIT_EXTERN NSString *const kMPSettingsKeyClearPasteboardOnQuit; APPKIT_EXTERN NSString *const kMPSettingsKeyPasswordEncoding; +APPKIT_EXTERN NSString *const kMPSettingsKeyOpenEmptyDatabaseOnLaunch; typedef enum { MPPasswordEncodingUTF8, diff --git a/MacPass/MPSettingsHelper.m b/MacPass/MPSettingsHelper.m index 63cb1fa1..22c13c0a 100644 --- a/MacPass/MPSettingsHelper.m +++ b/MacPass/MPSettingsHelper.m @@ -10,6 +10,7 @@ NSString *const kMPSettingsKeyPasteboardClearTimeout = @"ClipboardClearTimeout"; NSString *const kMPSettingsKeyClearPasteboardOnQuit = @"ClearClipboardOnQuit"; +NSString *const kMPSettingsKeyOpenEmptyDatabaseOnLaunch = @"OpenEmptyDatabaseOnLaunch"; @interface MPSettingsHelper () @@ -27,6 +28,7 @@ NSString *const kMPSettingsKeyClearPasteboardOnQuit = @"ClearClipboardOnQuit"; return @{ kMPSettingsKeyPasteboardClearTimeout: @10, kMPSettingsKeyClearPasteboardOnQuit: @YES, + kMPSettingsKeyOpenEmptyDatabaseOnLaunch: @NO, }; } diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index c4b10cc1..46c5fed1 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -48,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - ACC + AEE LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright diff --git a/MacPass/SettingsWindow.xib b/MacPass/SettingsWindow.xib index 6b575f6d..1f971867 100644 --- a/MacPass/SettingsWindow.xib +++ b/MacPass/SettingsWindow.xib @@ -2,9 +2,9 @@ 1080 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -35,19 +35,21 @@ 7 2 - {{196, 240}, {350, 200}} + {{196, 240}, {371, 164}} 544735232 Window NSWindow - + 256 - {350, 200} + {371, 164} + + - {{0, 0}, {1680, 1028}} + {{0, 0}, {1920, 1058}} {10000000000000, 10000000000000} YES @@ -120,7 +122,18 @@ 89 - + + + + MPSettingsWindowController + NSWindowController + + IBProjectSource + ./Classes/MPSettingsWindowController.h + + + + 0 IBCocoaFramework YES diff --git a/MacPass/de.lproj/Credits.rtf b/MacPass/de.lproj/Credits.rtf new file mode 100644 index 00000000..74400892 --- /dev/null +++ b/MacPass/de.lproj/Credits.rtf @@ -0,0 +1,43 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;} +\paperw11900\paperh16840\vieww28040\viewh7240\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 + +\f0\b\fs24 \cf0 Project Website:\ +{\field{\*\fldinst{HYPERLINK "https://github.com/mstarke/MacPass"}}{\fldrslt +\b0 MacPass}} +\b0 \ + +\b \ +License:\ + +\b0 MacPass KeePass compatible client for OS X\ +Copyright (c) 2012-2013 Michael Starke, HicknHack Software GmbH\ + \ +This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by\ +the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\ +\ +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of\ +\ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ +\ +You should have received a copy of the GNU General Public License along with this program. If not, see {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt http://www.gnu.org/licenses/}}.\ +\ + +\b Credits:\ +{\field{\*\fldinst{HYPERLINK "https://github.com/robbiehanson/KissXML"}}{\fldrslt +\b0 \cf2 KissXML}} +\b0 \cf3 \ +Copyright \'a9 2012 Robbie Hanson. All rights reserved.\ + \ +{\field{\*\fldinst{HYPERLINK "https://github.com/MiniKeePass/MiniKeePass"}}{\fldrslt \cf2 MiniKeePass}}\ +Copyright \'a9 2011 Jason Rush and John Flanagan. All rights reserved.\ + \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +{\field{\*\fldinst{HYPERLINK "https://github.com/mpowrie/KeePassLib"}}{\fldrslt \cf2 KeePass Database Library}}\ +Copyright \'a9 2010 Qiang Yu. All rights reserved.\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +{\field{\*\fldinst{HYPERLINK "https://github.com/Perspx/PXSourceList"}}{\fldrslt \cf3 PXSourceList}}\ +Copyright \'a9 2011, Alex Rozanski. All rights reserved.} \ No newline at end of file diff --git a/MacPass/de.lproj/GeneralSettings.strings b/MacPass/de.lproj/GeneralSettings.strings new file mode 100644 index 00000000..f48e8275 --- /dev/null +++ b/MacPass/de.lproj/GeneralSettings.strings @@ -0,0 +1,30 @@ + +/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "421"; */ +"421.title" = "OtherViews"; + +/* Class = "NSMenuItem"; title = "10 Seconds"; ObjectID = "422"; */ +"422.title" = "10 Sekunden"; + +/* Class = "NSMenuItem"; title = "30 Seconds"; ObjectID = "423"; */ +"423.title" = "30 Sekunden"; + +/* Class = "NSMenuItem"; title = "1 Minute"; ObjectID = "424"; */ +"424.title" = "1 Minute"; + +/* Class = "NSMenuItem"; title = "Never"; ObjectID = "429"; */ +"429.title" = "Nie"; + +/* Class = "NSTextFieldCell"; title = "Clear Copied Items"; ObjectID = "432"; */ +"432.title" = "Zwischenablage Leere"; + +/* Class = "NSButtonCell"; title = "Clear Clipboard on Quit"; ObjectID = "448"; */ +"448.title" = "Zwischenablage beim Beenden leeren"; + +/* Class = "NSBox"; title = "Clipboard"; ObjectID = "465"; */ +"465.title" = "Zwischenablage"; + +/* Class = "NSButtonCell"; title = "Open empty database on launch"; ObjectID = "527"; */ +"527.title" = "Leere Datenbank beim Programmstart öffnen"; + +/* Class = "NSButtonCell"; title = "Open empty database on activate"; ObjectID = "531"; */ +"531.title" = "Lerre Datenbank beim Aktiveren öffnen"; diff --git a/MacPass/de.lproj/InfoPlist.strings b/MacPass/de.lproj/InfoPlist.strings new file mode 100644 index 00000000..477b28ff --- /dev/null +++ b/MacPass/de.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/MacPass/de.lproj/InspectorView.strings b/MacPass/de.lproj/InspectorView.strings new file mode 100644 index 00000000..2f07447a --- /dev/null +++ b/MacPass/de.lproj/InspectorView.strings @@ -0,0 +1,15 @@ + +/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "101"; */ +"101.title" = "Name"; + +/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "495"; */ +"495.title" = "Name"; + +/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "498"; */ +"498.title" = "Username"; + +/* Class = "NSTextFieldCell"; title = "URL"; ObjectID = "500"; */ +"500.title" = "URL"; + +/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "502"; */ +"502.title" = "Password"; diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings new file mode 100644 index 00000000..3d0fd2fb Binary files /dev/null and b/MacPass/de.lproj/Localizable.strings differ diff --git a/MacPass/de.lproj/MainMenu.strings b/MacPass/de.lproj/MainMenu.strings new file mode 100644 index 00000000..9214c828 --- /dev/null +++ b/MacPass/de.lproj/MainMenu.strings @@ -0,0 +1,138 @@ + +/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */ +"5.title" = "Bring All to Front"; + +/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */ +"19.title" = "Window"; + +/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */ +"23.title" = "Minimize"; + +/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */ +"24.title" = "Window"; + +/* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */ +"29.title" = "AMainMenu"; + +/* Class = "NSMenuItem"; title = "MacPass"; ObjectID = "56"; */ +"56.title" = "MacPass"; + +/* Class = "NSMenu"; title = "MacPass"; ObjectID = "57"; */ +"57.title" = "MacPass"; + +/* Class = "NSMenuItem"; title = "About MacPass"; ObjectID = "58"; */ +"58.title" = "About MacPass"; + +/* Class = "NSMenuItem"; title = "Open…"; ObjectID = "72"; */ +"72.title" = "Open…"; + +/* Class = "NSMenuItem"; title = "Close"; ObjectID = "73"; */ +"73.title" = "Close"; + +/* Class = "NSMenuItem"; title = "Save…"; ObjectID = "75"; */ +"75.title" = "Save…"; + +/* Class = "NSMenu"; title = "File"; ObjectID = "81"; */ +"81.title" = "File"; + +/* Class = "NSMenuItem"; title = "New"; ObjectID = "82"; */ +"82.title" = "New"; + +/* Class = "NSMenuItem"; title = "File"; ObjectID = "83"; */ +"83.title" = "File"; + +/* Class = "NSMenuItem"; title = "Revert to Saved"; ObjectID = "112"; */ +"112.title" = "Revert to Saved"; + +/* Class = "NSMenuItem"; title = "Open Recent"; ObjectID = "124"; */ +"124.title" = "Open Recent"; + +/* Class = "NSMenu"; title = "Open Recent"; ObjectID = "125"; */ +"125.title" = "Open Recent"; + +/* Class = "NSMenuItem"; title = "Clear Menu"; ObjectID = "126"; */ +"126.title" = "Clear Menu"; + +/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */ +"129.title" = "Preferences…"; + +/* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */ +"130.title" = "Services"; + +/* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */ +"131.title" = "Services"; + +/* Class = "NSMenuItem"; title = "Hide MacPass"; ObjectID = "134"; */ +"134.title" = "Hide MacPass"; + +/* Class = "NSMenuItem"; title = "Quit MacPass"; ObjectID = "136"; */ +"136.title" = "Quit MacPass"; + +/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */ +"145.title" = "Hide Others"; + +/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */ +"150.title" = "Show All"; + +/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "197"; */ +"197.title" = "Copy"; + +/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "198"; */ +"198.title" = "Select All"; + +/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "199"; */ +"199.title" = "Cut"; + +/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "202"; */ +"202.title" = "Delete"; + +/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "203"; */ +"203.title" = "Paste"; + +/* Class = "NSMenu"; title = "Edit"; ObjectID = "205"; */ +"205.title" = "Edit"; + +/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "207"; */ +"207.title" = "Undo"; + +/* Class = "NSMenuItem"; title = "Find…"; ObjectID = "209"; */ +"209.title" = "Find…"; + +/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "215"; */ +"215.title" = "Redo"; + +/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "217"; */ +"217.title" = "Edit"; + +/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "239"; */ +"239.title" = "Zoom"; + +/* Class = "NSMenuItem"; title = "View"; ObjectID = "295"; */ +"295.title" = "View"; + +/* Class = "NSMenu"; title = "View"; ObjectID = "296"; */ +"296.title" = "View"; + +/* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "297"; */ +"297.title" = "Show Toolbar"; + +/* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "298"; */ +"298.title" = "Customize Toolbar…"; + +/* Class = "NSMenuItem"; title = "Help"; ObjectID = "490"; */ +"490.title" = "Help"; + +/* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */ +"491.title" = "Help"; + +/* Class = "NSMenuItem"; title = "MacPass Help"; ObjectID = "492"; */ +"492.title" = "MacPass Help"; + +/* Class = "NSMenuItem"; title = "Toggle Inspector"; ObjectID = "1181"; */ +"1181.title" = "Toggle Inspector"; + +/* Class = "NSMenuItem"; title = "Show Password Creator"; ObjectID = "1200"; */ +"1200.title" = "Show Password Creator"; + +/* Class = "NSMenuItem"; title = "Change Password…"; ObjectID = "1203"; */ +"1203.title" = "Change Password…"; diff --git a/MacPass/de.lproj/PasswordEditView.strings b/MacPass/de.lproj/PasswordEditView.strings new file mode 100644 index 00000000..6f8b6d28 --- /dev/null +++ b/MacPass/de.lproj/PasswordEditView.strings @@ -0,0 +1,15 @@ + +/* Class = "NSButtonCell"; title = "Change"; ObjectID = "32"; */ +"32.title" = "Change"; + +/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "33"; */ +"33.title" = "Password"; + +/* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "37"; */ +"37.title" = "Keyfile"; + +/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "38"; */ +"38.title" = "Cancel"; + +/* Class = "NSTextFieldCell"; title = "Change Password/Keyfile"; ObjectID = "46"; */ +"46.title" = "Change Password/Keyfile"; diff --git a/MacPass/de.lproj/PasswordInputView.strings b/MacPass/de.lproj/PasswordInputView.strings new file mode 100644 index 00000000..903f4f09 --- /dev/null +++ b/MacPass/de.lproj/PasswordInputView.strings @@ -0,0 +1,12 @@ + +/* Class = "NSButtonCell"; title = "Unlock"; ObjectID = "3"; */ +"3.title" = "Unlock"; + +/* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "18"; */ +"18.title" = "Keyfile"; + +/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "32"; */ +"32.title" = "Password"; + +/* Class = "NSTextFieldCell"; title = "Wrong password!"; ObjectID = "269"; */ +"269.title" = "Wrong password!"; diff --git a/MacPass/en.lproj/GeneralSettings.strings b/MacPass/en.lproj/GeneralSettings.strings new file mode 100644 index 00000000..6bb2c3d7 --- /dev/null +++ b/MacPass/en.lproj/GeneralSettings.strings @@ -0,0 +1,30 @@ + +/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "421"; */ +"421.title" = "OtherViews"; + +/* Class = "NSMenuItem"; title = "10 Seconds"; ObjectID = "422"; */ +"422.title" = "10 Seconds"; + +/* Class = "NSMenuItem"; title = "30 Seconds"; ObjectID = "423"; */ +"423.title" = "30 Seconds"; + +/* Class = "NSMenuItem"; title = "1 Minute"; ObjectID = "424"; */ +"424.title" = "1 Minute"; + +/* Class = "NSMenuItem"; title = "Never"; ObjectID = "429"; */ +"429.title" = "Never"; + +/* Class = "NSTextFieldCell"; title = "Clear Copied Items"; ObjectID = "432"; */ +"432.title" = "Clear Copied Items"; + +/* Class = "NSButtonCell"; title = "Clear Clipboard on Quit"; ObjectID = "448"; */ +"448.title" = "Clear Clipboard on Quit"; + +/* Class = "NSBox"; title = "Clipboard"; ObjectID = "465"; */ +"465.title" = "Clipboard"; + +/* Class = "NSButtonCell"; title = "Open empty database on launch"; ObjectID = "527"; */ +"527.title" = "Open empty database on launch"; + +/* Class = "NSButtonCell"; title = "Open empty database on activate"; ObjectID = "531"; */ +"531.title" = "Open empty database on activate"; diff --git a/MacPass/en.lproj/InspectorView.strings b/MacPass/en.lproj/InspectorView.strings new file mode 100644 index 00000000..2f07447a --- /dev/null +++ b/MacPass/en.lproj/InspectorView.strings @@ -0,0 +1,15 @@ + +/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "101"; */ +"101.title" = "Name"; + +/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "495"; */ +"495.title" = "Name"; + +/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "498"; */ +"498.title" = "Username"; + +/* Class = "NSTextFieldCell"; title = "URL"; ObjectID = "500"; */ +"500.title" = "URL"; + +/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "502"; */ +"502.title" = "Password"; diff --git a/MacPass/en.lproj/MainMenu.strings b/MacPass/en.lproj/MainMenu.strings new file mode 100644 index 00000000..9214c828 --- /dev/null +++ b/MacPass/en.lproj/MainMenu.strings @@ -0,0 +1,138 @@ + +/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */ +"5.title" = "Bring All to Front"; + +/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */ +"19.title" = "Window"; + +/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */ +"23.title" = "Minimize"; + +/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */ +"24.title" = "Window"; + +/* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */ +"29.title" = "AMainMenu"; + +/* Class = "NSMenuItem"; title = "MacPass"; ObjectID = "56"; */ +"56.title" = "MacPass"; + +/* Class = "NSMenu"; title = "MacPass"; ObjectID = "57"; */ +"57.title" = "MacPass"; + +/* Class = "NSMenuItem"; title = "About MacPass"; ObjectID = "58"; */ +"58.title" = "About MacPass"; + +/* Class = "NSMenuItem"; title = "Open…"; ObjectID = "72"; */ +"72.title" = "Open…"; + +/* Class = "NSMenuItem"; title = "Close"; ObjectID = "73"; */ +"73.title" = "Close"; + +/* Class = "NSMenuItem"; title = "Save…"; ObjectID = "75"; */ +"75.title" = "Save…"; + +/* Class = "NSMenu"; title = "File"; ObjectID = "81"; */ +"81.title" = "File"; + +/* Class = "NSMenuItem"; title = "New"; ObjectID = "82"; */ +"82.title" = "New"; + +/* Class = "NSMenuItem"; title = "File"; ObjectID = "83"; */ +"83.title" = "File"; + +/* Class = "NSMenuItem"; title = "Revert to Saved"; ObjectID = "112"; */ +"112.title" = "Revert to Saved"; + +/* Class = "NSMenuItem"; title = "Open Recent"; ObjectID = "124"; */ +"124.title" = "Open Recent"; + +/* Class = "NSMenu"; title = "Open Recent"; ObjectID = "125"; */ +"125.title" = "Open Recent"; + +/* Class = "NSMenuItem"; title = "Clear Menu"; ObjectID = "126"; */ +"126.title" = "Clear Menu"; + +/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */ +"129.title" = "Preferences…"; + +/* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */ +"130.title" = "Services"; + +/* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */ +"131.title" = "Services"; + +/* Class = "NSMenuItem"; title = "Hide MacPass"; ObjectID = "134"; */ +"134.title" = "Hide MacPass"; + +/* Class = "NSMenuItem"; title = "Quit MacPass"; ObjectID = "136"; */ +"136.title" = "Quit MacPass"; + +/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */ +"145.title" = "Hide Others"; + +/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */ +"150.title" = "Show All"; + +/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "197"; */ +"197.title" = "Copy"; + +/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "198"; */ +"198.title" = "Select All"; + +/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "199"; */ +"199.title" = "Cut"; + +/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "202"; */ +"202.title" = "Delete"; + +/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "203"; */ +"203.title" = "Paste"; + +/* Class = "NSMenu"; title = "Edit"; ObjectID = "205"; */ +"205.title" = "Edit"; + +/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "207"; */ +"207.title" = "Undo"; + +/* Class = "NSMenuItem"; title = "Find…"; ObjectID = "209"; */ +"209.title" = "Find…"; + +/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "215"; */ +"215.title" = "Redo"; + +/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "217"; */ +"217.title" = "Edit"; + +/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "239"; */ +"239.title" = "Zoom"; + +/* Class = "NSMenuItem"; title = "View"; ObjectID = "295"; */ +"295.title" = "View"; + +/* Class = "NSMenu"; title = "View"; ObjectID = "296"; */ +"296.title" = "View"; + +/* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "297"; */ +"297.title" = "Show Toolbar"; + +/* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "298"; */ +"298.title" = "Customize Toolbar…"; + +/* Class = "NSMenuItem"; title = "Help"; ObjectID = "490"; */ +"490.title" = "Help"; + +/* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */ +"491.title" = "Help"; + +/* Class = "NSMenuItem"; title = "MacPass Help"; ObjectID = "492"; */ +"492.title" = "MacPass Help"; + +/* Class = "NSMenuItem"; title = "Toggle Inspector"; ObjectID = "1181"; */ +"1181.title" = "Toggle Inspector"; + +/* Class = "NSMenuItem"; title = "Show Password Creator"; ObjectID = "1200"; */ +"1200.title" = "Show Password Creator"; + +/* Class = "NSMenuItem"; title = "Change Password…"; ObjectID = "1203"; */ +"1203.title" = "Change Password…"; diff --git a/MacPass/en.lproj/PasswordEditView.strings b/MacPass/en.lproj/PasswordEditView.strings new file mode 100644 index 00000000..6f8b6d28 --- /dev/null +++ b/MacPass/en.lproj/PasswordEditView.strings @@ -0,0 +1,15 @@ + +/* Class = "NSButtonCell"; title = "Change"; ObjectID = "32"; */ +"32.title" = "Change"; + +/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "33"; */ +"33.title" = "Password"; + +/* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "37"; */ +"37.title" = "Keyfile"; + +/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "38"; */ +"38.title" = "Cancel"; + +/* Class = "NSTextFieldCell"; title = "Change Password/Keyfile"; ObjectID = "46"; */ +"46.title" = "Change Password/Keyfile"; diff --git a/MacPass/en.lproj/PasswordInputView.strings b/MacPass/en.lproj/PasswordInputView.strings new file mode 100644 index 00000000..903f4f09 --- /dev/null +++ b/MacPass/en.lproj/PasswordInputView.strings @@ -0,0 +1,12 @@ + +/* Class = "NSButtonCell"; title = "Unlock"; ObjectID = "3"; */ +"3.title" = "Unlock"; + +/* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "18"; */ +"18.title" = "Keyfile"; + +/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "32"; */ +"32.title" = "Password"; + +/* Class = "NSTextFieldCell"; title = "Wrong password!"; ObjectID = "269"; */ +"269.title" = "Wrong password!";