nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 15:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Experimented with URL draggin and Entry creationg

Browse Source
This commit is contained in:
michael starke
2013-07-26 02:12:09 +02:00
parent 4172d10aa7
commit b96810db1b
11 changed files with 562 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

612
Assets/Keepass Icons.ai
View File

File diff suppressed because one or more lines are too long

2
KeePassKit

Submodule KeePassKit updated: e52882661c...92476a505f

22
MacPass.xcodeproj/project.pbxproj
View File

@@ -13,6 +13,7 @@
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 */; };
4C17D8E517A1C780006C8C1E /* MPDocumentWindowDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C17D8E417A1C780006C8C1E /* MPDocumentWindowDelegate.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 */; };
@@ -113,7 +114,7 @@
4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */; };
4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */; };
4C58BD4F176370B100B8178C /* HNHBadgedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C58BD4E176370B100B8178C /* HNHBadgedTextField.m */; };
4C591B57178F897A0080B16B /* KPKAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C591B56178F897A0080B16B /* KPKAttachment.m */; };
4C591B57178F897A0080B16B /* KPKBinary.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C591B56178F897A0080B16B /* KPKBinary.m */; };
4C5A11FE1708DE8700223D8A /* MPPasswordCreatorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5A11FC1708DE8700223D8A /* MPPasswordCreatorViewController.m */; };
4C5A11FF1708DE8800223D8A /* PasswordCreatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */; };
4C5AA591179549A1008ECAD7 /* KPKXmlTreeWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5AA590179549A1008ECAD7 /* KPKXmlTreeWriter.m */; };
@@ -189,6 +190,7 @@
4C8A173D1790AA41008B5C17 /* NSData+Keyfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8A173C1790AA41008B5C17 /* NSData+Keyfile.m */; };
4C8FECC816D57E3200BF26CF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8FECC716D57E3200BF26CF /* QuartzCore.framework */; };
4C920E2A16DCDFA00083839B /* MPLoggerProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C920E2916DCDFA00083839B /* MPLoggerProxy.m */; };
4C96D15417A12E4F00D931FA /* 99_CreatedTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C96D15317A12E4F00D931FA /* 99_CreatedTemplate.pdf */; };
4C9D6AA917615199001C660C /* HNHRoundedSecureTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */; };
4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; };
4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */; };
@@ -269,6 +271,8 @@
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>"; };
4C17D8E317A1C780006C8C1E /* MPDocumentWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDocumentWindowDelegate.h; sourceTree = "<group>"; };
4C17D8E417A1C780006C8C1E /* MPDocumentWindowDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDocumentWindowDelegate.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>"; };
@@ -453,8 +457,8 @@
4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 02_MessageBoxWarningTemplate.pdf; sourceTree = "<group>"; };
4C58BD4D176370B100B8178C /* HNHBadgedTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHBadgedTextField.h; sourceTree = "<group>"; };
4C58BD4E176370B100B8178C /* HNHBadgedTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHBadgedTextField.m; sourceTree = "<group>"; };
4C591B55178F897A0080B16B /* KPKAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKAttachment.h; sourceTree = "<group>"; };
4C591B56178F897A0080B16B /* KPKAttachment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKAttachment.m; sourceTree = "<group>"; };
4C591B55178F897A0080B16B /* KPKBinary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKBinary.h; sourceTree = "<group>"; };
4C591B56178F897A0080B16B /* KPKBinary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKBinary.m; sourceTree = "<group>"; };
4C5A11FB1708DE8700223D8A /* MPPasswordCreatorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordCreatorViewController.h; sourceTree = "<group>"; };
4C5A11FC1708DE8700223D8A /* MPPasswordCreatorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordCreatorViewController.m; sourceTree = "<group>"; };
4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorView.xib; sourceTree = "<group>"; };
@@ -604,6 +608,7 @@
4C8FECC716D57E3200BF26CF /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
4C920E2816DCDFA00083839B /* MPLoggerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLoggerProxy.h; sourceTree = "<group>"; };
4C920E2916DCDFA00083839B /* MPLoggerProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLoggerProxy.m; sourceTree = "<group>"; };
4C96D15317A12E4F00D931FA /* 99_CreatedTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 99_CreatedTemplate.pdf; sourceTree = "<group>"; };
4C9D6AA717615199001C660C /* HNHRoundedSecureTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHRoundedSecureTextFieldCell.h; sourceTree = "<group>"; };
4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHRoundedSecureTextFieldCell.m; sourceTree = "<group>"; };
4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsWindow.xib; sourceTree = "<group>"; };
@@ -1086,6 +1091,8 @@
4CC0D2CD17974A47000B4BDA /* MPCustomFieldTableViewDelegate.m */,
4CC0D2CF17974A5A000B4BDA /* MPAttachmentTableViewDelegate.h */,
4CC0D2D017974A5A000B4BDA /* MPAttachmentTableViewDelegate.m */,
4C17D8E317A1C780006C8C1E /* MPDocumentWindowDelegate.h */,
4C17D8E417A1C780006C8C1E /* MPDocumentWindowDelegate.m */,
);
name = Delegates;
sourceTree = "<group>";
@@ -1173,6 +1180,7 @@
4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */,
4C52A891178863B000868229 /* 68_PhoneTemplate.pdf */,
4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */,
4C96D15317A12E4F00D931FA /* 99_CreatedTemplate.pdf */,
4C366642178748F500B249F1 /* 99_HarddiskTemplate.pdf */,
4C7714AB176C9D4600549F2A /* 99_InfoTemplate.pdf */,
);
@@ -1512,8 +1520,8 @@
4CD3ABBE178F72610073F5C5 /* KPKEntry.m */,
4CD3ABC0178F72720073F5C5 /* KPKGroup.h */,
4CD3ABC1178F72720073F5C5 /* KPKGroup.m */,
4C591B55178F897A0080B16B /* KPKAttachment.h */,
4C591B56178F897A0080B16B /* KPKAttachment.m */,
4C591B55178F897A0080B16B /* KPKBinary.h */,
4C591B56178F897A0080B16B /* KPKBinary.m */,
4C39B3F3178FEFAE0027DC7C /* KPKNode.h */,
4C39B3F4178FEFAE0027DC7C /* KPKNode.m */,
4C3F28521791EDE800703281 /* KPKErrors.h */,
@@ -1760,6 +1768,7 @@
4C52A8901788628B00868229 /* 18_DisplayTemplate.pdf in Resources */,
4C52A892178863B000868229 /* 68_PhoneTemplate.pdf in Resources */,
4C18816C179E06920045C5B7 /* TrashBar.xib in Resources */,
4C96D15417A12E4F00D931FA /* 99_CreatedTemplate.pdf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1949,7 +1958,7 @@
4CD3ABBA178F71B50073F5C5 /* KPKTree.m in Sources */,
4CD3ABBF178F72610073F5C5 /* KPKEntry.m in Sources */,
4CD3ABC2178F72720073F5C5 /* KPKGroup.m in Sources */,
4C591B57178F897A0080B16B /* KPKAttachment.m in Sources */,
4C591B57178F897A0080B16B /* KPKBinary.m in Sources */,
4C39B3F5178FEFAE0027DC7C /* KPKNode.m in Sources */,
4C70D100179092F200652EE9 /* KPKPassword.m in Sources */,
4C8A173D1790AA41008B5C17 /* NSData+Keyfile.m in Sources */,
@@ -1986,6 +1995,7 @@
4CCEDE2A179F203B008402BE /* MPOutlineView.m in Sources */,
4CCEDE2E179F213B008402BE /* MPNotifications.m in Sources */,
4CCEDE32179F5B6C008402BE /* KPKDataStreamer.m in Sources */,
4C17D8E517A1C780006C8C1E /* MPDocumentWindowDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

254
MacPass/Base.lproj/InspectorView.xib
View File

@@ -52,7 +52,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSView" id="87082330">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSCustomView" id="816254670">
@@ -61,8 +61,6 @@
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{293, 30}</string>
<reference key="NSSuperview" ref="87082330"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">HNHGradientView</string>
</object>
@@ -71,7 +69,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{85, 496}, {124, 25}}</string>
<reference key="NSSuperview" ref="87082330"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="816254670"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@ -122,8 +119,6 @@
<int key="NSvFlags">12</int>
<string key="NSFrame">{{0, 31}, {293, 466}}</string>
<reference key="NSSuperview" ref="87082330"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="177600245"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<array class="NSMutableArray" key="NSTabViewItems">
<object class="NSTabViewItem" id="1002013291">
@@ -177,7 +172,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 9}, {259, 11}}</string>
<reference key="NSSuperview" ref="726109125"/>
<reference key="NSNextKeyView" ref="894571713"/>
<reference key="NSNextKeyView" ref="166081160"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="72260846">
@@ -390,7 +385,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 147}, {52, 16}}</string>
<reference key="NSSuperview" ref="994354248"/>
<reference key="NSNextKeyView" ref="894571713"/>
<reference key="NSNextKeyView" ref="166081160"/>
<string key="NSReuseIdentifierKey">_NS:60</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -430,7 +425,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{241, 429}, {32, 19}}</string>
<reference key="NSSuperview" ref="177600245"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="892620201"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@ -456,7 +450,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 432}, {80, 14}}</string>
<reference key="NSSuperview" ref="177600245"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="966066653"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
@@ -486,7 +479,6 @@
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{259, 400}</string>
<reference key="NSSuperview" ref="236190992"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="291769955"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool>
@@ -549,7 +541,6 @@
</array>
<string key="NSFrame">{{1, 1}, {259, 400}}</string>
<reference key="NSSuperview" ref="892620201"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="441697535"/>
<string key="NSReuseIdentifierKey">_NS:11</string>
<reference key="NSDocView" ref="441697535"/>
@@ -561,7 +552,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 17}, {15, 102}}</string>
<reference key="NSSuperview" ref="892620201"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1045948787"/>
<string key="NSReuseIdentifierKey">_NS:58</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -574,8 +564,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 119}, {223, 15}}</string>
<reference key="NSSuperview" ref="892620201"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="894571713"/>
<reference key="NSNextKeyView" ref="166081160"/>
<string key="NSReuseIdentifierKey">_NS:60</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -586,7 +575,6 @@
</array>
<string key="NSFrame">{{16, 20}, {261, 402}}</string>
<reference key="NSSuperview" ref="177600245"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="236190992"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133681</int>
@@ -601,7 +589,6 @@
</array>
<string key="NSFrameSize">{293, 466}</string>
<reference key="NSSuperview" ref="166081160"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="40836012"/>
</object>
<string key="NSLabel">Fields</string>
@@ -619,13 +606,11 @@
</object>
</array>
<string key="NSFrameSize">{293, 529}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="166081160"/>
<string key="NSReuseIdentifierKey">_NS:11</string>
</object>
<object class="NSCustomView" id="581195218">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="564843810">
@@ -633,7 +618,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 288}, {35, 14}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="850153963"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
@@ -681,8 +665,7 @@
</set>
<string key="NSFrameSize">{210, 258}</string>
<reference key="NSSuperview" ref="454120122"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="942541726"/>
<reference key="NSNextKeyView" ref="657519150"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<object class="NSTextContainer" key="NSTextContainer" id="77792568">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -703,7 +686,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">67121027</int>
<int key="NSFlags">100675459</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="566946319"/>
@@ -744,7 +727,6 @@
</array>
<string key="NSFrame">{{1, 1}, {210, 258}}</string>
<reference key="NSSuperview" ref="850153963"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="569376381"/>
<string key="NSReuseIdentifierKey">_NS:11</string>
<reference key="NSDocView" ref="569376381"/>
@@ -775,8 +757,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{195, 1}, {16, 258}}</string>
<reference key="NSSuperview" ref="850153963"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:83</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="850153963"/>
@@ -788,7 +768,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="850153963"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="454120122"/>
<string key="NSReuseIdentifierKey">_NS:33</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -801,8 +780,7 @@
</array>
<string key="NSFrame">{{20, 20}, {212, 260}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="657519150"/>
<reference key="NSNextKeyView" ref="454120122"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133138</int>
<reference key="NSVScroller" ref="942541726"/>
@@ -817,7 +795,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{201, 334}, {31, 25}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="172507372"/>
<string key="NSReuseIdentifierKey">_NS:22</string>
<bool key="NSEnabled">YES</bool>
@@ -846,7 +823,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 336}, {173, 22}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1035439471"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@ -881,7 +857,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 309}, {212, 19}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="564843810"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSHuggingPriority">{250, 750}</string>
@@ -907,7 +882,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 366}, {58, 14}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="685310174"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
@@ -928,7 +902,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 418}, {25, 14}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="484293743"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
@@ -949,7 +922,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 388}, {212, 22}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="279643156"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@ -971,7 +943,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 440}, {212, 22}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="428053603"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@ -993,7 +964,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 470}, {58, 14}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="800408621"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
@@ -1014,7 +984,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 492}, {212, 22}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="328122838"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@ -1036,7 +1005,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 522}, {35, 14}}</string>
<reference key="NSSuperview" ref="581195218"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="909883915"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
@@ -1054,8 +1022,6 @@
</object>
</array>
<string key="NSFrameSize">{252, 553}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="734056912"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">HNHScrollDocumentViewAdapter</string>
@@ -2452,16 +2418,6 @@
<reference key="object" ref="51494952"/>
<reference key="parent" ref="361499112"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1575</int>
<reference key="object" ref="144789846"/>
<reference key="parent" ref="998331805"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1577</int>
<reference key="object" ref="942915903"/>
<reference key="parent" ref="998331805"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1567</int>
<reference key="object" ref="485748133"/>
@@ -2520,11 +2476,6 @@
<reference key="object" ref="313244465"/>
<reference key="parent" ref="485748133"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1952</int>
<reference key="object" ref="421684971"/>
<reference key="parent" ref="292493070"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1512</int>
<reference key="object" ref="1028562761"/>
@@ -2640,12 +2591,6 @@
<reference key="object" ref="559416629"/>
<reference key="parent" ref="330991171"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2020</int>
<reference key="object" ref="109281840"/>
<reference key="parent" ref="177600245"/>
<string key="objectName">Horizontal Space - Scroll View - Table View - View</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">2024</int>
<reference key="object" ref="291769955"/>
@@ -2943,26 +2888,11 @@
<reference key="object" ref="943826544"/>
<reference key="parent" ref="966655738"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2153</int>
<reference key="object" ref="127801656"/>
<reference key="parent" ref="291769955"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2156</int>
<reference key="object" ref="556249621"/>
<reference key="parent" ref="291769955"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2165</int>
<reference key="object" ref="268050676"/>
<reference key="parent" ref="397967954"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2175</int>
<reference key="object" ref="243564120"/>
<reference key="parent" ref="291769955"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2180</int>
<reference key="object" ref="1038591982"/>
@@ -3206,16 +3136,6 @@
</array>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2205</int>
<reference key="object" ref="424584351"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2207</int>
<reference key="object" ref="6696189"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2209</int>
<reference key="object" ref="526596272"/>
@@ -3231,11 +3151,6 @@
<reference key="object" ref="1013024996"/>
<reference key="parent" ref="667286275"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2212</int>
<reference key="object" ref="247276485"/>
<reference key="parent" ref="667286275"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2213</int>
<reference key="object" ref="885133549"/>
@@ -3270,11 +3185,6 @@
<reference key="object" ref="535600323"/>
<reference key="parent" ref="121170874"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2237</int>
<reference key="object" ref="25403768"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2246</int>
<reference key="object" ref="298252958"/>
@@ -3309,36 +3219,11 @@
<reference key="object" ref="500217449"/>
<reference key="parent" ref="877766676"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2251</int>
<reference key="object" ref="972049638"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2252</int>
<reference key="object" ref="555758646"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2253</int>
<reference key="object" ref="344424093"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2255</int>
<reference key="object" ref="220755404"/>
<reference key="parent" ref="877766676"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2256</int>
<reference key="object" ref="924075646"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2258</int>
<reference key="object" ref="334071022"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2345</int>
<reference key="object" ref="511009648"/>
@@ -3574,16 +3459,6 @@
<reference key="object" ref="991080261"/>
<reference key="parent" ref="781002733"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2369</int>
<reference key="object" ref="680263316"/>
<reference key="parent" ref="632623009"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2370</int>
<reference key="object" ref="346165127"/>
<reference key="parent" ref="511009648"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1985</int>
<reference key="object" ref="966066653"/>
@@ -3697,16 +3572,6 @@
<reference key="object" ref="612070871"/>
<reference key="parent" ref="177600245"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2022</int>
<reference key="object" ref="1062481963"/>
<reference key="parent" ref="177600245"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2087</int>
<reference key="object" ref="626588286"/>
<reference key="parent" ref="292493070"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2090</int>
<reference key="object" ref="969134938"/>
@@ -4622,6 +4487,107 @@
<reference key="object" ref="207294490"/>
<reference key="parent" ref="292493070"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2205</int>
<reference key="object" ref="424584351"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1577</int>
<reference key="object" ref="942915903"/>
<reference key="parent" ref="998331805"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1575</int>
<reference key="object" ref="144789846"/>
<reference key="parent" ref="998331805"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2252</int>
<reference key="object" ref="555758646"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2253</int>
<reference key="object" ref="344424093"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2251</int>
<reference key="object" ref="972049638"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2207</int>
<reference key="object" ref="6696189"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2369</int>
<reference key="object" ref="680263316"/>
<reference key="parent" ref="632623009"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2156</int>
<reference key="object" ref="556249621"/>
<reference key="parent" ref="291769955"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2153</int>
<reference key="object" ref="127801656"/>
<reference key="parent" ref="291769955"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2022</int>
<reference key="object" ref="1062481963"/>
<reference key="parent" ref="177600245"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2370</int>
<reference key="object" ref="346165127"/>
<reference key="parent" ref="511009648"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2175</int>
<reference key="object" ref="243564120"/>
<reference key="parent" ref="291769955"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2020</int>
<reference key="object" ref="109281840"/>
<reference key="parent" ref="177600245"/>
<string key="objectName">Horizontal Space - Scroll View - Table View - View</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">2087</int>
<reference key="object" ref="626588286"/>
<reference key="parent" ref="292493070"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2212</int>
<reference key="object" ref="247276485"/>
<reference key="parent" ref="667286275"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2237</int>
<reference key="object" ref="25403768"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2258</int>
<reference key="object" ref="334071022"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2256</int>
<reference key="object" ref="924075646"/>
<reference key="parent" ref="421971283"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1952</int>
<reference key="object" ref="421684971"/>
<reference key="parent" ref="292493070"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -5060,7 +5026,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">2565</int>
<int key="maxID">2631</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">

BIN
MacPass/Icons/99_CreatedTemplate.pdf Normal file
View File

Binary file not shown.

15
MacPass/MPDocumentWindowController.m
View File

@@ -18,6 +18,7 @@
#import "MPDatabaseSettingsWindowController.h"
#import "MPConstants.h"
#import "MPSettingsHelper.h"
#import "MPDocumentWindowDelegate.h"
@interface MPDocumentWindowController () {
@private
@@ -34,6 +35,7 @@
@property (strong) MPOutlineViewController *outlineViewController;
@property (strong) MPInspectorViewController *inspectorViewController;
@property (strong) MPDatabaseSettingsWindowController *documentSettingsWindowController;
@property (strong) MPDocumentWindowDelegate *documentWindowDelegate;
@property (strong) MPToolbarDelegate *toolbarDelegate;
@@ -49,6 +51,7 @@
_outlineViewController = [[MPOutlineViewController alloc] init];
_entryViewController = [[MPEntryViewController alloc] init];
_inspectorViewController = [[MPInspectorViewController alloc] init];
_documentWindowDelegate = [[MPDocumentWindowDelegate alloc] init];
_saveAfterPasswordEdit = NO;
}
return self;
@@ -60,6 +63,15 @@
#pragma mark View Handling
- (void)windowDidLoad {
[super windowDidLoad];
/* Drag and Drop of URLS is working, but the current
und/Redo system cannot guarantee that the undomanager is found
when no window is active, thus this needs to be addresed when switching to KeePassKit
[[self window] setDelegate:self.documentWindowDelegate];
[[self window] registerForDraggedTypes:@[NSURLPboardType]];
*/
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didRevertDocument:) name:MPDocumentDidRevertNotifiation object:[self document]];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_setPasswordAndSave) name:MPDocumentRequestPasswordSaveNotification object:[self document]];
@@ -68,7 +80,8 @@
[_inspectorViewController setupNotifications:self];
[_outlineViewController setupNotifications:self];
[super windowDidLoad];
_toolbar = [[NSToolbar alloc] initWithIdentifier:@"MainWindowToolbar"];
[self.toolbar setAllowsUserCustomization:YES];
[self.toolbar setDelegate:self.toolbarDelegate];

13
MacPass/MPDocumentWindowDelegate.h Normal file
View File

@@ -0,0 +1,13 @@
//
// MPDocumentWindowDelegate.h
// MacPass
//
// Created by Michael Starke on 25.07.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface MPDocumentWindowDelegate : NSObject <NSWindowDelegate, NSDraggingDestination>
@end

66
MacPass/MPDocumentWindowDelegate.m Normal file
View File

@@ -0,0 +1,66 @@
//
// MPDocumentWindowDelegate.m
// MacPass
//
// Created by Michael Starke on 25.07.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import "MPDocumentWindowDelegate.h"
#import "MPDocument.h"
#import "Kdb.h"
#import "KdbEntry+Undo.h"
@implementation MPDocumentWindowDelegate
- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender {
MPDocument *document = [[[sender draggingDestinationWindow] windowController] document];
if(document.isLocked || !document.decrypted) {
return NSDragOperationNone;
}
NSPasteboard *draggingPasteBoard = [sender draggingPasteboard];
NSArray *classArray = [NSArray arrayWithObject:[NSURL class]];
NSArray *arrayOfURLs = [draggingPasteBoard readObjectsForClasses:classArray options:nil];
BOOL ok;
for(NSURL *url in arrayOfURLs) {
if([url isFileURL] || [url isFileReferenceURL]) {
continue;
ok = NO;
}
ok = YES;
}
return ok ? NSDragOperationCopy : NSDragOperationNone;
}
- (BOOL)prepareForDragOperation:(id<NSDraggingInfo>)sender {
return YES;
}
- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
NSPasteboard *draggingPasteBoard = [sender draggingPasteboard];
NSArray *classArray = [NSArray arrayWithObject:[NSURL class]];
NSArray *arrayOfURLs = [draggingPasteBoard readObjectsForClasses:classArray options:nil];
NSURL *url = [arrayOfURLs lastObject];
if(!url) {
return NO;
}
/* Currently not working, as the underlying operations do not get the unomanager */
MPDocument *document = [[[sender draggingDestinationWindow] windowController] document];
BOOL ok = NO;
if(document.selectedGroup) {
[[document undoManager] beginUndoGrouping];
KdbEntry *entry = [document createEntry:document.selectedGroup];
ok = (nil != entry);
entry.urlUndoable = [url absoluteString];
[[document undoManager] endUndoGrouping];
[[document undoManager] setActionName:NSLocalizedString(@"IMPORT_URL", @"Imports a dragged URL for a new entry")];
}
return ok;
}
@end

1
MacPass/MPIconHelper.h
View File

@@ -32,6 +32,7 @@ typedef NS_ENUM(NSUInteger, MPIconType) {
MPIconInfo = 1000,
MPIconAddFolder,
MPIconHardDisk,
MPIconCreated,
};
@interface MPIconHelper : NSObject

3
MacPass/MPIconHelper.m
View File

@@ -62,7 +62,8 @@ static NSDictionary *icons;
@(MPIconInfo): @"99_InfoTemplate",
@(MPIconAddFolder): @"99_AddFolderTemplate",
@(MPIconHardDisk): @"99_HarddiskTemplate"
@(MPIconHardDisk): @"99_HarddiskTemplate",
@(MPIconCreated): @"99_CreatedTemplate"
};
return imageNames;
}

BIN
MacPass/en.lproj/Localizable.strings
View File

Binary file not shown.