diff --git a/.gitmodules b/.gitmodules index 7eaf54a0..2e26e987 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "KeePassLib"] - path = KeePassLib - url = https://mstarke@github.com/mstarke/KeePassLib.git [submodule "KissXML"] path = KissXML url = https://github.com/robbiehanson/KissXML.git +[submodule "MiniKeePassLib"] + path = MiniKeePassLib + url = https://mstarke@github.com/mstarke/MiniKeePassLib.git diff --git a/KeePassLib b/KeePassLib deleted file mode 160000 index 032d6136..00000000 --- a/KeePassLib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 032d61369f38073311163b7eb41761a58d0fe9de diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 23cc0c4b..ca960ea4 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -8,69 +8,141 @@ /* Begin PBXBuildFile section */ 4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; }; + 4C669B7F16760ED100DD0774 /* AesInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3116760ED100DD0774 /* AesInputStream.m */; }; + 4C669B8016760ED100DD0774 /* AesOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3316760ED100DD0774 /* AesOutputStream.m */; }; + 4C669B8116760ED100DD0774 /* Arc4RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3516760ED100DD0774 /* Arc4RandomStream.m */; }; + 4C669B8216760ED100DD0774 /* DataInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3716760ED100DD0774 /* DataInputStream.m */; }; + 4C669B8316760ED100DD0774 /* DataOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3916760ED100DD0774 /* DataOutputStream.m */; }; + 4C669B8416760ED100DD0774 /* FileInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3B16760ED100DD0774 /* FileInputStream.m */; }; + 4C669B8516760ED100DD0774 /* FileOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3D16760ED100DD0774 /* FileOutputStream.m */; }; + 4C669B8616760ED100DD0774 /* GZipInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3F16760ED100DD0774 /* GZipInputStream.m */; }; + 4C669B8716760ED100DD0774 /* GZipOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4116760ED100DD0774 /* GZipOutputStream.m */; }; + 4C669B8816760ED100DD0774 /* HashedInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4316760ED100DD0774 /* HashedInputStream.m */; }; + 4C669B8916760ED100DD0774 /* HashedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4516760ED100DD0774 /* HashedOutputStream.m */; }; + 4C669B8A16760ED100DD0774 /* InputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4716760ED100DD0774 /* InputStream.m */; }; + 4C669B8B16760ED100DD0774 /* OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4916760ED100DD0774 /* OutputStream.m */; }; + 4C669B8C16760ED100DD0774 /* Sha256OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4B16760ED100DD0774 /* Sha256OutputStream.m */; }; + 4C669B8E16760ED100DD0774 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5016760ED100DD0774 /* Base64.m */; }; + 4C669B8F16760ED100DD0774 /* DDXMLDocument+MKPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5216760ED100DD0774 /* DDXMLDocument+MKPAdditions.m */; }; + 4C669B9016760ED100DD0774 /* DDXMLElement+MKPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5416760ED100DD0774 /* DDXMLElement+MKPAdditions.m */; }; + 4C669B9116760ED100DD0774 /* Kdb.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5616760ED100DD0774 /* Kdb.m */; }; + 4C669B9216760ED100DD0774 /* Kdb3Date.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5816760ED100DD0774 /* Kdb3Date.m */; }; + 4C669B9316760ED100DD0774 /* Kdb3Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5A16760ED100DD0774 /* Kdb3Node.m */; }; + 4C669B9416760ED100DD0774 /* Kdb3Reader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5C16760ED100DD0774 /* Kdb3Reader.m */; }; + 4C669B9516760ED100DD0774 /* Kdb3Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5E16760ED100DD0774 /* Kdb3Utils.m */; }; + 4C669B9616760ED100DD0774 /* Kdb3Writer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6016760ED100DD0774 /* Kdb3Writer.m */; }; + 4C669B9716760ED100DD0774 /* Kdb4Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6216760ED100DD0774 /* Kdb4Node.m */; }; + 4C669B9816760ED100DD0774 /* Kdb4Parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6416760ED100DD0774 /* Kdb4Parser.m */; }; + 4C669B9916760ED100DD0774 /* Kdb4Persist.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6616760ED100DD0774 /* Kdb4Persist.m */; }; + 4C669B9A16760ED100DD0774 /* Kdb4Reader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6816760ED100DD0774 /* Kdb4Reader.m */; }; + 4C669B9B16760ED100DD0774 /* Kdb4Writer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6A16760ED100DD0774 /* Kdb4Writer.m */; }; + 4C669B9C16760ED100DD0774 /* KdbPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6D16760ED100DD0774 /* KdbPassword.m */; }; + 4C669B9D16760ED100DD0774 /* KdbReaderFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7016760ED100DD0774 /* KdbReaderFactory.m */; }; + 4C669B9E16760ED100DD0774 /* KdbWriterFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7316760ED100DD0774 /* KdbWriterFactory.m */; }; + 4C669B9F16760ED100DD0774 /* RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7516760ED100DD0774 /* RandomStream.m */; }; + 4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */; }; + 4C669BA116760ED100DD0774 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7916760ED100DD0774 /* Utils.m */; }; + 4C669BA216760ED100DD0774 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7B16760ED100DD0774 /* UUID.m */; }; 4C77E36715B84A240093A587 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77E36615B84A240093A587 /* Cocoa.framework */; }; 4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E36F15B84A240093A587 /* InfoPlist.strings */; }; 4C77E37315B84A240093A587 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77E37215B84A240093A587 /* main.m */; }; 4C77E37715B84A240093A587 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E37515B84A240093A587 /* Credits.rtf */; }; 4C77E37A15B84A240093A587 /* MPAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77E37915B84A240093A587 /* MPAppDelegate.m */; }; 4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E37B15B84A240093A587 /* MainMenu.xib */; }; + 4C83814215BF4677001AE468 /* MPMainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPMainWindowController.m */; }; 4C88763415BABA30003D2CE9 /* PasswordWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C88763315BABA30003D2CE9 /* PasswordWindow.xib */; }; 4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; }; 4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */; }; 4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */; }; 4CA0B2FC15BCAF8600654E32 /* MPSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2FB15BCAF8600654E32 /* MPSettingsController.m */; }; - 4CAD742E15B8860800104512 /* AesInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73E615B8860800104512 /* AesInputStream.m */; }; - 4CAD742F15B8860800104512 /* AesOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73E815B8860800104512 /* AesOutputStream.m */; }; - 4CAD743015B8860800104512 /* Arc4RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73EA15B8860800104512 /* Arc4RandomStream.m */; }; - 4CAD743115B8860800104512 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73EC15B8860800104512 /* Base64.m */; }; - 4CAD743215B8860800104512 /* DataInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73EE15B8860800104512 /* DataInputStream.m */; }; - 4CAD743315B8860800104512 /* DataOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F015B8860800104512 /* DataOutputStream.m */; }; - 4CAD743415B8860800104512 /* FileInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F215B8860800104512 /* FileInputStream.m */; }; - 4CAD743515B8860800104512 /* FileOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F415B8860800104512 /* FileOutputStream.m */; }; - 4CAD743615B8860800104512 /* GZipInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F615B8860800104512 /* GZipInputStream.m */; }; - 4CAD743715B8860800104512 /* GZipOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F815B8860800104512 /* GZipOutputStream.m */; }; - 4CAD743815B8860800104512 /* HashedInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73FA15B8860800104512 /* HashedInputStream.m */; }; - 4CAD743915B8860800104512 /* HashedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73FC15B8860800104512 /* HashedOutputStream.m */; }; - 4CAD743A15B8860800104512 /* InputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73FE15B8860800104512 /* InputStream.m */; }; - 4CAD743B15B8860800104512 /* Kdb.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740015B8860800104512 /* Kdb.m */; }; - 4CAD743C15B8860800104512 /* Kdb3Date.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740215B8860800104512 /* Kdb3Date.m */; }; - 4CAD743D15B8860800104512 /* Kdb3Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740415B8860800104512 /* Kdb3Node.m */; }; - 4CAD743E15B8860800104512 /* Kdb3Parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740615B8860800104512 /* Kdb3Parser.m */; }; - 4CAD743F15B8860800104512 /* Kdb3Persist.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740815B8860800104512 /* Kdb3Persist.m */; }; - 4CAD744015B8860800104512 /* Kdb3Reader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740A15B8860800104512 /* Kdb3Reader.m */; }; - 4CAD744115B8860800104512 /* Kdb3Writer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740C15B8860800104512 /* Kdb3Writer.m */; }; - 4CAD744215B8860800104512 /* Kdb4Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740E15B8860800104512 /* Kdb4Node.m */; }; - 4CAD744315B8860800104512 /* Kdb4Parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741015B8860800104512 /* Kdb4Parser.m */; }; - 4CAD744415B8860800104512 /* Kdb4Persist.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741215B8860800104512 /* Kdb4Persist.m */; }; - 4CAD744515B8860800104512 /* Kdb4Reader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741415B8860800104512 /* Kdb4Reader.m */; }; - 4CAD744615B8860800104512 /* Kdb4Writer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741615B8860800104512 /* Kdb4Writer.m */; }; - 4CAD744715B8860800104512 /* KdbPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741915B8860800104512 /* KdbPassword.m */; }; - 4CAD744815B8860800104512 /* KdbReaderFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741C15B8860800104512 /* KdbReaderFactory.m */; }; - 4CAD744915B8860800104512 /* KdbWriterFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741F15B8860800104512 /* KdbWriterFactory.m */; }; - 4CAD744A15B8860800104512 /* OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742115B8860800104512 /* OutputStream.m */; }; - 4CAD744B15B8860800104512 /* RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742315B8860800104512 /* RandomStream.m */; }; - 4CAD744D15B8860800104512 /* Salsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742615B8860800104512 /* Salsa20RandomStream.m */; }; - 4CAD744E15B8860800104512 /* Sha256OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742815B8860800104512 /* Sha256OutputStream.m */; }; - 4CAD744F15B8860800104512 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742A15B8860800104512 /* Utils.m */; }; - 4CAD745015B8860800104512 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742C15B8860800104512 /* UUID.m */; }; - 4CAD747915B887FD00104512 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD745215B887FD00104512 /* .gitignore */; }; - 4CAD747A15B887FD00104512 /* .hgignore in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD745315B887FD00104512 /* .hgignore */; }; 4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; 4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745A15B887FD00104512 /* NSString+DDXML.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; 4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745D15B887FD00104512 /* DDXMLDocument.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; 4CAD747E15B887FD00104512 /* DDXMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745F15B887FD00104512 /* DDXMLElement.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; 4CAD747F15B887FD00104512 /* DDXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD746115B887FD00104512 /* DDXMLNode.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4CAD748015B887FD00104512 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD746415B887FD00104512 /* LICENSE.txt */; }; - 4CAD748115B887FD00104512 /* README.markdown in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD746515B887FD00104512 /* README.markdown */; }; 4CAD748C15B889B700104512 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748B15B889B700104512 /* Security.framework */; }; 4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; }; 4CBA981815BA0DB600721965 /* MPDatabaseDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA981715BA0DB600721965 /* MPDatabaseDocument.m */; }; 4CC6259115BA1C99002F5B11 /* MPOutlineViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6259015BA1C99002F5B11 /* MPOutlineViewDelegate.m */; }; + 4CD884B715BD47080042BBF8 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CD884B615BD47080042BBF8 /* MainWindow.xib */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 4C37A83E15B8B474005EF8EE /* MPOutlineDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineDataSource.h; sourceTree = ""; }; 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineDataSource.m; sourceTree = ""; }; + 4C669B3016760ED100DD0774 /* AesInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesInputStream.h; sourceTree = ""; }; + 4C669B3116760ED100DD0774 /* AesInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesInputStream.m; sourceTree = ""; }; + 4C669B3216760ED100DD0774 /* AesOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesOutputStream.h; sourceTree = ""; }; + 4C669B3316760ED100DD0774 /* AesOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesOutputStream.m; sourceTree = ""; }; + 4C669B3416760ED100DD0774 /* Arc4RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Arc4RandomStream.h; sourceTree = ""; }; + 4C669B3516760ED100DD0774 /* Arc4RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Arc4RandomStream.m; sourceTree = ""; }; + 4C669B3616760ED100DD0774 /* DataInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataInputStream.h; sourceTree = ""; }; + 4C669B3716760ED100DD0774 /* DataInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataInputStream.m; sourceTree = ""; }; + 4C669B3816760ED100DD0774 /* DataOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataOutputStream.h; sourceTree = ""; }; + 4C669B3916760ED100DD0774 /* DataOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataOutputStream.m; sourceTree = ""; }; + 4C669B3A16760ED100DD0774 /* FileInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileInputStream.h; sourceTree = ""; }; + 4C669B3B16760ED100DD0774 /* FileInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileInputStream.m; sourceTree = ""; }; + 4C669B3C16760ED100DD0774 /* FileOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileOutputStream.h; sourceTree = ""; }; + 4C669B3D16760ED100DD0774 /* FileOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileOutputStream.m; sourceTree = ""; }; + 4C669B3E16760ED100DD0774 /* GZipInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GZipInputStream.h; sourceTree = ""; }; + 4C669B3F16760ED100DD0774 /* GZipInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GZipInputStream.m; sourceTree = ""; }; + 4C669B4016760ED100DD0774 /* GZipOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GZipOutputStream.h; sourceTree = ""; }; + 4C669B4116760ED100DD0774 /* GZipOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GZipOutputStream.m; sourceTree = ""; }; + 4C669B4216760ED100DD0774 /* HashedInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashedInputStream.h; sourceTree = ""; }; + 4C669B4316760ED100DD0774 /* HashedInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashedInputStream.m; sourceTree = ""; }; + 4C669B4416760ED100DD0774 /* HashedOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashedOutputStream.h; sourceTree = ""; }; + 4C669B4516760ED100DD0774 /* HashedOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashedOutputStream.m; sourceTree = ""; }; + 4C669B4616760ED100DD0774 /* InputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputStream.h; sourceTree = ""; }; + 4C669B4716760ED100DD0774 /* InputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputStream.m; sourceTree = ""; }; + 4C669B4816760ED100DD0774 /* OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputStream.h; sourceTree = ""; }; + 4C669B4916760ED100DD0774 /* OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OutputStream.m; sourceTree = ""; }; + 4C669B4A16760ED100DD0774 /* Sha256OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sha256OutputStream.h; sourceTree = ""; }; + 4C669B4B16760ED100DD0774 /* Sha256OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sha256OutputStream.m; sourceTree = ""; }; + 4C669B4F16760ED100DD0774 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = ""; }; + 4C669B5016760ED100DD0774 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = ""; }; + 4C669B5116760ED100DD0774 /* DDXMLDocument+MKPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDXMLDocument+MKPAdditions.h"; sourceTree = ""; }; + 4C669B5216760ED100DD0774 /* DDXMLDocument+MKPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DDXMLDocument+MKPAdditions.m"; sourceTree = ""; }; + 4C669B5316760ED100DD0774 /* DDXMLElement+MKPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDXMLElement+MKPAdditions.h"; sourceTree = ""; }; + 4C669B5416760ED100DD0774 /* DDXMLElement+MKPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DDXMLElement+MKPAdditions.m"; sourceTree = ""; }; + 4C669B5516760ED100DD0774 /* Kdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb.h; sourceTree = ""; }; + 4C669B5616760ED100DD0774 /* Kdb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb.m; sourceTree = ""; }; + 4C669B5716760ED100DD0774 /* Kdb3Date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Date.h; sourceTree = ""; }; + 4C669B5816760ED100DD0774 /* Kdb3Date.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Date.m; sourceTree = ""; }; + 4C669B5916760ED100DD0774 /* Kdb3Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Node.h; sourceTree = ""; }; + 4C669B5A16760ED100DD0774 /* Kdb3Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Node.m; sourceTree = ""; }; + 4C669B5B16760ED100DD0774 /* Kdb3Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Reader.h; sourceTree = ""; }; + 4C669B5C16760ED100DD0774 /* Kdb3Reader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Reader.m; sourceTree = ""; }; + 4C669B5D16760ED100DD0774 /* Kdb3Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Utils.h; sourceTree = ""; }; + 4C669B5E16760ED100DD0774 /* Kdb3Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Utils.m; sourceTree = ""; }; + 4C669B5F16760ED100DD0774 /* Kdb3Writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Writer.h; sourceTree = ""; }; + 4C669B6016760ED100DD0774 /* Kdb3Writer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Writer.m; sourceTree = ""; }; + 4C669B6116760ED100DD0774 /* Kdb4Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Node.h; sourceTree = ""; }; + 4C669B6216760ED100DD0774 /* Kdb4Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Node.m; sourceTree = ""; }; + 4C669B6316760ED100DD0774 /* Kdb4Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Parser.h; sourceTree = ""; }; + 4C669B6416760ED100DD0774 /* Kdb4Parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Parser.m; sourceTree = ""; }; + 4C669B6516760ED100DD0774 /* Kdb4Persist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Persist.h; sourceTree = ""; }; + 4C669B6616760ED100DD0774 /* Kdb4Persist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Persist.m; sourceTree = ""; }; + 4C669B6716760ED100DD0774 /* Kdb4Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Reader.h; sourceTree = ""; }; + 4C669B6816760ED100DD0774 /* Kdb4Reader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Reader.m; sourceTree = ""; }; + 4C669B6916760ED100DD0774 /* Kdb4Writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Writer.h; sourceTree = ""; }; + 4C669B6A16760ED100DD0774 /* Kdb4Writer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Writer.m; sourceTree = ""; }; + 4C669B6B16760ED100DD0774 /* KdbLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbLib.h; sourceTree = ""; }; + 4C669B6C16760ED100DD0774 /* KdbPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbPassword.h; sourceTree = ""; }; + 4C669B6D16760ED100DD0774 /* KdbPassword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbPassword.m; sourceTree = ""; }; + 4C669B6E16760ED100DD0774 /* KdbReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbReader.h; sourceTree = ""; }; + 4C669B6F16760ED100DD0774 /* KdbReaderFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbReaderFactory.h; sourceTree = ""; }; + 4C669B7016760ED100DD0774 /* KdbReaderFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbReaderFactory.m; sourceTree = ""; }; + 4C669B7116760ED100DD0774 /* KdbWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbWriter.h; sourceTree = ""; }; + 4C669B7216760ED100DD0774 /* KdbWriterFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbWriterFactory.h; sourceTree = ""; }; + 4C669B7316760ED100DD0774 /* KdbWriterFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbWriterFactory.m; sourceTree = ""; }; + 4C669B7416760ED100DD0774 /* RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomStream.h; sourceTree = ""; }; + 4C669B7516760ED100DD0774 /* RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RandomStream.m; sourceTree = ""; }; + 4C669B7616760ED100DD0774 /* Salsa20RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Salsa20RandomStream.h; sourceTree = ""; }; + 4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Salsa20RandomStream.m; sourceTree = ""; }; + 4C669B7816760ED100DD0774 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = ""; }; + 4C669B7916760ED100DD0774 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = ""; }; + 4C669B7A16760ED100DD0774 /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = ""; }; + 4C669B7B16760ED100DD0774 /* UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UUID.m; sourceTree = ""; }; 4C77E36215B84A240093A587 /* MacPass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacPass.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4C77E36615B84A240093A587 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 4C77E36915B84A240093A587 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; @@ -84,6 +156,8 @@ 4C77E37815B84A240093A587 /* MPAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAppDelegate.h; sourceTree = ""; }; 4C77E37915B84A240093A587 /* MPAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate.m; sourceTree = ""; }; 4C77E37C15B84A240093A587 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; + 4C83814015BF4677001AE468 /* MPMainWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMainWindowController.h; sourceTree = ""; }; + 4C83814115BF4677001AE468 /* MPMainWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPMainWindowController.m; sourceTree = ""; }; 4C88763315BABA30003D2CE9 /* PasswordWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordWindow.xib; sourceTree = ""; }; 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsWindow.xib; sourceTree = ""; }; 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GeneralSettings.xib; sourceTree = ""; }; @@ -92,79 +166,6 @@ 4CA0B2FA15BCAF8600654E32 /* MPSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSettingsController.h; sourceTree = ""; }; 4CA0B2FB15BCAF8600654E32 /* MPSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSettingsController.m; sourceTree = ""; }; 4CA0B30D15BCB6FD00654E32 /* MPSettingsTabProtocoll.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPSettingsTabProtocoll.h; sourceTree = ""; }; - 4CAD73E515B8860800104512 /* AesInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesInputStream.h; sourceTree = ""; }; - 4CAD73E615B8860800104512 /* AesInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesInputStream.m; sourceTree = ""; }; - 4CAD73E715B8860800104512 /* AesOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesOutputStream.h; sourceTree = ""; }; - 4CAD73E815B8860800104512 /* AesOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesOutputStream.m; sourceTree = ""; }; - 4CAD73E915B8860800104512 /* Arc4RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Arc4RandomStream.h; sourceTree = ""; }; - 4CAD73EA15B8860800104512 /* Arc4RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Arc4RandomStream.m; sourceTree = ""; }; - 4CAD73EB15B8860800104512 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = ""; }; - 4CAD73EC15B8860800104512 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = ""; }; - 4CAD73ED15B8860800104512 /* DataInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataInputStream.h; sourceTree = ""; }; - 4CAD73EE15B8860800104512 /* DataInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataInputStream.m; sourceTree = ""; }; - 4CAD73EF15B8860800104512 /* DataOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataOutputStream.h; sourceTree = ""; }; - 4CAD73F015B8860800104512 /* DataOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataOutputStream.m; sourceTree = ""; }; - 4CAD73F115B8860800104512 /* FileInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileInputStream.h; sourceTree = ""; }; - 4CAD73F215B8860800104512 /* FileInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileInputStream.m; sourceTree = ""; }; - 4CAD73F315B8860800104512 /* FileOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileOutputStream.h; sourceTree = ""; }; - 4CAD73F415B8860800104512 /* FileOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileOutputStream.m; sourceTree = ""; }; - 4CAD73F515B8860800104512 /* GZipInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GZipInputStream.h; sourceTree = ""; }; - 4CAD73F615B8860800104512 /* GZipInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GZipInputStream.m; sourceTree = ""; }; - 4CAD73F715B8860800104512 /* GZipOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GZipOutputStream.h; sourceTree = ""; }; - 4CAD73F815B8860800104512 /* GZipOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GZipOutputStream.m; sourceTree = ""; }; - 4CAD73F915B8860800104512 /* HashedInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashedInputStream.h; sourceTree = ""; }; - 4CAD73FA15B8860800104512 /* HashedInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashedInputStream.m; sourceTree = ""; }; - 4CAD73FB15B8860800104512 /* HashedOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashedOutputStream.h; sourceTree = ""; }; - 4CAD73FC15B8860800104512 /* HashedOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashedOutputStream.m; sourceTree = ""; }; - 4CAD73FD15B8860800104512 /* InputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputStream.h; sourceTree = ""; }; - 4CAD73FE15B8860800104512 /* InputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputStream.m; sourceTree = ""; }; - 4CAD73FF15B8860800104512 /* Kdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb.h; sourceTree = ""; }; - 4CAD740015B8860800104512 /* Kdb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb.m; sourceTree = ""; }; - 4CAD740115B8860800104512 /* Kdb3Date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Date.h; sourceTree = ""; }; - 4CAD740215B8860800104512 /* Kdb3Date.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Date.m; sourceTree = ""; }; - 4CAD740315B8860800104512 /* Kdb3Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Node.h; sourceTree = ""; }; - 4CAD740415B8860800104512 /* Kdb3Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Node.m; sourceTree = ""; }; - 4CAD740515B8860800104512 /* Kdb3Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Parser.h; sourceTree = ""; }; - 4CAD740615B8860800104512 /* Kdb3Parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Parser.m; sourceTree = ""; }; - 4CAD740715B8860800104512 /* Kdb3Persist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Persist.h; sourceTree = ""; }; - 4CAD740815B8860800104512 /* Kdb3Persist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Persist.m; sourceTree = ""; }; - 4CAD740915B8860800104512 /* Kdb3Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Reader.h; sourceTree = ""; }; - 4CAD740A15B8860800104512 /* Kdb3Reader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Reader.m; sourceTree = ""; }; - 4CAD740B15B8860800104512 /* Kdb3Writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Writer.h; sourceTree = ""; }; - 4CAD740C15B8860800104512 /* Kdb3Writer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Writer.m; sourceTree = ""; }; - 4CAD740D15B8860800104512 /* Kdb4Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Node.h; sourceTree = ""; }; - 4CAD740E15B8860800104512 /* Kdb4Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Node.m; sourceTree = ""; }; - 4CAD740F15B8860800104512 /* Kdb4Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Parser.h; sourceTree = ""; }; - 4CAD741015B8860800104512 /* Kdb4Parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Parser.m; sourceTree = ""; }; - 4CAD741115B8860800104512 /* Kdb4Persist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Persist.h; sourceTree = ""; }; - 4CAD741215B8860800104512 /* Kdb4Persist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Persist.m; sourceTree = ""; }; - 4CAD741315B8860800104512 /* Kdb4Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Reader.h; sourceTree = ""; }; - 4CAD741415B8860800104512 /* Kdb4Reader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Reader.m; sourceTree = ""; }; - 4CAD741515B8860800104512 /* Kdb4Writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Writer.h; sourceTree = ""; }; - 4CAD741615B8860800104512 /* Kdb4Writer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Writer.m; sourceTree = ""; }; - 4CAD741715B8860800104512 /* KdbLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbLib.h; sourceTree = ""; }; - 4CAD741815B8860800104512 /* KdbPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbPassword.h; sourceTree = ""; }; - 4CAD741915B8860800104512 /* KdbPassword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbPassword.m; sourceTree = ""; }; - 4CAD741A15B8860800104512 /* KdbReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbReader.h; sourceTree = ""; }; - 4CAD741B15B8860800104512 /* KdbReaderFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbReaderFactory.h; sourceTree = ""; }; - 4CAD741C15B8860800104512 /* KdbReaderFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbReaderFactory.m; sourceTree = ""; }; - 4CAD741D15B8860800104512 /* KdbWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbWriter.h; sourceTree = ""; }; - 4CAD741E15B8860800104512 /* KdbWriterFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbWriterFactory.h; sourceTree = ""; }; - 4CAD741F15B8860800104512 /* KdbWriterFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbWriterFactory.m; sourceTree = ""; }; - 4CAD742015B8860800104512 /* OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputStream.h; sourceTree = ""; }; - 4CAD742115B8860800104512 /* OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OutputStream.m; sourceTree = ""; }; - 4CAD742215B8860800104512 /* RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomStream.h; sourceTree = ""; }; - 4CAD742315B8860800104512 /* RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RandomStream.m; sourceTree = ""; }; - 4CAD742515B8860800104512 /* Salsa20RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Salsa20RandomStream.h; sourceTree = ""; }; - 4CAD742615B8860800104512 /* Salsa20RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Salsa20RandomStream.m; sourceTree = ""; }; - 4CAD742715B8860800104512 /* Sha256OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sha256OutputStream.h; sourceTree = ""; }; - 4CAD742815B8860800104512 /* Sha256OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sha256OutputStream.m; sourceTree = ""; }; - 4CAD742915B8860800104512 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = ""; }; - 4CAD742A15B8860800104512 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = ""; }; - 4CAD742B15B8860800104512 /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = ""; }; - 4CAD742C15B8860800104512 /* UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UUID.m; sourceTree = ""; }; - 4CAD745215B887FD00104512 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; - 4CAD745315B887FD00104512 /* .hgignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .hgignore; sourceTree = ""; }; 4CAD745615B887FD00104512 /* DDXMLElementAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLElementAdditions.h; sourceTree = ""; }; 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLElementAdditions.m; sourceTree = ""; }; 4CAD745915B887FD00104512 /* NSString+DDXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+DDXML.h"; sourceTree = ""; }; @@ -177,14 +178,13 @@ 4CAD746015B887FD00104512 /* DDXMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLNode.h; sourceTree = ""; }; 4CAD746115B887FD00104512 /* DDXMLNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLNode.m; sourceTree = ""; }; 4CAD746315B887FD00104512 /* DDXMLPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLPrivate.h; sourceTree = ""; }; - 4CAD746415B887FD00104512 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = ""; }; - 4CAD746515B887FD00104512 /* README.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.markdown; sourceTree = ""; }; 4CAD748B15B889B700104512 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 4CAD748D15B88AC100104512 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 4CBA981615BA0DB600721965 /* MPDatabaseDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabaseDocument.h; sourceTree = ""; }; 4CBA981715BA0DB600721965 /* MPDatabaseDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseDocument.m; sourceTree = ""; }; 4CC6258F15BA1C99002F5B11 /* MPOutlineViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineViewDelegate.h; sourceTree = ""; }; 4CC6259015BA1C99002F5B11 /* MPOutlineViewDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineViewDelegate.m; sourceTree = ""; }; + 4CD884B615BD47080042BBF8 /* MainWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -208,6 +208,7 @@ 4C88763315BABA30003D2CE9 /* PasswordWindow.xib */, 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */, 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */, + 4CD884B615BD47080042BBF8 /* MainWindow.xib */, ); name = Views; sourceTree = ""; @@ -234,11 +235,107 @@ name = Model; sourceTree = ""; }; + 4C669B2D16760ED100DD0774 /* MiniKeePassLib */ = { + isa = PBXGroup; + children = ( + 4C669B2F16760ED100DD0774 /* IOStream */, + 4C669B4C16760ED100DD0774 /* KeePassLib */, + ); + path = MiniKeePassLib; + sourceTree = ""; + }; + 4C669B2F16760ED100DD0774 /* IOStream */ = { + isa = PBXGroup; + children = ( + 4C669B3016760ED100DD0774 /* AesInputStream.h */, + 4C669B3116760ED100DD0774 /* AesInputStream.m */, + 4C669B3216760ED100DD0774 /* AesOutputStream.h */, + 4C669B3316760ED100DD0774 /* AesOutputStream.m */, + 4C669B3416760ED100DD0774 /* Arc4RandomStream.h */, + 4C669B3516760ED100DD0774 /* Arc4RandomStream.m */, + 4C669B3616760ED100DD0774 /* DataInputStream.h */, + 4C669B3716760ED100DD0774 /* DataInputStream.m */, + 4C669B3816760ED100DD0774 /* DataOutputStream.h */, + 4C669B3916760ED100DD0774 /* DataOutputStream.m */, + 4C669B3A16760ED100DD0774 /* FileInputStream.h */, + 4C669B3B16760ED100DD0774 /* FileInputStream.m */, + 4C669B3C16760ED100DD0774 /* FileOutputStream.h */, + 4C669B3D16760ED100DD0774 /* FileOutputStream.m */, + 4C669B3E16760ED100DD0774 /* GZipInputStream.h */, + 4C669B3F16760ED100DD0774 /* GZipInputStream.m */, + 4C669B4016760ED100DD0774 /* GZipOutputStream.h */, + 4C669B4116760ED100DD0774 /* GZipOutputStream.m */, + 4C669B4216760ED100DD0774 /* HashedInputStream.h */, + 4C669B4316760ED100DD0774 /* HashedInputStream.m */, + 4C669B4416760ED100DD0774 /* HashedOutputStream.h */, + 4C669B4516760ED100DD0774 /* HashedOutputStream.m */, + 4C669B4616760ED100DD0774 /* InputStream.h */, + 4C669B4716760ED100DD0774 /* InputStream.m */, + 4C669B4816760ED100DD0774 /* OutputStream.h */, + 4C669B4916760ED100DD0774 /* OutputStream.m */, + 4C669B4A16760ED100DD0774 /* Sha256OutputStream.h */, + 4C669B4B16760ED100DD0774 /* Sha256OutputStream.m */, + ); + path = IOStream; + sourceTree = ""; + }; + 4C669B4C16760ED100DD0774 /* KeePassLib */ = { + isa = PBXGroup; + children = ( + 4C669B4F16760ED100DD0774 /* Base64.h */, + 4C669B5016760ED100DD0774 /* Base64.m */, + 4C669B5116760ED100DD0774 /* DDXMLDocument+MKPAdditions.h */, + 4C669B5216760ED100DD0774 /* DDXMLDocument+MKPAdditions.m */, + 4C669B5316760ED100DD0774 /* DDXMLElement+MKPAdditions.h */, + 4C669B5416760ED100DD0774 /* DDXMLElement+MKPAdditions.m */, + 4C669B5516760ED100DD0774 /* Kdb.h */, + 4C669B5616760ED100DD0774 /* Kdb.m */, + 4C669B5716760ED100DD0774 /* Kdb3Date.h */, + 4C669B5816760ED100DD0774 /* Kdb3Date.m */, + 4C669B5916760ED100DD0774 /* Kdb3Node.h */, + 4C669B5A16760ED100DD0774 /* Kdb3Node.m */, + 4C669B5B16760ED100DD0774 /* Kdb3Reader.h */, + 4C669B5C16760ED100DD0774 /* Kdb3Reader.m */, + 4C669B5D16760ED100DD0774 /* Kdb3Utils.h */, + 4C669B5E16760ED100DD0774 /* Kdb3Utils.m */, + 4C669B5F16760ED100DD0774 /* Kdb3Writer.h */, + 4C669B6016760ED100DD0774 /* Kdb3Writer.m */, + 4C669B6116760ED100DD0774 /* Kdb4Node.h */, + 4C669B6216760ED100DD0774 /* Kdb4Node.m */, + 4C669B6316760ED100DD0774 /* Kdb4Parser.h */, + 4C669B6416760ED100DD0774 /* Kdb4Parser.m */, + 4C669B6516760ED100DD0774 /* Kdb4Persist.h */, + 4C669B6616760ED100DD0774 /* Kdb4Persist.m */, + 4C669B6716760ED100DD0774 /* Kdb4Reader.h */, + 4C669B6816760ED100DD0774 /* Kdb4Reader.m */, + 4C669B6916760ED100DD0774 /* Kdb4Writer.h */, + 4C669B6A16760ED100DD0774 /* Kdb4Writer.m */, + 4C669B6B16760ED100DD0774 /* KdbLib.h */, + 4C669B6C16760ED100DD0774 /* KdbPassword.h */, + 4C669B6D16760ED100DD0774 /* KdbPassword.m */, + 4C669B6E16760ED100DD0774 /* KdbReader.h */, + 4C669B6F16760ED100DD0774 /* KdbReaderFactory.h */, + 4C669B7016760ED100DD0774 /* KdbReaderFactory.m */, + 4C669B7116760ED100DD0774 /* KdbWriter.h */, + 4C669B7216760ED100DD0774 /* KdbWriterFactory.h */, + 4C669B7316760ED100DD0774 /* KdbWriterFactory.m */, + 4C669B7416760ED100DD0774 /* RandomStream.h */, + 4C669B7516760ED100DD0774 /* RandomStream.m */, + 4C669B7616760ED100DD0774 /* Salsa20RandomStream.h */, + 4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */, + 4C669B7816760ED100DD0774 /* Utils.h */, + 4C669B7916760ED100DD0774 /* Utils.m */, + 4C669B7A16760ED100DD0774 /* UUID.h */, + 4C669B7B16760ED100DD0774 /* UUID.m */, + ); + path = KeePassLib; + sourceTree = ""; + }; 4C77E35715B84A240093A587 = { isa = PBXGroup; children = ( + 4C669B2D16760ED100DD0774 /* MiniKeePassLib */, 4CAD745115B887FD00104512 /* KissXML */, - 4CAD73E315B8860800104512 /* KeePassLib */, 4C77E36C15B84A240093A587 /* MacPass */, 4C77E36515B84A240093A587 /* Frameworks */, 4C77E36315B84A240093A587 /* Products */, @@ -307,6 +404,8 @@ 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */, 4CA0B2FA15BCAF8600654E32 /* MPSettingsController.h */, 4CA0B2FB15BCAF8600654E32 /* MPSettingsController.m */, + 4C83814015BF4677001AE468 /* MPMainWindowController.h */, + 4C83814115BF4677001AE468 /* MPMainWindowController.m */, ); name = Controller; sourceTree = ""; @@ -326,92 +425,10 @@ name = General; sourceTree = ""; }; - 4CAD73E315B8860800104512 /* KeePassLib */ = { - isa = PBXGroup; - children = ( - 4CAD73E515B8860800104512 /* AesInputStream.h */, - 4CAD73E615B8860800104512 /* AesInputStream.m */, - 4CAD73E715B8860800104512 /* AesOutputStream.h */, - 4CAD73E815B8860800104512 /* AesOutputStream.m */, - 4CAD73E915B8860800104512 /* Arc4RandomStream.h */, - 4CAD73EA15B8860800104512 /* Arc4RandomStream.m */, - 4CAD73EB15B8860800104512 /* Base64.h */, - 4CAD73EC15B8860800104512 /* Base64.m */, - 4CAD73ED15B8860800104512 /* DataInputStream.h */, - 4CAD73EE15B8860800104512 /* DataInputStream.m */, - 4CAD73EF15B8860800104512 /* DataOutputStream.h */, - 4CAD73F015B8860800104512 /* DataOutputStream.m */, - 4CAD73F115B8860800104512 /* FileInputStream.h */, - 4CAD73F215B8860800104512 /* FileInputStream.m */, - 4CAD73F315B8860800104512 /* FileOutputStream.h */, - 4CAD73F415B8860800104512 /* FileOutputStream.m */, - 4CAD73F515B8860800104512 /* GZipInputStream.h */, - 4CAD73F615B8860800104512 /* GZipInputStream.m */, - 4CAD73F715B8860800104512 /* GZipOutputStream.h */, - 4CAD73F815B8860800104512 /* GZipOutputStream.m */, - 4CAD73F915B8860800104512 /* HashedInputStream.h */, - 4CAD73FA15B8860800104512 /* HashedInputStream.m */, - 4CAD73FB15B8860800104512 /* HashedOutputStream.h */, - 4CAD73FC15B8860800104512 /* HashedOutputStream.m */, - 4CAD73FD15B8860800104512 /* InputStream.h */, - 4CAD73FE15B8860800104512 /* InputStream.m */, - 4CAD73FF15B8860800104512 /* Kdb.h */, - 4CAD740015B8860800104512 /* Kdb.m */, - 4CAD740115B8860800104512 /* Kdb3Date.h */, - 4CAD740215B8860800104512 /* Kdb3Date.m */, - 4CAD740315B8860800104512 /* Kdb3Node.h */, - 4CAD740415B8860800104512 /* Kdb3Node.m */, - 4CAD740515B8860800104512 /* Kdb3Parser.h */, - 4CAD740615B8860800104512 /* Kdb3Parser.m */, - 4CAD740715B8860800104512 /* Kdb3Persist.h */, - 4CAD740815B8860800104512 /* Kdb3Persist.m */, - 4CAD740915B8860800104512 /* Kdb3Reader.h */, - 4CAD740A15B8860800104512 /* Kdb3Reader.m */, - 4CAD740B15B8860800104512 /* Kdb3Writer.h */, - 4CAD740C15B8860800104512 /* Kdb3Writer.m */, - 4CAD740D15B8860800104512 /* Kdb4Node.h */, - 4CAD740E15B8860800104512 /* Kdb4Node.m */, - 4CAD740F15B8860800104512 /* Kdb4Parser.h */, - 4CAD741015B8860800104512 /* Kdb4Parser.m */, - 4CAD741115B8860800104512 /* Kdb4Persist.h */, - 4CAD741215B8860800104512 /* Kdb4Persist.m */, - 4CAD741315B8860800104512 /* Kdb4Reader.h */, - 4CAD741415B8860800104512 /* Kdb4Reader.m */, - 4CAD741515B8860800104512 /* Kdb4Writer.h */, - 4CAD741615B8860800104512 /* Kdb4Writer.m */, - 4CAD741715B8860800104512 /* KdbLib.h */, - 4CAD741815B8860800104512 /* KdbPassword.h */, - 4CAD741915B8860800104512 /* KdbPassword.m */, - 4CAD741A15B8860800104512 /* KdbReader.h */, - 4CAD741B15B8860800104512 /* KdbReaderFactory.h */, - 4CAD741C15B8860800104512 /* KdbReaderFactory.m */, - 4CAD741D15B8860800104512 /* KdbWriter.h */, - 4CAD741E15B8860800104512 /* KdbWriterFactory.h */, - 4CAD741F15B8860800104512 /* KdbWriterFactory.m */, - 4CAD742015B8860800104512 /* OutputStream.h */, - 4CAD742115B8860800104512 /* OutputStream.m */, - 4CAD742215B8860800104512 /* RandomStream.h */, - 4CAD742315B8860800104512 /* RandomStream.m */, - 4CAD742515B8860800104512 /* Salsa20RandomStream.h */, - 4CAD742615B8860800104512 /* Salsa20RandomStream.m */, - 4CAD742715B8860800104512 /* Sha256OutputStream.h */, - 4CAD742815B8860800104512 /* Sha256OutputStream.m */, - 4CAD742915B8860800104512 /* Utils.h */, - 4CAD742A15B8860800104512 /* Utils.m */, - 4CAD742B15B8860800104512 /* UUID.h */, - 4CAD742C15B8860800104512 /* UUID.m */, - ); - path = KeePassLib; - sourceTree = ""; - }; 4CAD745115B887FD00104512 /* KissXML */ = { isa = PBXGroup; children = ( - 4CAD745215B887FD00104512 /* .gitignore */, - 4CAD745315B887FD00104512 /* .hgignore */, 4CAD745415B887FD00104512 /* KissXML */, - 4CAD746415B887FD00104512 /* LICENSE.txt */, - 4CAD746515B887FD00104512 /* README.markdown */, ); path = KissXML; sourceTree = ""; @@ -486,7 +503,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = MP; - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0440; ORGANIZATIONNAME = "HicknHack Software GmbH"; }; buildConfigurationList = 4C77E35C15B84A240093A587 /* Build configuration list for PBXProject "MacPass" */; @@ -515,13 +532,10 @@ 4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */, 4C77E37715B84A240093A587 /* Credits.rtf in Resources */, 4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */, - 4CAD747915B887FD00104512 /* .gitignore in Resources */, - 4CAD747A15B887FD00104512 /* .hgignore in Resources */, - 4CAD748015B887FD00104512 /* LICENSE.txt in Resources */, - 4CAD748115B887FD00104512 /* README.markdown in Resources */, 4C88763415BABA30003D2CE9 /* PasswordWindow.xib in Resources */, 4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */, 4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */, + 4CD884B715BD47080042BBF8 /* MainWindow.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -534,40 +548,6 @@ files = ( 4C77E37315B84A240093A587 /* main.m in Sources */, 4C77E37A15B84A240093A587 /* MPAppDelegate.m in Sources */, - 4CAD742E15B8860800104512 /* AesInputStream.m in Sources */, - 4CAD742F15B8860800104512 /* AesOutputStream.m in Sources */, - 4CAD743015B8860800104512 /* Arc4RandomStream.m in Sources */, - 4CAD743115B8860800104512 /* Base64.m in Sources */, - 4CAD743215B8860800104512 /* DataInputStream.m in Sources */, - 4CAD743315B8860800104512 /* DataOutputStream.m in Sources */, - 4CAD743415B8860800104512 /* FileInputStream.m in Sources */, - 4CAD743515B8860800104512 /* FileOutputStream.m in Sources */, - 4CAD743615B8860800104512 /* GZipInputStream.m in Sources */, - 4CAD743715B8860800104512 /* GZipOutputStream.m in Sources */, - 4CAD743815B8860800104512 /* HashedInputStream.m in Sources */, - 4CAD743915B8860800104512 /* HashedOutputStream.m in Sources */, - 4CAD743A15B8860800104512 /* InputStream.m in Sources */, - 4CAD743B15B8860800104512 /* Kdb.m in Sources */, - 4CAD743C15B8860800104512 /* Kdb3Date.m in Sources */, - 4CAD743D15B8860800104512 /* Kdb3Node.m in Sources */, - 4CAD743E15B8860800104512 /* Kdb3Parser.m in Sources */, - 4CAD743F15B8860800104512 /* Kdb3Persist.m in Sources */, - 4CAD744015B8860800104512 /* Kdb3Reader.m in Sources */, - 4CAD744115B8860800104512 /* Kdb3Writer.m in Sources */, - 4CAD744215B8860800104512 /* Kdb4Node.m in Sources */, - 4CAD744315B8860800104512 /* Kdb4Parser.m in Sources */, - 4CAD744415B8860800104512 /* Kdb4Persist.m in Sources */, - 4CAD744515B8860800104512 /* Kdb4Reader.m in Sources */, - 4CAD744615B8860800104512 /* Kdb4Writer.m in Sources */, - 4CAD744715B8860800104512 /* KdbPassword.m in Sources */, - 4CAD744815B8860800104512 /* KdbReaderFactory.m in Sources */, - 4CAD744915B8860800104512 /* KdbWriterFactory.m in Sources */, - 4CAD744A15B8860800104512 /* OutputStream.m in Sources */, - 4CAD744B15B8860800104512 /* RandomStream.m in Sources */, - 4CAD744D15B8860800104512 /* Salsa20RandomStream.m in Sources */, - 4CAD744E15B8860800104512 /* Sha256OutputStream.m in Sources */, - 4CAD744F15B8860800104512 /* Utils.m in Sources */, - 4CAD745015B8860800104512 /* UUID.m in Sources */, 4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */, 4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */, 4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */, @@ -578,6 +558,42 @@ 4CC6259115BA1C99002F5B11 /* MPOutlineViewDelegate.m in Sources */, 4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */, 4CA0B2FC15BCAF8600654E32 /* MPSettingsController.m in Sources */, + 4C83814215BF4677001AE468 /* MPMainWindowController.m in Sources */, + 4C669B7F16760ED100DD0774 /* AesInputStream.m in Sources */, + 4C669B8016760ED100DD0774 /* AesOutputStream.m in Sources */, + 4C669B8116760ED100DD0774 /* Arc4RandomStream.m in Sources */, + 4C669B8216760ED100DD0774 /* DataInputStream.m in Sources */, + 4C669B8316760ED100DD0774 /* DataOutputStream.m in Sources */, + 4C669B8416760ED100DD0774 /* FileInputStream.m in Sources */, + 4C669B8516760ED100DD0774 /* FileOutputStream.m in Sources */, + 4C669B8616760ED100DD0774 /* GZipInputStream.m in Sources */, + 4C669B8716760ED100DD0774 /* GZipOutputStream.m in Sources */, + 4C669B8816760ED100DD0774 /* HashedInputStream.m in Sources */, + 4C669B8916760ED100DD0774 /* HashedOutputStream.m in Sources */, + 4C669B8A16760ED100DD0774 /* InputStream.m in Sources */, + 4C669B8B16760ED100DD0774 /* OutputStream.m in Sources */, + 4C669B8C16760ED100DD0774 /* Sha256OutputStream.m in Sources */, + 4C669B8E16760ED100DD0774 /* Base64.m in Sources */, + 4C669B8F16760ED100DD0774 /* DDXMLDocument+MKPAdditions.m in Sources */, + 4C669B9016760ED100DD0774 /* DDXMLElement+MKPAdditions.m in Sources */, + 4C669B9116760ED100DD0774 /* Kdb.m in Sources */, + 4C669B9216760ED100DD0774 /* Kdb3Date.m in Sources */, + 4C669B9316760ED100DD0774 /* Kdb3Node.m in Sources */, + 4C669B9416760ED100DD0774 /* Kdb3Reader.m in Sources */, + 4C669B9516760ED100DD0774 /* Kdb3Utils.m in Sources */, + 4C669B9616760ED100DD0774 /* Kdb3Writer.m in Sources */, + 4C669B9716760ED100DD0774 /* Kdb4Node.m in Sources */, + 4C669B9816760ED100DD0774 /* Kdb4Parser.m in Sources */, + 4C669B9916760ED100DD0774 /* Kdb4Persist.m in Sources */, + 4C669B9A16760ED100DD0774 /* Kdb4Reader.m in Sources */, + 4C669B9B16760ED100DD0774 /* Kdb4Writer.m in Sources */, + 4C669B9C16760ED100DD0774 /* KdbPassword.m in Sources */, + 4C669B9D16760ED100DD0774 /* KdbReaderFactory.m in Sources */, + 4C669B9E16760ED100DD0774 /* KdbWriterFactory.m in Sources */, + 4C669B9F16760ED100DD0774 /* RandomStream.m in Sources */, + 4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */, + 4C669BA116760ED100DD0774 /* Utils.m in Sources */, + 4C669BA216760ED100DD0774 /* UUID.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -636,7 +652,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lxml2"; - SDKROOT = macosx; + SDKROOT = macosx10.7; }; name = Debug; }; @@ -658,13 +674,14 @@ HEADER_SEARCH_PATHS = "/usr/include/libxml2/**"; MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "-lxml2"; - SDKROOT = macosx; + SDKROOT = macosx10.7; }; name = Release; }; 4C77E38115B84A240093A587 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch"; INFOPLIST_FILE = "MacPass/MacPass-Info.plist"; @@ -676,6 +693,7 @@ 4C77E38215B84A240093A587 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch"; INFOPLIST_FILE = "MacPass/MacPass-Info.plist"; diff --git a/MacPass/MPAppDelegate.h b/MacPass/MPAppDelegate.h index b1a0541f..389f5408 100644 --- a/MacPass/MPAppDelegate.h +++ b/MacPass/MPAppDelegate.h @@ -8,14 +8,9 @@ #import -APPKIT_EXTERN NSString *const kOutlineViewIdentifier; - @class MPDatabaseDocument; @interface MPAppDelegate : NSObject -@property (assign) IBOutlet NSWindow *window; -@property (readonly, retain) MPDatabaseDocument *database; - -@end +@end \ No newline at end of file diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m index e5d4b767..eadbe4d2 100644 --- a/MacPass/MPAppDelegate.m +++ b/MacPass/MPAppDelegate.m @@ -8,46 +8,21 @@ #import "MPAppDelegate.h" -#import "MPDatabaseDocument.h" -#import "MPOutlineDataSource.h" -#import "MPOutlineViewDelegate.h" +#import "MPMainWindowController.h" #import "MPSettingsController.h" -NSString *const kColumnIdentifier = @"OutlineColumn"; -NSString *const kOutlineViewIdentifier = @"OutlineView"; - @interface MPAppDelegate () -@property (assign) IBOutlet NSOutlineView *outlineView; @property (retain) MPSettingsController *settingsController; -@property (retain) MPOutlineDataSource *datasource; -@property (retain) MPOutlineViewDelegate *outlineDelegate; -@property (retain) MPDatabaseDocument *database; -- (void)updateData; +@property (retain) MPMainWindowController *mainWindowController; - (IBAction)showPreferences:(id)sender; @end @implementation MPAppDelegate -@synthesize outlineView = _outlineView; -@synthesize window = _window; -@synthesize database = _database; -@synthesize outlineDelegate = _outlineDelegate; -@synthesize datasource = _datasource; -@synthesize settingsController = _settingsController; - - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - _outlineDelegate = [[MPOutlineViewDelegate alloc] init]; - _datasource = [[MPOutlineDataSource alloc] init]; - [[_outlineView outlineTableColumn] setIdentifier:kColumnIdentifier]; - [_outlineView setDelegate:_outlineDelegate]; - [_outlineView setDataSource:_datasource]; - // register for sucessfull document loads - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateData) name:MPDidLoadDataBaseNotification object:_database]; -} - -- (void)updateData { - [_outlineView reloadData]; + _mainWindowController = [[MPMainWindowController alloc] init]; + [_mainWindowController showWindow:[_mainWindowController window]]; } #pragma mark IBActions @@ -56,7 +31,6 @@ NSString *const kOutlineViewIdentifier = @"OutlineView"; _settingsController = [[MPSettingsController alloc] init]; } [_settingsController showWindow:_settingsController.window]; - } @end diff --git a/MacPass/MPDatabaseDocument.m b/MacPass/MPDatabaseDocument.m index e7f4223e..f5c93bd8 100644 --- a/MacPass/MPDatabaseDocument.m +++ b/MacPass/MPDatabaseDocument.m @@ -17,8 +17,6 @@ NSString *const MPDidLoadDataBaseNotification = @"DidLoadDataBaseNotification"; @implementation MPDatabaseDocument -@synthesize tree = _tree; - - (id)init { // no appropriate init method return nil; diff --git a/MacPass/MPGeneralSettingsController.m b/MacPass/MPGeneralSettingsController.m index 64867bd7..a95319ff 100644 --- a/MacPass/MPGeneralSettingsController.m +++ b/MacPass/MPGeneralSettingsController.m @@ -16,7 +16,6 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab"; @end @implementation MPGeneralSettingsController -@synthesize encodingPopup = _encodingPopup; + (NSString *)identifier { return MPGeneralSetingsIdentifier; diff --git a/MacPass/MPMainWindowController.h b/MacPass/MPMainWindowController.h new file mode 100644 index 00000000..8afb8f4b --- /dev/null +++ b/MacPass/MPMainWindowController.h @@ -0,0 +1,15 @@ +// +// MPMainWindowController.h +// MacPass +// +// Created by Michael Starke on 24.07.12. +// Copyright (c) 2012 HicknHack Software GmbH. All rights reserved. +// + +#import + +@class MPDatabaseDocument; + +@interface MPMainWindowController : NSWindowController +@property (readonly, retain) MPDatabaseDocument *database; +@end diff --git a/MacPass/MPMainWindowController.m b/MacPass/MPMainWindowController.m new file mode 100644 index 00000000..a46e2573 --- /dev/null +++ b/MacPass/MPMainWindowController.m @@ -0,0 +1,62 @@ +// +// MPMainWindowController.m +// MacPass +// +// Created by Michael Starke on 24.07.12. +// Copyright (c) 2012 HicknHack Software GmbH. All rights reserved. +// + +#import "MPMainWindowController.h" +#import "MPOutlineDataSource.h" +#import "MPOutlineViewDelegate.h" +#import "MPDatabaseDocument.h" + +NSString *const kColumnIdentifier = @"OutlineColumn"; +NSString *const kOutlineViewIdentifier = @"OutlineView"; + + +@interface MPMainWindowController () +@property (assign) IBOutlet NSOutlineView *outlineView; +@property (retain) MPOutlineDataSource *datasource; +@property (retain) MPOutlineViewDelegate *outlineDelegate; +@property (retain) MPDatabaseDocument *database; +- (void)updateData; +@end + +@implementation MPMainWindowController + + +-(id)init { + return [super initWithWindowNibName:@"MainWindow" owner:self]; +} + +- (void)windowDidLoad +{ + [super windowDidLoad]; + + _outlineDelegate = [[MPOutlineViewDelegate alloc] init]; + _datasource = [[MPOutlineDataSource alloc] init]; + [[_outlineView outlineTableColumn] setIdentifier:kColumnIdentifier]; + [_outlineView setDelegate:_outlineDelegate]; + [_outlineView setDataSource:_datasource]; + // register for sucessfull document loads + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateData) name:MPDidLoadDataBaseNotification object:_database]; +} + +- (void)updateData { + [_outlineView reloadData]; +} + +- (void)newDocument:(id)sender { + NSLog(@"New"); +} + +- (void)performClose:(id)sender { + NSLog(@"Close"); +} + +- (void)openDocument:(id)sender { + NSLog(@"OpenDocument"); +} + +@end diff --git a/MacPass/MPSettingsController.m b/MacPass/MPSettingsController.m index 1a53a88a..7d7bd4ed 100644 --- a/MacPass/MPSettingsController.m +++ b/MacPass/MPSettingsController.m @@ -16,7 +16,6 @@ NSString const* kMPPasswordEnvodingSettingsKey = @"PasswordEncoding"; @end @implementation MPSettingsController -@synthesize generalController = _generalController; -(id)init { self = [super initWithWindowNibName:@"SettingsWindow"]; diff --git a/MacPass/MainWindow.xib b/MacPass/MainWindow.xib new file mode 100644 index 00000000..1b222e1c --- /dev/null +++ b/MacPass/MainWindow.xib @@ -0,0 +1,1286 @@ + + + + 1080 + 12C60 + 2844 + 1187.34 + 625.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 2844 + + + IBNSLayoutConstraint + NSBox + NSButton + NSButtonCell + NSCustomObject + NSImageCell + NSImageView + NSOutlineView + NSScrollView + NSScroller + NSSplitView + NSTableCellView + NSTableColumn + NSTextField + NSTextFieldCell + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + MPMainWindowController + + + FirstResponder + + + NSApplication + + + 15 + 2 + {{196, 240}, {780, 701}} + 544735232 + Window + NSWindow + + + + + 256 + + + + 268 + {{132, 5}, {21, 18}} + + + _NS:22 + YES + + -2080374784 + 134348800 + + + LucidaGrande + 11 + 3100 + + _NS:22 + + -2033958912 + 163 + + NSImage + NSAddTemplate + + + + 400 + 75 + + NO + + + + 268 + {{103, 5}, {21, 18}} + + + _NS:22 + YES + + -2080374784 + 134348800 + + + _NS:22 + + -2033958912 + 163 + + NSImage + NSRemoveTemplate + + + + 400 + 75 + + NO + + + + 4364 + + + + 4364 + + + + 2304 + + + + 4352 + + {181, 669} + + + _NS:13 + YES + NO + YES + + + -2147483392 + {{224, 0}, {16, 17}} + _NS:16 + + + + AutomaticTableColumnIdentifier.0 + 178 + 16 + 1000 + + 75497536 + 2048 + + + + 3 + MC4zMzMzMzI5ODU2AA + + + 6 + System + headerTextColor + + 3 + MAA + + + + + 337641536 + 2048 + Text Cell + + LucidaGrande + 13 + 1044 + + + + 6 + System + controlBackgroundColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + + + 3 + YES + YES + + + + 3 + 0.0 + + 6 + System + _sourceListBackgroundColor + + 6 + System + alternateSelectedControlColor + + 1 + MCAwIDEAA + + + + + 6 + System + gridColor + + 3 + MC41AA + + + 24 + -767557632 + + + 4 + 15 + 0 + YES + 1 + 1 + 1 + -1 + NO + + + {181, 669} + + + _NS:11 + + + 4 + + + + -2147483392 + {{224, 17}, {15, 102}} + + + _NS:15 + NO + + _doScroller: + 0.99749373433583954 + + + + -2147483392 + {{1, 119}, {238, 15}} + + + _NS:60 + NO + 1 + + _doScroller: + 0.99328859060402686 + + + {181, 669} + + + _NS:9 + 133680 + + + + QSAAAEEgAABBwAAAQcAAAA + 0.25 + 4 + 1 + + + + 274 + + + + 12 + {{-2, 0}, {5, 669}} + + + _NS:9 + {0, 0} + + 67108864 + 0 + Box + + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + 3 + 2 + 0 + NO + + + {{182, 0}, {598, 669}} + + + _NS:13 + + + {{0, 32}, {780, 669}} + + + _NS:9 + YES + 2 + + + {780, 701} + + + + {{0, 0}, {2560, 1418}} + {10000000000000, 10000000000000} + NO + 32 + YES + + + + + + + textField + + + 274 + + + + 266 + {{0, 1}, {178, 14}} + + + _NS:101 + YES + + 67108928 + 272631808 + HEADER CELL + + LucidaGrande-Bold + 11 + 16 + + _NS:101 + + + 6 + System + controlColor + + + + 1 + MC40MzkyMTU2ODYzIDAuNDk0MTE3NjQ3MSAwLjU0OTAxOTYwNzgAA + + + NO + + + {{1, 0}, {178, 17}} + + HeaderCell + + + + 438 + + + + textField + + + 274 + + + + 268 + + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + {{3, 0}, {17, 17}} + + + _NS:71 + YES + + 134217728 + 33554432 + + NSImage + NSActionTemplate + + _NS:71 + 0 + 0 + 0 + NO + + NO + YES + + + + 266 + {{25, 0}, {153, 17}} + + + _NS:80 + YES + + 67108928 + 272631808 + Table View Cell + + _NS:80 + + + + + NO + + + {{1, 17}, {178, 17}} + + DataCell + + + + 439 + + + + imageView + + + + 440 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + + + + + + 2 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 4 + 0 + + 4 + 1 + + 5 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 103 + + 1000 + + 3 + 9 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 32 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + + + + + + 108 + + + + + + 7 + 0 + + 0 + 1 + + 21 + + 1000 + + 3 + 9 + 1 + + + + + + 109 + + + + + 178 + + + + + 179 + + + + + 7 + 0 + + 0 + 1 + + 21 + + 1000 + + 3 + 9 + 1 + + + + + + + 180 + + + + + 181 + + + + + 183 + + + + + 184 + + + + + 405 + + + + + 406 + + + + + 407 + + + + + + + + + 414 + + + + + 415 + + + + + 418 + + + + + 419 + + + + + 420 + + + + + + + + + + 423 + + + + + 422 + + + + + 421 + + + + + + + + 424 + + + + + + + + + + 433 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 3 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + + + 6 + 0 + + 6 + 1 + + 3 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + + + + + 430 + + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + + + 6 + 0 + + 6 + 1 + + 3 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 3 + + 1000 + + 8 + 29 + 3 + + + + + + + 425 + + + + + 445 + + + + + 446 + + + + + 447 + + + + + 431 + + + + + + + + 432 + + + + + 448 + + + + + 450 + + + + + 451 + + + + + 452 + + + + + 449 + + + + + 453 + + + + + 436 + + + + + + + + 434 + + + + + + 7 + 0 + + 0 + 1 + + 17 + + 1000 + + 3 + 9 + 1 + + + + + + 435 + + + + + 437 + + + + + 475 + + + + + 469 + + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 9 + 40 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 9 + 40 + 3 + + + + + + 486 + + + + + + 490 + + + + + 494 + + + + + 488 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + {{357, 418}, {480, 270}} + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + HeaderCell + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + DataCell + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 499 + + + 0 + IBCocoaFramework + YES + 3 + + {15, 15} + {8, 8} + {8, 8} + + YES + + diff --git a/MacPass/PasswordWindow.xib b/MacPass/PasswordWindow.xib index a6a3d4f7..f3ce3972 100644 --- a/MacPass/PasswordWindow.xib +++ b/MacPass/PasswordWindow.xib @@ -1,19 +1,19 @@ - 1070 - 11E53 - 2182 - 1138.47 - 569.00 + 1080 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2182 + 2844 - NSWindowTemplate - NSView NSCustomObject + NSView + NSWindowTemplate com.apple.InterfaceBuilder.CocoaPlugin @@ -35,7 +35,7 @@ 15 2 - {{196, 207}, {480, 270}} + {{196, 207}, {482, 258}} 611845120 Window NSWindow @@ -44,12 +44,12 @@ 256 - {480, 270} + {482, 258} - + _NS:20 - {{0, 0}, {1920, 1058}} + {{0, 0}, {2560, 1418}} {10000000000000, 10000000000000} YES @@ -101,6 +101,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin diff --git a/MacPass/en.lproj/MainMenu.xib b/MacPass/en.lproj/MainMenu.xib index b0b95f80..10f2d0f0 100644 --- a/MacPass/en.lproj/MainMenu.xib +++ b/MacPass/en.lproj/MainMenu.xib @@ -11,23 +11,9 @@ 2182 - NSScroller - NSSplitView - NSMenuItem NSMenu - NSScrollView - NSTextFieldCell - NSImageView - NSImageCell - IBNSLayoutConstraint - NSTableCellView - NSOutlineView - NSCustomView + NSMenuItem NSCustomObject - NSView - NSWindowTemplate - NSTableColumn - NSTextField com.apple.InterfaceBuilder.CocoaPlugin @@ -824,219 +810,6 @@ _NSMainMenu - - 15 - 2 - {{476, 342}, {724, 501}} - 1954021376 - MacPass - NSWindow - - - - - 256 - - - - 268 - - - - 268 - - - - 2304 - - - - 256 - {142, 499} - - - - _NS:13 - YES - - - -2147483392 - {{224, 0}, {16, 17}} - _NS:16 - - - - AutomaticTableColumnIdentifier.0 - 139 - 16 - 1000 - - 75628096 - 2048 - - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337772096 - 2048 - Text Cell - - LucidaGrande - 13 - 1044 - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - YES - - - - 3 - 0.0 - - 6 - System - _sourceListBackgroundColor - - 6 - System - alternateSelectedControlColor - - 1 - MCAwIDEAA - - - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -767557632 - - - 4 - 15 - 0 - YES - 1 - 1 - 1 - - - {{1, 1}, {142, 499}} - - - - _NS:11 - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - - _NS:15 - - _doScroller: - 0.99749373433583954 - - - - -2147483392 - {{1, 485}, {122, 15}} - - - - _NS:60 - 1 - - _doScroller: - 0.54222222222222227 - - - {144, 501} - - - - _NS:9 - 133682 - - - - QSAAAEEgAABBiAAAQYgAAA - - - - 256 - {{145, 0}, {579, 501}} - - - _NS:13 - NSView - - - {724, 501} - - - - _NS:9 - YES - 2 - - - {724, 501} - - - - - {{0, 0}, {1680, 1050}} - {10000000000000, 10000000000000} - YES - MPAppDelegate @@ -1446,22 +1219,6 @@ 535 - - - window - - - - 532 - - - - outlineView - - - - 1109 - showPreferences: @@ -1470,86 +1227,6 @@ 1175 - - - imageView - - - 274 - - - - 268 - - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - {{3, 0}, {17, 17}} - - - _NS:11 - YES - - 130560 - 33554432 - - NSImage - NSActionTemplate - - _NS:11 - 0 - 0 - 0 - NO - - YES - - - - 266 - {{25, 0}, {114, 17}} - - - _NS:20 - {250, 750} - YES - - 67239488 - 272631808 - Table View Cell - - _NS:20 - - - 6 - System - controlColor - - - - - - - {{1, 0}, {139, 17}} - - _NS:9 - - - - 1166 - - - - textField - - - - 1167 - @@ -2062,86 +1739,6 @@ - - 371 - - - - - - - - 372 - - - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - 8 - 29 - 3 - - - - - 4 - 0 - - 4 - 1 - - 0.0 - - 1000 - 8 - 29 - 3 - - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - 8 - 29 - 3 - - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - 8 - 29 - 3 - - - - - 420 @@ -2246,309 +1843,13 @@ - - 785 - - - - - - - - - 787 - - - - - - 844 - - - - - 847 - - - - - 935 - - - - - 842 - - - - - 1070 - - - - - - - - - - 1073 - - - - - 1072 - - - - - 1071 - - - - - - - - 1074 - - - - - - - - - 1075 - - - - - 1161 - - - - - - - 4 - 0 - - 4 - 1 - - 0.0 - - 1000 - 6 - 24 - 2 - - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - 6 - 24 - 3 - - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - 6 - 24 - 2 - - - - - 5 - 0 - - 5 - 1 - - 3 - - 1000 - 8 - 29 - 3 - - - - - 6 - 0 - - 6 - 1 - - 3 - - 1000 - 8 - 29 - 3 - - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - 5 - 22 - 2 - - - - - - - 1162 - - - - - - 7 - 0 - - 0 - 1 - - 17 - - 1000 - 3 - 9 - 1 - - - - - - - 1163 - - - - - - - - 1164 - - - - - 1165 - - - - - 1168 - - - - - 1169 - - - - - 1170 - - - - - 1171 - - - - - 1172 - - - - - 1173 - - - - - 1174 - - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - OutlineCell - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2605,16 +1906,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{380, 496}, {480, 360}} - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2643,18 +1934,11 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin @@ -2678,33 +1962,11 @@ id - - NSOutlineView - NSWindow - - - - outlineView - NSOutlineView - - - window - NSWindow - - IBProjectSource ./Classes/MPAppDelegate.h - - NSLayoutConstraint - NSObject - - IBProjectSource - ./Classes/NSLayoutConstraint.h - - 0 @@ -2716,7 +1978,6 @@ YES 3 - {15, 15} {11, 11} {10, 3} diff --git a/MiniKeePassLib b/MiniKeePassLib new file mode 160000 index 00000000..8d7a1871 --- /dev/null +++ b/MiniKeePassLib @@ -0,0 +1 @@ +Subproject commit 8d7a18714096a8aef4cef32ef5e71b0eaed098be