Changed Inspectorview to 3 tabs. Notes are now at the first tab.

Filtering should work reliably now. No "sticking" of entries
Fixed #42. Deleted entries now result in desolation.

MacPass.xcodeproj/project.pbxproj

@@ -13,6 +13,19 @@
 		4C055E74179620BF00BD2BAB /* NSString+CommandString.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C055E73179620BF00BD2BAB /* NSString+CommandString.m */; };
 		4C10412C178CDD44001B5239 /* NSDate+Humanized.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C10412B178CDD44001B5239 /* NSDate+Humanized.m */; };
 		4C16BA6217879A3C002B42BD /* MPPasswordStringFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */; };
+		4C1842AB179B027800E2F5BC /* KPKDeletedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842AA179B027800E2F5BC /* KPKDeletedNode.m */; };
+		4C1842AF179B211C00E2F5BC /* KPKXmlTreeReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842AE179B211C00E2F5BC /* KPKXmlTreeReader.m */; };
+		4C1842B2179B28C400E2F5BC /* KPKLegacyTreeReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842B1179B28C400E2F5BC /* KPKLegacyTreeReader.m */; };
+		4C1842B5179B28D400E2F5BC /* KPKLegacyTreeWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842B4179B28D400E2F5BC /* KPKLegacyTreeWriter.m */; };
+		4C1842B8179B348600E2F5BC /* KPKLegacyLoadingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842B7179B348600E2F5BC /* KPKLegacyLoadingTest.m */; };
+		4C1842BC179B434C00E2F5BC /* KPKXmlHeaderReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842BB179B434C00E2F5BC /* KPKXmlHeaderReader.m */; };
+		4C1842C0179B5BFD00E2F5BC /* NSData+CommonCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842BF179B5BFD00E2F5BC /* NSData+CommonCrypto.m */; };
+		4C1842C3179B69E700E2F5BC /* NSData+HashedData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842C2179B69E700E2F5BC /* NSData+HashedData.m */; };
+		4C1842C6179BF52100E2F5BC /* KPKLegacyHeaderReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842C5179BF52000E2F5BC /* KPKLegacyHeaderReader.m */; };
+		4C1842CA179C616700E2F5BC /* KPKTreeCryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842C9179C616700E2F5BC /* KPKTreeCryptor.m */; };
+		4C1842D0179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842CF179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m */; };
+		4C1842D3179C64F000E2F5BC /* KPKXmlTreeCryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1842D2179C64EF00E2F5BC /* KPKXmlTreeCryptor.m */; };
+		4C18816C179E06920045C5B7 /* TrashBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C18816B179E06920045C5B7 /* TrashBar.xib */; };
 		4C18F9AB178E122500890BCE /* Test_Password_1234.kdb in Resources */ = {isa = PBXBuildFile; fileRef = 4C18F9AA178E122500890BCE /* Test_Password_1234.kdb */; };
 		4C19E500178E26EF002F2CD0 /* Test_Password_1234.kdbx in Resources */ = {isa = PBXBuildFile; fileRef = 4C19E4FF178E26EF002F2CD0 /* Test_Password_1234.kdbx */; };
 		4C19E503178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C19E502178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m */; };
@@ -57,6 +70,9 @@
 		4C2E381F16D11FF900037A9D /* 05_LanguagesTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381C16D11FF900037A9D /* 05_LanguagesTemplate.pdf */; };
 		4C2E382316D1421B00037A9D /* MPIconHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382216D1421B00037A9D /* MPIconHelper.m */; };
 		4C2E382616D1470200037A9D /* MPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382516D1470200037A9D /* MPViewController.m */; };
+		4C305F36179A0BD70082334F /* KPKIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C305F35179A0BD70082334F /* KPKIcon.m */; };
+		4C305F3C179A19F90082334F /* KPKIconLoading.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C305F3B179A19F90082334F /* KPKIconLoading.m */; };
+		4C305F3E179A1A760082334F /* image.png in Resources */ = {isa = PBXBuildFile; fileRef = 4C305F3D179A1A760082334F /* image.png */; };
 		4C3666411787327E00B249F1 /* MPDocument+Attachments.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3666401787327E00B249F1 /* MPDocument+Attachments.m */; };
 		4C366643178748F500B249F1 /* 99_HarddiskTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C366642178748F500B249F1 /* 99_HarddiskTemplate.pdf */; };
 		4C36E5B4177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C36E5B3177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m */; };
@@ -67,11 +83,12 @@
 		4C3D4C0817594CA40038DAAC /* HNHSeparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D4C0717594CA40038DAAC /* HNHSeparator.m */; };
 		4C3E1CC0177DEFB3003BD9BD /* StringField+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3E1CBF177DEFB3003BD9BD /* StringField+Undo.m */; };
 		4C3F28541791EDFD00703281 /* KPKErrors.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3F28531791EDFD00703281 /* KPKErrors.m */; };
-		4C3F28581791F04F00703281 /* LocalizableErrors.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C3F28571791F04F00703281 /* LocalizableErrors.strings */; };
 		4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */; };
 		4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */; };
 		4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */; };
 		4C4436771792BE810099E220 /* KPKFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4436761792BE810099E220 /* KPKFormat.m */; };
+		4C4510091798C53700219998 /* StringField+Validation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4510081798C53700219998 /* StringField+Validation.m */; };
+		4C45100C1798C65C00219998 /* Kdb4Entry+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C45100B1798C65C00219998 /* Kdb4Entry+MPAdditions.m */; };
 		4C45FB1C178E09ED0010007D /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C45FB1B178E09ED0010007D /* SenTestingKit.framework */; };
 		4C45FB1D178E09ED0010007D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77E36615B84A240093A587 /* Cocoa.framework */; };
 		4C45FB23178E09ED0010007D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C45FB21178E09ED0010007D /* InfoPlist.strings */; };
@@ -138,12 +155,13 @@
 		4C669B9F16760ED100DD0774 /* RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7516760ED100DD0774 /* RandomStream.m */; };
 		4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */; };
 		4C669BA216760ED100DD0774 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7B16760ED100DD0774 /* UUID.m */; };
+		4C67D33017981A2B00A7BDFC /* HNHTokenField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C67D32F17981A2B00A7BDFC /* HNHTokenField.m */; };
+		4C67D33317981ABA00A7BDFC /* HNHTokenFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C67D33217981ABA00A7BDFC /* HNHTokenFieldCell.m */; };
 		4C69A73A16D589DF00EC1B1A /* HNHGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C69A73916D589DF00EC1B1A /* HNHGradientView.m */; };
 		4C6D1D25178579570014C5A5 /* 48_FolderTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */; };
 		4C6D1D27178586CA0014C5A5 /* 99_AddFolderTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */; };
 		4C6D1D2B17858A250014C5A5 /* MacPass.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D2A17858A250014C5A5 /* MacPass.icns */; };
 		4C701CBC178618A000581B88 /* 12_RemoteTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */; };
-		4C70D0FD1790924700652EE9 /* KPKParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C70D0FC1790924700652EE9 /* KPKParser.m */; };
 		4C70D100179092F200652EE9 /* KPKPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C70D0FF179092F200652EE9 /* KPKPassword.m */; };
 		4C74DD07177BD1640034A9DB /* MPCustomFieldView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C74DD06177BD1640034A9DB /* MPCustomFieldView.m */; };
 		4C76155C1764C04C0015A1A6 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */; };
@@ -177,6 +195,7 @@
 		4CA0B2FC15BCAF8600654E32 /* MPSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2FB15BCAF8600654E32 /* MPSettingsWindowController.m */; };
 		4CA0E3A7176FAF99004D18CB /* MPDocumentQueryService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0E3A6176FAF99004D18CB /* MPDocumentQueryService.m */; };
 		4CA2335A176DBFE100F0B6AC /* MPLockDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */; };
+		4CA7C36C179A98140099C34B /* NSString+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA7C36B179A98140099C34B /* NSString+Base64.m */; };
 		4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; };
 		4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745A15B887FD00104512 /* NSString+DDXML.m */; };
 		4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745D15B887FD00104512 /* DDXMLDocument.m */; };
@@ -196,6 +215,9 @@
 		4CC672791781D0C0006DEDCF /* KdbGroup+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC672781781D0C0006DEDCF /* KdbGroup+MPAdditions.m */; };
 		4CC6727C1781D0D2006DEDCF /* KdbEntry+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6727B1781D0D2006DEDCF /* KdbEntry+MPAdditions.m */; };
 		4CC7EA1B17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7EA1A17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m */; };
+		4CCEDE2A179F203B008402BE /* MPOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEDE29179F203B008402BE /* MPOutlineView.m */; };
+		4CCEDE2E179F213B008402BE /* MPNotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEDE2D179F213B008402BE /* MPNotifications.m */; };
+		4CCEDE32179F5B6C008402BE /* KPKDataStreamer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEDE31179F5B6C008402BE /* KPKDataStreamer.m */; };
 		4CD3ABBA178F71B50073F5C5 /* KPKTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABB4178F71B50073F5C5 /* KPKTree.m */; };
 		4CD3ABBF178F72610073F5C5 /* KPKEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABBE178F72610073F5C5 /* KPKEntry.m */; };
 		4CD3ABC2178F72720073F5C5 /* KPKGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABC1178F72720073F5C5 /* KPKGroup.m */; };
@@ -228,6 +250,10 @@
 		4CF7805F176E75110032EE71 /* ServerSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CF7805E176E75110032EE71 /* ServerSettings.xib */; };
 		4CF78064176E75AD0032EE71 /* MPServerSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78063176E75AD0032EE71 /* MPServerSettingsController.m */; };
 		4CFC53BF16E94729007396BE /* MPShadowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC53BE16E94729007396BE /* MPShadowBox.m */; };
+		4CFC873B179DEDF3000DFC03 /* KPKMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC873A179DEDF3000DFC03 /* KPKMetaData.m */; };
+		4CFC873E179DF200000DFC03 /* KPKTimeInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC873D179DF200000DFC03 /* KPKTimeInfo.m */; };
+		4CFC8743179DFD3E000DFC03 /* KPKXmlLoadingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC8742179DFD3E000DFC03 /* KPKXmlLoadingTest.m */; };
+		4CFEB36E1799D9CF00AF1868 /* Kdb3Entry+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFEB36D1799D9CF00AF1868 /* Kdb3Entry+KVOAdditions.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -243,6 +269,35 @@
 		4C10412B178CDD44001B5239 /* NSDate+Humanized.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Humanized.m"; sourceTree = "<group>"; };
 		4C16BA6017879A3C002B42BD /* MPPasswordStringFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordStringFormatter.h; sourceTree = "<group>"; };
 		4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordStringFormatter.m; sourceTree = "<group>"; };
+		4C1842A9179B027700E2F5BC /* KPKDeletedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKDeletedNode.h; sourceTree = "<group>"; };
+		4C1842AA179B027800E2F5BC /* KPKDeletedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKDeletedNode.m; sourceTree = "<group>"; };
+		4C1842AD179B211C00E2F5BC /* KPKXmlTreeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKXmlTreeReader.h; sourceTree = "<group>"; };
+		4C1842AE179B211C00E2F5BC /* KPKXmlTreeReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKXmlTreeReader.m; sourceTree = "<group>"; };
+		4C1842B0179B28C400E2F5BC /* KPKLegacyTreeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKLegacyTreeReader.h; sourceTree = "<group>"; };
+		4C1842B1179B28C400E2F5BC /* KPKLegacyTreeReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKLegacyTreeReader.m; sourceTree = "<group>"; };
+		4C1842B3179B28D400E2F5BC /* KPKLegacyTreeWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKLegacyTreeWriter.h; sourceTree = "<group>"; };
+		4C1842B4179B28D400E2F5BC /* KPKLegacyTreeWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKLegacyTreeWriter.m; sourceTree = "<group>"; };
+		4C1842B6179B348600E2F5BC /* KPKLegacyLoadingTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKLegacyLoadingTest.h; sourceTree = "<group>"; };
+		4C1842B7179B348600E2F5BC /* KPKLegacyLoadingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKLegacyLoadingTest.m; sourceTree = "<group>"; };
+		4C1842B9179B3A1700E2F5BC /* KPKHeaderFields.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KPKHeaderFields.h; path = Format/KPKHeaderFields.h; sourceTree = "<group>"; };
+		4C1842BA179B434C00E2F5BC /* KPKXmlHeaderReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKXmlHeaderReader.h; sourceTree = "<group>"; };
+		4C1842BB179B434C00E2F5BC /* KPKXmlHeaderReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKXmlHeaderReader.m; sourceTree = "<group>"; };
+		4C1842BE179B5BFD00E2F5BC /* NSData+CommonCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+CommonCrypto.h"; sourceTree = "<group>"; };
+		4C1842BF179B5BFD00E2F5BC /* NSData+CommonCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+CommonCrypto.m"; sourceTree = "<group>"; };
+		4C1842C1179B69E600E2F5BC /* NSData+HashedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+HashedData.h"; sourceTree = "<group>"; };
+		4C1842C2179B69E700E2F5BC /* NSData+HashedData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+HashedData.m"; sourceTree = "<group>"; };
+		4C1842C4179BF51F00E2F5BC /* KPKLegacyHeaderReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKLegacyHeaderReader.h; sourceTree = "<group>"; };
+		4C1842C5179BF52000E2F5BC /* KPKLegacyHeaderReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKLegacyHeaderReader.m; sourceTree = "<group>"; };
+		4C1842C7179BF6A100E2F5BC /* KPKLegacyHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KPKLegacyHeader.h; path = Format/KPKLegacyHeader.h; sourceTree = "<group>"; };
+		4C1842C8179C616600E2F5BC /* KPKTreeCryptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTreeCryptor.h; sourceTree = "<group>"; };
+		4C1842C9179C616700E2F5BC /* KPKTreeCryptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTreeCryptor.m; sourceTree = "<group>"; };
+		4C1842CE179C64DC00E2F5BC /* KPKLegacyTreeCryptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKLegacyTreeCryptor.h; sourceTree = "<group>"; };
+		4C1842CF179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKLegacyTreeCryptor.m; sourceTree = "<group>"; };
+		4C1842D1179C64EF00E2F5BC /* KPKXmlTreeCryptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKXmlTreeCryptor.h; sourceTree = "<group>"; };
+		4C1842D2179C64EF00E2F5BC /* KPKXmlTreeCryptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKXmlTreeCryptor.m; sourceTree = "<group>"; };
+		4C1842D4179C6DE400E2F5BC /* KPKHeaderReading.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKHeaderReading.h; sourceTree = "<group>"; };
+		4C1842D5179C6F1800E2F5BC /* KPKHeaderWriting.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKHeaderWriting.h; sourceTree = "<group>"; };
+		4C18816B179E06920045C5B7 /* TrashBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TrashBar.xib; sourceTree = "<group>"; };
 		4C18F9AA178E122500890BCE /* Test_Password_1234.kdb */ = {isa = PBXFileReference; lastKnownFileType = file; name = Test_Password_1234.kdb; path = Databases/Test_Password_1234.kdb; sourceTree = "<group>"; };
 		4C19E4FF178E26EF002F2CD0 /* Test_Password_1234.kdbx */ = {isa = PBXFileReference; lastKnownFileType = file; name = Test_Password_1234.kdbx; path = Databases/Test_Password_1234.kdbx; sourceTree = "<group>"; };
 		4C19E501178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabasePasswordAndKeyfile.h; sourceTree = "<group>"; };
@@ -325,6 +380,11 @@
 		4C2E382216D1421B00037A9D /* MPIconHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPIconHelper.m; sourceTree = "<group>"; };
 		4C2E382416D1470200037A9D /* MPViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPViewController.h; sourceTree = "<group>"; };
 		4C2E382516D1470200037A9D /* MPViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPViewController.m; sourceTree = "<group>"; };
+		4C305F34179A0BD70082334F /* KPKIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKIcon.h; sourceTree = "<group>"; };
+		4C305F35179A0BD70082334F /* KPKIcon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKIcon.m; sourceTree = "<group>"; };
+		4C305F3A179A19F90082334F /* KPKIconLoading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKIconLoading.h; sourceTree = "<group>"; };
+		4C305F3B179A19F90082334F /* KPKIconLoading.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKIconLoading.m; sourceTree = "<group>"; };
+		4C305F3D179A1A760082334F /* image.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = image.png; path = Images/image.png; sourceTree = "<group>"; };
 		4C3666401787327E00B249F1 /* MPDocument+Attachments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPDocument+Attachments.m"; sourceTree = "<group>"; };
 		4C366642178748F500B249F1 /* 99_HarddiskTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 99_HarddiskTemplate.pdf; sourceTree = "<group>"; };
 		4C36E5B2177CD4FB00152132 /* Kdb4Tree+KVOAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Kdb4Tree+KVOAdditions.h"; sourceTree = "<group>"; };
@@ -343,13 +403,16 @@
 		4C3E1CBF177DEFB3003BD9BD /* StringField+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "StringField+Undo.m"; sourceTree = "<group>"; };
 		4C3F28521791EDE800703281 /* KPKErrors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKErrors.h; sourceTree = "<group>"; };
 		4C3F28531791EDFD00703281 /* KPKErrors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKErrors.m; sourceTree = "<group>"; };
-		4C3F28571791F04F00703281 /* LocalizableErrors.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = LocalizableErrors.strings; path = Resources/LocalizableErrors.strings; sourceTree = "<group>"; };
 		4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterBar.xib; sourceTree = "<group>"; };
 		4C431BCB16E2A82700700A81 /* MPPasteBoardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasteBoardController.h; sourceTree = "<group>"; };
 		4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasteBoardController.m; sourceTree = "<group>"; };
 		4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OverlayWindow.xib; sourceTree = "<group>"; };
-		4C4436751792BE810099E220 /* KPKFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKFormat.h; sourceTree = "<group>"; };
+		4C4436751792BE810099E220 /* KPKFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KPKFormat.h; path = Format/KPKFormat.h; sourceTree = "<group>"; };
-		4C4436761792BE810099E220 /* KPKFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKFormat.m; sourceTree = "<group>"; };
+		4C4436761792BE810099E220 /* KPKFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KPKFormat.m; path = Format/KPKFormat.m; sourceTree = "<group>"; };
+		4C4510071798C53700219998 /* StringField+Validation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "StringField+Validation.h"; sourceTree = "<group>"; };
+		4C4510081798C53700219998 /* StringField+Validation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "StringField+Validation.m"; sourceTree = "<group>"; };
+		4C45100A1798C65C00219998 /* Kdb4Entry+MPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Kdb4Entry+MPAdditions.h"; sourceTree = "<group>"; };
+		4C45100B1798C65C00219998 /* Kdb4Entry+MPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Kdb4Entry+MPAdditions.m"; sourceTree = "<group>"; };
 		4C45FB1A178E09ED0010007D /* MacPassTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MacPassTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
 		4C45FB1B178E09ED0010007D /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
 		4C45FB20178E09ED0010007D /* MacPassTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MacPassTests-Info.plist"; sourceTree = "<group>"; };
@@ -477,14 +540,16 @@
 		4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Salsa20RandomStream.m; sourceTree = "<group>"; };
 		4C669B7A16760ED100DD0774 /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = "<group>"; };
 		4C669B7B16760ED100DD0774 /* UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UUID.m; sourceTree = "<group>"; };
+		4C67D32E17981A2B00A7BDFC /* HNHTokenField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHTokenField.h; sourceTree = "<group>"; };
+		4C67D32F17981A2B00A7BDFC /* HNHTokenField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHTokenField.m; sourceTree = "<group>"; };
+		4C67D33117981ABA00A7BDFC /* HNHTokenFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHTokenFieldCell.h; sourceTree = "<group>"; };
+		4C67D33217981ABA00A7BDFC /* HNHTokenFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHTokenFieldCell.m; sourceTree = "<group>"; };
 		4C69A73816D589DF00EC1B1A /* HNHGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHGradientView.h; sourceTree = "<group>"; };
 		4C69A73916D589DF00EC1B1A /* HNHGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHGradientView.m; sourceTree = "<group>"; };
 		4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 48_FolderTemplate.pdf; sourceTree = "<group>"; };
 		4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 99_AddFolderTemplate.pdf; sourceTree = "<group>"; };
 		4C6D1D2A17858A250014C5A5 /* MacPass.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacPass.icns; path = "../Assets/App icon/MacPass.icns"; sourceTree = "<group>"; };
 		4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 12_RemoteTemplate.pdf; sourceTree = "<group>"; };
-		4C70D0FB1790924700652EE9 /* KPKParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKParser.h; sourceTree = "<group>"; };
-		4C70D0FC1790924700652EE9 /* KPKParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKParser.m; sourceTree = "<group>"; };
 		4C70D0FE179092F200652EE9 /* KPKPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKPassword.h; sourceTree = "<group>"; };
 		4C70D0FF179092F200652EE9 /* KPKPassword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKPassword.m; sourceTree = "<group>"; };
 		4C74DD05177BD1640034A9DB /* MPCustomFieldView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCustomFieldView.h; sourceTree = "<group>"; };
@@ -551,6 +616,8 @@
 		4CA0E3A6176FAF99004D18CB /* MPDocumentQueryService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDocumentQueryService.m; sourceTree = "<group>"; };
 		4CA23358176DBFE100F0B6AC /* MPLockDaemon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLockDaemon.h; sourceTree = "<group>"; };
 		4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLockDaemon.m; sourceTree = "<group>"; };
+		4CA7C36A179A98140099C34B /* NSString+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Base64.h"; sourceTree = "<group>"; };
+		4CA7C36B179A98140099C34B /* NSString+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Base64.m"; sourceTree = "<group>"; };
 		4CAAFDD51787AED60013FCF9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		4CAD745615B887FD00104512 /* DDXMLElementAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLElementAdditions.h; sourceTree = "<group>"; };
 		4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLElementAdditions.m; sourceTree = "<group>"; };
@@ -591,7 +658,14 @@
 		4CC7EA1A17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHRoundendTextFieldCellHelper.m; sourceTree = "<group>"; };
 		4CCA7EEC1797866F00B0B55E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/GeneralSettings.strings; sourceTree = "<group>"; };
 		4CCA7EEE1797867200B0B55E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralSettings.strings; sourceTree = "<group>"; };
-		4CD3ABB2178F71B50073F5C5 /* KPKVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKVersion.h; sourceTree = "<group>"; };
+		4CCEDE28179F203B008402BE /* MPOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineView.h; sourceTree = "<group>"; };
+		4CCEDE29179F203B008402BE /* MPOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineView.m; sourceTree = "<group>"; };
+		4CCEDE2C179F2122008402BE /* MPNotifications.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPNotifications.h; sourceTree = "<group>"; };
+		4CCEDE2D179F213B008402BE /* MPNotifications.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPNotifications.m; sourceTree = "<group>"; };
+		4CCEDE2F179F550D008402BE /* KPKTreeReading.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKTreeReading.h; sourceTree = "<group>"; };
+		4CCEDE30179F5B6C008402BE /* KPKDataStreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKDataStreamer.h; sourceTree = "<group>"; };
+		4CCEDE31179F5B6C008402BE /* KPKDataStreamer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKDataStreamer.m; sourceTree = "<group>"; };
+		4CD3ABB2178F71B50073F5C5 /* KPKVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KPKVersion.h; path = Format/KPKVersion.h; sourceTree = "<group>"; };
 		4CD3ABB3178F71B50073F5C5 /* KPKTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTree.h; sourceTree = "<group>"; };
 		4CD3ABB4178F71B50073F5C5 /* KPKTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTree.m; sourceTree = "<group>"; };
 		4CD3ABBD178F72610073F5C5 /* KPKEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKEntry.h; sourceTree = "<group>"; };
@@ -609,8 +683,9 @@
 		4CD78ABA16D155FF00768A1D /* 10_ContactTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 10_ContactTemplate.pdf; sourceTree = "<group>"; };
 		4CD78ABB16D155FF00768A1D /* 11_CameraTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 11_CameraTemplate.pdf; sourceTree = "<group>"; };
 		4CD884B615BD47080042BBF8 /* DocumentWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DocumentWindow.xib; sourceTree = "<group>"; };
-		4CDB5C401794AA4F0017667E /* KPKTree+Serializing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "KPKTree+Serializing.h"; path = "../Core/KPKTree+Serializing.h"; sourceTree = "<group>"; };
+		4CDB5C401794AA4F0017667E /* KPKTree+Serializing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KPKTree+Serializing.h"; sourceTree = "<group>"; };
-		4CDB5C411794AA4F0017667E /* KPKTree+Serializing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "KPKTree+Serializing.m"; path = "../Core/KPKTree+Serializing.m"; sourceTree = "<group>"; };
+		4CDB5C411794AA4F0017667E /* KPKTree+Serializing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KPKTree+Serializing.m"; sourceTree = "<group>"; };
+		4CDE28D0179C8E010036C771 /* MPDatabaseSettingsDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPDatabaseSettingsDelegate.h; sourceTree = "<group>"; };
 		4CDF01A116D1B76700D0AC08 /* MPEntryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEntryViewController.h; sourceTree = "<group>"; };
 		4CDF01A216D1B76700D0AC08 /* MPEntryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPEntryViewController.m; sourceTree = "<group>"; };
 		4CE298E91795FC2A00DF7BDB /* MPEntryMenuDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEntryMenuDelegate.h; sourceTree = "<group>"; };
@@ -647,6 +722,16 @@
 		4CF78063176E75AD0032EE71 /* MPServerSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPServerSettingsController.m; sourceTree = "<group>"; };
 		4CFC53BD16E94729007396BE /* MPShadowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPShadowBox.h; sourceTree = "<group>"; };
 		4CFC53BE16E94729007396BE /* MPShadowBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPShadowBox.m; sourceTree = "<group>"; };
+		4CFC8739179DEDF3000DFC03 /* KPKMetaData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKMetaData.h; sourceTree = "<group>"; };
+		4CFC873A179DEDF3000DFC03 /* KPKMetaData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKMetaData.m; sourceTree = "<group>"; };
+		4CFC873C179DF200000DFC03 /* KPKTimeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTimeInfo.h; sourceTree = "<group>"; };
+		4CFC873D179DF200000DFC03 /* KPKTimeInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTimeInfo.m; sourceTree = "<group>"; };
+		4CFC873F179DF295000DFC03 /* KPKTimerecording.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKTimerecording.h; sourceTree = "<group>"; };
+		4CFC8740179DF7A3000DFC03 /* KPKUndoing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKUndoing.h; sourceTree = "<group>"; };
+		4CFC8741179DFD3E000DFC03 /* KPKXmlLoadingTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKXmlLoadingTest.h; sourceTree = "<group>"; };
+		4CFC8742179DFD3E000DFC03 /* KPKXmlLoadingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKXmlLoadingTest.m; sourceTree = "<group>"; };
+		4CFEB36C1799D9CF00AF1868 /* Kdb3Entry+KVOAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Kdb3Entry+KVOAdditions.h"; sourceTree = "<group>"; };
+		4CFEB36D1799D9CF00AF1868 /* Kdb3Entry+KVOAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Kdb3Entry+KVOAdditions.m"; sourceTree = "<group>"; };
 		6E719715172058BA00E4C5FC /* MPDatabaseVersion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPDatabaseVersion.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -683,6 +768,7 @@
 				4C61EA0416D2FFE200AC519E /* OutlineView.xib */,
 				4CF78061176E752E0032EE71 /* PasswordInputs */,
 				4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */,
+				4C18816B179E06920045C5B7 /* TrashBar.xib */,
 				4C76156F1764C0E20015A1A6 /* InspectorView.xib */,
 				4CE39AC016ECE359000FE29D /* IconSelection.xib */,
 				4C2C8B331787500E009649F3 /* UnprotectedWarningView.xib */,
@@ -700,6 +786,8 @@
 				4C4FCE14177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m */,
 				4C5FE9AC17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.h */,
 				4C5FE9AD17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m */,
+				4CCEDE28179F203B008402BE /* MPOutlineView.h */,
+				4CCEDE29179F203B008402BE /* MPOutlineView.m */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -724,6 +812,18 @@
 			name = ValueTransformer;
 			sourceTree = "<group>";
 		};
+		4C1842D6179C716100E2F5BC /* Format */ = {
+			isa = PBXGroup;
+			children = (
+				4C4436751792BE810099E220 /* KPKFormat.h */,
+				4C4436761792BE810099E220 /* KPKFormat.m */,
+				4CD3ABB2178F71B50073F5C5 /* KPKVersion.h */,
+				4C1842C7179BF6A100E2F5BC /* KPKLegacyHeader.h */,
+				4C1842B9179B3A1700E2F5BC /* KPKHeaderFields.h */,
+			);
+			name = Format;
+			sourceTree = "<group>";
+		};
 		4C18F9AC178E123200890BCE /* Databases */ = {
 			isa = PBXGroup;
 			children = (
@@ -892,6 +992,8 @@
 				4C2724D917790E7C00FD8456 /* NSMutableData+Base64.m */,
 				4C801AFA179310E2002821E3 /* NSString+Hexdata.h */,
 				4C801AFB179310E2002821E3 /* NSString+Hexdata.m */,
+				4CA7C36A179A98140099C34B /* NSString+Base64.h */,
+				4CA7C36B179A98140099C34B /* NSString+Base64.m */,
 			);
 			name = Categories;
 			sourceTree = "<group>";
@@ -921,10 +1023,16 @@
 				4C36E5B3177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m */,
 				4C4FCE16177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.h */,
 				4C4FCE17177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m */,
+				4CFEB36C1799D9CF00AF1868 /* Kdb3Entry+KVOAdditions.h */,
+				4CFEB36D1799D9CF00AF1868 /* Kdb3Entry+KVOAdditions.m */,
 				4C83F4A81774B155006C5FC0 /* Kdb3Tree+NewTree.h */,
 				4C83F4A91774B155006C5FC0 /* Kdb3Tree+NewTree.m */,
 				4C83F4AB1774B25F006C5FC0 /* Kdb4Tree+NewTree.h */,
 				4C83F4AC1774B25F006C5FC0 /* Kdb4Tree+NewTree.m */,
+				4C4510071798C53700219998 /* StringField+Validation.h */,
+				4C4510081798C53700219998 /* StringField+Validation.m */,
+				4C45100A1798C65C00219998 /* Kdb4Entry+MPAdditions.h */,
+				4C45100B1798C65C00219998 /* Kdb4Entry+MPAdditions.m */,
 			);
 			name = "KeePassLib Categories";
 			sourceTree = "<group>";
@@ -949,10 +1057,20 @@
 				4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */,
 				4C16BA6017879A3C002B42BD /* MPPasswordStringFormatter.h */,
 				4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */,
+				4CCEDE2C179F2122008402BE /* MPNotifications.h */,
+				4CCEDE2D179F213B008402BE /* MPNotifications.m */,
 			);
 			name = Helper;
 			sourceTree = "<group>";
 		};
+		4C305F3F179A1A790082334F /* Images */ = {
+			isa = PBXGroup;
+			children = (
+				4C305F3D179A1A760082334F /* image.png */,
+			);
+			name = Images;
+			sourceTree = "<group>";
+		};
 		4C37A84115B8B47D005EF8EE /* Delegates */ = {
 			isa = PBXGroup;
 			children = (
@@ -989,17 +1107,10 @@
 			name = Model;
 			sourceTree = "<group>";
 		};
-		4C3F28591791F05400703281 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				4C3F28571791F04F00703281 /* LocalizableErrors.strings */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
 		4C45FB1E178E09ED0010007D /* MacPassTests */ = {
 			isa = PBXGroup;
 			children = (
+				4C305F3F179A1A790082334F /* Images */,
 				4C18F9AC178E123200890BCE /* Databases */,
 				4C45FB2B178E0BCB0010007D /* MPDatabaseLoading.h */,
 				4C45FB2C178E0BCB0010007D /* MPDatabaseLoading.m */,
@@ -1008,6 +1119,12 @@
 				4C19E501178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.h */,
 				4C19E502178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m */,
 				4C45FB1F178E09ED0010007D /* Supporting Files */,
+				4C305F3A179A19F90082334F /* KPKIconLoading.h */,
+				4C305F3B179A19F90082334F /* KPKIconLoading.m */,
+				4C1842B6179B348600E2F5BC /* KPKLegacyLoadingTest.h */,
+				4C1842B7179B348600E2F5BC /* KPKLegacyLoadingTest.m */,
+				4CFC8741179DFD3E000DFC03 /* KPKXmlLoadingTest.h */,
+				4CFC8742179DFD3E000DFC03 /* KPKXmlLoadingTest.m */,
 			);
 			path = MacPassTests;
 			sourceTree = "<group>";
@@ -1266,6 +1383,7 @@
 			children = (
 				4CF6C715176F5183007A811D /* MPServerRequestHandler.h */,
 				4CA0B30D15BCB6FD00654E32 /* MPSettingsTab.h */,
+				4CDE28D0179C8E010036C771 /* MPDatabaseSettingsDelegate.h */,
 			);
 			name = Protocolls;
 			sourceTree = "<group>";
@@ -1329,6 +1447,10 @@
 				4CC3AAB9175F4983003EF01B /* HNHRoundedTextFieldCell.m */,
 				4C9D6AA717615199001C660C /* HNHRoundedSecureTextFieldCell.h */,
 				4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */,
+				4C67D32E17981A2B00A7BDFC /* HNHTokenField.h */,
+				4C67D32F17981A2B00A7BDFC /* HNHTokenField.m */,
+				4C67D33117981ABA00A7BDFC /* HNHTokenFieldCell.h */,
+				4C67D33217981ABA00A7BDFC /* HNHTokenFieldCell.m */,
 				4C58BD4D176370B100B8178C /* HNHBadgedTextField.h */,
 				4C58BD4E176370B100B8178C /* HNHBadgedTextField.m */,
 				4CAF62FA1763604000CD7084 /* HNHBadgedTextFieldCell.h */,
@@ -1354,7 +1476,7 @@
 		4CD3ABAD178F71B50073F5C5 /* KeePassKit */ = {
 			isa = PBXGroup;
 			children = (
-				4C3F28591791F05400703281 /* Resources */,
+				4C1842D6179C716100E2F5BC /* Format */,
 				4CD3ABAF178F71B50073F5C5 /* Categories */,
 				4CD3ABB1178F71B50073F5C5 /* Core */,
 				4CD3ABB5178F71B50073F5C5 /* IO */,
@@ -1365,14 +1487,16 @@
 		4CD3ABAF178F71B50073F5C5 /* Categories */ = {
 			isa = PBXGroup;
 			children = (
+				4C1842BE179B5BFD00E2F5BC /* NSData+CommonCrypto.h */,
+				4C1842BF179B5BFD00E2F5BC /* NSData+CommonCrypto.m */,
 				4C2724D51778FF1A00FD8456 /* NSUUID+KeePassKit.h */,
 				4C2724D61778FF1A00FD8456 /* NSUUID+KeePassKit.m */,
 				4C8A173B1790AA41008B5C17 /* NSData+Keyfile.h */,
 				4C8A173C1790AA41008B5C17 /* NSData+Keyfile.m */,
-				4CDB5C401794AA4F0017667E /* KPKTree+Serializing.h */,
-				4CDB5C411794AA4F0017667E /* KPKTree+Serializing.m */,
 				4C055E72179620BF00BD2BAB /* NSString+CommandString.h */,
 				4C055E73179620BF00BD2BAB /* NSString+CommandString.m */,
+				4C1842C1179B69E600E2F5BC /* NSData+HashedData.h */,
+				4C1842C2179B69E700E2F5BC /* NSData+HashedData.m */,
 			);
 			path = Categories;
 			sourceTree = "<group>";
@@ -1382,11 +1506,6 @@
 			children = (
 				4C70D0FE179092F200652EE9 /* KPKPassword.h */,
 				4C70D0FF179092F200652EE9 /* KPKPassword.m */,
-				4C70D0FB1790924700652EE9 /* KPKParser.h */,
-				4C70D0FC1790924700652EE9 /* KPKParser.m */,
-				4C4436751792BE810099E220 /* KPKFormat.h */,
-				4C4436761792BE810099E220 /* KPKFormat.m */,
-				4CD3ABB2178F71B50073F5C5 /* KPKVersion.h */,
 				4CD3ABB3178F71B50073F5C5 /* KPKTree.h */,
 				4CD3ABB4178F71B50073F5C5 /* KPKTree.m */,
 				4CD3ABBD178F72610073F5C5 /* KPKEntry.h */,
@@ -1401,8 +1520,16 @@
 				4C3F28531791EDFD00703281 /* KPKErrors.m */,
 				4CF62B84179385D700B660B6 /* KPKAttribute.h */,
 				4CF62B85179385D700B660B6 /* KPKAttribute.m */,
-				4C5AA58F179549A1008ECAD7 /* KPKXmlTreeWriter.h */,
+				4C305F34179A0BD70082334F /* KPKIcon.h */,
-				4C5AA590179549A1008ECAD7 /* KPKXmlTreeWriter.m */,
+				4C305F35179A0BD70082334F /* KPKIcon.m */,
+				4C1842A9179B027700E2F5BC /* KPKDeletedNode.h */,
+				4C1842AA179B027800E2F5BC /* KPKDeletedNode.m */,
+				4CFC8739179DEDF3000DFC03 /* KPKMetaData.h */,
+				4CFC873A179DEDF3000DFC03 /* KPKMetaData.m */,
+				4CFC873C179DF200000DFC03 /* KPKTimeInfo.h */,
+				4CFC873D179DF200000DFC03 /* KPKTimeInfo.m */,
+				4CFC873F179DF295000DFC03 /* KPKTimerecording.h */,
+				4CFC8740179DF7A3000DFC03 /* KPKUndoing.h */,
 			);
 			path = Core;
 			sourceTree = "<group>";
@@ -1410,6 +1537,31 @@
 		4CD3ABB5178F71B50073F5C5 /* IO */ = {
 			isa = PBXGroup;
 			children = (
+				4CDB5C401794AA4F0017667E /* KPKTree+Serializing.h */,
+				4CDB5C411794AA4F0017667E /* KPKTree+Serializing.m */,
+				4C1842C8179C616600E2F5BC /* KPKTreeCryptor.h */,
+				4C1842C9179C616700E2F5BC /* KPKTreeCryptor.m */,
+				4C1842BA179B434C00E2F5BC /* KPKXmlHeaderReader.h */,
+				4C1842BB179B434C00E2F5BC /* KPKXmlHeaderReader.m */,
+				4C1842D1179C64EF00E2F5BC /* KPKXmlTreeCryptor.h */,
+				4C1842D2179C64EF00E2F5BC /* KPKXmlTreeCryptor.m */,
+				4C5AA58F179549A1008ECAD7 /* KPKXmlTreeWriter.h */,
+				4C5AA590179549A1008ECAD7 /* KPKXmlTreeWriter.m */,
+				4C1842AD179B211C00E2F5BC /* KPKXmlTreeReader.h */,
+				4C1842AE179B211C00E2F5BC /* KPKXmlTreeReader.m */,
+				4C1842B0179B28C400E2F5BC /* KPKLegacyTreeReader.h */,
+				4C1842B1179B28C400E2F5BC /* KPKLegacyTreeReader.m */,
+				4C1842B3179B28D400E2F5BC /* KPKLegacyTreeWriter.h */,
+				4C1842B4179B28D400E2F5BC /* KPKLegacyTreeWriter.m */,
+				4C1842C4179BF51F00E2F5BC /* KPKLegacyHeaderReader.h */,
+				4C1842C5179BF52000E2F5BC /* KPKLegacyHeaderReader.m */,
+				4C1842CE179C64DC00E2F5BC /* KPKLegacyTreeCryptor.h */,
+				4C1842CF179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m */,
+				4C1842D4179C6DE400E2F5BC /* KPKHeaderReading.h */,
+				4C1842D5179C6F1800E2F5BC /* KPKHeaderWriting.h */,
+				4CCEDE2F179F550D008402BE /* KPKTreeReading.h */,
+				4CCEDE30179F5B6C008402BE /* KPKDataStreamer.h */,
+				4CCEDE31179F5B6C008402BE /* KPKDataStreamer.m */,
 			);
 			path = IO;
 			sourceTree = "<group>";
@@ -1556,6 +1708,7 @@
 				4C45FB23178E09ED0010007D /* InfoPlist.strings in Resources */,
 				4C18F9AB178E122500890BCE /* Test_Password_1234.kdb in Resources */,
 				4C19E500178E26EF002F2CD0 /* Test_Password_1234.kdbx in Resources */,
+				4C305F3E179A1A760082334F /* image.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1606,7 +1759,7 @@
 				4C52A88F1788628B00868229 /* 13_KeysTemplate.pdf in Resources */,
 				4C52A8901788628B00868229 /* 18_DisplayTemplate.pdf in Resources */,
 				4C52A892178863B000868229 /* 68_PhoneTemplate.pdf in Resources */,
-				4C3F28581791F04F00703281 /* LocalizableErrors.strings in Resources */,
+				4C18816C179E06920045C5B7 /* TrashBar.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1636,6 +1789,9 @@
 				4C45FB2D178E0BCB0010007D /* MPDatabaseLoading.m in Sources */,
 				4C45FB30178E0CE20010007D /* MPDatabaseCreation.m in Sources */,
 				4C19E503178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m in Sources */,
+				4C305F3C179A19F90082334F /* KPKIconLoading.m in Sources */,
+				4C1842B8179B348600E2F5BC /* KPKLegacyLoadingTest.m in Sources */,
+				4CFC8743179DFD3E000DFC03 /* KPKXmlLoadingTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1795,7 +1951,6 @@
 				4CD3ABC2178F72720073F5C5 /* KPKGroup.m in Sources */,
 				4C591B57178F897A0080B16B /* KPKAttachment.m in Sources */,
 				4C39B3F5178FEFAE0027DC7C /* KPKNode.m in Sources */,
-				4C70D0FD1790924700652EE9 /* KPKParser.m in Sources */,
 				4C70D100179092F200652EE9 /* KPKPassword.m in Sources */,
 				4C8A173D1790AA41008B5C17 /* NSData+Keyfile.m in Sources */,
 				4C3F28541791EDFD00703281 /* KPKErrors.m in Sources */,
@@ -1808,6 +1963,29 @@
 				4C055E74179620BF00BD2BAB /* NSString+CommandString.m in Sources */,
 				4CC0D2CE17974A47000B4BDA /* MPCustomFieldTableViewDelegate.m in Sources */,
 				4CC0D2D117974A5A000B4BDA /* MPAttachmentTableViewDelegate.m in Sources */,
+				4C67D33017981A2B00A7BDFC /* HNHTokenField.m in Sources */,
+				4C67D33317981ABA00A7BDFC /* HNHTokenFieldCell.m in Sources */,
+				4C4510091798C53700219998 /* StringField+Validation.m in Sources */,
+				4C45100C1798C65C00219998 /* Kdb4Entry+MPAdditions.m in Sources */,
+				4CFEB36E1799D9CF00AF1868 /* Kdb3Entry+KVOAdditions.m in Sources */,
+				4C305F36179A0BD70082334F /* KPKIcon.m in Sources */,
+				4CA7C36C179A98140099C34B /* NSString+Base64.m in Sources */,
+				4C1842AB179B027800E2F5BC /* KPKDeletedNode.m in Sources */,
+				4C1842AF179B211C00E2F5BC /* KPKXmlTreeReader.m in Sources */,
+				4C1842B2179B28C400E2F5BC /* KPKLegacyTreeReader.m in Sources */,
+				4C1842B5179B28D400E2F5BC /* KPKLegacyTreeWriter.m in Sources */,
+				4C1842BC179B434C00E2F5BC /* KPKXmlHeaderReader.m in Sources */,
+				4C1842C0179B5BFD00E2F5BC /* NSData+CommonCrypto.m in Sources */,
+				4C1842C3179B69E700E2F5BC /* NSData+HashedData.m in Sources */,
+				4C1842C6179BF52100E2F5BC /* KPKLegacyHeaderReader.m in Sources */,
+				4C1842CA179C616700E2F5BC /* KPKTreeCryptor.m in Sources */,
+				4C1842D0179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m in Sources */,
+				4C1842D3179C64F000E2F5BC /* KPKXmlTreeCryptor.m in Sources */,
+				4CFC873B179DEDF3000DFC03 /* KPKMetaData.m in Sources */,
+				4CFC873E179DF200000DFC03 /* KPKTimeInfo.m in Sources */,
+				4CCEDE2A179F203B008402BE /* MPOutlineView.m in Sources */,
+				4CCEDE2E179F213B008402BE /* MPNotifications.m in Sources */,
+				4CCEDE32179F5B6C008402BE /* KPKDataStreamer.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

MacPass/Base.lproj/GeneralSettings.xib

@@ -45,42 +45,121 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSButton" id="145041823">
+					<object class="NSBox" id="996160987">
 						<reference key="NSNextResponder" ref="1005"/>
-						<int key="NSvFlags">268</int>
+						<int key="NSvFlags">12</int>
-						<string key="NSFrame">{{18, 177}, {241, 18}}</string>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="NSView" id="589191611">
+								<reference key="NSNextResponder" ref="996160987"/>
+								<int key="NSvFlags">274</int>
+								<array class="NSMutableArray" key="NSSubviews">
+									<object class="NSButton" id="145041823">
+										<reference key="NSNextResponder" ref="589191611"/>
+										<int key="NSvFlags">268</int>
+										<string key="NSFrame">{{16, 12}, {241, 18}}</string>
+										<reference key="NSSuperview" ref="589191611"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="60918609"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<string key="NSHuggingPriority">{250, 252}</string>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSButtonCell" key="NSCell" id="168279901">
+											<int key="NSCellFlags">-2080374784</int>
+											<int key="NSCellFlags2">268435456</int>
+											<string key="NSContents">Reopen last Database after Launch</string>
+											<object class="NSFont" key="NSSupport" id="874940307">
+												<string key="NSName">LucidaGrande</string>
+												<double key="NSSize">13</double>
+												<int key="NSfFlags">1044</int>
+											</object>
+											<string key="NSCellIdentifier">_NS:9</string>
+											<reference key="NSControlView" ref="145041823"/>
+											<int key="NSButtonFlags">1211912448</int>
+											<int key="NSButtonFlags2">2</int>
+											<object class="NSCustomResource" key="NSNormalImage" id="125685135">
+												<string key="NSClassName">NSImage</string>
+												<string key="NSResourceName">NSSwitch</string>
+											</object>
+											<object class="NSButtonImageSource" key="NSAlternateImage" id="765261007">
+												<string key="NSImageName">NSSwitch</string>
+											</object>
+											<string key="NSAlternateContents"/>
+											<string key="NSKeyEquivalent"/>
+											<int key="NSPeriodicDelay">200</int>
+											<int key="NSPeriodicInterval">25</int>
+										</object>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									</object>
+									<object class="NSButton" id="366343837">
+										<reference key="NSNextResponder" ref="589191611"/>
+										<int key="NSvFlags">268</int>
+										<string key="NSFrame">{{16, 32}, {228, 18}}</string>
+										<reference key="NSSuperview" ref="589191611"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="145041823"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<string key="NSHuggingPriority">{250, 252}</string>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSButtonCell" key="NSCell" id="480309686">
+											<int key="NSCellFlags">-1543503872</int>
+											<int key="NSCellFlags2">268435456</int>
+											<string key="NSContents">Create new Database if activated</string>
+											<reference key="NSSupport" ref="874940307"/>
+											<string key="NSCellIdentifier">_NS:9</string>
+											<reference key="NSControlView" ref="366343837"/>
+											<int key="NSButtonFlags">1211912448</int>
+											<int key="NSButtonFlags2">2</int>
+											<reference key="NSNormalImage" ref="125685135"/>
+											<reference key="NSAlternateImage" ref="765261007"/>
+											<string key="NSAlternateContents"/>
+											<string key="NSKeyEquivalent"/>
+											<int key="NSPeriodicDelay">200</int>
+											<int key="NSPeriodicInterval">25</int>
+										</object>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									</object>
+								</array>
+								<string key="NSFrame">{{1, 1}, {364, 58}}</string>
+								<reference key="NSSuperview" ref="996160987"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="366343837"/>
+								<string key="NSReuseIdentifierKey">_NS:11</string>
+							</object>
+						</array>
+						<string key="NSFrame">{{17, 157}, {366, 74}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="60918609"/>
+						<reference key="NSNextKeyView" ref="589191611"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<string key="NSHuggingPriority">{250, 252}</string>
+						<string key="NSOffsets">{0, 0}</string>
-						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSTitleCell">
-						<object class="NSButtonCell" key="NSCell" id="168279901">
+							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags">-2080374784</int>
+							<int key="NSCellFlags2">0</int>
-							<int key="NSCellFlags2">268435456</int>
+							<string key="NSContents">Startup</string>
-							<string key="NSContents">Reopen last Database after Launch</string>
+							<object class="NSFont" key="NSSupport" id="26">
-							<object class="NSFont" key="NSSupport" id="874940307">
 								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">13</double>
+								<double key="NSSize">11</double>
-								<int key="NSfFlags">1044</int>
+								<int key="NSfFlags">3100</int>
 							</object>
-							<string key="NSCellIdentifier">_NS:9</string>
+							<object class="NSColor" key="NSBackgroundColor" id="116323791">
-							<reference key="NSControlView" ref="145041823"/>
+								<int key="NSColorSpace">6</int>
-							<int key="NSButtonFlags">1211912448</int>
+								<string key="NSCatalogName">System</string>
-							<int key="NSButtonFlags2">2</int>
+								<string key="NSColorName">textBackgroundColor</string>
-							<object class="NSCustomResource" key="NSNormalImage" id="125685135">
+								<object class="NSColor" key="NSColor">
-								<string key="NSClassName">NSImage</string>
+									<int key="NSColorSpace">3</int>
-								<string key="NSResourceName">NSSwitch</string>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
 							</object>
-							<object class="NSButtonImageSource" key="NSAlternateImage" id="765261007">
+							<object class="NSColor" key="NSTextColor">
-								<string key="NSImageName">NSSwitch</string>
+								<int key="NSColorSpace">3</int>
+								<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
 							</object>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
 						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<reference key="NSContentView" ref="589191611"/>
+						<int key="NSBorderType">1</int>
+						<int key="NSBoxType">0</int>
+						<int key="NSTitlePosition">2</int>
+						<bool key="NSTransparent">NO</bool>
 					</object>
 					<object class="NSBox" id="60918609">
 						<reference key="NSNextResponder" ref="1005"/>
@@ -93,7 +172,7 @@
 									<object class="NSTextField" id="958810247">
 										<reference key="NSNextResponder" ref="731672371"/>
 										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{15, 96}, {124, 17}}</string>
+										<string key="NSFrame">{{15, 93}, {124, 17}}</string>
 										<reference key="NSSuperview" ref="731672371"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="222890410"/>
@@ -130,7 +209,7 @@
 									<object class="NSPopUpButton" id="222890410">
 										<reference key="NSNextResponder" ref="731672371"/>
 										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{179, 92}, {170, 23}}</string>
+										<string key="NSFrame">{{179, 90}, {170, 22}}</string>
 										<reference key="NSSuperview" ref="731672371"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="326334884"/>
@@ -220,7 +299,7 @@
 									<object class="NSButton" id="326334884">
 										<reference key="NSNextResponder" ref="731672371"/>
 										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{31, 72}, {172, 18}}</string>
+										<string key="NSFrame">{{31, 69}, {172, 18}}</string>
 										<reference key="NSSuperview" ref="731672371"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="982397212"/>
@@ -377,14 +456,14 @@
 										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									</object>
 								</array>
-								<string key="NSFrame">{{1, 1}, {364, 124}}</string>
+								<string key="NSFrame">{{1, 1}, {364, 121}}</string>
 								<reference key="NSSuperview" ref="60918609"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="958810247"/>
 								<string key="NSReuseIdentifierKey">_NS:11</string>
 							</object>
 						</array>
-						<string key="NSFrame">{{17, 16}, {366, 140}}</string>
+						<string key="NSFrame">{{17, 16}, {366, 137}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="731672371"/>
@@ -396,20 +475,8 @@
 							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Security</string>
-							<object class="NSFont" key="NSSupport">
+							<reference key="NSSupport" ref="26"/>
-								<string key="NSName">LucidaGrande</string>
+							<reference key="NSBackgroundColor" ref="116323791"/>
-								<double key="NSSize">11</double>
-								<int key="NSfFlags">3100</int>
-							</object>
-							<object class="NSColor" key="NSBackgroundColor">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">textBackgroundColor</string>
-								<object class="NSColor" key="NSColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MQA</bytes>
-								</object>
-							</object>
 							<object class="NSColor" key="NSTextColor">
 								<int key="NSColorSpace">3</int>
 								<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
@@ -422,10 +489,10 @@
 						<bool key="NSTransparent">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{400, 230}</string>
+				<string key="NSFrameSize">{400, 251}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="145041823"/>
+				<reference key="NSNextKeyView" ref="996160987"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 		</array>
@@ -479,6 +546,14 @@
 					</object>
 					<int key="connectionID">878</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">createUntitledOnActivation</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="366343837"/>
+					</object>
+					<int key="connectionID">920</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -510,22 +585,6 @@
 						<int key="objectID">1</int>
 						<reference key="object" ref="1005"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="505875569">
-								<reference key="firstItem" ref="60918609"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1005"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">74</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="213536579">
 								<reference key="firstItem" ref="1005"/>
 								<int key="firstAttribute">4</int>
@@ -542,6 +601,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="871081113">
+								<reference key="firstItem" ref="60918609"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="996160987"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="484547610">
 								<reference key="firstItem" ref="1005"/>
 								<int key="firstAttribute">6</int>
@@ -574,24 +649,40 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="119736576">
+							<object class="IBNSLayoutConstraint" id="198070882">
-								<reference key="firstItem" ref="145041823"/>
+								<reference key="firstItem" ref="996160987"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="1005"/>
 								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">37</double>
+									<double key="value">20</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">3</int>
+								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">9</float>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="689860785">
+								<reference key="firstItem" ref="1005"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="996160987"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="1065146703">
-								<reference key="firstItem" ref="145041823"/>
+								<reference key="firstItem" ref="996160987"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="1005"/>
@@ -606,7 +697,7 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="250630005">
+							<object class="IBNSLayoutConstraint" id="557216379">
 								<reference key="firstItem" ref="1005"/>
 								<int key="firstAttribute">8</int>
 								<int key="relation">0</int>
@@ -614,7 +705,7 @@
 								<int key="secondAttribute">0</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">230</double>
+									<double key="value">251</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1005"/>
@@ -638,8 +729,8 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">1</int>
 							</object>
+							<reference ref="996160987"/>
 							<reference ref="60918609"/>
-							<reference ref="145041823"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -679,6 +770,22 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="217416544">
+								<reference key="firstItem" ref="222890410"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="958810247"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="60918609"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="459585909">
 								<reference key="firstItem" ref="222890410"/>
 								<int key="firstAttribute">5</int>
@@ -855,22 +962,6 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1014678196">
-								<reference key="firstItem" ref="958810247"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="222890410"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="60918609"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="891799107">
 								<reference key="firstItem" ref="958810247"/>
 								<int key="firstAttribute">5</int>
@@ -1027,24 +1118,6 @@
 						<reference key="object" ref="891799107"/>
 						<reference key="parent" ref="60918609"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">530</int>
-						<reference key="object" ref="145041823"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="168279901"/>
-						</array>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">531</int>
-						<reference key="object" ref="168279901"/>
-						<reference key="parent" ref="145041823"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">532</int>
-						<reference key="object" ref="1065146703"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">584</int>
 						<reference key="object" ref="272904029"/>
@@ -1105,11 +1178,6 @@
 						<reference key="object" ref="871797750"/>
 						<reference key="parent" ref="326334884"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">784</int>
-						<reference key="object" ref="1014678196"/>
-						<reference key="parent" ref="60918609"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">789</int>
 						<reference key="object" ref="311160635"/>
@@ -1125,11 +1193,6 @@
 						<reference key="object" ref="484547610"/>
 						<reference key="parent" ref="1005"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">798</int>
-						<reference key="object" ref="1063893674"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">801</int>
 						<reference key="object" ref="806133159"/>
@@ -1163,26 +1226,6 @@
 						<reference key="object" ref="772519144"/>
 						<reference key="parent" ref="60918609"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">840</int>
-						<reference key="object" ref="213536579"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">845</int>
-						<reference key="object" ref="119736576"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">846</int>
-						<reference key="object" ref="505875569"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">847</int>
-						<reference key="object" ref="250630005"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">861</int>
 						<reference key="object" ref="1037442692"/>
@@ -1233,6 +1276,186 @@
 						<reference key="object" ref="777025190"/>
 						<reference key="parent" ref="222890410"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">888</int>
+						<reference key="object" ref="996160987"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="680904412">
+								<reference key="firstItem" ref="996160987"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="145041823"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">11</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="996160987"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="700397535">
+								<reference key="firstItem" ref="145041823"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="366343837"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="996160987"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="32139976">
+								<reference key="firstItem" ref="145041823"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="996160987"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="996160987"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="255254776">
+								<reference key="firstItem" ref="366343837"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="996160987"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="996160987"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="650293569">
+								<reference key="firstItem" ref="366343837"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="996160987"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="996160987"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="366343837"/>
+							<reference ref="145041823"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">891</int>
+						<reference key="object" ref="1065146703"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">893</int>
+						<reference key="object" ref="689860785"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">530</int>
+						<reference key="object" ref="145041823"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="168279901"/>
+						</array>
+						<reference key="parent" ref="996160987"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">531</int>
+						<reference key="object" ref="168279901"/>
+						<reference key="parent" ref="145041823"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">894</int>
+						<reference key="object" ref="32139976"/>
+						<reference key="parent" ref="996160987"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">879</int>
+						<reference key="object" ref="366343837"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="480309686"/>
+						</array>
+						<reference key="parent" ref="996160987"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">880</int>
+						<reference key="object" ref="480309686"/>
+						<reference key="parent" ref="366343837"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">896</int>
+						<reference key="object" ref="650293569"/>
+						<reference key="parent" ref="996160987"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">897</int>
+						<reference key="object" ref="255254776"/>
+						<reference key="parent" ref="996160987"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">903</int>
+						<reference key="object" ref="198070882"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">901</int>
+						<reference key="object" ref="680904412"/>
+						<reference key="parent" ref="996160987"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">898</int>
+						<reference key="object" ref="700397535"/>
+						<reference key="parent" ref="996160987"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">906</int>
+						<reference key="object" ref="871081113"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">916</int>
+						<reference key="object" ref="217416544"/>
+						<reference key="parent" ref="60918609"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">917</int>
+						<reference key="object" ref="213536579"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">918</int>
+						<reference key="object" ref="1063893674"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">919</int>
+						<reference key="object" ref="557216379"/>
+						<reference key="parent" ref="1005"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1241,13 +1464,14 @@
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="1.IBNSViewMetadataConstraints">
 					<reference ref="1063893674"/>
-					<reference ref="250630005"/>
+					<reference ref="557216379"/>
 					<reference ref="1065146703"/>
-					<reference ref="119736576"/>
+					<reference ref="689860785"/>
+					<reference ref="198070882"/>
 					<reference ref="989429017"/>
 					<reference ref="484547610"/>
+					<reference ref="871081113"/>
 					<reference ref="213536579"/>
-					<reference ref="505875569"/>
 				</array>
 				<boolean value="NO" key="1.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
 				<boolean value="NO" key="1.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1275,9 +1499,8 @@
 				<boolean value="NO" key="447.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="448.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="465.IBNSViewMetadataConstraints">
+				<array class="NSMutableArray" key="465.IBNSViewMetadataConstraints">
 					<reference ref="891799107"/>
-					<reference ref="1014678196"/>
 					<reference ref="432174165"/>
 					<reference ref="933426524"/>
 					<reference ref="236685633"/>
@@ -1289,6 +1512,7 @@
 					<reference ref="311160635"/>
 					<reference ref="437525640"/>
 					<reference ref="459585909"/>
+					<reference ref="217416544"/>
 					<reference ref="920770187"/>
 					<reference ref="771059501"/>
 				</array>
@@ -1300,7 +1524,6 @@
 				<boolean value="NO" key="530.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="530.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="531.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="532.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="584.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="584.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="585.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1312,21 +1535,15 @@
 				<string key="630.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="631.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="773.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="784.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="788.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="789.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="792.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="798.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="801.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="803.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="804.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="805.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="805.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="806.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="840.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="845.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="846.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="847.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="861.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="862.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="867.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1337,12 +1554,37 @@
 				<string key="875.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="876.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="877.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="879.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="879.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="880.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="888.IBNSViewMetadataConstraints">
+					<reference ref="650293569"/>
+					<reference ref="255254776"/>
+					<reference ref="32139976"/>
+					<reference ref="700397535"/>
+					<reference ref="680904412"/>
+				</array>
+				<boolean value="NO" key="888.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="888.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="891.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="893.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="894.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="896.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="897.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="898.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="901.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="903.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="906.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="916.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="917.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="918.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="919.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">878</int>
+			<int key="maxID">920</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1352,6 +1594,7 @@
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="clearPasteboardOnQuitCheckButton">NSButton</string>
 						<string key="clearPasteboardTimeoutPopup">NSPopUpButton</string>
+						<string key="createUntitledOnActivation">NSButton</string>
 						<string key="idleTimeOutPopup">NSPopUpButton</string>
 						<string key="lockOnSleepCheckButton">NSButton</string>
 						<string key="reopenLastDatabase">NSButton</string>
@@ -1365,6 +1608,10 @@
 							<string key="name">clearPasteboardTimeoutPopup</string>
 							<string key="candidateClassName">NSPopUpButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="createUntitledOnActivation">
+							<string key="name">createUntitledOnActivation</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="idleTimeOutPopup">
 							<string key="name">idleTimeOutPopup</string>
 							<string key="candidateClassName">NSPopUpButton</string>

MacPass/Base.lproj/MainMenu.xib

@@ -235,6 +235,15 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
+								<object class="NSMenuItem" id="919874146">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Lock</string>
+									<string key="NSKeyEquiv">L</string>
+									<int key="NSKeyEquivModMask">262144</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
 								<object class="NSMenuItem" id="776162233">
 									<reference key="NSMenu" ref="720053764"/>
 									<string key="NSTitle">Close</string>
@@ -828,6 +837,14 @@
 					</object>
 					<int key="connectionID">1260</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">lock:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="919874146"/>
+					</object>
+					<int key="connectionID">1263</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showPreferences:</string>
@@ -932,6 +949,7 @@
 							<reference ref="544639599"/>
 							<reference ref="663106531"/>
 							<reference ref="438377242"/>
+							<reference ref="919874146"/>
 						</array>
 						<reference key="parent" ref="379814623"/>
 					</object>
@@ -1272,6 +1290,11 @@
 						<reference key="object" ref="438377242"/>
 						<reference key="parent" ref="720053764"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1261</int>
+						<reference key="object" ref="919874146"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1291,6 +1314,7 @@
 				<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1259.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1261.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1346,7 +1370,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">1260</int>
+			<int key="maxID">1263</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1407,6 +1431,7 @@
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="editPassword:">id</string>
 						<string key="exportDatabase:">id</string>
+						<string key="lock:">id</string>
 						<string key="showDatabaseSettings:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
@@ -1418,6 +1443,10 @@
 							<string key="name">exportDatabase:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="lock:">
+							<string key="name">lock:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="showDatabaseSettings:">
 							<string key="name">showDatabaseSettings:</string>
 							<string key="candidateClassName">id</string>

MacPass/DocumentWindow.xib

@@ -50,7 +50,7 @@
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">DatabaseWindow</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -65,6 +65,7 @@
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<bool key="NSIsVertical">YES</bool>
 				<int key="NSDividerStyle">2</int>
+				<string key="NSAutosaveName"/>
 			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">

MacPass/EntryView.xib

@@ -471,7 +471,7 @@
 								<object class="NSTextField" id="306813103">
 									<reference key="NSNextResponder" ref="788738248"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrameSize">{105, 17}</string>
+									<string key="NSFrameSize">{104.5, 17}</string>
 									<reference key="NSSuperview" ref="788738248"/>
 									<reference key="NSNextKeyView" ref="804102913"/>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -493,7 +493,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{1, 1}, {105, 17}}</string>
+							<string key="NSFrame">{{1, 1}, {104.5, 17}}</string>
 							<reference key="NSNextKeyView" ref="306813103"/>
 						</object>
 						<reference key="destination" ref="306813103"/>
@@ -562,7 +562,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{109, 1}, {144, 17}}</string>
+							<string key="NSFrame">{{108.5, 1}, {144, 17}}</string>
 							<reference key="NSNextKeyView" ref="591921532"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 						</object>
@@ -605,7 +605,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{378, 1}, {113, 17}}</string>
+							<string key="NSFrame">{{377, 1}, {113, 17}}</string>
 							<reference key="NSNextKeyView" ref="441850286"/>
 						</object>
 						<reference key="destination" ref="441850286"/>
@@ -622,7 +622,7 @@
 								<object class="NSTextField" id="1042596093">
 									<reference key="NSNextResponder" ref="878614701"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrameSize">{119, 17}</string>
+									<string key="NSFrameSize">{118.5, 17}</string>
 									<reference key="NSSuperview" ref="878614701"/>
 									<reference key="NSNextKeyView" ref="542633869"/>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -639,7 +639,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{256, 1}, {119, 17}}</string>
+							<string key="NSFrame">{{255.5, 1}, {118.5, 17}}</string>
 							<reference key="NSNextKeyView" ref="1042596093"/>
 						</object>
 						<reference key="destination" ref="1042596093"/>
@@ -673,7 +673,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
 							</array>
-							<string key="NSFrame">{{494, 1}, {198, 17}}</string>
+							<string key="NSFrame">{{493, 1}, {198, 17}}</string>
 							<reference key="NSNextKeyView" ref="488604658"/>
 						</object>
 						<reference key="destination" ref="488604658"/>
@@ -1575,7 +1575,7 @@
 						<reference key="parent" ref="276578969"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">834</int>
+						<int key="objectID">843</int>
 						<reference key="object" ref="244975730"/>
 						<reference key="parent" ref="163272962"/>
 					</object>
@@ -1735,13 +1735,13 @@
 				<string key="733.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="741.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="743.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="834.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="843.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">834</int>
+			<int key="maxID">843</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1759,6 +1759,7 @@
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="addEntryButton">NSButton</string>
 						<string key="bottomBar">HNHGradientView</string>
+						<string key="entryCountTextField">NSTextField</string>
 						<string key="entryTable">NSTableView</string>
 						<string key="filterBar">NSView</string>
 						<string key="filterDoneButton">NSButton</string>
@@ -1768,6 +1769,7 @@
 						<string key="filterURLButton">NSButton</string>
 						<string key="filterUsernameButton">NSButton</string>
 						<string key="tableToTop">NSLayoutConstraint</string>
+						<string key="trashBar">HNHGradientView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="addEntryButton">
@@ -1778,6 +1780,10 @@
 							<string key="name">bottomBar</string>
 							<string key="candidateClassName">HNHGradientView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="entryCountTextField">
+							<string key="name">entryCountTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="entryTable">
 							<string key="name">entryTable</string>
 							<string key="candidateClassName">NSTableView</string>
@@ -1814,6 +1820,10 @@
 							<string key="name">tableToTop</string>
 							<string key="candidateClassName">NSLayoutConstraint</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="trashBar">
+							<string key="name">trashBar</string>
+							<string key="candidateClassName">HNHGradientView</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>

MacPass/FilterBar.xib

@@ -897,18 +897,10 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">MPEntryViewController</string>
 					<string key="superclassName">MPViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">_toggleFilterSpace:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">_toggleFilterSpace:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">_toggleFilterSpace:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="addEntryButton">NSButton</string>
+						<string key="bottomBar">HNHGradientView</string>
+						<string key="entryCountTextField">NSTextField</string>
 						<string key="entryTable">NSTableView</string>
 						<string key="filterBar">NSView</string>
 						<string key="filterDoneButton">NSButton</string>
@@ -918,8 +910,21 @@
 						<string key="filterURLButton">NSButton</string>
 						<string key="filterUsernameButton">NSButton</string>
 						<string key="tableToTop">NSLayoutConstraint</string>
+						<string key="trashBar">HNHGradientView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="addEntryButton">
+							<string key="name">addEntryButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="bottomBar">
+							<string key="name">bottomBar</string>
+							<string key="candidateClassName">HNHGradientView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="entryCountTextField">
+							<string key="name">entryCountTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="entryTable">
 							<string key="name">entryTable</string>
 							<string key="candidateClassName">NSTableView</string>
@@ -956,6 +961,10 @@
 							<string key="name">tableToTop</string>
 							<string key="candidateClassName">NSLayoutConstraint</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="trashBar">
+							<string key="name">trashBar</string>
+							<string key="candidateClassName">HNHGradientView</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>

MacPass/Kdb3Entry+KVOAdditions.h

@@ -0,0 +1,18 @@
+//
+//  Kdb3Entry+KVOAdditions.h
+//  MacPass
+//
+//  Created by Michael Starke on 19.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb3Node.h"
+
+@interface Kdb3Entry (KVOAdditions)
+
+- (NSUInteger)countOfBinaries;
+- (id)objectInBinariesAtIndex:(NSUInteger)index;
+- (void)removeObjectFromBinariesAtIndex:(NSUInteger)index;
+- (void)insertObject:(id)binary inBinariesAtIndex:(NSUInteger)index;
+
+@end

MacPass/Kdb3Entry+KVOAdditions.m

@@ -0,0 +1,31 @@
+//
+//  Kdb3Entry+KVOAdditions.m
+//  MacPass
+//
+//  Created by Michael Starke on 19.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb3Entry+KVOAdditions.h"
+
+@implementation Kdb3Entry (KVOAdditions)
+
+- (NSUInteger)countOfBinaries {
+  return (self.binary != nil ? 1 : 0);
+}
+- (id)objectInBinariesAtIndex:(NSUInteger)index {
+  return self.binary;
+}
+- (void)removeObjectFromBinariesAtIndex:(NSUInteger)index {
+  if(self.binary ) {
+    self.binary = nil;
+    self.binaryDesc = nil;
+  }
+}
+- (void)insertObject:(id)binary inBinariesAtIndex:(NSUInteger)index {
+  return;//
+}
+
+
+
+@end

MacPass/Kdb4Entry+MPAdditions.h

@@ -0,0 +1,15 @@
+//
+//  Kdb4Entry+MPAdditions.h
+//  MacPass
+//
+//  Created by Michael Starke on 19.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb4Node.h"
+
+@interface Kdb4Entry (MPAdditions)
+
+- (NSString *)uniqueKeyForProposal:(NSString *)key;
+
+@end

MacPass/Kdb4Entry+MPAdditions.m

@@ -0,0 +1,34 @@
+//
+//  Kdb4Entry+MPAdditions.m
+//  MacPass
+//
+//  Created by Michael Starke on 19.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb4Entry+MPAdditions.h"
+
+@implementation Kdb4Entry (MPAdditions)
+
+- (NSString *)uniqueKeyForProposal:(NSString *)key {
+  /*
+   FIXME: Introduce some cachin behaviour. We iterate over after every single edit
+   */
+  NSArray *defaultKeys = @[ FIELD_TITLE,
+                            FIELD_USER_NAME,
+                            FIELD_PASSWORD,
+                            FIELD_URL,
+                            FIELD_NOTES ];
+  NSMutableSet *keys = [[NSMutableSet alloc] initWithArray:defaultKeys];
+  for(StringField *field in self.stringFields) {
+    [keys addObject:field.key];
+  }
+  NSUInteger counter = 1;
+  NSString *base = key;
+  while([keys containsObject:key]) {
+    key = [NSString stringWithFormat:@"%@-%ld", base, counter++];
+  }
+  return key;
+}
+
+@end

MacPass/KdbGroup+MPTreeTools.h

@@ -20,4 +20,6 @@
 /* Returns the group with the UUID */
 - (KdbGroup *)groupForUUID:(UUID *)uuid;
 
+- (BOOL)isAnchestorOfGroup:(KdbGroup *)group;
+
 @end

MacPass/KdbGroup+MPTreeTools.m

@@ -49,4 +49,18 @@
   return  [filteredGroups lastObject];
 }
 
+- (BOOL)isAnchestorOfGroup:(KdbGroup *)group {
+  if(group == nil) {
+    return NO;
+  }
+  KdbGroup *ancestor = self.parent;
+  while(ancestor.parent) {
+    if(group == self) {
+      return YES;
+    }
+    ancestor = ancestor.parent;
+  }
+  return NO;
+}
+
 @end

MacPass/MPActionHelper.h

@@ -9,9 +9,9 @@
 #import <Foundation/Foundation.h>
 
 typedef NS_ENUM(NSUInteger, MPActionType) {
+  MPUnkownAction, // Netural element to be used for returns
   MPActionAddEntry, // Add an new entry
   MPActionAddGroup, // Add a new group
-  MPActionEdit, // Edit entry or group
   MPActionDelete, // Delete entry or group
   MPActionCopyUsername, // copy username to pasteboard
   MPActionCopyPassword, // copy password to pasteboard
@@ -25,5 +25,6 @@ typedef NS_ENUM(NSUInteger, MPActionType) {
 @interface MPActionHelper : NSObject
 
 + (SEL)actionOfType:(MPActionType)type;
++ (MPActionType)typeForAction:(SEL)action;
 
 @end

MacPass/MPActionHelper.m

@@ -10,25 +10,42 @@
 
 @implementation MPActionHelper
 
-+ (SEL)actionOfType:(MPActionType)type {
++ (NSDictionary *)_actionDictionary {
   static NSDictionary *actionDict;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     actionDict = @{
-                  @(MPActionAddEntry) : @"createEntry:",
+                   @(MPActionAddEntry) : @"createEntry:",
-                  @(MPActionAddGroup) : @"createGroup:",
+                   @(MPActionAddGroup) : @"createGroup:",
-                  @(MPActionCopyPassword) : @"copyPassword:",
+                   @(MPActionCopyPassword) : @"copyPassword:",
-                  @(MPActionCopyURL) : @"copyURL:",
+                   @(MPActionCopyURL) : @"copyURL:",
-                  @(MPActionCopyUsername) : @"copyUsername:",
+                   @(MPActionCopyUsername) : @"copyUsername:",
-                  @(MPActionDelete) : @"deleteNode:",
+                   @(MPActionDelete) : @"deleteNode:",
-                  @(MPActionEdit) : @"editEntry:",
+                   @(MPActionOpenURL) : @"openURL:",
-                  @(MPActionOpenURL) : @"openURL:",
+                   @(MPActionToggleInspector) : @"toggleInspector:",
-                  @(MPActionToggleInspector) : @"toggleInspector:",
+                   @(MPActionLock) : @"lock:",
-                  @(MPActionLock) : @"lock:",
+                   @(MPActionEmptyTrash) : @"emptyTrash:"
-                  @(MPActionEmptyTrash) : @"emptyTrash:"
+                   };
-                  };
   });
+  return actionDict;
+}
+
++ (SEL)actionOfType:(MPActionType)type {
+  NSDictionary *actionDict = [self _actionDictionary];
   return NSSelectorFromString(actionDict[@(type)]);
 }
 
++ (MPActionType)typeForAction:(SEL)action {
+  NSString *selectorString = NSStringFromSelector(action);
+  NSArray *selectors = [[self _actionDictionary] allValues];
+  NSUInteger index = [selectors indexOfObject:selectorString];
+  if(index == NSNotFound) {
+    return MPUnkownAction;
+  }
+  NSArray *keys = [[self _actionDictionary] allKeysForObject:selectorString];
+  NSAssert([keys count] == 1, @"There should only be one object for the specified key");
+  return [[keys lastObject] integerValue];
+}
+
+
 @end

MacPass/MPAppDelegate.m

@@ -112,11 +112,21 @@
   NSDocumentController *documentController = [NSDocumentController sharedDocumentController];
   NSArray *documents = [documentController documents];
   NSArray *recentDocuments = [documentController recentDocumentURLs];
-  if([documents count] == 0 && [recentDocuments count] > 0) {
+  if([documents count] > 0 ) {
-    NSURL *url = recentDocuments[0];
+    return; // There's already a document restored
-    [documentController openDocumentWithContentsOfURL:url display:YES completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {
+  }
-      // do nothing
+  NSURL *documentUrl;
-    }];
+  if([recentDocuments count] > 0) {
+    documentUrl = recentDocuments[0];
+  }
+  else {
+    NSString *lastPath = [[NSUserDefaults standardUserDefaults] stringForKey:kMPSettingsKeyLastDatabasePath];
+    documentUrl = [NSURL URLWithString:lastPath];
+  }
+  if([documentUrl isFileURL]) {
+    [documentController openDocumentWithContentsOfURL:documentUrl display:YES
+                                    completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {}];
+
   }
 }
 

MacPass/MPAttachmentTableViewDelegate.m

@@ -12,6 +12,7 @@
 #import "MPSelectedAttachmentTableCellView.h"
 
 #import "Kdb4Node.h"
+#import "Kdb3Node.h"
 
 #import "HNHTableRowView.h"
 
@@ -20,9 +21,16 @@
 - (void)tableViewSelectionDidChange:(NSNotification *)notification {
   NSTableView *tableView = [notification object];
   NSIndexSet *allColumns = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [[tableView tableColumns] count])];
-  Kdb4Entry *entryv4 = (Kdb4Entry *)self.viewController.selectedEntry;
+  if([self.viewController.selectedEntry isKindOfClass:[Kdb4Entry class]]) {
-  NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [entryv4.binaries count] )];
+    Kdb4Entry *entryv4 = (Kdb4Entry *)self.viewController.selectedEntry;
-  [tableView reloadDataForRowIndexes:indexSet columnIndexes:allColumns];
+    NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [entryv4.binaries count] )];
+    [tableView reloadDataForRowIndexes:indexSet columnIndexes:allColumns];
+  }
+  if([self.viewController.selectedEntry isKindOfClass:[Kdb3Entry class]]) {
+    Kdb3Entry *entryv3 = (Kdb3Entry *)self.viewController.selectedEntry;
+    NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, (entryv3.binary ? 1 : 0 ))];
+    [tableView reloadDataForRowIndexes:indexSet columnIndexes:allColumns];
+  }
 }
 
 - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
@@ -50,7 +58,9 @@
     [[view imageView] setImage:[[NSWorkspace sharedWorkspace] iconForFileType:[binaryRef.key pathExtension]]];
   }
   else {
-    // Create view to support only one binary!
+    Kdb3Entry *entry= (Kdb3Entry *)self.viewController.selectedEntry;
+    [[view textField] bind:NSValueBinding toObject:entry withKeyPath:@"binaryDesc" options:nil];
+    [[view imageView] setImage:[[NSWorkspace sharedWorkspace] iconForFileType:[entry.binaryDesc pathExtension]]];
   }
   return view;
 }

MacPass/MPCustomFieldTableViewDelegate.m

@@ -24,7 +24,8 @@
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_customFieldFrameChanged:) name:NSViewFrameDidChangeNotification object:view];
   if([self.viewController.selectedEntry isKindOfClass:[Kdb4Entry class]]) {
     StringField *stringField = entry.stringFields[row];
-    [view.labelTextField bind:NSValueBinding toObject:stringField withKeyPath:MPStringFieldKeyUndoableKey options:nil];
+    NSDictionary *validateOptions = @{ NSValidatesImmediatelyBindingOption: @YES };
+    [view.labelTextField bind:NSValueBinding toObject:stringField withKeyPath:MPStringFieldKeyUndoableKey options:validateOptions];
     [view.valueTextField bind:NSValueBinding toObject:stringField withKeyPath:MPStringFieldValueUndoableKey options:nil];
     [view.removeButton setTarget:self.viewController];
     [view.removeButton setAction:@selector(removeCustomField:)];

MacPass/MPDatabaseSettingsDelegate.h

@@ -0,0 +1,17 @@
+//
+//  MPDatabaseSettingsDelegate.h
+//  MacPass
+//
+//  Created by Michael Starke on 21.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol MPDatabaseSettingsDelegate <NSObject>
+
+@optional
+- (void)didCancelDatabaseSettings;
+- (void)didSaveDatabaseSettings;
+
+@end

MacPass/MPDatabaseSettingsWindowController.h

@@ -7,20 +7,27 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "MPDatabaseSettingsDelegate.h"
 
 typedef NS_ENUM(NSUInteger, MPDatabaseSettingsTab) {
   MPDatabaseSettingsTabGeneral,
   MPDatabaseSettingsTabPassword,
   MPDatabaseSettingsTabDisplay,
-  MPDatabaseSettingsTabAdvanced
+  MPDatabaseSettingsTabAdvanced,
+  MPDatabaseSettingsTemplatesTab,
 };
 
 @class MPDocument;
+@class HNHRoundendTextField;
 @class HNHRoundedSecureTextField;
 
-@interface MPDatabaseSettingsWindowController : NSWindowController
+@interface MPDatabaseSettingsWindowController : NSWindowController <NSTextFieldDelegate, NSTabViewDelegate>
+
+@property (nonatomic,weak) id<MPDatabaseSettingsDelegate> delegate;
 
 @property (weak) IBOutlet NSTabView *sectionTabView;
+@property (weak) IBOutlet NSButton *saveButton;
+@property (weak) IBOutlet NSButton *cancelButton;
 
 /* General Tab */
 @property (weak) IBOutlet NSTextField *databaseNameTextField;
@@ -28,8 +35,11 @@ typedef NS_ENUM(NSUInteger, MPDatabaseSettingsTab) {
 
 /* Protection */
 @property (weak) IBOutlet HNHRoundedSecureTextField *passwordTextField;
+@property (weak) IBOutlet HNHRoundedSecureTextField *passwordRepeatTextField;
 @property (weak) IBOutlet NSPathControl *keyfilePathControl;
 @property (weak) IBOutlet NSButton *togglePasswordButton;
+@property (weak) IBOutlet NSTextField *errorTextField;
+
 
 - (IBAction)clearKey:(id)sender;
 - (IBAction)generateKey:(id)sender;
@@ -46,10 +56,19 @@ typedef NS_ENUM(NSUInteger, MPDatabaseSettingsTab) {
 @property (weak) IBOutlet NSButton *emptyRecycleBinOnQuitCheckButton;
 @property (weak) IBOutlet NSPopUpButton *selectRecycleBinGroupPopUpButton;
 
+
+/* Templates Tab */
+@property (weak) IBOutlet HNHRoundendTextField *defaultUsernameTextField;
+@property (weak) IBOutlet NSPopUpButton *templateGroupPopUpButton;
+
+
 - (id)initWithDocument:(MPDocument *)document;
 
 - (void)showSettingsTab:(MPDatabaseSettingsTab)tab;
 
 - (void)update;
 
+
 @end
+
+

MacPass/MPDatabaseSettingsWindowController.m

@@ -11,19 +11,26 @@
 #import "MPDocumentWindowController.h"
 #import "MPDatabaseVersion.h"
 #import "MPIconHelper.h"
+#import "MPSettingsHelper.h"
 
+#import "HNHRoundedTextField.h"
 #import "HNHRoundedSecureTextField.h"
 
+#import "NSString+Empty.h"
+
 #import "Kdb.h"
 #import "Kdb4Node.h"
 #import "KdbGroup+MPAdditions.h"
 
 @interface MPDatabaseSettingsWindowController () {
   MPDocument *_document;
+  NSString *_missingFeature;
 }
 
 @property (nonatomic,assign) BOOL trashEnabled;
 @property (nonatomic,assign) BOOL showPassword;
+@property (nonatomic,assign) BOOL hasValidPasswordOrKey;
+@property (nonatomic,weak) NSURL *keyURL;
 
 @end
 
@@ -38,6 +45,8 @@
   if(self) {
     _document = document;
     _showPassword = NO;
+    _hasValidPasswordOrKey = NO;
+    _missingFeature = NSLocalizedString(@"KDBX_ONLX_FEATURE", "Feature only available in kdbx databases");
   }
   return self;
 }
@@ -47,15 +56,22 @@
   
   NSAssert(_document != nil, @"Document needs to be present");
   
-  Kdb4Tree *tree = _document.treeV4;
+  [self.saveButton bind:NSEnabledBinding toObject:self withKeyPath:@"hasValidPasswordOrKey" options:nil];
-  if( tree ) {
+    
-    [self _setupDatabase:tree];
+  [self.sectionTabView setDelegate:self];
-    [self _setupProtectionTab:tree];
+  
-    [self _setupAdvancedTab:tree];
+  
-    [self _setupPasswordTab:tree];
+  [self update];
-  }
+}
-  else {
+
-    // Switch to KdbV3 View
+- (void)setDelegate:(id<MPDatabaseSettingsDelegate>)delegate {
+  if(_delegate != delegate) {
+    if([delegate conformsToProtocol:@protocol(MPDatabaseSettingsDelegate)]) {
+      _delegate = delegate;
+    }
+    else{
+      NSAssert(NO, @"Delegate needs to conform to MPDatabaseSettingsDelegate protocoll");
+    }
   }
 }
 
@@ -64,7 +80,7 @@
   /* Protection */
   _document.password = [self.passwordTextField stringValue];
   _document.key = [self.keyfilePathControl URL];
-
+  
   /* General */
   _document.treeV4.databaseDescription = [self.databaseDescriptionTextView string];
   _document.treeV4.databaseName = [self.databaseNameTextField stringValue];
@@ -72,89 +88,300 @@
   /* Display */
   
   /* Advanced */
- _document.treeV4.recycleBinEnabled = self.trashEnabled;
+  _document.treeV4.recycleBinEnabled = self.trashEnabled;
-  NSMenuItem *menuItem = [self.selectRecycleBinGroupPopUpButton selectedItem];
+  NSMenuItem *trashMenuItem = [self.selectRecycleBinGroupPopUpButton selectedItem];
-  KdbGroup *group = [menuItem representedObject];
+  KdbGroup *trashGroup = [trashMenuItem representedObject];
-  [_document useGroupAsTrash:group];
+  [_document useGroupAsTrash:trashGroup];
   
-  _document.treeV4.protectNotes = [self.protectNotesCheckButton state] == NSOnState;
+  NSMenuItem *templateMenuItem = [self.templateGroupPopUpButton selectedItem];
-  _document.treeV4.protectPassword = [self.protectPasswortCheckButton state] == NSOnState;
+  KdbGroup *templateGroup = [templateMenuItem representedObject];
-  _document.treeV4.protectTitle = [self.protectTitleCheckButton state] == NSOnState;
+  [_document useGroupAsTemplate:templateGroup];
-  _document.treeV4.protectUrl = [self.protectURLCheckButton state] == NSOnState;
-  _document.treeV4.protectUserName = [self.protectUserNameCheckButton state] == NSOnState;
   
-  /* Close to finish */
+  BOOL protectNotes = [self.protectNotesCheckButton state] == NSOnState;
-  [self close:nil];
+  BOOL protectPassword = [self.protectPasswortCheckButton state] == NSOnState;
+  BOOL protectTitle = [self.protectTitleCheckButton state] == NSOnState;
+  BOOL protectURL = [self.protectURLCheckButton state] == NSOnState;
+  BOOL protectUsername = [self.protectUserNameCheckButton state] == NSOnState;
+  
+  if(_document.version == MPDatabaseVersion4) {
+    _document.treeV4.protectNotes = protectNotes;
+    _document.treeV4.protectPassword = protectPassword;
+    _document.treeV4.protectTitle = protectTitle;
+    _document.treeV4.protectUrl = protectURL;
+    _document.treeV4.protectUserName = protectUsername;
+    
+  }
+  else {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setBool:protectNotes forKey:kMPSettingsKeyLegacyHideNotes];
+    [defaults setBool:protectPassword forKey:kMPSettingsKeyLegacyHidePassword];
+    [defaults setBool:protectTitle forKey:kMPSettingsKeyLegacyHideTitle];
+    [defaults setBool:protectURL forKey:kMPSettingsKeyLegacyHideURL];
+    [defaults setBool:protectUsername forKey:kMPSettingsKeyLegacyHideUsername];
+    [defaults synchronize];
+  }
+  [self closeDidSave:YES];
 }
 
-- (IBAction)close:(id)sender {
+- (IBAction)cancel:(id)sender {
+  [self closeDidSave:NO];
+}
+- (void)closeDidSave:(BOOL)didSave {
+  /* Remove the window first */
   [NSApp endSheet:[self window]];
   [[self window] orderOut:nil];
+  
+  /* Then notify the delegate */
+  if(self.delegate) {
+    if(didSave && [self.delegate respondsToSelector:@selector(didSaveDatabaseSettings)]) {
+      [self.delegate didSaveDatabaseSettings];
+    }
+    else if(!didSave && [self.delegate respondsToSelector:@selector(didCancelDatabaseSettings)]) {
+      [self.delegate didCancelDatabaseSettings];
+    }
+  }
 }
 
 
 - (void)update {
   /* Update all stuff that might have changed */
   Kdb4Tree *tree = _document.treeV4;
-  if(tree) {
+  [self _setupPasswordTab:tree];
-    [self _setupDatabase:tree];
+  [self _setupDatabase:tree];
-    [self _setupProtectionTab:tree];
+  [self _setupProtectionTab:tree];
-    [self _setupAdvancedTab:tree];
+  [self _setupAdvancedTab:tree];
-    [self _setupPasswordTab:tree];
+  [self _setupTemplatesTab:tree];
-  }
 }
 
 - (void)showSettingsTab:(MPDatabaseSettingsTab)tab {
+  /*
+   We need to make sure the window is loaded
+   so we just call the the getter and led teh loading commence
+   */
+  if(![self window]) {
+    return;
+  }
   self.showPassword = NO;
+  NSTabViewItem *tabViewItem = [self.sectionTabView tabViewItemAtIndex:tab];
+  BOOL canSelectTab = [self tabView:self.sectionTabView shouldSelectTabViewItem:tabViewItem];
+  if(!canSelectTab) {
+    [self.sectionTabView selectTabViewItemAtIndex:MPDatabaseSettingsTabPassword];
+  }
   [self.sectionTabView selectTabViewItemAtIndex:tab];
 }
 
+- (void)setShowPassword:(BOOL)showPassword {
+  if(_showPassword != showPassword) {
+    _showPassword = showPassword;
+    
+    [self.passwordRepeatTextField setStringValue:@""];
+    [self _verifyPasswordAndKey];
+  }
+}
+
+- (void)setKeyURL:(NSURL *)keyURL {
+  _keyURL = keyURL;
+  [self _verifyPasswordAndKey];
+}
+
 #pragma mark Actions
 - (IBAction)clearKey:(id)sender {
-  [self.keyfilePathControl setURL:nil];
+  self.keyURL = nil;
 }
 
 - (IBAction)generateKey:(id)sender {
 }
 
+#pragma mark NSTextFieldDelegate
+- (void)controlTextDidChange:(NSNotification *)obj {
+  [self _verifyPasswordAndKey];
+}
+
+#pragma mark NSTableViewDelegate
+- (BOOL)tabView:(NSTabView *)tabView shouldSelectTabViewItem:(NSTabViewItem *)tabViewItem {
+  NSUInteger index = [tabView indexOfTabViewItem:tabViewItem];
+  switch ((MPDatabaseSettingsTab)index) {
+    case MPDatabaseSettingsTabPassword:
+    case MPDatabaseSettingsTabDisplay:
+      return YES;
+      
+    case MPDatabaseSettingsTabAdvanced:
+    case MPDatabaseSettingsTabGeneral:
+    case MPDatabaseSettingsTemplatesTab:
+      return (_document.version == MPDatabaseVersion4);
+      
+    default:
+      return NO;
+  }
+}
+
 #pragma mark Private Helper
+- (void)_verifyPasswordAndKey {
+  NSString *password = [self.passwordTextField stringValue];
+  NSString *repeat = [self.passwordRepeatTextField stringValue];
+  BOOL hasKey = (self.keyURL != nil);
+  BOOL keyOk = YES;
+  if(hasKey) {
+    keyOk = [self.keyURL checkResourceIsReachableAndReturnError:nil];
+  }
+  BOOL hasPassword = ![NSString isEmptyString:password];
+  BOOL passwordOk = YES;
+  if(hasPassword ) {
+    passwordOk = [password isEqualToString:repeat] || self.showPassword;
+  }
+  BOOL hasPasswordOrKey = (hasKey || hasPassword);
+  keyOk = hasKey ? keyOk : YES;
+  passwordOk = hasPassword ? passwordOk : YES;
+  self.hasValidPasswordOrKey = hasPasswordOrKey && passwordOk && keyOk;
+  
+  if(!hasPasswordOrKey) {
+    [self.errorTextField setStringValue:NSLocalizedString(@"ERROR_NO_PASSWORD_OR_KEYFILE", "Missing Key or Password")];
+    return; // alldone
+  }
+  if(!passwordOk && !keyOk ) {
+    [self.errorTextField setStringValue:NSLocalizedString(@"ERROR_PASSWORD_MISSMATCH_INVALID_KEYFILE", "Passwords do not match, keyfile is invalid")];
+  }
+  else if(!passwordOk) {
+    [self.errorTextField setStringValue:NSLocalizedString(@"ERROR_PASSWORD_MISSMATCH", "Passwords do not match")];
+  }
+  else {
+    [self.errorTextField setStringValue:NSLocalizedString(@"ERROR_INVALID_KEYFILE", "Keyfile not valid")];
+  }
+  
+}
+
 - (void)_setupDatabase:(Kdb4Tree *)tree {
-  [self.databaseNameTextField setStringValue:tree.databaseName];
+  BOOL isKdbx = (nil != tree);
-  [self.databaseDescriptionTextView setString:tree.databaseDescription];
+  [self.databaseDescriptionTextView setEditable:isKdbx];
+  [self.databaseNameTextField setEnabled:isKdbx];
+  if(isKdbx) {
+    [self.databaseNameTextField setStringValue:tree.databaseName];
+    [self.databaseDescriptionTextView setString:tree.databaseDescription];
+  }
+  else {
+    [self.databaseNameTextField setStringValue:_missingFeature];
+    [self.databaseDescriptionTextView setString:_missingFeature];
+  }
 }
 
 - (void)_setupProtectionTab:(Kdb4Tree *)tree {
-  [self.protectNotesCheckButton setState:tree.protectNotes ? NSOnState : NSOffState ];
+  BOOL isKdbX = (nil != tree);
-  [self.protectNotesCheckButton setState:tree.protectPassword ? NSOnState : NSOffState];
+  
-  [self.protectTitleCheckButton setState:tree.protectTitle ? NSOnState : NSOffState];
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-  [self.protectURLCheckButton setState:tree.protectUrl ? NSOnState : NSOffState];
+  
-  [self.protectUserNameCheckButton setState:tree.protectUserName ? NSOnState : NSOffState];
+  BOOL protectNotes = isKdbX ? tree.protectNotes : [defaults boolForKey:kMPSettingsKeyLegacyHideNotes];
+  BOOL protectPassword = isKdbX ? tree.protectPassword : [defaults boolForKey:kMPSettingsKeyLegacyHidePassword];
+  BOOL protectTitle = isKdbX ? tree.protectTitle : [defaults boolForKey:kMPSettingsKeyLegacyHideTitle];
+  BOOL protectUrl = isKdbX ? tree.protectUrl : [defaults boolForKey:kMPSettingsKeyLegacyHideURL];
+  BOOL protectUsername = isKdbX ? tree.protectUserName : [defaults boolForKey:kMPSettingsKeyLegacyHideUsername];
+  
+  [self.protectNotesCheckButton setState:protectNotes ? NSOnState : NSOffState ];
+  [self.protectPasswortCheckButton setState:protectPassword ? NSOnState : NSOffState];
+  [self.protectTitleCheckButton setState:protectTitle ? NSOnState : NSOffState];
+  [self.protectURLCheckButton setState:protectUrl ? NSOnState : NSOffState];
+  [self.protectUserNameCheckButton setState:protectUsername ? NSOnState : NSOffState];
 }
 
 - (void)_setupAdvancedTab:(Kdb4Tree *)tree {
-  self.trashEnabled = tree.recycleBinEnabled;
+  BOOL isKdbX = (nil != tree);
+  
+  self.trashEnabled = isKdbX ? tree.recycleBinEnabled : NO;
+  
   [self.enableRecycleBinCheckButton bind:NSValueBinding toObject:self withKeyPath:@"trashEnabled" options:nil];
+  [self.enableRecycleBinCheckButton setEnabled:isKdbX];
   [self.selectRecycleBinGroupPopUpButton bind:NSEnabledBinding toObject:self withKeyPath:@"trashEnabled" options:nil];
-  [self _updateTrashFolders:tree];
+  if(isKdbX) {
+    [self _updateTrashFolders:tree];
+  }
 }
 
 - (void)_setupPasswordTab:(Kdb4Tree *)tree {
   [self.passwordTextField setStringValue:_document.password ? _document.password : @""];
-  [self.keyfilePathControl setURL:_document.key];
+  [self.passwordRepeatTextField setStringValue:[self.passwordTextField stringValue]];
+  self.keyURL = _document.key;
   
+  NSDictionary *negateOption = @{ NSValueTransformerNameBindingOption : NSNegateBooleanTransformerName };
   [self.passwordTextField bind:@"showPassword" toObject:self withKeyPath:@"showPassword" options:nil];
   [self.togglePasswordButton bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
+  [self.passwordRepeatTextField bind:NSEnabledBinding toObject:self withKeyPath:@"showPassword" options:negateOption];
+  [self.errorTextField bind:NSHiddenBinding toObject:self withKeyPath:@"hasValidPasswordOrKey" options:nil];
+  [self.keyfilePathControl bind:NSValueBinding toObject:self withKeyPath:@"keyURL" options:nil];
+  
+  [self.passwordRepeatTextField setDelegate:self];
+  [self.passwordTextField setDelegate:self];
+  
+  /* Manually initate the first check */
+  [self _verifyPasswordAndKey];
+}
+
+- (void)_setupTemplatesTab:(Kdb4Tree *)tree {
+  
+}
+
+- (void)_updateFirstResponder {
+  NSTabViewItem *selected = [self.sectionTabView selectedTabViewItem];
+  MPDatabaseSettingsTab tab = [[self.sectionTabView tabViewItems] indexOfObject:selected];
+  
+  switch(tab) {
+    case MPDatabaseSettingsTabAdvanced:
+      [[self window] makeFirstResponder:self.databaseNameTextField];
+      break;
+      
+    case MPDatabaseSettingsTabDisplay:
+      [[self window] makeFirstResponder:self.protectTitleCheckButton];
+      break;
+      
+    case MPDatabaseSettingsTabGeneral:
+      [[self window] makeFirstResponder:self.databaseNameTextField];
+      break;
+      
+    case MPDatabaseSettingsTabPassword:
+      [[self window] makeFirstResponder:self.passwordTextField];
+      break;
+      
+    case MPDatabaseSettingsTemplatesTab:
+      break;
+  }
 }
 
 - (void)_updateTrashFolders:(Kdb4Tree *)tree {
-  NSMenu *menu = [self _buildTreeMenu:tree];
+  NSMenu *menu = [self _buildTrashTreeMenu:tree];
   [self.selectRecycleBinGroupPopUpButton setMenu:menu];
 }
 
+- (void)_updateTemplateGroup:(Kdb4Tree *)tree {
+  //
+}
+
+- (NSMenu *)_buildTrashTreeMenu:(Kdb4Tree *)tree {
+  NSMenu *menu = [self _buildTreeMenu:tree];
+  
+  NSMenuItem *selectItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOCREATE_TRASH_FOLDER", @"Menu item for automatic trash creation")
+                                                      action:NULL
+                                               keyEquivalent:@""];
+  [selectItem setEnabled:YES];
+  [menu insertItem:selectItem atIndex:0];
+  
+  return menu;
+}
+
+- (NSMenu *)_buildTemplateTreeMenu:(Kdb4Tree *)tree {
+  NSMenu *menu = [self _buildTreeMenu:tree];
+  
+  NSMenuItem *selectItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"NO_TEMPLATE_GROUP", @"Menu item to reset the template groups")
+                                                      action:NULL
+                                               keyEquivalent:@""];
+  [selectItem setEnabled:YES];
+  [menu insertItem:selectItem atIndex:0];
+  
+  return menu;
+}
+
+
 - (NSMenu *)_buildTreeMenu:(Kdb4Tree *)tree {
   NSMenu *menu = [[NSMenu alloc] init];
   [menu setAutoenablesItems:NO];
-
+  
   for(Kdb4Group *group in tree.root.groups) {
     NSMenuItem *groupItem = [[NSMenuItem alloc] init];
     [groupItem setImage:group.icon];
@@ -166,10 +393,7 @@
     }
     [menu addItem:groupItem];
   }
-  NSMenuItem *selectItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"SELECT_RECYCLEBIN", @"Menu item if no reycleBin is selected") action:NULL keyEquivalent:@""];
-  [selectItem setEnabled:YES];
-  [menu insertItem:selectItem atIndex:0];
-  
   return menu;
 }
+
 @end

MacPass/MPDocument+Attachments.m

@@ -12,6 +12,7 @@
 #import "NSData+Gzip.h"
 
 #import "Kdb3Node.h"
+#import "Kdb3Entry+KVOAdditions.h"
 #import "Kdb4Node.h"
 #import "Kdb4Entry+KVOAdditions.h"
 
@@ -31,6 +32,7 @@
     }
     entry.binary = binaryData;
     entry.binaryDesc = fileName;
+    [entry insertObject:@"" inBinariesAtIndex:1];
   }
   if( [anEntry isKindOfClass:[Kdb4Entry class]]) {
     Kdb4Entry *entry = (Kdb4Entry *)anEntry;
@@ -68,7 +70,7 @@
     else {
       encodedData = fileData;
     }
-    binary.data = [[NSString alloc] initWithData:encodedData encoding:NSASCIIStringEncoding];
+    binary.data = [[NSString alloc] initWithData:encodedData encoding:NSUTF8StringEncoding];
     
     [self.treeV4.binaries addObject:binary];
     BinaryRef *ref = [[BinaryRef alloc] init];
@@ -78,17 +80,6 @@
   }
 }
 
-- (void)saveAttachmentFromEntry:(KdbEntry *)anEntry toLocation:(NSURL *)location {
-  if([anEntry isKindOfClass:[Kdb3Entry class]]) {
-    Kdb3Entry *entry = (Kdb3Entry *)anEntry;
-    NSError *error = nil;
-    if(! [entry.binary writeToURL:location options:NSDataWritingWithoutOverwriting error:&error] ) {
-      [NSApp presentError:error];
-    }
-  }
-  return; //
-}
-
 - (void)removeAttachment:(BinaryRef *)reference fromEntry:(KdbEntry *)anEntry {
   if(self.version != MPDatabaseVersion4) {
     return; // Wrong Database version;
@@ -103,6 +94,14 @@
   [self.treeV4.binaries removeObject:binary];
 }
 
+- (void)removeAttachmentFromEntry:(KdbEntry *)anEntry {
+  if(self.version != MPDatabaseVersion3) {
+    return;
+  }
+  Kdb3Entry *entry = (Kdb3Entry *)anEntry;
+  [entry removeObjectFromBinariesAtIndex:0];
+}
+
 - (Binary *)findBinary:(BinaryRef *)reference {
   if(self.version != MPDatabaseVersion4) {
     return nil;
@@ -115,22 +114,35 @@
   return [filteredBinary lastObject];
 }
 
-- (void)saveAttachment:(BinaryRef *)reference toLocation:(NSURL *)location {
+- (void)saveAttachmentForItem:(id)item toLocation:(NSURL *)location {
-  Binary *binary = [self findBinary:reference];
+  if([item isKindOfClass:[Kdb3Entry class]]) {
-  NSData *rawData = nil;
+    Kdb3Entry *entry = (Kdb3Entry *)item;
-  if(binary) {
-    if(binary.compressed) {
-      rawData = [NSMutableData mutableDataWithBase64DecodedData:[binary.data dataUsingEncoding:NSASCIIStringEncoding]];
-      rawData = [rawData gzipInflate];
-    }
-    else {
-      rawData = [NSMutableData mutableDataWithBase64DecodedData:[binary.data dataUsingEncoding:NSASCIIStringEncoding]];
-    }
     NSError *error = nil;
-    if( ![rawData writeToURL:location options:0 error:&error] ) {
+    if(! [entry.binary writeToURL:location options:NSDataWritingAtomic error:&error] ) {
       [NSApp presentError:error];
     }
   }
+  else if([item isKindOfClass:[BinaryRef class]]) {
+    Binary *binary = [self findBinary:item];
+    NSData *rawData = nil;
+    if(binary) {
+      if(binary.compressed) {
+        rawData = [NSMutableData mutableDataWithBase64DecodedData:[binary.data dataUsingEncoding:NSUTF8StringEncoding]];
+        rawData = [rawData gzipInflate];
+      }
+      else {
+        rawData = [NSMutableData mutableDataWithBase64DecodedData:[binary.data dataUsingEncoding:NSUTF8StringEncoding]];
+      }
+      NSError *error = nil;
+      if( ![rawData writeToURL:location options:NSDataWritingAtomic error:&error] ) {
+        [NSApp presentError:error];
+      }
+    }
+  }
+  else {
+    NSAssert(NO, @"Item is neither BinaryRef nor Kdb3Entry");
+    return;
+  }
 }
 
 - (NSUInteger)nextBinaryId {

MacPass/MPDocument.h

@@ -11,14 +11,20 @@
 
 
 APPKIT_EXTERN NSString *const MPDocumentDidAddGroupNotification;
-APPKIT_EXTERN NSString *const MPDocumentWillDelteGroupNotification;
 APPKIT_EXTERN NSString *const MPDocumentDidAddEntryNotification;
-APPKIT_EXTERN NSString *const MPDocumentWillDeleteEntryNotification;
 APPKIT_EXTERN NSString *const MPDocumentDidRevertNotifiation;
 
 APPKIT_EXTERN NSString *const MPDocumentEntryKey;
 APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 
+APPKIT_EXTERN NSString *const MPDocumentRequestPasswordSaveNotification;
+
+/*
+ APPKIT_EXTERN NSString *const MPDocumentDidChangeCurrentItemNotification;
+APPKIT_EXTERN NSString *const MPDocumentDidChangeCurrentGroupNotication;
+APPKIT_EXTERN NSString *const MPDocumnetDidChangeCurrentEntryNotification;
+*/
+
 @class KdbGroup;
 @class KdbEntry;
 @class KdbTree;
@@ -42,6 +48,7 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 @property (strong, readonly, nonatomic) KdbTree *tree;
 @property (weak, readonly, nonatomic) KdbGroup *root;
 @property (readonly, strong) MPRootAdapter *rootAdapter;
+@property (weak, readonly) KdbGroup *trash;
 
 @property (nonatomic, copy) NSString *password;
 @property (nonatomic, strong) NSURL *key;
@@ -49,6 +56,15 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 @property (assign, readonly) MPDatabaseVersion version;
 @property (assign, readonly, getter = isReadOnly) BOOL readOnly;
 
+
+/*
+ State (active group/entry)
+ */
+@property (nonatomic, weak) KdbEntry *selectedEntry;
+@property (nonatomic, weak) KdbGroup *selectedGroup;
+@property (nonatomic, weak) id selectedItem;
+
+
 - (id)initWithVersion:(MPDatabaseVersion)version;
 
 #pragma mark Lock/Decrypt
@@ -66,6 +82,9 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 - (Kdb3Tree *)treeV3;
 
 - (void)useGroupAsTrash:(KdbGroup *)group;
+- (void)useGroupAsTemplate:(KdbGroup *)group;
+
+- (BOOL)isItemTrashed:(id)item;
 
 #pragma mark Export
 - (void)writeXMLToURL:(NSURL *)url;
@@ -79,7 +98,6 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 /*
  All non-setter undoable actions
 */
-- (BOOL)group:(KdbGroup *)group isMoveableToGroup:(KdbGroup *)target;
 
 /* TODO in UNDO auslagen */
 - (void)addStringField:(StringField *)field toEntry:(Kdb4Entry *)entry atIndex:(NSUInteger)index;
@@ -88,16 +106,19 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 - (void)deleteGroup:(KdbGroup *)group;
 - (void)deleteEntry:(KdbEntry *)entry;
 
-- (void)emptyTrash:(id)sender;
+- (IBAction)emptyTrash:(id)sender;
 
 @end
 
 @interface MPDocument (Attachments)
 
 - (void)addAttachment:(NSURL *)location toEntry:(KdbEntry *)anEntry;
-- (void)saveAttachmentFromEntry:(KdbEntry *)anEntry toLocation:(NSURL *)location;
+/**
-- (void)saveAttachment:(BinaryRef *)reference toLocation:(NSURL *)location;
+ item can be either a BinaryRef or an Kdb3Entry.
+ */
+- (void)saveAttachmentForItem:(id)item toLocation:(NSURL *)location;
 - (void)removeAttachment:(BinaryRef *)reference fromEntry:(KdbEntry *)anEntry;
+- (void)removeAttachmentFromEntry:(KdbEntry *)anEntry;
 - (NSUInteger)nextBinaryId;
 - (Binary *)findBinary:(BinaryRef *)reference;
 

MacPass/MPDocument.m

@@ -13,33 +13,39 @@
 #import "MPRootAdapter.h"
 #import "MPIconHelper.h"
 #import "MPActionHelper.h"
+#import "MPSettingsHelper.h"
+#import "MPNotifications.h"
 
 #import "KdbLib.h"
 #import "Kdb3Node.h"
 #import "Kdb4Node.h"
 #import "Kdb4Persist.h"
 #import "KdbPassword.h"
-#import "KdbGroup+Undo.h"
+
 #import "KdbGroup+KVOAdditions.h"
 #import "Kdb4Entry+KVOAdditions.h"
-#import "KdbGroup+MPTreeTools.h"
+
-#import "KdbGroup+MPAdditions.h"
 #import "KdbEntry+Undo.h"
+#import "KdbGroup+Undo.h"
+
 #import "Kdb3Tree+NewTree.h"
 #import "Kdb4Tree+NewTree.h"
+#import "Kdb4Entry+MPAdditions.h"
+#import "KdbGroup+MPTreeTools.h"
+#import "KdbGroup+MPAdditions.h"
 
 #import "DataOutputStream.h"
 
 #import "DDXMLNode.h"
 
-NSString *const MPDocumentDidAddGroupNotification     = @"com.hicknhack.macpass.MPDocumentDidAddGroupNotification";
+NSString *const MPDocumentDidAddGroupNotification         = @"com.hicknhack.macpass.MPDocumentDidAddGroupNotification";
-NSString *const MPDocumentWillDelteGroupNotification  = @"com.hicknhack.macpass.MPDocumentDidDelteGroupNotification";
+NSString *const MPDocumentDidAddEntryNotification         = @"com.hicknhack.macpass.MPDocumentDidAddEntryNotification";
-NSString *const MPDocumentDidAddEntryNotification     = @"com.hicknhack.macpass.MPDocumentDidAddEntryNotification";
+NSString *const MPDocumentDidRevertNotifiation            = @"com.hicknhack.macpass.MPDocumentDidRevertNotifiation";
-NSString *const MPDocumentWillDeleteEntryNotification = @"com.hicknhack.macpass.MPDocumentDidDeleteEntryNotification";
+NSString *const MPDocumentRequestPasswordSaveNotification = @"com.hicknhack.macpass.MPDocumentRequestPasswordSaveNotification";
-NSString *const MPDocumentDidRevertNotifiation        = @"com.hicknhack.macpass.MPDocumentDidRevertNotifiation";
 
-NSString *const MPDocumentEntryKey                    = @"MPDocumentEntryKey";
+
-NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
+NSString *const MPDocumentEntryKey                        = @"MPDocumentEntryKey";
+NSString *const MPDocumentGroupKey                        = @"MPDocumentGroupKey";
 
 
 @interface MPDocument () {
@@ -61,7 +67,6 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 @property (strong) NSURL *lockFileURL;
 
 @property (readonly) BOOL useTrash;
-@property (weak, readonly) KdbGroup *trash;
 @property (strong) IBOutlet NSView *warningView;
 @property (weak) IBOutlet NSImageView *warningViewImage;
 
@@ -162,6 +167,13 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 
 - (void)close {
   [self _cleanupLock];
+  /*
+   We store the last url. Restored windows are automatically handeld.
+   If closeAllDocuments is set, all docs get this messgae
+   */
+  if([[self fileURL] isFileURL]) {
+    [[NSUserDefaults standardUserDefaults] setObject:[self.fileURL absoluteString] forKey:kMPSettingsKeyLastDatabasePath];
+  }
   [super close];
 }
 
@@ -227,17 +239,42 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   return NO;
 }
 
+- (void)saveDocument:(id)sender {
+  if(self.hasPasswordOrKey) {
+    [super saveDocument:sender];
+  }
+  else {
+    [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentRequestPasswordSaveNotification object:self userInfo:nil];
+  }
+}
+
 - (BOOL)prepareSavePanel:(NSSavePanel *)savePanel {
   if(self.hasPasswordOrKey) {
     [savePanel setAccessoryView:nil];
     return YES;
   }
-  if(!self.warningView) {
+  return NO;
-    [[NSBundle mainBundle] loadNibNamed:@"UnprotectedWarningView" owner:self topLevelObjects:nil];
+}
-    [self.warningViewImage setImage:[NSImage imageNamed:NSImageNameCaution]];
+
+- (void)setSelectedGroup:(KdbGroup *)selectedGroup {
+  if(_selectedGroup != selectedGroup) {
+    _selectedGroup = selectedGroup;
+  }
+  self.selectedItem = _selectedGroup;
+}
+
+- (void)setSelectedEntry:(KdbEntry *)selectedEntry {
+  if(_selectedEntry != selectedEntry) {
+    _selectedEntry = selectedEntry;
+  }
+  self.selectedItem = selectedEntry;
+}
+
+- (void)setSelectedItem:(id)selectedItem {
+  if(_selectedItem != selectedItem) {
+    _selectedItem = selectedItem;
+    [[NSNotificationCenter defaultCenter] postNotificationName:MPCurrentItemChangedNotification object:self];
   }
-  [savePanel setAccessoryView:self.warningView];
-  return YES;
 }
 
 #pragma mark Data Accesors
@@ -303,6 +340,26 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   return nil;
 }
 
+- (BOOL)isItemTrashed:(id)item {
+  BOOL validItem = [item isKindOfClass:[KdbEntry class]] || [item isKindOfClass:[KdbGroup class]];
+  if(!item) {
+    return NO;
+  }
+  if(item == self.trash) {
+    return NO; // No need to look further as this is the trashcan
+  }
+  if(validItem) {
+    BOOL isTrashed = NO;
+    id parent = [item parent];
+    while( parent && !isTrashed ) {
+      isTrashed = (parent == self.trash);
+      parent = [parent parent];
+    }
+    return isTrashed;
+  }
+  return NO;
+}
+
 - (void)useGroupAsTrash:(KdbGroup *)group {
   if(self.useTrash) {
     Kdb4Group *groupv4 = (Kdb4Group *)group;
@@ -312,11 +369,24 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   }
 }
 
+- (void)useGroupAsTemplate:(KdbGroup *)group {
+  Kdb4Group *groupv4 = (Kdb4Group *)group;
+  if([self.treeV4.entryTemplatesGroup isEqual:groupv4.uuid]) {
+    self.treeV4.entryTemplatesGroup = groupv4.uuid;
+  }
+}
+
 #pragma mark Data manipulation
 - (KdbEntry *)createEntry:(KdbGroup *)parent {
   if(!parent) {
     return nil; // No parent
   }
+  if(parent == self.trash) {
+    return nil; // no new Groups in trash
+  }
+  if([self isItemTrashed:parent]) {
+    return nil;
+  }
   KdbEntry *newEntry = [self.tree createEntry:parent];
   newEntry.title = NSLocalizedString(@"DEFAULT_ENTRY_TITLE", @"Title for a newly created entry");
   if(self.treeV4 && ([self.treeV4.defaultUserName length] > 0)) {
@@ -332,6 +402,12 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   if(!parent) {
     return nil; // no parent!
   }
+  if(parent == self.trash) {
+    return nil; // no new Groups in trash
+  }
+  if([self isItemTrashed:parent]) {
+    return nil;
+  }
   KdbGroup *newGroup = [self.tree createGroup:parent];
   newGroup.name = NSLocalizedString(@"DEFAULT_GROUP_NAME", @"Title for a newly created group");
   newGroup.image = MPIconFolder;
@@ -349,57 +425,26 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   Kdb4Entry *entryV4 = (Kdb4Entry *)entry;
   NSString *title = NSLocalizedString(@"DEFAULT_CUSTOM_FIELD_TITLE", @"Default Titel for new Custom-Fields");
   NSString *value = NSLocalizedString(@"DEFAULT_CUSTOM_FIELD_VALUE", @"Default Value for new Custom-Fields");
+  title = [entryV4 uniqueKeyForProposal:title];
   StringField *newStringField = [StringField stringFieldWithKey:title andValue:value];
   [self addStringField:newStringField toEntry:entryV4 atIndex:[entryV4.stringFields count]];
   return newStringField;
 }
 
-- (void)moveGroup:(KdbGroup *)group toGroup:(KdbGroup *)target index:(NSInteger)index {
-  NSInteger oldIndex = [group.parent.groups indexOfObject:group];
-  if(group.parent == target && oldIndex == index) {
-    return; // No changes
-  }
-  [[[self undoManager] prepareWithInvocationTarget:self] moveGroup:group toGroup:group.parent index:oldIndex];
-  if(self.trash == target) {
-    [[self undoManager] setActionName:@"UNDO_DELETE_GROUP"];
-  }
-  else {
-    [[self undoManager] setActionName:@"MOVE_GROUP"];
-  }
-  [group.parent removeObjectFromGroupsAtIndex:oldIndex];
-  if(index < 0 || index > [target.groups count] ) {
-    index = [target.groups count];
-  }
-  [target insertObject:group inGroupsAtIndex:index];
-}
-
-- (BOOL)group:(KdbGroup *)group isMoveableToGroup:(KdbGroup *)target {
-  if(target == nil) {
-    return NO;
-  }
-  BOOL isMovable = YES;
-  
-  KdbGroup *ancestor = target.parent;
-  while(ancestor.parent) {
-    if(ancestor == group) {
-      isMovable = NO;
-      break;
-    }
-    ancestor = ancestor.parent;
-  }
-  return isMovable;
-}
-
 - (void)deleteEntry:(KdbEntry *)entry {
   if(self.useTrash) {
     if(!self.trash) {
       [self _createTrashGroup];
     }
+    if([self isItemTrashed:entry]) {
+      return; // Entry is already trashed
+    }
     [entry moveToTrashUndoable:self.trash atIndex:[self.trash.entries count]];
   }
   else {
     [entry deleteUndoable];
   }
+  self.selectedEntry = nil;
 }
 
 - (void)deleteGroup:(KdbGroup *)group {
@@ -407,6 +452,9 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
     if(!self.trash) {
       [self _createTrashGroup];
     }
+    if( (group == self.trash) || [self isItemTrashed:group] ) {
+      return; //Groups already trashed cannot be deleted
+    }
     [group moveToTrashUndoable:self.trash atIndex:[self.trash.groups count]];
   }
   else {
@@ -419,6 +467,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 - (void)addStringField:(StringField *)field toEntry:(Kdb4Entry *)entry atIndex:(NSUInteger)index {
   [[[self undoManager] prepareWithInvocationTarget:self] removeStringField:field formEntry:entry];
   [[self undoManager] setActionName:NSLocalizedString(@"UNDO_ADD_STRING_FIELD", @"Add Stringfield Undo")];
+  field.entry = entry;
   [entry insertObject:field inStringFieldsAtIndex:index];
 }
 
@@ -429,12 +478,16 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   }
   [[[self undoManager] prepareWithInvocationTarget:self] addStringField:field toEntry:entry atIndex:index];
   [[self undoManager] setActionName:NSLocalizedString(@"UNDO_DELETE_STRING_FIELD", @"Delte Stringfield undo")];
+  field.entry = nil;
   [entry removeObjectFromStringFieldsAtIndex:index];
 }
 
 #pragma mark Actions
 
 - (void)emptyTrash:(id)sender {
+  if(self.version != MPDatabaseVersion4) {
+    return; // We have no trash on those file types
+  }
   NSAlert *alert = [[NSAlert alloc] init];
   [alert setAlertStyle:NSWarningAlertStyle];
   [alert setMessageText:NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_TITLE", "")];
@@ -460,6 +513,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
     BOOL hasEntries = [self.trash.entries count] > 0;
     return (hasEntries || hasGroups);
   }
+  
   return [super validateUserInterfaceItem:anItem];
 }
 
@@ -503,7 +557,24 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   for(KdbGroup *group in [self.trash childGroups]) {
     [[self undoManager] removeAllActionsWithTarget:group];
   }
+  [self _cleanTrashedBinaries];
   [self.trash clear];
 }
 
+- (void)_cleanTrashedBinaries {
+  NSMutableSet *clearKeys = [[NSMutableSet alloc] initWithCapacity:20];
+  NSMutableArray *clearBinaries = [[NSMutableArray alloc] initWithCapacity:[self.treeV4.binaries count]];
+  for(Kdb4Entry *entry in [self.trash childEntries]) {
+    for(BinaryRef *binaryRef in entry.binaries) {
+      [clearKeys addObject:@(binaryRef.ref)];
+    }
+  }
+  for(Binary *binary in self.treeV4.binaries) {
+    if([clearKeys containsObject:@(binary.binaryId)]) {
+      [clearBinaries addObject:binary];
+    }
+  }
+  [self.treeV4.binaries removeObjectsInArray:clearBinaries];
+}
+
 @end

MacPass/MPDocumentWindowController.h

@@ -7,6 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "MPDatabaseSettingsDelegate.h"
 
 @class MPViewController;
 @class MPEntryViewController;
@@ -17,21 +18,19 @@
 @class KdbGroup;
 @class KdbEntry;
 
-APPKIT_EXTERN NSString *const MPCurrentItemChangedNotification;
+@interface MPDocumentWindowController : NSWindowController <MPDatabaseSettingsDelegate>
-
-@interface MPDocumentWindowController : NSWindowController <NSWindowDelegate>
 
 @property (readonly, strong) MPPasswordInputController *passwordInputController;
 @property (readonly, strong) MPEntryViewController *entryViewController;
 @property (readonly, strong) MPOutlineViewController *outlineViewController;
 @property (readonly, strong) MPInspectorViewController *inspectorViewController;
 
-
+/**
-/* Holds the current item. That is either a KdbGroup or a KdbEntry */
+ @param action The action that should be validatet
-@property (readonly, unsafe_unretained) id currentItem;
+ @param item The item that the action affects. Pass nil to fall back for default item
-@property (readonly, unsafe_unretained) KdbGroup *currentGroup;
+ @returns YES if the action is valid, NO otherwise
-@property (readonly, unsafe_unretained) KdbEntry *currentEntry;
+ */
-
+- (BOOL)validateAction:(SEL)action forItem:(id)item;
 
 - (void)showEntries;
 - (void)showPasswordInput;
@@ -40,7 +39,7 @@ APPKIT_EXTERN NSString *const MPCurrentItemChangedNotification;
 - (IBAction)showDatabaseSettings:(id)sender;
 - (IBAction)exportDatabase:(id)sender;
 
-- (void)lock:(id)sender;
+- (IBAction)lock:(id)sender;
 
 - (void)createGroup:(id)sender;
 - (void)toggleInspector:(id)sender;

MacPass/MPDocumentWindowController.m

@@ -17,20 +17,17 @@
 #import "MPActionHelper.h"
 #import "MPDatabaseSettingsWindowController.h"
 #import "MPConstants.h"
-
+#import "MPSettingsHelper.h"
-NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCurrentItemChangedNotification";
 
 @interface MPDocumentWindowController () {
 @private
   id _firstResponder;
+  BOOL _saveAfterPasswordEdit; // Flag to indicat that the document needs to be saved after password edit did finish
 }
 
 @property (strong) IBOutlet NSSplitView *splitView;
 
 @property (strong) NSToolbar *toolbar;
-@property (unsafe_unretained) id currentItem;
-@property (unsafe_unretained) KdbGroup *currentGroup;
-@property (unsafe_unretained) KdbEntry *currentEntry;
 
 @property (strong) MPPasswordInputController *passwordInputController;
 @property (strong) MPEntryViewController *entryViewController;
@@ -52,25 +49,20 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
     _outlineViewController = [[MPOutlineViewController alloc] init];
     _entryViewController = [[MPEntryViewController alloc] init];
     _inspectorViewController = [[MPInspectorViewController alloc] init];
-    _currentItem = nil;
+    _saveAfterPasswordEdit = NO;
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateCurrentItem:) name:MPOutlineViewDidChangeGroupSelection object:_outlineViewController];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateCurrentItem:) name:MPDidChangeSelectedEntryNotification object:_entryViewController];
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
-  
-  
-  
 }
 
 #pragma mark View Handling
 - (void)windowDidLoad {
   
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didRevertDocument:) name:MPDocumentDidRevertNotifiation object:[self document]];
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_setPasswordAndSave) name:MPDocumentRequestPasswordSaveNotification object:[self document]];
   
   [_entryViewController setupNotifications:self];
   [_inspectorViewController setupNotifications:self];
@@ -94,7 +86,10 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
   [_splitView setHoldingPriority:NSLayoutPriorityDefaultLow+2 forSubviewAtIndex:0];
   [_splitView setHoldingPriority:NSLayoutPriorityDefaultLow+1 forSubviewAtIndex:2];
   
-  [[self window] setDelegate:self];
+  BOOL showInspector = [[NSUserDefaults standardUserDefaults] boolForKey:kMPSettingsKeyShowInspector];
+  if(!showInspector) {
+    [inspectorView removeFromSuperview];
+  }
   
   MPDocument *document = [self document];
   if(!document.decrypted) {
@@ -103,6 +98,8 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
   else {
     [self showEntries];
   }
+  
+  [_splitView setAutosaveName:@"SplitView"];
 }
 
 - (void)_setContentViewController:(MPViewController *)viewController {
@@ -137,25 +134,6 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
   [self.window makeFirstResponder:[viewController reconmendedFirstResponder]];
 }
 
-#pragma mark Notification handling
-- (void)_updateCurrentItem:(NSNotification *)notification {
-  id sender = [notification object];
-  
-  self.currentGroup = _outlineViewController.selectedGroup;
-  self.currentEntry = _entryViewController.selectedEntry;
-  
-  if( sender == _outlineViewController.outlineView || sender == _outlineViewController ) {
-    self.currentItem = _outlineViewController.selectedGroup;
-  }
-  else if( sender == _entryViewController.entryTable || sender == _entryViewController) {
-    self.currentItem = _entryViewController.selectedEntry;
-  }
-  else {
-    return; // no notification!
-  }
-  [[NSNotificationCenter defaultCenter] postNotificationName:MPCurrentItemChangedNotification object:self];
-}
-
 - (void)_didRevertDocument:(NSNotification *)notification {
   [self.outlineViewController clearSelection];
   [self showPasswordInput];
@@ -187,6 +165,9 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
   if(itemAction == @selector(exportDatabase:)) {
     enabled = (nil != document.treeV4);
   }
+  if(itemAction == [MPActionHelper actionOfType:MPActionDelete]) {
+    enabled &= (nil != document.selectedItem) && (document.selectedItem != document.trash);
+  }
   
   enabled &= !( !document.decrypted || document.isLocked || document.isReadOnly );
   return enabled;
@@ -197,20 +178,55 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
   if(!document.decrypted || document.isLocked || document.isReadOnly) {
     return NO;
   }
-  SEL itemAction = [theItem action];
+  MPActionType actionType = [MPActionHelper typeForAction:[theItem action]];
-  if( itemAction == [MPActionHelper actionOfType:MPActionLock]) {
+  switch (actionType) {
-    return document.hasPasswordOrKey;
+    case MPActionAddGroup:
+    case MPActionAddEntry:
+      return (nil != document.selectedGroup);
+    case MPActionDelete: {
+      BOOL valid = (nil != document.selectedItem);
+      valid &= (document.selectedItem != document.trash);
+      valid &= ![document isItemTrashed:document.selectedItem];
+      return valid;
+    }
+    case MPActionLock:
+      return document.hasPasswordOrKey;
+      
+    case MPActionToggleInspector:
+      return (nil != [_splitView superview]);
+      
+    default:
+      return YES;
   }
-  if(itemAction == [MPActionHelper actionOfType:MPActionAddEntry]) {
+  return YES;
-    return (nil != _outlineViewController.selectedGroup);
+}
+
+- (BOOL)validateAction:(SEL)action forItem:(id)item {
+  MPDocument *document = [self document];
+  if(!document.decrypted || document.isLocked || document.isReadOnly) {
+    return NO;
   }
-  if(itemAction == [MPActionHelper actionOfType:MPActionDelete]) {
+  MPActionType actionType = [MPActionHelper typeForAction:action];
-    return (nil != _currentItem);
+  switch (actionType) {
+    case MPActionAddGroup:
+    case MPActionAddEntry:
+      // test if Group is in trash
+      return (nil != document.selectedGroup);
+    case MPActionDelete: {
+      BOOL valid = (nil != document.selectedItem);
+      valid &= (document.selectedItem != document.trash);
+      valid &= ![document isItemTrashed:document.selectedItem];
+      return valid;
+    }
+    case MPActionLock:
+      return document.hasPasswordOrKey;
+      
+    case MPActionToggleInspector:
+      return (nil != [_splitView superview]);
+      
+    default:
+      return YES;
   }
-  if(itemAction == [MPActionHelper actionOfType:MPActionToggleInspector]) {
-    return (nil != [_splitView superview]);
-  }
-  
   return YES;
 }
 
@@ -223,14 +239,14 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
 }
 
 - (void)editPassword:(id)sender {
-  [self _showDatabaseSetting:MPDatabaseSettingsTabPassword];
+  [self _showDatabaseSetting:MPDatabaseSettingsTabPassword saveDocument:NO];
 }
 
 - (void)showDatabaseSettings:(id)sender {
-  [self _showDatabaseSetting:MPDatabaseSettingsTabGeneral];
+  [self _showDatabaseSetting:MPDatabaseSettingsTabGeneral saveDocument:NO];
 }
 
-- (void)lock:(id)sender {
+- (IBAction)lock:(id)sender {
   MPDocument *document = [self document];
   if(!document.hasPasswordOrKey) {
     return; // Document needs a password/keyfile to be lockable
@@ -252,18 +268,21 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
 
 - (void)toggleInspector:(id)sender {
   NSView *inspectorView = [_inspectorViewController view];
+  BOOL inspectorVisible = NO;
   if([inspectorView superview]) {
     //[inspectorView animator]
     [inspectorView removeFromSuperview];
   }
   else {
     // Remove contraint on view removal.
+    inspectorVisible = YES;
     [_splitView addSubview:inspectorView];
     [_splitView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"[inspectorView(>=200)]"
                                                                        options:0
                                                                        metrics:nil
                                                                          views:NSDictionaryOfVariableBindings(inspectorView)]];
   }
+  [[NSUserDefaults standardUserDefaults] setBool:inspectorVisible forKey:kMPSettingsKeyShowInspector];
 }
 
 - (void)showEntries {
@@ -275,7 +294,7 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
     [[contentView subviews][0] removeFromSuperviewWithoutNeedingDisplay];
   }
   [contentView addSubview:_splitView];
-  [_splitView adjustSubviews];
+  //[_splitView adjustSubviews];
   NSView *outlineView = [_outlineViewController view];
   NSView *inspectorView = [_inspectorViewController view];
   NSView *entryView = [_entryViewController view];
@@ -321,7 +340,7 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
   if(removeInspector) {
     [inspectorView removeFromSuperview];
   }
-  [contentView layout];
+  [contentView layoutSubtreeIfNeeded];
   
   MPDocument *document = [self document];
   document.locked = NO;
@@ -332,28 +351,38 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
   [_outlineViewController showOutline];
 }
 
-#pragma mark NSWindowDelegate
+#pragma mark MPDatabaseSettingsDelegate
-- (void)windowDidUpdate:(NSNotification *)notification {
+- (void)didCancelDatabaseSettings {
-  id firstResonder = [[self window] firstResponder];
+  _saveAfterPasswordEdit = NO; // Just Reset the flag
-  if(_firstResponder == firstResonder) {
-    return;
-  }
-  _firstResponder = firstResonder;
-  if([_firstResponder isKindOfClass:[NSView class]]) {
-    [self _updateCurrentItem:[NSNotification notificationWithName:@"dummy" object:_firstResponder ]];
-  }
 }
 
+- (void)didSaveDatabaseSettings {
+  if (_saveAfterPasswordEdit) {
+    _saveAfterPasswordEdit = NO;
+  }
+  [[self document] saveDocument:nil];
+}
 
 #pragma mark Helper
 
-- (void)_showDatabaseSetting:(MPDatabaseSettingsTab)tab {
+- (void)_setPasswordAndSave {
-    if(!self.documentSettingsWindowController) {
+  _saveAfterPasswordEdit = YES;
-      _documentSettingsWindowController = [[MPDatabaseSettingsWindowController alloc] initWithDocument:[self document]];
+  [self editPassword:nil];
-    }
+}
-    [self.documentSettingsWindowController update];
+
+- (void)_showDatabaseSetting:(MPDatabaseSettingsTab)tab saveDocument:(BOOL)save{
+  if(!self.documentSettingsWindowController) {
+    _documentSettingsWindowController = [[MPDatabaseSettingsWindowController alloc] initWithDocument:[self document]];
+    [_documentSettingsWindowController setDelegate:self];
+  }
+  [self.documentSettingsWindowController update];
   [self.documentSettingsWindowController showSettingsTab:tab];
-    [[NSApplication sharedApplication] beginSheet:[self.documentSettingsWindowController window] modalForWindow:[self window] modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
+  [[NSApplication sharedApplication] beginSheet:[self.documentSettingsWindowController window]
+                                 modalForWindow:[self window]
+                                  modalDelegate:nil
+                                 didEndSelector:NULL
+                                    contextInfo:NULL];
+  
 }
 
 - (NSSearchField *)locateToolbarSearchField {

MacPass/MPEntryViewController.h

@@ -14,8 +14,6 @@ APPKIT_EXTERN NSString *const MPEntryTablePasswordColumnIdentifier;
 APPKIT_EXTERN NSString *const MPEntryTableParentColumnIdentifier;
 APPKIT_EXTERN NSString *const MPEntryTableURLColumnIdentifier;
 
-APPKIT_EXTERN NSString *const MPDidChangeSelectedEntryNotification;
-
 /* Tags to determine what to copy */
 typedef NS_ENUM( NSUInteger, MPCopyContentTypeTag) {
   MPCopyUsername,

MacPass/MPEntryViewController.m

@@ -30,7 +30,7 @@
 #import "KdbGroup+Undo.h"
 #import "KdbEntry+Undo.h"
 
-NSString *const MPDidChangeSelectedEntryNotification = @"com.macpass.MPDidChangeSelectedEntryNotification";
+#import "MPNotifications.h"
 
 #define STATUS_BAR_ANIMATION_TIME 0.2
 
@@ -69,6 +69,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 @property (strong) NSArrayController *entryArrayController;
 @property (strong) NSArray *filteredEntries;
 @property (strong) IBOutlet NSView *filterBar;
+@property (strong) IBOutlet HNHGradientView *trashBar;
 @property (weak) IBOutlet NSTableView *entryTable;
 @property (strong) IBOutlet NSLayoutConstraint *tableToTop;
 @property (weak) IBOutlet NSButton *filterDoneButton;
@@ -80,6 +81,8 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 @property (weak) IBOutlet NSSearchField *filterSearchField;
 @property (weak) IBOutlet HNHGradientView *bottomBar;
 @property (weak) IBOutlet NSButton *addEntryButton;
+@property (weak) IBOutlet NSTextField *entryCountTextField;
+
 
 @property (weak) KdbEntry *selectedEntry;
 
@@ -102,9 +105,9 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   if(self) {
     _filterMode = MPFilterTitles;
     _filterButtonToMode = @{ _toggleFilterUsernameButton : @(MPFilterUsernames),
-                           _toggleFilterTitleButton : @(MPFilterTitles),
+                             _toggleFilterTitleButton : @(MPFilterTitles),
-                           _toggleFilterURLButton : @(MPFilterUrls)
+                             _toggleFilterURLButton : @(MPFilterUrls)
-                           };
+                             };
     _entryArrayController = [[NSArrayController alloc] init];
     _dataSource = [[MPEntryTableDataSource alloc] init];
     _dataSource.viewController = self;
@@ -133,6 +136,11 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   [self.entryTable setTarget:self];
   [self.entryTable setFloatsGroupRows:NO];
   //[self.entryTable registerForDraggedTypes:@[MPPasteBoardType]];
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(_didBecomFirstResponder:)
+                                               name:MPDidBecomeFirstResonderNotification
+                                             object:_entryTable];
+  
   [self _setupEntryMenu];
   
   NSTableColumn *parentColumn = [self.entryTable tableColumns][0];
@@ -174,10 +182,11 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 }
 
 - (void)setupNotifications:(MPDocumentWindowController *)windowController {
+  MPDocument *document = [windowController document];
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(_didChangeCurrentItem:)
                                                name:MPCurrentItemChangedNotification
-                                             object:windowController];  
+                                             object:document];
 }
 
 #pragma mark NSTableViewDelgate
@@ -225,45 +234,52 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 }
 
 - (void)tableViewSelectionDidChange:(NSNotification *)notification {
+  MPDocument *document = [[self windowController] document];
   if([self.entryTable selectedRow] < 0 || [[_entryTable selectedRowIndexes] count] > 1) {
-    self.selectedEntry = nil;
+    document.selectedEntry = nil;
   }
   else {
-    self.selectedEntry = [self.entryArrayController arrangedObjects][[self.entryTable selectedRow]];
+    document.selectedEntry = [self.entryArrayController arrangedObjects][[self.entryTable selectedRow]];
   }
-  [[NSNotificationCenter defaultCenter] postNotificationName:MPDidChangeSelectedEntryNotification object:self userInfo:nil];
 }
 
 #pragma mark Notifications
 - (void)_didChangeCurrentItem:(NSNotification *)notification {
-  if([self _showsFilterBar]) {
+  MPDocument *document = [notification object];
-    //[self.filterSearchField setStringValue:@""];
+  
-    [self clearFilter:nil];
+  if(!document.selectedGroup) {
-  }
-  MPDocumentWindowController *sender = [notification object];
-  id item = sender.currentItem;
-  /*
-   Filter? If no group is selected, we shouldn display a list of entries
-   */
-  if(!sender.currentGroup) {
     [self.entryArrayController unbind:NSContentArrayBinding];
     [self.entryArrayController setContent:nil];
     return;
   }
   /*
    If a grup is the current item, see if we already show that group
-   */
+   */ 
-  if(item == sender.currentGroup) {
+  if(document.selectedItem == document.selectedGroup) {
+    /*
+     If we reselct the group, or just another group
+     we clear the filter and bind to the new selected group
+     */
+    if([self _showsFilterBar] && ![document.selectedItem isKindOfClass:[KdbEntry class]]) {
+      [self clearFilter:nil];
+      [self.entryArrayController bind:NSContentArrayBinding toObject:document.selectedGroup withKeyPath:@"entries" options:nil];
+      return;
+    }
     if([[self.entryArrayController content] count] > 0) {
       KdbEntry *entry = [[self.entryArrayController content] lastObject];
-      if(entry.parent == item) {
+      if(entry.parent == document.selectedGroup) {
         return; // we are showing the correct object right now.
       }
     }
-    [self.entryArrayController bind:NSContentArrayBinding toObject:item withKeyPath:@"entries" options:nil];
+    [self.entryArrayController bind:NSContentArrayBinding toObject:document.selectedGroup withKeyPath:@"entries" options:nil];
   }
 }
 
+- (void)_didBecomFirstResponder:(NSNotification *)notification {
+  MPDocument *document = [[self windowController] document];
+  document.selectedItem = document.selectedEntry;
+}
+
 
 #pragma mark Filtering
 
@@ -284,8 +300,11 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 
 - (void)clearFilter:(id)sender {
   self.filter = nil;
+  [self.filterSearchField setStringValue:@""];
   [[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:YES];
   [self _hideFilterBarAnimated:YES];
+  MPDocument *document = [[self windowController] document];
+  document.selectedGroup = document.selectedGroup;
 }
 
 - (void)updateFilter {
@@ -312,6 +331,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
     self.filteredEntries = [[document.root childEntries] filteredArrayUsingPredicate:fullFilter];
     
     dispatch_sync(dispatch_get_main_queue(), ^{
+      document.selectedEntry = nil;
       [self.entryArrayController unbind:NSContentArrayBinding];
       [self.entryArrayController setContent:self.filteredEntries];
       [[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:NO];
@@ -382,6 +402,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   else {
     [self.view layoutSubtreeIfNeeded];
   }
+  [[[self windowController] window] makeFirstResponder:self.filterSearchField];
 }
 
 - (void)_hideFilterBarAnimated:(BOOL)animate {
@@ -428,7 +449,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
       infoImage = [[NSBundle mainBundle] imageForResource:@"09_IdentityTemplate"];
       infoText = NSLocalizedString(@"COPIED_USERNAME", @"Username was copied to the pasteboard");
       break;
-  
+      
     case MPOverlayInfoCustom:
       infoImage = [[NSBundle mainBundle] imageForResource:@"00_PasswordTemplate"];
       infoText = [NSString stringWithFormat:NSLocalizedString(@"COPIED_FIELD_%@", "Field nam that was copied to the pasteboard"), name];
@@ -437,6 +458,56 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   [[MPOverlayWindowController sharedController] displayOverlayImage:infoImage label:infoText atView:self.view];
 }
 
+- (void)_showTrashBar {
+  if([self hasFilter]) {
+    [self clearFilter:nil];
+  }
+  if(!self.trashBar) {
+    [self _setupTrashBar];
+  }
+  NSView *scrollView = [_entryTable enclosingScrollView];
+  NSDictionary *views = NSDictionaryOfVariableBindings(scrollView, _trashBar);
+  [[self view] layout];
+  [[self view] removeConstraint:self.tableToTop];
+  [[self view] addSubview:self.trashBar];
+  [[self view] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_trashBar]|" options:0 metrics:nil views:views]];
+  [[self view] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_trashBar(==30)]-0-[scrollView]" options:0 metrics:nil views:views]];
+  
+  [NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
+    context.duration = STATUS_BAR_ANIMATION_TIME;
+    context.allowsImplicitAnimation = YES;
+    [[self view] layoutSubtreeIfNeeded];
+  } completionHandler:nil] ;
+  
+  
+  //[[self view] layoutSubtreeIfNeeded];
+  
+}
+
+- (void)_hideTrashBar {
+  if(![self.trashBar superview]) {
+    return; // Trahsbar is not visible
+  }
+  
+  [self.trashBar removeFromSuperview];
+  [[self view] addConstraint:self.tableToTop];
+  [[self view] layoutSubtreeIfNeeded];
+}
+
+- (void)_setupTrashBar {
+  /* Load the bundle */
+  [[NSBundle mainBundle] loadNibNamed:@"TrashBar" owner:self topLevelObjects:nil];
+  NSArray *activeColors = @[
+                            [NSColor colorWithCalibratedWhite:0.2 alpha:1],
+                            [NSColor colorWithCalibratedWhite:0.4 alpha:1]
+                            ];
+  NSArray *inactiveColors = @[ [NSColor colorWithCalibratedWhite:0.3 alpha:1],
+                               [NSColor colorWithCalibratedWhite:0.6 alpha:1]
+                               ];
+  self.trashBar.activeGradient = [[NSGradient alloc] initWithColors:activeColors];
+  self.trashBar.inactiveGradient = [[NSGradient alloc] initWithColors:inactiveColors];
+}
+
 #pragma mark EntryMenu
 
 - (void)_setupEntryMenu {
@@ -513,6 +584,11 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   [document deleteEntry:entry];
 }
 
+#pragma mark Validation
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+  return YES;
+}
+
 - (void)_toggleFilterSpace:(id)sender {
   NSButton *button = sender;
   NSNumber *value = self.filterButtonToMode[[button identifier]];

MacPass/MPGeneralSettingsController.h

@@ -17,5 +17,6 @@
 @property (weak) IBOutlet NSPopUpButton *idleTimeOutPopup;
 @property (weak) IBOutlet NSButton *lockOnSleepCheckButton;
 @property (weak) IBOutlet NSButton *reopenLastDatabase;
+@property (weak) IBOutlet NSButton *createUntitledOnActivation;
 
 @end

MacPass/MPGeneralSettingsController.m

@@ -33,6 +33,7 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
 - (void)didLoadView {
   NSUserDefaultsController *defaultsController = [NSUserDefaultsController sharedUserDefaultsController];
   NSString *reopenLastFilePath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyReopenLastDatabaseOnLaunch];
+  //NSString *createUntitledOnActivatePaht = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyOpenEmptyDatabaseOnLaunch];
   NSString *clearPasteboardKeyPath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyClearPasteboardOnQuit];
   NSString *clearPasteboardTimeOutKeyPath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyPasteboardClearTimeout];
   NSString *idleTimeOutKeyPath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyIdleLockTimeOut];
@@ -42,5 +43,7 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
   [self.lockOnSleepCheckButton bind:NSValueBinding toObject:defaultsController withKeyPath:lockOnSleepKeyPath options:nil];
   [self.idleTimeOutPopup bind:NSSelectedTagBinding toObject:defaultsController withKeyPath:idleTimeOutKeyPath options:nil];
   [self.reopenLastDatabase bind:NSValueBinding toObject:defaultsController withKeyPath:reopenLastFilePath options:nil];
+  [self.createUntitledOnActivation setState:NSOffState];
+  //[self.createUntitledOnActivation bind:NSValueBinding toObject:defaultsController withKeyPath:createUntitledOnActivatePaht options:nil];
 }
 @end

MacPass/MPInspectorViewController.m

@@ -22,6 +22,7 @@
 #import "MPSelectedAttachmentTableCellView.h"
 #import "MPAttachmentTableViewDelegate.h"
 #import "MPCustomFieldTableViewDelegate.h"
+#import "MPNotifications.h"
 
 #import "NSDate+Humanized.h"
 
@@ -35,12 +36,12 @@
 #import "NSMutableData+Base64.h"
 
 #import "HNHGradientView.h"
+#import "HNHScrollView.h"
 #import "HNHTableRowView.h"
 #import "HNHRoundedSecureTextField.h"
 
 enum {
   MPGeneralTab,
-  MPNotesTab,
   MPAttachmentsTab,
   MPCustomFieldsTab
 };
@@ -59,13 +60,14 @@ enum {
 @property (strong) NSPopover *activePopover;
 @property (weak) IBOutlet NSButton *generatePasswordButton;
 
-@property (nonatomic, weak) NSDate *modificationDate;
+@property (nonatomic, strong) NSDate *modificationDate;
-@property (nonatomic, weak) NSDate *creationDate;
+@property (nonatomic, strong) NSDate *creationDate;
 
 @property (nonatomic, assign) BOOL showPassword;
 
 @property (nonatomic, assign) NSUInteger activeTab;
 @property (weak) IBOutlet NSTabView *tabView;
+@property (strong) IBOutlet NSView *generalView;
 
 - (IBAction)addCustomField:(id)sender;
 - (IBAction)removeCustomField:(id)sender;
@@ -105,6 +107,38 @@ enum {
 }
 
 - (void)didLoadView {
+
+  HNHScrollView *scrollView = [[HNHScrollView alloc] init];
+  scrollView.actAsFlipped = NO;
+  [scrollView setHasVerticalScroller:YES];
+  [scrollView setDrawsBackground:NO];
+  [scrollView setTranslatesAutoresizingMaskIntoConstraints:NO];
+  NSView *clipView = [scrollView contentView];
+  
+  NSView *tabView = [[self.tabView tabViewItemAtIndex:MPGeneralTab] view];
+  /*
+   DO NEVER SET setTranslatesAutoresizingMaskIntoConstraints on NSTabViewItem's view
+   [tabView setTranslatesAutoresizingMaskIntoConstraints:NO];
+   */
+  [scrollView setDocumentView:self.generalView];
+  [tabView addSubview:scrollView];
+  
+  NSDictionary *views = NSDictionaryOfVariableBindings(_generalView, scrollView);
+  [[scrollView superview] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[scrollView]|"
+                                                                      options:0
+                                                                      metrics:nil
+                                                                        views:views ]];
+  [[scrollView superview] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-3-[scrollView]-50-|"
+                                                                      options:0
+                                                                      metrics:nil
+                                                                        views:views]];
+  [clipView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_generalView]|"
+                                                                      options:0
+                                                                      metrics:nil
+                                                                        views:views]];
+  [[self view] layoutSubtreeIfNeeded];
+  
+  
   //[self.scrollContentView setAutoresizingMask:NSViewWidthSizable];
   [[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
   [self.itemImageView setTarget:self];
@@ -129,33 +163,40 @@ enum {
 }
 
 - (void)setupNotifications:(MPDocumentWindowController *)windowController {
-  /* Register for Entry selection */
+  MPDocument *document = [windowController document];
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(_didChangeCurrentItem:)
                                                name:MPCurrentItemChangedNotification
-                                             object:windowController];
+                                             object:document];
 }
 
 - (void)setModificationDate:(NSDate *)modificationDate {
-  NSString *modificationString = [NSDateFormatter localizedStringFromDate:modificationDate
+  _modificationDate = modificationDate;
-                                                                dateStyle:NSDateFormatterShortStyle
+  [self _updateDateStrings];
-                                                                timeStyle:NSDateFormatterShortStyle];
-  
-  modificationString = [modificationDate humanized];
-  
-  NSString *modifedAtTemplate = NSLocalizedString(@"MODIFED_AT_%@", @"Modifed at template string. %@ is replaced by locaized date and time");
-  [self.modifiedTextField setStringValue:[NSString stringWithFormat:modifedAtTemplate, modificationString]];
-  
 }
 
 - (void)setCreationDate:(NSDate *)creationDate {
-  NSString *creationString = [NSDateFormatter localizedStringFromDate:creationDate
+  _creationDate = creationDate;
-                                                            dateStyle:NSDateFormatterShortStyle
+  [self _updateDateStrings];
-                                                            timeStyle:NSDateFormatterShortStyle];
+}
-  creationString = [creationDate humanized];
+
+- (void)_updateDateStrings {
   
+  if(!self.creationDate || !self.modificationDate ) {
+    [self.modifiedTextField setStringValue:@""];
+    [self.createdTextField setStringValue:@""];
+    return; // No dates, just clear
+  }
+  
+  NSString *creationString = [self.creationDate humanized];
+  NSString *modificationString = [self.modificationDate humanized];
+
+  NSString *modifedAtTemplate = NSLocalizedString(@"MODIFED_AT_%@", @"Modifed at template string. %@ is replaced by locaized date and time");
   NSString *createdAtTemplate = NSLocalizedString(@"CREATED_AT_%@", @"Created at template string. %@ is replaced by locaized date and time");
+
+  [self.modifiedTextField setStringValue:[NSString stringWithFormat:modifedAtTemplate, modificationString]];
   [self.createdTextField setStringValue:[NSString stringWithFormat:createdAtTemplate, creationString]];
+  
 }
 
 - (void)_updateContent {
@@ -178,7 +219,7 @@ enum {
       [_attachmentsController bind:NSContentArrayBinding toObject:self.selectedEntry withKeyPath:@"binaries" options:nil];
     }
     else {
-      /* Use binary from Kdb3Entry */
+      [_attachmentsController bind:NSContentArrayBinding toObject:self.selectedEntry withKeyPath:@"binaries" options:nil];
     }
   }
   else if([_attachmentsController content] != nil){
@@ -283,7 +324,6 @@ enum {
   [self.URLTextField setEnabled:enabled];
   [self.generatePasswordButton setEnabled:enabled];
   
-  [self.infoTabControl setEnabled:enabled forSegment:MPNotesTab];
   [self.infoTabControl setEnabled:enabled forSegment:MPAttachmentsTab];
   
   enabled &= [self.selectedEntry isKindOfClass:[Kdb4Entry class]];
@@ -343,18 +383,26 @@ enum {
 }
 
 - (IBAction)saveAttachment:(id)sender {
-  Kdb4Entry *entry = (Kdb4Entry *)self.selectedEntry;
+  BOOL isVersion4 = [self.selectedEntry isKindOfClass:[Kdb4Entry class]];
-  BinaryRef *reference = entry.binaries[[sender tag]];
+  id item = self.selectedEntry;
-  
+  NSString *fileName = nil;
+  if(isVersion4) {
+    Kdb4Entry *entry= (Kdb4Entry *)self.selectedEntry;
+    item = entry.binaries[[sender tag]];
+    fileName = ((BinaryRef *)item).key;
+  }
+  else {
+    fileName = ((Kdb3Entry *)item).binaryDesc;
+  }
   
   NSSavePanel *savePanel = [NSSavePanel savePanel];
   [savePanel setCanCreateDirectories:YES];
-  [savePanel setNameFieldStringValue:reference.key];
+  [savePanel setNameFieldStringValue:fileName];
   
   [savePanel beginSheetModalForWindow:[[self windowController] window] completionHandler:^(NSInteger result) {
     if(result == NSFileHandlingPanelOKButton) {
       MPDocument *document = [[self windowController] document];
-      [document saveAttachment:reference toLocation:[savePanel URL]];
+      [document saveAttachmentForItem:item toLocation:[savePanel URL]];
     }
   }];
 }
@@ -377,9 +425,9 @@ enum {
 - (IBAction)removeAttachment:(id)sender {
   MPDocument *document = [[self windowController] document];
   if(document.version == MPDatabaseVersion3) {
-    // Uhhhh :D
+    [document removeAttachmentFromEntry:self.selectedEntry];
   }
-  if(document.version == MPDatabaseVersion4) {
+  else if(document.version == MPDatabaseVersion4) {
     Kdb4Entry *entry = (Kdb4Entry *)self.selectedEntry;
     BinaryRef *reference = entry.binaries[[sender tag]];
     [document removeAttachment:reference fromEntry:self.selectedEntry];
@@ -394,28 +442,37 @@ enum {
 
 - (IBAction)finishEdit:(id)sender {
   NSUndoManager *undoManger =   [[[self windowController] document] undoManager];
-  [undoManger setActionName:@"Edit"];
+  if([undoManger canUndo]) {
+    [undoManger setActionName:@"Edit"];
+  }
   [undoManger endUndoGrouping];
   [self.titleTextField setEditable:NO];
+  [self.titleTextField setSelectable:YES];
   [self.usernameTextField setEditable:NO];
+  [self.usernameTextField setSelectable:YES];
 
 }
 
 #pragma mark Notificiations
 - (void)_didChangeCurrentItem:(NSNotification *)notification {
-  MPDocumentWindowController *sender = [notification object];
+  /**
-  id item = sender.currentItem;
+   Remove double handling.
-  if(!item) {
+   Just call for documents properties when neede
+   */
+  MPDocument *document = [[self windowController] document];
+  if(!document.selectedItem) {
     self.selectedGroup = nil;
     self.selectedEntry = nil;
   }
-  if([item isKindOfClass:[KdbGroup class]]) {
+  BOOL isGroup = document.selectedItem == document.selectedGroup;
+  BOOL isEntry = document.selectedItem == document.selectedEntry;
+  if(isGroup) {
     self.selectedEntry = nil;
-    self.selectedGroup = sender.currentItem;
+    self.selectedGroup = document.selectedItem;
   }
-  else if([item isKindOfClass:[KdbEntry class]]) {
+  else if(isEntry) {
     self.selectedGroup = nil;
-    self.selectedEntry = sender.currentItem;
+    self.selectedEntry = document.selectedItem;
   }
   [self _updateContent];
 }

MacPass/MPNotifications.h

@@ -0,0 +1,17 @@
+//
+//  MPNotifications.h
+//  MacPass
+//
+//  Created by Michael Starke on 23.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#ifndef MacPass_MPNotifications_h
+#define MacPass_MPNotifications_h
+
+#import <Foundation/Foundation.h>
+
+FOUNDATION_EXPORT NSString *const MPDidBecomeFirstResonderNotification;
+FOUNDATION_EXPORT NSString *const MPCurrentItemChangedNotification;
+
+#endif

MacPass/MPNotifications.m

@@ -0,0 +1,12 @@
+//
+//  MPNotifications.m
+//  MacPass
+//
+//  Created by Michael Starke on 23.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPNotifications.h"
+
+NSString *const MPDidBecomeFirstResonderNotification = @"com.hicknhack.macpass.MPDidBecomeFirstResonderNotification";
+NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCurrentItemChangedNotification";

MacPass/MPOutlineDataSource.m

@@ -77,8 +77,7 @@
       accepted &= index != NSOutlineViewDropOnItemIndex;
       accepted &= index != [_draggedItem.parent.groups indexOfObject:_draggedItem];
     }
-    MPDocument *document = [[[outlineView window] windowController] document];
+    accepted = ![_draggedItem isAnchestorOfGroup:target];
-    accepted = [document group:_draggedItem isMoveableToGroup:target];
     if( accepted ) {
       [_draggedItem moveToGroupUndoable:target atIndex:index];
     }

MacPass/MPOutlineView.h

@@ -0,0 +1,13 @@
+//
+//  MPOutlineView.h
+//  MacPass
+//
+//  Created by Michael Starke on 23.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface MPOutlineView : NSOutlineView
+
+@end

MacPass/MPOutlineView.m

@@ -0,0 +1,21 @@
+//
+//  MPOutlineView.m
+//  MacPass
+//
+//  Created by Michael Starke on 23.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPOutlineView.h"
+#import "MPNotifications.h"
+
+@implementation MPOutlineView
+
+- (BOOL)becomeFirstResponder {
+  [[NSNotificationCenter defaultCenter] postNotificationName:MPDidBecomeFirstResonderNotification
+                                                      object:self
+                                                    userInfo:nil];
+  return YES;
+}
+
+@end

MacPass/MPOutlineViewController.h

@@ -17,9 +17,8 @@ APPKIT_EXTERN NSString *const MPOutlineViewDidChangeGroupSelection;
 
 @interface MPOutlineViewController : MPViewController <NSOutlineViewDelegate>
 
-@property (readonly, weak) NSOutlineView *outlineView;
+
 @property (weak) IBOutlet HNHGradientView *bottomBar;
-@property (weak, readonly) KdbGroup *selectedGroup;
 
 - (void)clearSelection;
 - (void)showOutline;

MacPass/MPOutlineViewController.m

@@ -16,6 +16,7 @@
 #import "MPIconHelper.h"
 #import "MPUppercaseStringValueTransformer.h"
 #import "MPRootAdapter.h"
+#import "MPNotifications.h"
 
 #import "KdbLib.h"
 #import "Kdb4Node.h"
@@ -33,7 +34,6 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 }
 @property (weak) IBOutlet NSOutlineView *outlineView;
 @property (weak) IBOutlet NSButton *addGroupButton;
-@property (weak) KdbGroup *selectedGroup;
 
 @property (strong) NSTreeController *treeController;
 @property (strong) MPOutlineDataSource *datasource;
@@ -71,6 +71,11 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   [_outlineView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES];
   [_bottomBar setBorderType:HNHBorderTop];
   [_addGroupButton setAction:[MPActionHelper actionOfType:MPActionAddGroup]];
+  
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(_didBecomeFirstResponder:)
+                                               name:MPDidBecomeFirstResonderNotification
+                                             object:_outlineView];
 }
 
 - (void)showOutline {
@@ -89,6 +94,18 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   [_outlineView expandItem:node expandChildren:YES];
 }
 
+#pragma mark Custom Setter/Getter
+- (void)setDatabaseNameWrapper:(NSString *)databaseNameWrapper {
+  if(![_databaseNameWrapper isEqualToString:databaseNameWrapper]) {
+    if([databaseNameWrapper length] == 0) {
+      _databaseNameWrapper = NSLocalizedString(@"DATABASE", "Default name database");
+    }
+    else {
+      _databaseNameWrapper= [databaseNameWrapper copy];
+    }
+  }
+}
+
 #pragma mark Notifications
 - (void)setupNotifications:(MPDocumentWindowController *)windowController {
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didCreateGroup:) name:MPDocumentDidAddGroupNotification object:[windowController document]];
@@ -105,7 +122,6 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   if( selectedRow == -1) {
     MPDocument *document = [[self windowController] document];
     indexSet = [NSIndexSet indexSetWithIndex:[document.root.groups count]];
-    //TODO: Find out why selection is not set (treeUpdate?)
   }
   else {
     id item = [_outlineView itemAtRow:selectedRow];
@@ -114,14 +130,34 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   }
 }
 
-- (void)setDatabaseNameWrapper:(NSString *)databaseNameWrapper {
+- (void)_didBecomeFirstResponder:(NSNotification *)notification {
-  if(![_databaseNameWrapper isEqualToString:databaseNameWrapper]) {
+  if( [notification object] != _outlineView ) {
-    if([databaseNameWrapper length] == 0) {
+    return; // Nothing we need to worry about
-      _databaseNameWrapper = NSLocalizedString(@"DATABASE", "Default name database");
+  }
-    }
+  MPDocument *document = [[self windowController] document];
-    else {
+  document.selectedItem = document.selectedGroup;
-      _databaseNameWrapper= [databaseNameWrapper copy];
+}
+
+#pragma mark Validation
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+  MPActionType actionType = [MPActionHelper typeForAction:[menuItem action]];
+  switch(actionType) {
+    case MPActionAddEntry:
+    case MPActionAddGroup:
+    case MPActionDelete: {
+      MPDocument *document = [[self windowController] document];
+      id selected = [self _clickedOrSelectedGroup];
+      if(!selected) {
+        return NO;
+      }
+      if(selected == document.trash) {
+        return NO;
+      }
+      return ![document isItemTrashed:selected];
     }
+    default:
+      return YES; // We are only validated for three targets
   }
 }
 
@@ -177,8 +213,8 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 - (void)outlineViewSelectionDidChange:(NSNotification *)notification {
   NSTreeNode *treeNode = [_outlineView itemAtRow:[_outlineView selectedRow]];
   KdbGroup *selectedGroup = [treeNode representedObject];
-  self.selectedGroup = selectedGroup;
+  MPDocument *document = [[self windowController] document];
-  [[NSNotificationCenter defaultCenter] postNotificationName:MPOutlineViewDidChangeGroupSelection object:self userInfo:nil];
+  document.selectedGroup = selectedGroup;
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView shouldShowOutlineCellForItem:(id)item {

MacPass/MPSettingsHelper.h

@@ -26,6 +26,22 @@ APPKIT_EXTERN NSString *const kMPSettingsKeyShowMenuItem;
 APPKIT_EXTERN NSString *const kMPSettingsKeyLockOnSleep;
 APPKIT_EXTERN NSString *const kMPSettingsKeyIdleLockTimeOut;
 
+/* Autosaving states */
+APPKIT_EXTERN NSString *const kMPSettingsKeyShowInspector;
+
+/* Kdb Hide/Show settings */
+APPKIT_EXTERN NSString *const kMPSettingsKeyLegacyHideTitle;
+APPKIT_EXTERN NSString *const kMPSettingsKeyLegacyHideUsername;
+APPKIT_EXTERN NSString *const kMPSettingsKeyLegacyHidePassword;
+APPKIT_EXTERN NSString *const kMPSettingsKeyLegacyHideNotes;
+APPKIT_EXTERN NSString *const kMPSettingsKeyLegacyHideURL;
+
+/* Document/Key Location store */
+APPKIT_EXTERN NSString *const kMPSettingsKeyLastDatabasePath;
+/*
+APPKIT_EXTERN NSString *const kMPSettingsKeyLastKeyURL;
+APPKIT_EXTERN NSString *const kMPSettingsKeyRememberLastKey;
+*/
 
 typedef NS_ENUM(NSUInteger, MPPasswordEncoding) {
   MPPasswordEncodingUTF8,

MacPass/MPSettingsHelper.m

@@ -17,6 +17,15 @@ NSString *const kMPSettingsKeyEnableHttpServer = @"EnableHttpServer";
 NSString *const kMPSettingsKeyShowMenuItem = @"ShowMenuItem";
 NSString *const kMPSettingsKeyLockOnSleep = @"LockOnSleep";
 NSString *const kMPSettingsKeyIdleLockTimeOut = @"IdleLockTimeOut";
+NSString *const kMPSettingsKeyShowInspector = @"ShowInspector";
+
+NSString *const kMPSettingsKeyLegacyHideTitle = @"LegacyHideTitle";
+NSString *const kMPSettingsKeyLegacyHideUsername = @"LegacyHideUsername ";
+NSString *const kMPSettingsKeyLegacyHidePassword = @"LegacyHidePassword";
+NSString *const kMPSettingsKeyLegacyHideNotes = @"LegacyHideNotes";
+NSString *const kMPSettingsKeyLegacyHideURL = @"LegacyHideURL";
+
+NSString *const kMPSettingsKeyLastDatabasePath = @"MPLastDatabasePath";
 
 @implementation MPSettingsHelper
 
@@ -26,6 +35,7 @@ NSString *const kMPSettingsKeyIdleLockTimeOut = @"IdleLockTimeOut";
 
 + (NSDictionary *)_standardDefaults {
   return @{
+           kMPSettingsKeyShowInspector: @YES, // Show the Inspector by default
            kMPSettingsKeyPasteboardClearTimeout: @30, // 30 seconds
            kMPSettingsKeyClearPasteboardOnQuit: @YES,
            kMPSettingsKeyOpenEmptyDatabaseOnLaunch: @NO,
@@ -34,7 +44,12 @@ NSString *const kMPSettingsKeyIdleLockTimeOut = @"IdleLockTimeOut";
            kMPSettingsKeyEnableHttpServer: @NO,
            kMPSettingsKeyShowMenuItem: @YES,
            kMPSettingsKeyLockOnSleep: @YES,
-           kMPSettingsKeyIdleLockTimeOut: @0 // 5 minutes
+           kMPSettingsKeyIdleLockTimeOut: @0, // 5 minutes
+           kMPSettingsKeyLegacyHideNotes: @NO,
+           kMPSettingsKeyLegacyHidePassword: @YES,
+           kMPSettingsKeyLegacyHideTitle: @NO,
+           kMPSettingsKeyLegacyHideURL: @NO,
+           kMPSettingsKeyLegacyHideUsername: @NO
            };
 }
 

MacPass/MPTableView.m

@@ -7,9 +7,17 @@
 //
 
 #import "MPTableView.h"
+#import "MPNotifications.h"
 
 @implementation MPTableView
 
+- (BOOL)becomeFirstResponder {
+  [[NSNotificationCenter defaultCenter] postNotificationName:MPDidBecomeFirstResonderNotification
+                                                      object:self
+                                                    userInfo:nil];
+  return YES;
+}
+
 - (void)drawBackgroundInClipRect:(NSRect)clipRect {
   /*
    We need to clear the outer areas

MacPass/MPToolbarDelegate.m

@@ -17,7 +17,6 @@
 NSString *const MPToolbarItemLock = @"TOOLBAR_LOCK";
 NSString *const MPToolbarItemAddGroup = @"TOOLBAR_ADD_GROUP";
 NSString *const MPToolbarItemAddEntry = @"TOOLBAR_ADD_ENTRY";
-NSString *const MPToolbarItemEdit = @"TOOLBAR_EDIT";
 NSString *const MPToolbarItemDelete =@"TOOLBAR_DELETE";
 NSString *const MPToolbarItemAction = @"TOOLBAR_ACTION";
 NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
@@ -135,7 +134,6 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
                                MPToolbarItemAddEntry: NSLocalizedString(@"ADD_ENTRY", @""),
                                MPToolbarItemAddGroup: NSLocalizedString(@"ADD_GROUP", @""),
                                MPToolbarItemDelete: NSLocalizedString(@"DELETE", @""),
-                               MPToolbarItemEdit: NSLocalizedString(@"EDIT", @""),
                                MPToolbarItemInspector: NSLocalizedString(@"INSPECTOR", @"")
                                };
   return labelDict[identifier];
@@ -146,7 +144,6 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
                                 MPToolbarItemAddEntry: @(MPActionAddEntry),
                                 MPToolbarItemAddGroup: @(MPActionAddGroup),
                                 MPToolbarItemDelete: @(MPActionDelete),
-                                MPToolbarItemEdit: @(MPActionEdit),
                                 MPToolbarItemInspector: @(MPActionToggleInspector)
                                 };
   MPActionType actionType = (MPActionType)[actionDict[identifier] integerValue];

MacPass/MacPass-Info.plist

@@ -44,11 +44,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.3</string>
+	<string>0.3.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2508</string>
+	<string>2524</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>

MacPass/NSDate+Humanized.m

@@ -16,15 +16,38 @@
 
 - (NSString *)humanized {
   NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
-  NSDateComponents *components = [calendar components:NSMinuteCalendarUnit|NSHourCalendarUnit|NSDayCalendarUnit fromDate:self toDate:[NSDate date] options:0];
+  NSDateComponents *components = [calendar components:NSMinuteCalendarUnit|NSHourCalendarUnit|NSDayCalendarUnit|NSWeekCalendarUnit|NSMonthCalendarUnit fromDate:self toDate:[NSDate date] options:0];
-  if([components day] > 1) {
+  /* More than one month in the past, give full date */
+  if([components month] > 1) {
     return [NSDateFormatter localizedStringFromDate:self
                                           dateStyle:NSDateFormatterShortStyle
                                           timeStyle:NSDateFormatterShortStyle];
   }
-  if([components day] == 1) {
+  NSUInteger weeks = [components week];
+  /* More than one week, less than a month */
+  if(weeks > 1) {
+    NSString *weekTemplate = NSLocalizedString(@"%ld_WEEKS_AGO", "% Weeks ago");
+    return [NSString stringWithFormat:weekTemplate, weeks];
+  }
+  /* One week or more */
+  if( weeks == 1) {
+    return NSLocalizedString(@"ONE_WEEK_AGO", "one week ago");
+  }
+  /* Last week */
+  NSUInteger days = [components day];
+  if(days > 3) {
+    return NSLocalizedString(@"LAST_WEEK", "last week");
+  }
+  /* 1-3 days */
+  if(days > 1 ) {
+    NSString *daysTemplate = NSLocalizedString(@"%ld_DAYS_AGO", "% days ago");
+    return [NSString stringWithFormat:daysTemplate, days];
+  }
+  /* Yesterday */
+  if(days == 1) {
     return NSLocalizedString(@"YESTERDAY", "Yesterday");
   }
+  /* Hours ago */
   if([components hour] > 1) {
     NSString *hourTemplate = NSLocalizedString(@"%ld_HOURS_AGO", "% Hours ago");
     return [NSString stringWithFormat:hourTemplate, [components hour]];

MacPass/OutlineView.xib

@@ -1054,6 +1054,7 @@
 				<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="227.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="228.CustomClassName">MPOutlineView</string>
 				<string key="228.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="228.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
 				<string key="229.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1163,6 +1164,14 @@
 						<string key="minorKey">./Classes/HNHGradientView.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MPOutlineView</string>
+					<string key="superclassName">NSOutlineView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MPOutlineView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">MPOutlineViewController</string>
 					<string key="superclassName">MPViewController</string>

MacPass/PasswordCreatorView.xib

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1070</int>
+		<int key="IBDocument.SystemTarget">1080</int>
 		<string key="IBDocument.SystemVersion">12E55</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.39</string>
@@ -381,8 +381,8 @@
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="608946496">
-							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags">-2075131840</int>
-							<int key="NSCellFlags2">272630784</int>
+							<int key="NSCellFlags2">-1874852864</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="510117885"/>
 							<string key="NSCellIdentifier">_NS:9</string>
@@ -1189,6 +1189,7 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">183</int>
 						<reference key="object" ref="608946496"/>
+						<array class="NSMutableArray" key="children"/>
 						<reference key="parent" ref="240019321"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -1987,7 +1988,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">623</int>
+			<int key="maxID">626</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2003,11 +2004,16 @@
 					<string key="className">MPPasswordCreatorViewController</string>
 					<string key="superclassName">MPViewController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="_cancel:">id</string>
 						<string key="_generatePassword:">id</string>
 						<string key="_toggleCharacters:">id</string>
 						<string key="_usePassword:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="_cancel:">
+							<string key="name">_cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="_generatePassword:">
 							<string key="name">_generatePassword:</string>
 							<string key="candidateClassName">id</string>
@@ -2022,7 +2028,6 @@
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="_cancel">NSButton</string>
 						<string key="addPasswordToPasteboardButton">NSButton</string>
 						<string key="customButton">NSButton</string>
 						<string key="customCharactersTextField">NSTextField</string>
@@ -2035,10 +2040,6 @@
 						<string key="upperCaseButton">NSButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="_cancel">
-							<string key="name">_cancel</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="addPasswordToPasteboardButton">
 							<string key="name">addPasswordToPasteboardButton</string>
 							<string key="candidateClassName">NSButton</string>
@@ -2105,9 +2106,9 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="1070" key="NS.object.0"/>
+			<real value="4600" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>

MacPass/StringField+Validation.h

@@ -0,0 +1,13 @@
+//
+//  StringField+Validation.h
+//  MacPass
+//
+//  Created by Michael Starke on 19.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "Kdb4Node.h"
+
+@interface StringField (Validation)
+
+@end

MacPass/StringField+Validation.m

@@ -0,0 +1,19 @@
+//
+//  StringField+Validation.m
+//  MacPass
+//
+//  Created by Michael Starke on 19.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "StringField+Validation.h"
+#import "Kdb4Entry+MPAdditions.h"
+
+@implementation StringField (Validation)
+
+- (BOOL)validateValue:(inout __autoreleasing id *)ioValue forKey:(NSString *)inKey error:(out NSError *__autoreleasing *)outError {
+  *ioValue = [self.entry uniqueKeyForProposal:*ioValue];
+  return YES;
+}
+
+@end

MacPass/TrashBar.xib

@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1080</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">MPEntryViewController</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomView" id="1005">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">268</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="NSButton" id="277872291">
+						<reference key="NSNextResponder" ref="1005"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{71, 5}, {87, 19}}</string>
+						<reference key="NSSuperview" ref="1005"/>
+						<reference key="NSWindow"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="337475579">
+							<int key="NSCellFlags">-2080374784</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents">Empty Trash</string>
+							<object class="NSFont" key="NSSupport">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">12</double>
+								<int key="NSfFlags">16</int>
+							</object>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="277872291"/>
+							<int key="NSButtonFlags">-2038153216</int>
+							<int key="NSButtonFlags2">164</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+				</array>
+				<string key="NSFrameSize">{178, 30}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="277872291"/>
+				<string key="NSClassName">HNHGradientView</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">trashBar</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">emptyTrash:</string>
+						<reference key="source" ref="1003"/>
+						<reference key="destination" ref="277872291"/>
+					</object>
+					<int key="connectionID">23</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="120765898">
+								<reference key="firstItem" ref="277872291"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">1</int>
+								<reference key="secondItem" ref="1005"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="546131096">
+								<reference key="firstItem" ref="1005"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="277872291"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="879298244">
+								<reference key="firstItem" ref="277872291"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<reference ref="277872291"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="277872291"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="337475579"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="337475579"/>
+						<reference key="parent" ref="277872291"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="879298244"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="546131096"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="120765898"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="1.IBNSViewMetadataConstraints">
+					<reference ref="879298244"/>
+					<reference ref="546131096"/>
+					<reference ref="120765898"/>
+				</array>
+				<boolean value="NO" key="1.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
+				<boolean value="NO" key="1.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="13.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">23</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">HNHGradientView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/HNHGradientView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MPDocument</string>
+					<string key="superclassName">NSDocument</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">emptyTrash:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">emptyTrash:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">emptyTrash:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="warningView">NSView</string>
+						<string key="warningViewImage">NSImageView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="warningView">
+							<string key="name">warningView</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="warningViewImage">
+							<string key="name">warningViewImage</string>
+							<string key="candidateClassName">NSImageView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MPDocument.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MPEntryViewController</string>
+					<string key="superclassName">MPViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="addEntryButton">NSButton</string>
+						<string key="bottomBar">HNHGradientView</string>
+						<string key="entryCountTextField">NSTextField</string>
+						<string key="entryTable">NSTableView</string>
+						<string key="filterBar">NSView</string>
+						<string key="filterDoneButton">NSButton</string>
+						<string key="filterLabelTextField">NSTextField</string>
+						<string key="filterSearchField">NSSearchField</string>
+						<string key="filterTitleButton">NSButton</string>
+						<string key="filterURLButton">NSButton</string>
+						<string key="filterUsernameButton">NSButton</string>
+						<string key="tableToTop">NSLayoutConstraint</string>
+						<string key="trashBar">HNHGradientView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="addEntryButton">
+							<string key="name">addEntryButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="bottomBar">
+							<string key="name">bottomBar</string>
+							<string key="candidateClassName">HNHGradientView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="entryCountTextField">
+							<string key="name">entryCountTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="entryTable">
+							<string key="name">entryTable</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="filterBar">
+							<string key="name">filterBar</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="filterDoneButton">
+							<string key="name">filterDoneButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="filterLabelTextField">
+							<string key="name">filterLabelTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="filterSearchField">
+							<string key="name">filterSearchField</string>
+							<string key="candidateClassName">NSSearchField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="filterTitleButton">
+							<string key="name">filterTitleButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="filterURLButton">
+							<string key="name">filterURLButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="filterUsernameButton">
+							<string key="name">filterUsernameButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="tableToTop">
+							<string key="name">tableToTop</string>
+							<string key="candidateClassName">NSLayoutConstraint</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="trashBar">
+							<string key="name">trashBar</string>
+							<string key="candidateClassName">HNHGradientView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MPEntryViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MPViewController</string>
+					<string key="superclassName">NSViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MPViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

MacPass/de.lproj/Credits.rtf

@@ -1,7 +1,7 @@
 {\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
+\paperw11900\paperh16840\vieww19440\viewh14240\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
 \f0\b\fs24 \cf0 Projekt Webseite:\
@@ -37,6 +37,7 @@ You should have received a copy of the GNU General Public License along with thi
 \b0 \cf3 \
 Copyright \'a9 2012 Robbie Hanson. Alle Rechte vorbehalten.\
 	\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 {\field{\*\fldinst{HYPERLINK "https://github.com/MiniKeePass/MiniKeePass"}}{\fldrslt \cf2 MiniKeePass}}\
 Copyright \'a9 2011 Jason Rush und John Flanagan. Alle Rechte vorbehalten.\
 	\
@@ -50,9 +51,20 @@ Copyright \'a9 2011, Alex Rozanski. Alle Rechte vorbehalten.\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/questions/11386876/how-to-encode-and-decode-files-as-base64-in-cocoa-objective-c"}}{\fldrslt \cf3 Base64 Encoding Category}}\
-Copyright @2013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt denis2342}}\
+Copyright \'a92013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt denis2342}}\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 {\field{\*\fldinst{HYPERLINK "http://www.cocoadev.com/index.pl?NSDataCategory"}}{\fldrslt \cf3 NSData+Gzip}}\
 Basierend auf dem Code im CocoaDev Wiki\
-}
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+{\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\cf3 \kerning1\expnd0\expndtw3
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+\cf3 \kerning1\expnd0\expndtw0 Quelltext wird in HNHRoundedSecureTextField verwendet\cf3 \kerning1\expnd0\expndtw3
+\
+\cf3 \kerning1\expnd0\expndtw0 Copyright \'a92012 Mike Abdullah, Karelia Software. Alle Rechte vorbehalten.\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+{\field{\*\fldinst{HYPERLINK "https://github.com/AlanQuatermain/aqtoolkit"}}{\fldrslt \cf3 NSData+CommonCrypto}}\
+Copyright \'a92008-2009 Jim Dovey, Alle Rechte vorbehalten.}

MacPass/en.lproj/Credits.rtf

@@ -40,6 +40,7 @@ You should have received a copy of the GNU General Public License along with thi
 {\field{\*\fldinst{HYPERLINK "https://github.com/robbiehanson/KissXML"}}{\fldrslt \cf2 KissXML}}\cf3 \
 Copyright \'a9 2012 Robbie Hanson. All rights reserved.\
 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 {\field{\*\fldinst{HYPERLINK "https://github.com/MiniKeePass/MiniKeePass"}}{\fldrslt \cf2 MiniKeePass}}\
 Copyright \'a9 2011 Jason Rush and John Flanagan. All rights reserved.\
 	\
@@ -53,9 +54,17 @@ Copyright \'a9 2011, Alex Rozanski. All rights reserved.\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/questions/11386876/how-to-encode-and-decode-files-as-base64-in-cocoa-objective-c"}}{\fldrslt \cf3 NSData+Base64}}\
-Copyright @2013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt denis2342}}\
+Copyright \'a92013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt denis2342}}\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 {\field{\*\fldinst{HYPERLINK "http://www.cocoadev.com/index.pl?NSDataCategory"}}{\fldrslt \cf3 NSData+Gzip}}\
 Extracted from code on the CocoaDev Wiki\
-}
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+{\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\
+Code reused in HNHRoundedSecureTextField\
+Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+{\field{\*\fldinst{HYPERLINK "https://github.com/AlanQuatermain/aqtoolkit"}}{\fldrslt \cf3 NSData+CommonCrypto}}\
+Copyright \'a92008-2009 Jim Dovey, All rights reserved.}

MacPassTests/KPKIconLoading.h

@@ -0,0 +1,16 @@
+//
+//  KPKIconLoading.h
+//  MacPass
+//
+//  Created by Michael Starke on 20.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface KPKIconLoading : SenTestCase {
+  NSImage *_image;
+  NSData *_imageData;
+}
+
+@end

MacPassTests/KPKIconLoading.m

@@ -0,0 +1,43 @@
+//
+//  KPKIconLoading.m
+//  MacPass
+//
+//  Created by Michael Starke on 20.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "KPKIconLoading.h"
+#import "KPKIcon.h"
+
+@implementation KPKIconLoading
+
+- (void)setUp {
+    NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  _image = [myBundle imageForResource:@"image.png"];
+  _imageData = [[[_image representations] lastObject] representationUsingType:NSPNGFileType properties:nil];
+}
+
+- (void)tearDown {
+  _image = nil;
+  _imageData = nil;
+}
+
+- (void)testLoading {
+  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSURL *imageURL = [myBundle URLForImageResource:@"image.png"];
+  KPKIcon *icon = [[KPKIcon alloc] initWithImageAtURL:imageURL];
+  STAssertNotNil(icon, @"Icon should have been loaded");
+  NSString *iconString = [icon encodedString];
+  KPKIcon *iconFromString = [[KPKIcon alloc] initWithUUID:[NSUUID UUID] encodedString:iconString];
+  STAssertTrue([iconString isEqualToString:[iconFromString encodedString]], @"Encoding and Decoding should result in the same string");
+  Class repClass = [NSBitmapImageRep class];
+  NSImageRep *imageRep = [[icon.image representations] lastObject];
+  STAssertNotNil(imageRep, @"One image rep shoudl be there");
+  STAssertTrue([imageRep isKindOfClass:repClass], @"Representation should be bitmap");
+  NSBitmapImageRep *bitmapRep = (NSBitmapImageRep *)imageRep;
+  NSData *pngData = [bitmapRep representationUsingType:NSPNGFileType properties:nil];
+  STAssertTrue([pngData isEqualToData:_imageData], @"Image and PNG data shoudl be identical");
+  
+}
+
+@end

MacPassTests/KPKLegacyLoadingTest.h

@@ -0,0 +1,19 @@
+//
+//  KPKTreeLoadingTest.h
+//  MacPass
+//
+//  Created by Michael Starke on 20.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@class KPKPassword;
+
+@interface KPKLegacyLoadingTest : SenTestCase {
+  @private
+  NSData *_data;
+  KPKPassword *_password;
+}
+
+@end

MacPassTests/KPKLegacyLoadingTest.m

@@ -0,0 +1,33 @@
+//
+//  KPKTreeLoadingTest.m
+//  MacPass
+//
+//  Created by Michael Starke on 20.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "KPKLegacyLoadingTest.h"
+#import "KPKTreeCryptor.h"
+#import "KPKPassword.h"
+
+@implementation KPKLegacyLoadingTest
+
+- (void)setUp {
+  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdb"];
+  _data = [NSData dataWithContentsOfURL:url];
+  _password = [[KPKPassword alloc] initWithPassword:@"1234" key:nil];
+}
+
+- (void)tearDown {
+  _data = nil;
+  _password = nil;
+}
+
+- (void)testLoading {
+  KPKTreeCryptor *cryptor = [KPKTreeCryptor treeCryptorWithData:_data password:_password];
+  KPKTree *tree = [cryptor decryptTree:NULL];
+  STAssertNotNil(tree, @"Loading should result in a tree object");
+}
+
+@end

MacPassTests/KPKXmlLoadingTest.h

@@ -0,0 +1,18 @@
+//
+//  KPKXmlLoadingTest.h
+//  MacPass
+//
+//  Created by Michael Starke on 23.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+@class KPKPassword;
+
+@interface KPKXmlLoadingTest : SenTestCase {
+@private
+  NSData *_data;
+  KPKPassword *_password;
+}
+
+@end

MacPassTests/KPKXmlLoadingTest.m

@@ -0,0 +1,33 @@
+//
+//  KPKXmlLoadingTest.m
+//  MacPass
+//
+//  Created by Michael Starke on 23.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "KPKXmlLoadingTest.h"
+#import "KPKTreeCryptor.h"
+#import "KPKPassword.h"
+
+@implementation KPKXmlLoadingTest
+
+- (void)setUp {
+  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdbx"];
+  _data = [NSData dataWithContentsOfURL:url];
+  _password = [[KPKPassword alloc] initWithPassword:@"1234" key:nil];
+}
+
+- (void)tearDown {
+  _data = nil;
+  _password = nil;
+}
+
+- (void)testLoading {
+  KPKTreeCryptor *cryptor = [KPKTreeCryptor treeCryptorWithData:_data password:_password];
+  KPKTree *tree = [cryptor decryptTree:NULL];
+  STAssertNotNil(tree, @"Loading should result in a tree object");
+}
+
+@end

README.md

@@ -83,3 +83,5 @@ This Project is based upon the following work:
 [CocoaHTTPServer](https://github.com/robbiehanson/CocoaHTTPServer ) Copyright 2011, Deusty, LLC. All rights reserved.
 
 [KSPasswordField](https://github.com/karelia/SecurityInterface) Copyright 2012 Mike Abdullah, Karelia Software. All rights reserved.
+
+See submodules for additional Licenses