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

Changed layout to accommodate locking

Browse Source 
Fixed Autolayout hickups
Added lock screen
Removed unused views
Some refactorings
This commit is contained in:
michael starke
2013-06-08 23:54:57 +02:00
parent a014f2925c
commit 53850d8d35
26 changed files with 280 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MacPass.xcodeproj/project.pbxproj
View File

@@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */; }; 4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */; };
4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */; }; 4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */; };
4C25D58516CF0F8800F6806C /* WelcomeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58416CF0F8800F6806C /* WelcomeView.xib */; };
4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58616CF0FAA00F6806C /* EntryView.xib */; }; 4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58616CF0FAA00F6806C /* EntryView.xib */; };
4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPAdditions.m */; }; 4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPAdditions.m */; };
4C2E381D16D11FF900037A9D /* 03_ServerTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */; }; 4C2E381D16D11FF900037A9D /* 03_ServerTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */; };
@@ -133,7 +132,6 @@
4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorWindow.xib; sourceTree = "<group>"; }; 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorWindow.xib; sourceTree = "<group>"; };
4C22040B1746ED160054C916 /* KdbGroup+Undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+Undo.h"; sourceTree = "<group>"; }; 4C22040B1746ED160054C916 /* KdbGroup+Undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+Undo.h"; sourceTree = "<group>"; };
4C22040C1746ED160054C916 /* KdbGroup+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+Undo.m"; sourceTree = "<group>"; }; 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+Undo.m"; sourceTree = "<group>"; };
4C25D58416CF0F8800F6806C /* WelcomeView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WelcomeView.xib; sourceTree = "<group>"; };
4C25D58616CF0FAA00F6806C /* EntryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EntryView.xib; sourceTree = "<group>"; }; 4C25D58616CF0FAA00F6806C /* EntryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EntryView.xib; sourceTree = "<group>"; };
4C2C4C2A16D3BE3700D49295 /* KdbGroup+MPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+MPAdditions.h"; sourceTree = "<group>"; }; 4C2C4C2A16D3BE3700D49295 /* KdbGroup+MPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+MPAdditions.h"; sourceTree = "<group>"; };
4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+MPAdditions.m"; sourceTree = "<group>"; }; 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+MPAdditions.m"; sourceTree = "<group>"; };
@@ -377,7 +375,6 @@
4CBFA23F172B385D006090DF /* PasswordEditView.xib */, 4CBFA23F172B385D006090DF /* PasswordEditView.xib */,
4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */, 4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */,
4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */, 4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */,
4C25D58416CF0F8800F6806C /* WelcomeView.xib */,
4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */, 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */,
4C77547616E55FFC00970E02 /* InspectorView.xib */, 4C77547616E55FFC00970E02 /* InspectorView.xib */,
4CE39AC016ECE359000FE29D /* IconSelection.xib */, 4CE39AC016ECE359000FE29D /* IconSelection.xib */,
@@ -878,7 +875,6 @@
4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */, 4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */,
4CD884B715BD47080042BBF8 /* DocumentWindow.xib in Resources */, 4CD884B715BD47080042BBF8 /* DocumentWindow.xib in Resources */,
4C6B0E8C16C9B99B00A9ED23 /* PasswordInputView.xib in Resources */, 4C6B0E8C16C9B99B00A9ED23 /* PasswordInputView.xib in Resources */,
4C25D58516CF0F8800F6806C /* WelcomeView.xib in Resources */,
4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */, 4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */,
4C586F9E16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf in Resources */, 4C586F9E16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf in Resources */,
4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */, 4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */,

288
MacPass/DocumentWindow.xib
View File

@@ -11,9 +11,7 @@
<string key="NS.object.0">3084</string> <string key="NS.object.0">3084</string>
</object> </object>
<array key="IBDocument.IntegratedClassDependencies"> <array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string>
<string>NSCustomObject</string> <string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSSplitView</string> <string>NSSplitView</string>
<string>NSView</string> <string>NSView</string>
<string>NSWindowTemplate</string> <string>NSWindowTemplate</string>
@@ -38,83 +36,35 @@
<object class="NSWindowTemplate" id="1005"> <object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int> <int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int> <int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{196, 240}, {727, 548}}</string> <string key="NSWindowRect">{{196, 240}, {560, 429}}</string>
<int key="NSWTFlags">1618477056</int> <int key="NSWTFlags">1618477056</int>
<string key="NSWindowTitle">Window</string> <string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSWindow</string> <string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/> <nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/> <nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{400, 400}</string>
<object class="NSView" key="NSWindowView" id="1006"> <object class="NSView" key="NSWindowView" id="1006">
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews"/>
<object class="NSSplitView" id="947682332"> <string key="NSFrameSize">{560, 429}</string>
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">319</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSCustomView" id="425088172">
<reference key="NSNextResponder" ref="947682332"/>
<int key="NSvFlags">12</int>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{200, 548}</string>
<reference key="NSSuperview" ref="947682332"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="938782220"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="938782220">
<reference key="NSNextResponder" ref="947682332"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrame">{{201, 0}, {325, 548}}</string>
<reference key="NSSuperview" ref="947682332"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="350501330"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="350501330">
<reference key="NSNextResponder" ref="947682332"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{527, 0}, {200, 548}}</string>
<reference key="NSSuperview" ref="947682332"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string>
</object>
</array>
<string key="NSFrameSize">{727, 548}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="425088172"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
<object class="NSMutableDictionary" key="NSHoldingPriorities">
<bool key="EncodedWithXMLCoder">YES</bool>
<array key="dict.sortedKeys">
<integer value="0"/>
<integer value="2"/>
</array>
<array key="dict.values">
<real value="248"/>
<real value="249"/>
</array>
</object>
</object>
</array>
<string key="NSFrameSize">{727, 548}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="947682332"/>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string> <string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMinSize">{400, 422}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool> <bool key="NSWindowIsRestorable">YES</bool>
</object> </object>
<object class="NSSplitView" id="903506498">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{560, 194}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
</object>
</array> </array>
<object class="IBObjectContainer" key="IBDocument.Objects"> <object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords"> <array class="NSMutableArray" key="connectionRecords">
@@ -126,37 +76,13 @@
</object> </object>
<int key="connectionID">501</int> <int key="connectionID">501</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">contentView</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="938782220"/>
</object>
<int key="connectionID">625</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">splitView</string> <string key="label">splitView</string>
<reference key="source" ref="1001"/> <reference key="source" ref="1001"/>
<reference key="destination" ref="947682332"/> <reference key="destination" ref="903506498"/>
</object> </object>
<int key="connectionID">627</int> <int key="connectionID">700</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">outlineView</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="425088172"/>
</object>
<int key="connectionID">634</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">inspectorView</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="350501330"/>
</object>
<int key="connectionID">676</int>
</object> </object>
</array> </array>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
@@ -196,120 +122,13 @@
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">2</int> <int key="objectID">2</int>
<reference key="object" ref="1006"/> <reference key="object" ref="1006"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children"/>
<reference ref="947682332"/>
<object class="IBNSLayoutConstraint" id="317933005">
<reference key="firstItem" ref="947682332"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="631622849">
<reference key="firstItem" ref="947682332"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="855545557">
<reference key="firstItem" ref="947682332"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="667679916">
<reference key="firstItem" ref="947682332"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
</array>
<reference key="parent" ref="1005"/> <reference key="parent" ref="1005"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">603</int> <int key="objectID">697</int>
<reference key="object" ref="947682332"/> <reference key="object" ref="903506498"/>
<array class="NSMutableArray" key="children"> <reference key="parent" ref="0"/>
<reference ref="938782220"/>
<reference ref="425088172"/>
<reference ref="350501330"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">605</int>
<reference key="object" ref="938782220"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="947682332"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">628</int>
<reference key="object" ref="425088172"/>
<reference key="parent" ref="947682332"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">675</int>
<reference key="object" ref="350501330"/>
<reference key="parent" ref="947682332"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">677</int>
<reference key="object" ref="667679916"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">678</int>
<reference key="object" ref="855545557"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">680</int>
<reference key="object" ref="631622849"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">696</int>
<reference key="object" ref="317933005"/>
<reference key="parent" ref="1006"/>
</object> </object>
</array> </array>
</object> </object>
@@ -322,28 +141,16 @@
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string> <string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/> <boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
<array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
<reference ref="667679916"/>
<reference ref="855545557"/>
<reference ref="631622849"/>
<reference ref="317933005"/>
</array>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="603.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <boolean value="NO" key="697.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<string key="603.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="NO" key="697.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="605.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="697.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="628.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="675.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="677.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="678.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="680.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="696.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary> </dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/> <dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">696</int> <int key="maxID">709</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -361,53 +168,22 @@
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
</object> </object>
<dictionary class="NSMutableDictionary" key="outlets"> <object class="NSMutableDictionary" key="outlets">
<string key="contentView">NSView</string> <string key="NS.key.0">splitView</string>
<string key="inspectorView">NSView</string> <string key="NS.object.0">NSSplitView</string>
<string key="outlineView">NSView</string> </object>
<string key="splitView">NSSplitView</string> <object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="welcomeText">NSTextField</string> <string key="NS.key.0">splitView</string>
<string key="welcomeView">NSView</string> <object class="IBToOneOutletInfo" key="NS.object.0">
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="contentView">
<string key="name">contentView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="inspectorView">
<string key="name">inspectorView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="outlineView">
<string key="name">outlineView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="splitView">
<string key="name">splitView</string> <string key="name">splitView</string>
<string key="candidateClassName">NSSplitView</string> <string key="candidateClassName">NSSplitView</string>
</object> </object>
<object class="IBToOneOutletInfo" key="welcomeText"> </object>
<string key="name">welcomeText</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="welcomeView">
<string key="name">welcomeView</string>
<string key="candidateClassName">NSView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string> <string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPDocumentWindowController.h</string> <string key="minorKey">./Classes/MPDocumentWindowController.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
</object>
</object>
</array> </array>
</object> </object>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>

18
MacPass/EntryView.xib
View File

@@ -320,7 +320,6 @@
<string key="NSFrame">{{0, 310}, {480, 16}}</string> <string key="NSFrame">{{0, 310}, {480, 16}}</string>
<reference key="NSSuperview" ref="613995671"/> <reference key="NSSuperview" ref="613995671"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:60</string> <string key="NSReuseIdentifierKey">_NS:60</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int> <int key="NSsFlags">1</int>
@@ -449,7 +448,7 @@
<object class="NSTextField" id="306813103"> <object class="NSTextField" id="306813103">
<reference key="NSNextResponder" ref="788738248"/> <reference key="NSNextResponder" ref="788738248"/>
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<string key="NSFrameSize">{104.5, 17}</string> <string key="NSFrameSize">{105, 17}</string>
<reference key="NSSuperview" ref="788738248"/> <reference key="NSSuperview" ref="788738248"/>
<reference key="NSNextKeyView" ref="804102913"/> <reference key="NSNextKeyView" ref="804102913"/>
<string key="NSAntiCompressionPriority">{250, 750}</string> <string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -471,7 +470,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</array> </array>
<string key="NSFrame">{{1, 1}, {104.5, 17}}</string> <string key="NSFrame">{{1, 1}, {105, 17}}</string>
<reference key="NSNextKeyView" ref="306813103"/> <reference key="NSNextKeyView" ref="306813103"/>
</object> </object>
<reference key="destination" ref="306813103"/> <reference key="destination" ref="306813103"/>
@@ -540,7 +539,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</array> </array>
<string key="NSFrame">{{108.5, 1}, {144, 17}}</string> <string key="NSFrame">{{109, 1}, {144, 17}}</string>
<reference key="NSNextKeyView" ref="591921532"/> <reference key="NSNextKeyView" ref="591921532"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
</object> </object>
@@ -583,7 +582,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</array> </array>
<string key="NSFrame">{{377, 1}, {113, 17}}</string> <string key="NSFrame">{{378, 1}, {113, 17}}</string>
<reference key="NSNextKeyView" ref="441850286"/> <reference key="NSNextKeyView" ref="441850286"/>
</object> </object>
<reference key="destination" ref="441850286"/> <reference key="destination" ref="441850286"/>
@@ -600,7 +599,7 @@
<object class="NSTextField" id="1042596093"> <object class="NSTextField" id="1042596093">
<reference key="NSNextResponder" ref="878614701"/> <reference key="NSNextResponder" ref="878614701"/>
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<string key="NSFrameSize">{118.5, 17}</string> <string key="NSFrameSize">{119, 17}</string>
<reference key="NSSuperview" ref="878614701"/> <reference key="NSSuperview" ref="878614701"/>
<reference key="NSNextKeyView" ref="542633869"/> <reference key="NSNextKeyView" ref="542633869"/>
<string key="NSAntiCompressionPriority">{250, 750}</string> <string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -617,7 +616,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</array> </array>
<string key="NSFrame">{{255.5, 1}, {118.5, 17}}</string> <string key="NSFrame">{{256, 1}, {119, 17}}</string>
<reference key="NSNextKeyView" ref="1042596093"/> <reference key="NSNextKeyView" ref="1042596093"/>
</object> </object>
<reference key="destination" ref="1042596093"/> <reference key="destination" ref="1042596093"/>
@@ -651,7 +650,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</array> </array>
<string key="NSFrame">{{493, 1}, {292, 17}}</string> <string key="NSFrame">{{494, 1}, {292, 17}}</string>
<reference key="NSNextKeyView" ref="488604658"/> <reference key="NSNextKeyView" ref="488604658"/>
</object> </object>
<reference key="destination" ref="488604658"/> <reference key="destination" ref="488604658"/>
@@ -1439,7 +1438,8 @@
<reference ref="986749424"/> <reference ref="986749424"/>
<reference ref="858505477"/> <reference ref="858505477"/>
</array> </array>
<boolean value="YES" key="336.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/> <boolean value="NO" key="336.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<boolean value="NO" key="336.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="336.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="336.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

20
MacPass/FilterBar.xib
View File

@@ -39,7 +39,7 @@
<string key="NSClassName">NSApplication</string> <string key="NSClassName">NSApplication</string>
</object> </object>
<object class="NSCustomView" id="1005"> <object class="NSCustomView" id="1005">
<nil key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="NSSearchField" id="498286707"> <object class="NSSearchField" id="498286707">
@@ -47,6 +47,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{369, 5}, {136, 19}}</string> <string key="NSFrame">{{369, 5}, {136, 19}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="456364439"> <object class="NSSearchFieldCell" key="NSCell" id="456364439">
@@ -121,6 +122,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{513, 5}, {42, 17}}</string> <string key="NSFrame">{{513, 5}, {42, 17}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="791616402"> <object class="NSButtonCell" key="NSCell" id="791616402">
@@ -144,6 +146,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{188, 5}, {38, 17}}</string> <string key="NSFrame">{{188, 5}, {38, 17}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="113591000"/> <reference key="NSNextKeyView" ref="113591000"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -172,6 +175,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{104, 5}, {76, 17}}</string> <string key="NSFrame">{{104, 5}, {76, 17}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="340435610"/> <reference key="NSNextKeyView" ref="340435610"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -196,6 +200,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{5, 6}, {44, 14}}</string> <string key="NSFrame">{{5, 6}, {44, 14}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="7073340"/> <reference key="NSNextKeyView" ref="7073340"/>
<string key="NSReuseIdentifierKey">_NS:1535</string> <string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -236,6 +241,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{54, 4}, {42, 19}}</string> <string key="NSFrame">{{54, 4}, {42, 19}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="902262560"/> <reference key="NSNextKeyView" ref="902262560"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -257,6 +263,8 @@
</object> </object>
</array> </array>
<string key="NSFrameSize">{563, 28}</string> <string key="NSFrameSize">{563, 28}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="906526407"/> <reference key="NSNextKeyView" ref="906526407"/>
<string key="NSClassName">HNHGradientView</string> <string key="NSClassName">HNHGradientView</string>
</object> </object>
@@ -820,6 +828,8 @@
<reference ref="533969344"/> <reference ref="533969344"/>
<reference ref="548170831"/> <reference ref="548170831"/>
</array> </array>
<boolean value="NO" key="1.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<boolean value="NO" key="1.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="2.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <boolean value="NO" key="2.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -867,6 +877,14 @@
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">HNHGradientView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/HNHGradientView.h</string>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">MPEntryViewController</string> <string key="className">MPEntryViewController</string>
<string key="superclassName">MPViewController</string> <string key="superclassName">MPViewController</string>

3
MacPass/InspectorView.xib
View File

@@ -239,7 +239,6 @@
<string key="NSFrame">{{212, 286}, {32, 25}}</string> <string key="NSFrame">{{212, 286}, {32, 25}}</string>
<reference key="NSSuperview" ref="87082330"/> <reference key="NSSuperview" ref="87082330"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:22</string> <string key="NSReuseIdentifierKey">_NS:22</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="353877023"> <object class="NSButtonCell" key="NSCell" id="353877023">
@@ -1391,6 +1390,8 @@
<reference ref="246479646"/> <reference ref="246479646"/>
<reference ref="7482984"/> <reference ref="7482984"/>
</array> </array>
<boolean value="NO" key="455.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<boolean value="NO" key="455.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="455.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="457.IBNSViewMetadataConstraints"> <array key="457.IBNSViewMetadataConstraints">
<reference ref="749563412"/> <reference ref="749563412"/>

4
MacPass/KdbGroup+KVOAdditions.m
View File

@@ -17,8 +17,8 @@
- (void)removeObjectFromEntriesAtIndex:(NSUInteger)index { - (void)removeObjectFromEntriesAtIndex:(NSUInteger)index {
KdbEntry *entry = [entries objectAtIndex:index]; KdbEntry *entry = [entries objectAtIndex:index];
entry.parent = nil;
[entries removeObjectAtIndex:index]; [entries removeObjectAtIndex:index];
entry.parent = nil;
} }
- (NSUInteger)countOfEntries { - (NSUInteger)countOfEntries {
@@ -44,8 +44,8 @@
- (void)removeObjectFromGroupsAtIndex:(NSUInteger)index { - (void)removeObjectFromGroupsAtIndex:(NSUInteger)index {
KdbGroup *group = [groups objectAtIndex:index]; KdbGroup *group = [groups objectAtIndex:index];
group.parent = nil;
[groups removeObjectAtIndex:index]; [groups removeObjectAtIndex:index];
group.parent = nil;
} }
@end @end

1
MacPass/MPActionHelper.h
View File

@@ -18,6 +18,7 @@ typedef enum {
MPActionCopyURL, // copy url to pasteboard MPActionCopyURL, // copy url to pasteboard
MPActionOpenURL, // open url in default browser MPActionOpenURL, // open url in default browser
MPActionToggleInspector, MPActionToggleInspector,
MPActionLock, // show the lock screen
} }
MPActionType; MPActionType;

21
MacPass/MPActionHelper.m
View File

@@ -15,16 +15,17 @@
static dispatch_once_t onceToken; static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{ dispatch_once(&onceToken, ^{
actionDict = [@{ actionDict = [@{
@(MPActionAddEntry) : @"createEntry:", @(MPActionAddEntry) : @"createEntry:",
@(MPActionAddGroup) : @"createGroup:", @(MPActionAddGroup) : @"createGroup:",
@(MPActionCopyPassword) : @"copyPassword:", @(MPActionCopyPassword) : @"copyPassword:",
@(MPActionCopyURL) : @"copyURL:", @(MPActionCopyURL) : @"copyURL:",
@(MPActionCopyUsername) : @"copyUsername:", @(MPActionCopyUsername) : @"copyUsername:",
@(MPActionDelete) : @"deleteEntry:", @(MPActionDelete) : @"deleteEntry:",
@(MPActionEdit) : @"editEntry:", @(MPActionEdit) : @"editEntry:",
@(MPActionOpenURL) : @"openURL:", @(MPActionOpenURL) : @"openURL:",
@(MPActionToggleInspector) : @"toggleInspector:" @(MPActionToggleInspector) : @"toggleInspector:",
} retain]; @(MPActionLock) : @"lock:"
} retain];
}); });
return NSSelectorFromString(actionDict[@(type)]); return NSSelectorFromString(actionDict[@(type)]);
} }

5
MacPass/MPDocumentWindowController.h
View File

@@ -31,9 +31,6 @@
- (void)performFindPanelAction:(id)sender; - (void)performFindPanelAction:(id)sender;
- (void)clearOutlineSelection:(id)sender; - (void)clearOutlineSelection:(id)sender;
- (IBAction)editPassword:(id)sender; - (IBAction)editPassword:(id)sender;
/* - (void)lock:(id)sender;
Clears the Search filter
*/
- (void)toggleInspector:(id)sender;
@end @end

177
MacPass/MPDocumentWindowController.m
View File

@@ -15,20 +15,15 @@
#import "MPOutlineViewController.h" #import "MPOutlineViewController.h"
#import "MPInspectorViewController.h" #import "MPInspectorViewController.h"
#import "MPAppDelegate.h" #import "MPAppDelegate.h"
#import "DMSplitView.h" #import "MPActionHelper.h"
@interface MPDocumentWindowController () { @interface MPDocumentWindowController () {
@private @private
BOOL _needsDecryption; BOOL _needsDecryption;
} }
@property (assign) IBOutlet NSView *outlineView; @property (retain) IBOutlet NSSplitView *splitView;
@property (assign) IBOutlet NSSplitView *splitView;
@property (assign) IBOutlet NSView *contentView;
@property (assign) IBOutlet NSView *inspectorView;
@property (retain) IBOutlet NSView *welcomeView;
@property (assign) IBOutlet NSTextField *welcomeText;
@property (retain) NSToolbar *toolbar; @property (retain) NSToolbar *toolbar;
@property (retain) MPPasswordInputController *passwordInputController; @property (retain) MPPasswordInputController *passwordInputController;
@@ -40,8 +35,6 @@
@property (retain) MPToolbarDelegate *toolbarDelegate; @property (retain) MPToolbarDelegate *toolbarDelegate;
- (void)_setContentViewController:(MPViewController *)viewController; - (void)_setContentViewController:(MPViewController *)viewController;
- (void)_setOutlineVisible:(BOOL)isVisible;
@end @end
@@ -55,6 +48,7 @@
_outlineViewController = [[MPOutlineViewController alloc] init]; _outlineViewController = [[MPOutlineViewController alloc] init];
_inspectorTabViewController = [[MPInspectorViewController alloc] init]; _inspectorTabViewController = [[MPInspectorViewController alloc] init];
_passwordEditController = [[MPPasswordEditViewController alloc] init]; _passwordEditController = [[MPPasswordEditViewController alloc] init];
_entryViewController = [[MPEntryViewController alloc] init];
} }
return self; return self;
} }
@@ -70,6 +64,7 @@
[_creationViewController release]; [_creationViewController release];
[_toolbarDelegate release]; [_toolbarDelegate release];
[_splitView release];
[super dealloc]; [super dealloc];
} }
@@ -78,7 +73,6 @@
- (void)windowDidLoad - (void)windowDidLoad
{ {
[super windowDidLoad]; [super windowDidLoad];
_toolbar = [[NSToolbar alloc] initWithIdentifier:@"MainWindowToolbar"]; _toolbar = [[NSToolbar alloc] initWithIdentifier:@"MainWindowToolbar"];
[self.toolbar setAllowsUserCustomization:YES]; [self.toolbar setAllowsUserCustomization:YES];
[self.toolbar setDelegate:self.toolbarDelegate]; [self.toolbar setDelegate:self.toolbarDelegate];
@@ -86,105 +80,72 @@
[self.splitView setTranslatesAutoresizingMaskIntoConstraints:NO]; [self.splitView setTranslatesAutoresizingMaskIntoConstraints:NO];
/* Add outlineview */ NSView *outlineView = [_outlineViewController view];
const NSRect outlineFrame = [self.outlineView frame]; NSView *inspectorView = [_inspectorTabViewController view];
[self.outlineViewController.view setFrame:outlineFrame]; NSView *entryView = [_entryViewController view];
[self.outlineViewController.view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; [self.splitView addSubview:outlineView];
[self.splitView replaceSubview:self.outlineView with:[self.outlineViewController view]]; [self.splitView addSubview:entryView];
[self.outlineViewController updateResponderChain]; [self.splitView addSubview:inspectorView];
/* Add inspector view */ //TODO: Fix setup on start
const NSRect inspectorFrame = [self.inspectorView frame];
[self.inspectorTabViewController.view setFrame:inspectorFrame];
[self.splitView replaceSubview:self.inspectorView with:[self.inspectorTabViewController view]];
[self.inspectorTabViewController updateResponderChain];
[self _setOutlineVisible:NO];
MPDocument *document = [self document]; MPDocument *document = [self document];
if(!document.isDecrypted) { if(!document.isDecrypted) {
[self showPasswordInput]; [self showPasswordInput];
} }
else { else {
[self editPassword:nil]; [self showEntries];
} }
} }
- (void)_setContentViewController:(MPViewController *)viewController { - (void)_setContentViewController:(MPViewController *)viewController {
NSView *newContentView = self.welcomeView;
NSView *newContentView = nil;
if(viewController && viewController.view) { if(viewController && viewController.view) {
newContentView = viewController.view; newContentView = viewController.view;
} }
/* NSView *contentView = [[self window] contentView];
Set correct size and resizing for view NSView *oldSubView = nil;
*/ if([[contentView subviews] count] == 1) {
[newContentView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; oldSubView = [contentView subviews][0];
NSSize frameSize = [self.contentView frame].size; }
[newContentView setFrame:NSMakeRect(0,0, frameSize.width, frameSize.height)]; if(oldSubView == newContentView) {
return; // View is already present
}
[oldSubView removeFromSuperviewWithoutNeedingDisplay];
[contentView addSubview:newContentView];
[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[newContentView]|"
options:0
metrics:nil
views:NSDictionaryOfVariableBindings(newContentView)]];
[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[newContentView]|"
options:0
metrics:nil
views:NSDictionaryOfVariableBindings(newContentView)]];
/* [contentView layout];
Add or replace subview
*/
NSArray *subViews = [self.contentView subviews];
BOOL hasSubViews = ([subViews count] > 0);
if(hasSubViews) {
NSView *subView = subViews[0];
assert(subView);
[self.contentView replaceSubview:subView with:newContentView];
}
else {
[self.contentView addSubview:newContentView];
}
[viewController updateResponderChain]; [viewController updateResponderChain];
[self.contentView setNeedsDisplay:YES];
[self.splitView adjustSubviews];
/*
Set focus AFTER having added the view
*/
[self.window makeFirstResponder:[viewController reconmendedFirstResponder]]; [self.window makeFirstResponder:[viewController reconmendedFirstResponder]];
} }
- (void)_setOutlineVisible:(BOOL)isVisible {
self.outlineViewController.isVisible = isVisible;
}
#pragma mark Actions #pragma mark Actions
- (void)toggleInspector:(id)sender {
//if(self.inspectorTabViewController) {
// [self.inspectorTabViewController toggleVisible];
//}
}
- (void)performFindPanelAction:(id)sender { - (void)performFindPanelAction:(id)sender {
[self.entryViewController showFilter:sender]; [self.entryViewController showFilter:sender];
} }
- (void)toggleOutlineView:(id)sender {
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem { - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
SEL menuAction = [menuItem action];
if(menuAction == @selector(main:)) {
NSString *title = self.outlineViewController.isVisible ? NSLocalizedString(@"SHOW_OUTLINE_VIEW", @"") : NSLocalizedString(@"HIDE_OUTLINE_VIEW", @"Hide the Outline View");
[menuItem setTitle:title];
return YES;
}
if( menuAction == @selector(toggleInspector:) ) {
NSString *title = [self.inspectorTabViewController isVisible] ? NSLocalizedString(@"SHOW_INSPECTOR", @"Show the Inspector") : NSLocalizedString(@"HIDE_INSPECTOR", @"Hide the Inspector");
[menuItem setTitle:title];
return YES;
}
return YES; return YES;
} }
- (BOOL)validateToolbarItem:(NSToolbarItem *)theItem { - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem {
SEL itemAction = [theItem action];
if( itemAction == [MPActionHelper actionOfType:MPActionLock]) {
return (nil == [[_passwordInputController view] superview]);
}
return YES;
return [self.toolbarDelegate validateToolbarItem:theItem]; return [self.toolbarDelegate validateToolbarItem:theItem];
} }
- (void)showPasswordInput { - (void)showPasswordInput {
if(!self.passwordInputController) { if(!self.passwordInputController) {
self.passwordInputController = [[[MPPasswordInputController alloc] init] autorelease]; self.passwordInputController = [[[MPPasswordInputController alloc] init] autorelease];
@@ -204,8 +165,57 @@
[self _setContentViewController:self.passwordEditController]; [self _setContentViewController:self.passwordEditController];
} }
#pragma mark Helper - (void)lock:(id)sender {
[self showPasswordInput];
}
- (void)showEntries {
NSView *contentView = [[self window] contentView];
if(_splitView == contentView) {
return; // We are displaying the entries already
}
if([[contentView subviews] count] == 1) {
[[contentView subviews][0] removeFromSuperviewWithoutNeedingDisplay];
}
[contentView addSubview:_splitView];
[_splitView adjustSubviews];
NSView *outlineView = [_outlineViewController view];
NSView *inspectorView = [_inspectorTabViewController view];
NSView *entryView = [_entryViewController view];
NSDictionary *views = NSDictionaryOfVariableBindings(outlineView, inspectorView, entryView, _splitView);
[self.splitView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[outlineView(>=150,<=250)]-1-[entryView(>=250)]-1-[inspectorView(>=200)]|"
options:0
metrics:nil
views:views]];
[self.splitView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[outlineView]|"
options:0
metrics:nil
views:views]];
[self.splitView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[entryView(>=300)]|"
options:0
metrics:nil
views:views]];
[self.splitView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[inspectorView]|"
options:0
metrics:nil
views:views]];
[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_splitView]|"
options:0
metrics:nil
views:views]];
[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_splitView]|"
options:0
metrics:nil
views:views]];
[contentView layout];
[_entryViewController updateResponderChain];
[_inspectorTabViewController updateResponderChain];
[_outlineViewController updateResponderChain];
[_outlineViewController showOutline];
}
#pragma mark Helper
- (NSSearchField *)locateToolbarSearchField { - (NSSearchField *)locateToolbarSearchField {
for(NSToolbarItem *toolbarItem in [[self.window toolbar] items]) { for(NSToolbarItem *toolbarItem in [[self.window toolbar] items]) {
NSView *view = [toolbarItem view]; NSView *view = [toolbarItem view];
@@ -216,14 +226,5 @@
return nil; return nil;
} }
#pragma mark Notifications
- (void)showEntries {
if(!self.entryViewController) {
_entryViewController = [[MPEntryViewController alloc] init];
}
[self _setContentViewController:self.entryViewController];
[self.outlineViewController showOutline];
[self _setOutlineVisible:YES];
}
@end @end

3
MacPass/MPEntryViewController.m
View File

@@ -136,8 +136,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
name:MPOutlineViewDidChangeGroupSelection name:MPOutlineViewDidChangeGroupSelection
object:windowController.outlineViewController.outlineDelegate]; object:windowController.outlineViewController.outlineDelegate];
//[[NSNotificationCenter defaultCenter] addObserver:self.entryTable selector:@selector(reloadData) name:MPDocumentDidAddEntryNotification object:nil];
[self.entryTable setDelegate:self]; [self.entryTable setDelegate:self];
[self.entryTable setDoubleAction:@selector(_columnDoubleClick:)]; [self.entryTable setDoubleAction:@selector(_columnDoubleClick:)];
[self.entryTable setTarget:self]; [self.entryTable setTarget:self];
@@ -305,7 +303,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
- (void)setupFilterBar { - (void)setupFilterBar {
if(!self.filterBar) { if(!self.filterBar) {
[[NSBundle mainBundle] loadNibNamed:@"FilterBar" owner:self topLevelObjects:nil]; [[NSBundle mainBundle] loadNibNamed:@"FilterBar" owner:self topLevelObjects:nil];
[self.filterBar setAutoresizingMask:NSViewWidthSizable|NSViewMinYMargin];
[self.filterURLButton setIdentifier:_toggleFilterURLButton]; [self.filterURLButton setIdentifier:_toggleFilterURLButton];
[self.filterUsernameButton setIdentifier:_toggleFilterUsernameButton]; [self.filterUsernameButton setIdentifier:_toggleFilterUsernameButton];
[self.filterTitleButton setIdentifier:_toggleFilterTitleButton]; [self.filterTitleButton setIdentifier:_toggleFilterTitleButton];

1
MacPass/MPInspectorViewController.h
View File

@@ -25,7 +25,6 @@
@property (assign) IBOutlet NSButton *showPasswordCreator; @property (assign) IBOutlet NSButton *showPasswordCreator;
- (BOOL)isVisible; - (BOOL)isVisible;
- (void)toggleVisible;
- (IBAction)togglePasswordDisplay:(id)sender; - (IBAction)togglePasswordDisplay:(id)sender;
- (void)hideImagePopup:(id)sender; - (void)hideImagePopup:(id)sender;

24
MacPass/MPInspectorViewController.m
View File

@@ -76,22 +76,6 @@
selector:@selector(_didChangeSelectedGroup:) selector:@selector(_didChangeSelectedGroup:)
name:MPOutlineViewDidChangeGroupSelection name:MPOutlineViewDidChangeGroupSelection
object:nil]; object:nil];
self.showConstraint = [NSLayoutConstraint constraintWithItem:[self view] attribute:NSLayoutAttributeWidth
relatedBy:NSLayoutRelationGreaterThanOrEqual
toItem:nil
attribute:NSLayoutAttributeNotAnAttribute
multiplier:1
constant:200];
self.hideConstraint = [NSLayoutConstraint constraintWithItem:[self view] attribute:NSLayoutAttributeWidth
relatedBy:NSLayoutRelationEqual
toItem:nil
attribute:NSLayoutAttributeNotAnAttribute
multiplier:1
constant:0];
[self.view addConstraint:self.showConstraint];
[self _clearContent]; [self _clearContent];
} }
@@ -99,14 +83,6 @@
return [[self view] frame].size.width > 0; return [[self view] frame].size.width > 0;
} }
- (void)toggleVisible {
NSLayoutConstraint *add = [self isVisible] ? self.hideConstraint : self.showConstraint;
NSLayoutConstraint *remove = [self isVisible] ? self.showConstraint : self.hideConstraint;
[[self view] removeConstraint:remove];
[[self view] addConstraint:add];
[[[self view] window] layoutIfNeeded];
}
- (void)_updateContent { - (void)_updateContent {
if(self.showsEntry && self.selectedEntry) { if(self.showsEntry && self.selectedEntry) {
[self _showEntry]; [self _showEntry];

1
MacPass/MPOutlineViewController.h
View File

@@ -14,7 +14,6 @@
@interface MPOutlineViewController : MPViewController @interface MPOutlineViewController : MPViewController
@property (retain, readonly) MPOutlineViewDelegate *outlineDelegate; @property (retain, readonly) MPOutlineViewDelegate *outlineDelegate;
@property (assign, nonatomic) BOOL isVisible;
- (void)clearSelection; - (void)clearSelection;

43
MacPass/MPOutlineViewController.m
View File

@@ -13,7 +13,9 @@
#import "MPAppDelegate.h" #import "MPAppDelegate.h"
#import "KdbLib.h" #import "KdbLib.h"
@interface MPOutlineViewController () @interface MPOutlineViewController () {
BOOL _bindingEstablished;
}
@property (assign) IBOutlet NSOutlineView *outlineView; @property (assign) IBOutlet NSOutlineView *outlineView;
@@ -21,8 +23,6 @@
@property (retain) MPOutlineDataSource *datasource; @property (retain) MPOutlineDataSource *datasource;
@property (retain) MPOutlineViewDelegate *outlineDelegate; @property (retain) MPOutlineViewDelegate *outlineDelegate;
@property (retain) NSMenu *menu; @property (retain) NSMenu *menu;
@property (retain) NSArray *showConstraints;
@property (retain) NSArray *hideConstraints;
- (void)_didUpdateData:(NSNotification *)notification; - (void)_didUpdateData:(NSNotification *)notification;
@@ -40,8 +40,8 @@
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) { if (self) {
_isVisible = YES;
_treeController = [[NSTreeController alloc] init]; _treeController = [[NSTreeController alloc] init];
_bindingEstablished = NO;
self.outlineDelegate = [[[MPOutlineViewDelegate alloc] init] autorelease]; self.outlineDelegate = [[[MPOutlineViewDelegate alloc] init] autorelease];
self.datasource = [[[MPOutlineDataSource alloc] init] autorelease]; self.datasource = [[[MPOutlineDataSource alloc] init] autorelease];
@@ -77,27 +77,16 @@
[self.outlineView setAllowsEmptySelection:YES]; [self.outlineView setAllowsEmptySelection:YES];
[self.outlineView setFloatsGroupRows:NO]; [self.outlineView setFloatsGroupRows:NO];
[self.outlineView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES]; [self.outlineView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES];
NSView *myView = [self view];
self.showConstraints = [NSLayoutConstraint constraintsWithVisualFormat:@"H:[myView(>=100,<=250)]"
options:0
metrics:nil
views:NSDictionaryOfVariableBindings(myView)];
self.hideConstraints = [NSLayoutConstraint constraintsWithVisualFormat:@"H:[myView(==0)]"
options:0
metrics:nil
views:NSDictionaryOfVariableBindings(myView)];
[[self view] addConstraints:_showConstraints];
} }
- (void)showOutline { - (void)showOutline {
MPDocument *document = [[NSDocumentController sharedDocumentController] currentDocument]; if(!_bindingEstablished) {
[_treeController setChildrenKeyPath:@"groups"]; MPDocument *document = [[self windowController] document];
[_treeController bind:NSContentBinding toObject:document withKeyPath:@"root" options:nil]; [_treeController setChildrenKeyPath:@"groups"];
[_outlineView bind:NSContentBinding toObject:_treeController withKeyPath:@"arrangedObjects" options:nil]; [_treeController bind:NSContentBinding toObject:document withKeyPath:@"root" options:nil];
[_outlineView bind:NSContentBinding toObject:_treeController withKeyPath:@"arrangedObjects" options:nil];
_bindingEstablished = YES;
}
NSTreeNode *node = [_outlineView itemAtRow:0]; NSTreeNode *node = [_outlineView itemAtRow:0];
[_outlineView expandItem:node expandChildren:NO]; [_outlineView expandItem:node expandChildren:NO];
} }
@@ -106,16 +95,6 @@
[self.outlineView deselectAll:nil]; [self.outlineView deselectAll:nil];
} }
- (void)setIsVisible:(BOOL)isVisible {
if(_isVisible == isVisible) {
return; // nichts zu tun
}
[[self view] removeConstraints:(isVisible ? self.hideConstraints : self.showConstraints)];
[[self view] addConstraints:(isVisible ? self.showConstraints : self.hideConstraints)];
_isVisible = isVisible;
}
- (NSMenu *)_contextMenu { - (NSMenu *)_contextMenu {
NSMenu *menu = [[NSMenu alloc] init]; NSMenu *menu = [[NSMenu alloc] init];
NSArray *items = [(MPAppDelegate *)[NSApp delegate] contextMenuItemsWithItems:MPContextMenuMinimal]; NSArray *items = [(MPAppDelegate *)[NSApp delegate] contextMenuItemsWithItems:MPContextMenuMinimal];

16
MacPass/MPPasswordInputController.m
View File

@@ -51,10 +51,21 @@
} }
- (IBAction)_decrypt:(id)sender { - (IBAction)_decrypt:(id)sender {
MPDocumentWindowController *windowController = (MPDocumentWindowController *)[[[self view] window] windowController]; id windowController = [[[self view] window] windowController];
MPDocument *document = [windowController document]; MPDocument *document = [windowController document];
if(document) { if(document) {
BOOL isOk = [document decryptWithPassword:[self.passwordTextField stringValue] keyFileURL:[self.keyPathControl URL]]; BOOL isOk = NO;
if(document.isDecrypted) {
// TODO: Fix unlocking to actually test
BOOL noPassword = !document.password && [[self.passwordTextField stringValue] length] == 0;
BOOL passwordOk = [document.password isEqualToString:[self.passwordTextField stringValue]];
BOOL noKey = document.key == [self.keyPathControl URL];
BOOL keyOk = [document.key isEqualTo:[self.keyPathControl URL]];
isOk = (noPassword || passwordOk) && (noKey || keyOk);
}
else {
isOk = [document decryptWithPassword:[self.passwordTextField stringValue] keyFileURL:[self.keyPathControl URL]];
}
if(!isOk) { if(!isOk) {
[self _showError]; [self _showError];
} }
@@ -69,6 +80,7 @@
[self.keyPathControl setURL:nil]; [self.keyPathControl setURL:nil];
[self.errorInfoTextField setHidden:YES]; [self.errorInfoTextField setHidden:YES];
[self.errorImageView setHidden:YES]; [self.errorImageView setHidden:YES];
} }
- (void)_showError { - (void)_showError {

38
MacPass/MPToolbarDelegate.m
View File

@@ -13,6 +13,7 @@
#import "MPToolbarItem.h" #import "MPToolbarItem.h"
#import "MPActionHelper.h" #import "MPActionHelper.h"
NSString *const MPToolbarItemLock = @"TOOLBAR_LOCK";
NSString *const MPToolbarItemAddGroup = @"TOOLBAR_ADD_GROUP"; NSString *const MPToolbarItemAddGroup = @"TOOLBAR_ADD_GROUP";
NSString *const MPToolbarItemAddEntry = @"TOOLBAR_ADD_ENTRY"; NSString *const MPToolbarItemAddEntry = @"TOOLBAR_ADD_ENTRY";
NSString *const MPToolbarItemEdit = @"TOOLBAR_EDIT"; NSString *const MPToolbarItemEdit = @"TOOLBAR_EDIT";
@@ -37,7 +38,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
- (id)init { - (id)init {
self = [super init]; self = [super init];
if (self) { if (self) {
_toolbarIdentifiers = [@[ MPToolbarItemAddEntry, MPToolbarItemDelete, MPToolbarItemAddGroup, MPToolbarItemAction, NSToolbarFlexibleSpaceItemIdentifier, NSToolbarSpaceItemIdentifier, MPToolbarItemInspector ] retain]; _toolbarIdentifiers = [@[ MPToolbarItemAddEntry, MPToolbarItemDelete, MPToolbarItemAddGroup, MPToolbarItemAction, NSToolbarFlexibleSpaceItemIdentifier, MPToolbarItemLock ] retain];
_toolbarImages = [[self createToolbarImages] retain]; _toolbarImages = [[self createToolbarImages] retain];
_toolbarItems = [[NSMutableDictionary alloc] initWithCapacity:[self.toolbarIdentifiers count]]; _toolbarItems = [[NSMutableDictionary alloc] initWithCapacity:[self.toolbarIdentifiers count]];
} }
@@ -68,7 +69,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
NSRect newFrame = [popupButton frame]; NSRect newFrame = [popupButton frame];
newFrame.size.width += 20; newFrame.size.width += 20;
NSMenu *menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init]; NSMenu *menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
NSMenuItem *actionImageItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"" action:NULL keyEquivalent:@""]; NSMenuItem *actionImageItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"" action:NULL keyEquivalent:@""];
[actionImageItem setImage:self.toolbarImages[MPToolbarItemAction]]; [actionImageItem setImage:self.toolbarImages[MPToolbarItemAction]];
@@ -129,7 +130,8 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
} }
- (NSDictionary *)createToolbarImages{ - (NSDictionary *)createToolbarImages{
NSDictionary *imageDict = @{ MPToolbarItemAddEntry: [MPIconHelper icon:MPIconPassword], NSDictionary *imageDict = @{ MPToolbarItemLock: [NSImage imageNamed:NSImageNameLockUnlockedTemplate],
MPToolbarItemAddEntry: [MPIconHelper icon:MPIconPassword],
MPToolbarItemAddGroup: [MPIconHelper icon:MPIconPassword], MPToolbarItemAddGroup: [MPIconHelper icon:MPIconPassword],
MPToolbarItemDelete: [NSImage imageNamed:NSImageNameRemoveTemplate], MPToolbarItemDelete: [NSImage imageNamed:NSImageNameRemoveTemplate],
MPToolbarItemAction: [NSImage imageNamed:NSImageNameActionTemplate], MPToolbarItemAction: [NSImage imageNamed:NSImageNameActionTemplate],
@@ -139,25 +141,25 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
} }
- (NSString *)_localizedLabelForToolbarItemIdentifier:(NSString *)identifier { - (NSString *)_localizedLabelForToolbarItemIdentifier:(NSString *)identifier {
NSDictionary *labelDict = @{ NSDictionary *labelDict = @{ MPToolbarItemLock: NSLocalizedString(@"LOCK", @""),
MPToolbarItemAction: NSLocalizedString(@"ACTION", @""), MPToolbarItemAction: NSLocalizedString(@"ACTION", @""),
MPToolbarItemAddEntry: NSLocalizedString(@"ADD_ENTRY", @""), MPToolbarItemAddEntry: NSLocalizedString(@"ADD_ENTRY", @""),
MPToolbarItemAddGroup: NSLocalizedString(@"ADD_GROUP", @""), MPToolbarItemAddGroup: NSLocalizedString(@"ADD_GROUP", @""),
MPToolbarItemDelete: NSLocalizedString(@"DELETE", @""), MPToolbarItemDelete: NSLocalizedString(@"DELETE", @""),
MPToolbarItemEdit: NSLocalizedString(@"EDIT", @""), MPToolbarItemEdit: NSLocalizedString(@"EDIT", @""),
MPToolbarItemInspector: NSLocalizedString(@"TOGGLE_INSPECTOR", @"") MPToolbarItemInspector: NSLocalizedString(@"TOGGLE_INSPECTOR", @"")
}; };
return labelDict[identifier]; return labelDict[identifier];
} }
- (SEL)_actionForToolbarItemIdentifier:(NSString *)identifier { - (SEL)_actionForToolbarItemIdentifier:(NSString *)identifier {
NSDictionary *actionDict = @{ NSDictionary *actionDict = @{ MPToolbarItemLock: @(MPActionLock),
MPToolbarItemAddEntry: @(MPActionAddEntry), MPToolbarItemAddEntry: @(MPActionAddEntry),
MPToolbarItemAddGroup: @(MPActionAddGroup), MPToolbarItemAddGroup: @(MPActionAddGroup),
MPToolbarItemDelete: @(MPActionDelete), MPToolbarItemDelete: @(MPActionDelete),
MPToolbarItemEdit: @(MPActionEdit), MPToolbarItemEdit: @(MPActionEdit),
MPToolbarItemInspector: @(MPActionToggleInspector) MPToolbarItemInspector: @(MPActionToggleInspector)
}; };
MPActionType actionType = (MPActionType)[actionDict[identifier] integerValue]; MPActionType actionType = (MPActionType)[actionDict[identifier] integerValue];
return [MPActionHelper actionOfType:actionType]; return [MPActionHelper actionOfType:actionType];
} }

4
MacPass/MPToolbarItem.m
View File

@@ -14,7 +14,9 @@
- (void)validate { - (void)validate {
if(![self.view menu]) { if(![self.view menu]) {
id target = [NSApp targetForAction:[self action] to:nil from:self]; id target = [NSApp targetForAction:[self action] to:nil from:self];
[self setEnabled:( nil != target )]; BOOL isValid = [[[[NSApplication sharedApplication] keyWindow] windowController] validateToolbarItem:self];
[self setEnabled:( isValid && (nil != target) )];
} }
} }
@end @end

3
MacPass/MPViewController.m
View File

@@ -29,8 +29,7 @@
} }
- (void)updateResponderChain { - (void)updateResponderChain {
if(self.view) { if(self.view && [self.view nextResponder] != self) {
NSLog(@"Updated responder chain");
NSResponder *nextResponder = [[self view] nextResponder]; NSResponder *nextResponder = [[self view] nextResponder];
[[self view] setNextResponder:self]; [[self view] setNextResponder:self];
[self setNextResponder:nextResponder]; [self setNextResponder:nextResponder];

2
MacPass/MacPass-Info.plist
View File

@@ -48,7 +48,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>979</string> <string>A2F</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string> <string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>

19
MacPass/OutlineView.xib
View File

@@ -42,7 +42,7 @@
<string key="NSClassName">NSApplication</string> <string key="NSClassName">NSApplication</string>
</object> </object>
<object class="NSCustomView" id="595437442"> <object class="NSCustomView" id="595437442">
<nil key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="NSScrollView" id="628894392"> <object class="NSScrollView" id="628894392">
@@ -59,6 +59,7 @@
<array class="NSMutableArray" key="NSSubviews"/> <array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{177, 299}</string> <string key="NSFrameSize">{177, 299}</string>
<reference key="NSSuperview" ref="100228705"/> <reference key="NSSuperview" ref="100228705"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="352201595"/> <reference key="NSNextKeyView" ref="352201595"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -173,6 +174,7 @@
</array> </array>
<string key="NSFrameSize">{177, 299}</string> <string key="NSFrameSize">{177, 299}</string>
<reference key="NSSuperview" ref="628894392"/> <reference key="NSSuperview" ref="628894392"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="920491699"/> <reference key="NSNextKeyView" ref="920491699"/>
<string key="NSReuseIdentifierKey">_NS:11</string> <string key="NSReuseIdentifierKey">_NS:11</string>
<reference key="NSDocView" ref="920491699"/> <reference key="NSDocView" ref="920491699"/>
@@ -184,6 +186,7 @@
<int key="NSvFlags">-2147483392</int> <int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 17}, {15, 102}}</string> <string key="NSFrame">{{224, 17}, {15, 102}}</string>
<reference key="NSSuperview" ref="628894392"/> <reference key="NSSuperview" ref="628894392"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="578225175"/> <reference key="NSNextKeyView" ref="578225175"/>
<string key="NSReuseIdentifierKey">_NS:15</string> <string key="NSReuseIdentifierKey">_NS:15</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -196,6 +199,7 @@
<int key="NSvFlags">-2147483392</int> <int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 119}, {238, 15}}</string> <string key="NSFrame">{{1, 119}, {238, 15}}</string>
<reference key="NSSuperview" ref="628894392"/> <reference key="NSSuperview" ref="628894392"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:60</string> <string key="NSReuseIdentifierKey">_NS:60</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int> <int key="NSsFlags">1</int>
@@ -206,6 +210,7 @@
</array> </array>
<string key="NSFrameSize">{177, 299}</string> <string key="NSFrameSize">{177, 299}</string>
<reference key="NSSuperview" ref="595437442"/> <reference key="NSSuperview" ref="595437442"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="100228705"/> <reference key="NSNextKeyView" ref="100228705"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133680</int> <int key="NSsFlags">133680</int>
@@ -219,6 +224,8 @@
</object> </object>
</array> </array>
<string key="NSFrameSize">{177, 299}</string> <string key="NSFrameSize">{177, 299}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="628894392"/> <reference key="NSNextKeyView" ref="628894392"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string> <string key="NSClassName">NSView</string>
@@ -806,6 +813,8 @@
<reference ref="751516117"/> <reference ref="751516117"/>
<reference ref="20875447"/> <reference ref="20875447"/>
</array> </array>
<boolean value="NO" key="196.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<boolean value="NO" key="196.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="227.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <boolean value="NO" key="227.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -874,6 +883,14 @@
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">HNHBadgedTextField</string>
<string key="superclassName">NSTextField</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/HNHBadgedTextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">HNHBadgedTextFieldCell</string> <string key="className">HNHBadgedTextFieldCell</string>
<string key="superclassName">NSTextFieldCell</string> <string key="superclassName">NSTextFieldCell</string>

7
MacPass/PasswordCreatorView.xib
View File

@@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1070</int> <int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -57,7 +57,6 @@
<string key="NSFrame">{{18, 19}, {230, 22}}</string> <string key="NSFrame">{{18, 19}, {230, 22}}</string>
<reference key="NSSuperview" ref="317361033"/> <reference key="NSSuperview" ref="317361033"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="358808223"> <object class="NSTextFieldCell" key="NSCell" id="358808223">
@@ -1494,6 +1493,8 @@
<reference ref="265426486"/> <reference ref="265426486"/>
<reference ref="992911618"/> <reference ref="992911618"/>
</array> </array>
<boolean value="NO" key="1.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<boolean value="NO" key="1.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="148.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <boolean value="NO" key="148.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

3
MacPass/PasswordEditView.xib
View File

@@ -225,7 +225,6 @@
<string key="NSFrame">{{195, 13}, {88, 32}}</string> <string key="NSFrame">{{195, 13}, {88, 32}}</string>
<reference key="NSSuperview" ref="595834490"/> <reference key="NSSuperview" ref="595834490"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSHuggingPriority">{250, 250}</string> <string key="NSHuggingPriority">{250, 250}</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -837,6 +836,8 @@
<reference ref="1024015372"/> <reference ref="1024015372"/>
<reference ref="501931119"/> <reference ref="501931119"/>
</array> </array>
<boolean value="NO" key="2.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<boolean value="NO" key="2.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

173
MacPass/PasswordInputView.xib
View File

@@ -49,16 +49,15 @@
<object class="NSTextField" id="660673733"> <object class="NSTextField" id="660673733">
<reference key="NSNextResponder" ref="1005"/> <reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{96, 175}, {184, 17}}</string> <string key="NSFrame">{{125, 175}, {113, 17}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="662046682"/> <reference key="NSNextKeyView" ref="662046682"/>
<string key="NSReuseIdentifierKey">_NS:1535</string> <string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="25165057"> <object class="NSTextFieldCell" key="NSCell" id="25165057">
<int key="NSCellFlags">68157504</int> <int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">272630784</int> <int key="NSCellFlags2">272630784</int>
<string key="NSContents">Could not decrypt Database!</string> <string key="NSContents">Wrong password!</string>
<object class="NSFont" key="NSSupport" id="786940182"> <object class="NSFont" key="NSSupport" id="786940182">
<string key="NSName">LucidaGrande</string> <string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double> <double key="NSSize">13</double>
@@ -100,7 +99,6 @@
</set> </set>
<string key="NSFrame">{{157, 200}, {48, 48}}</string> <string key="NSFrame">{{157, 200}, {48, 48}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="660673733"/> <reference key="NSNextKeyView" ref="660673733"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -120,31 +118,6 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSEditable">YES</bool> <bool key="NSEditable">YES</bool>
</object> </object>
<object class="NSButton" id="132133585">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{127, 50}, {82, 32}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="769513826"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="859948829">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
<reference key="NSSupport" ref="786940182"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="132133585"/>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSPathControl" id="1034097047"> <object class="NSPathControl" id="1034097047">
<reference key="NSNextResponder" ref="1005"/> <reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
@@ -154,8 +127,7 @@
</set> </set>
<string key="NSFrame">{{83, 94}, {197, 22}}</string> <string key="NSFrame">{{83, 94}, {197, 22}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/> <reference key="NSNextKeyView" ref="769513826"/>
<reference key="NSNextKeyView" ref="132133585"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSPathCell" key="NSCell" id="780802395"> <object class="NSPathCell" key="NSCell" id="780802395">
@@ -179,7 +151,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{86, 123}, {191, 22}}</string> <string key="NSFrame">{{86, 123}, {191, 22}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="333885704"/> <reference key="NSNextKeyView" ref="333885704"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -217,7 +188,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 126}, {64, 17}}</string> <string key="NSFrame">{{17, 126}, {64, 17}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="219521947"/> <reference key="NSNextKeyView" ref="219521947"/>
<string key="NSReuseIdentifierKey">_NS:1535</string> <string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -238,7 +208,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{35, 99}, {46, 17}}</string> <string key="NSFrame">{{35, 99}, {46, 17}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1034097047"/> <reference key="NSNextKeyView" ref="1034097047"/>
<string key="NSReuseIdentifierKey">_NS:1535</string> <string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -257,16 +226,16 @@
<object class="NSButton" id="769513826"> <object class="NSButton" id="769513826">
<reference key="NSNextResponder" ref="1005"/> <reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{209, 50}, {74, 32}}</string> <string key="NSFrame">{{200, 50}, {83, 32}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/> <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSHuggingPriority">{250, 250}</string> <string key="NSHuggingPriority">{250, 250}</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="736946738"> <object class="NSButtonCell" key="NSCell" id="736946738">
<int key="NSCellFlags">67108864</int> <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int> <int key="NSCellFlags2">134217728</int>
<string key="NSContents">Open</string> <string key="NSContents">Unlock</string>
<reference key="NSSupport" ref="786940182"/> <reference key="NSSupport" ref="786940182"/>
<string key="NSCellIdentifier">_NS:9</string> <string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="769513826"/> <reference key="NSControlView" ref="769513826"/>
@@ -282,7 +251,6 @@
</array> </array>
<string key="NSFrameSize">{362, 268}</string> <string key="NSFrameSize">{362, 268}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="204058255"/> <reference key="NSNextKeyView" ref="204058255"/>
<string key="NSAntiCompressionPriority">{751, 750}</string> <string key="NSAntiCompressionPriority">{751, 750}</string>
<string key="NSClassName">NSView</string> <string key="NSClassName">NSView</string>
@@ -385,22 +353,6 @@
<int key="objectID">1</int> <int key="objectID">1</int>
<reference key="object" ref="1005"/> <reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<object class="IBNSLayoutConstraint" id="821938949">
<reference key="firstItem" ref="769513826"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="132133585"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">12</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="197250307"> <object class="IBNSLayoutConstraint" id="197250307">
<reference key="firstItem" ref="769513826"/> <reference key="firstItem" ref="769513826"/>
<int key="firstAttribute">3</int> <int key="firstAttribute">3</int>
@@ -449,22 +401,6 @@
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int> <int key="contentType">3</int>
</object> </object>
<object class="IBNSLayoutConstraint" id="441240653">
<reference key="firstItem" ref="132133585"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="769513826"/>
<int key="secondAttribute">11</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="761790265"> <object class="IBNSLayoutConstraint" id="761790265">
<reference key="firstItem" ref="1034097047"/> <reference key="firstItem" ref="1034097047"/>
<int key="firstAttribute">5</int> <int key="firstAttribute">5</int>
@@ -657,21 +593,21 @@
<float key="scoringTypeFloat">24</float> <float key="scoringTypeFloat">24</float>
<int key="contentType">2</int> <int key="contentType">2</int>
</object> </object>
<object class="IBNSLayoutConstraint" id="781301592"> <object class="IBNSLayoutConstraint" id="46265369">
<reference key="firstItem" ref="662046682"/> <reference key="firstItem" ref="660673733"/>
<int key="firstAttribute">5</int> <int key="firstAttribute">9</int>
<int key="relation">1</int> <int key="relation">0</int>
<reference key="secondItem" ref="1005"/> <reference key="secondItem" ref="219521947"/>
<int key="secondAttribute">5</int> <int key="secondAttribute">9</int>
<float key="multiplier">1</float> <float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant"> <object class="IBLayoutConstant" key="constant">
<double key="value">20</double> <double key="value">0.0</double>
</object> </object>
<float key="priority">1000</float> <float key="priority">1000</float>
<reference key="containingView" ref="1005"/> <reference key="containingView" ref="1005"/>
<int key="scoringType">9</int> <int key="scoringType">6</int>
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">24</float>
<int key="contentType">3</int> <int key="contentType">2</int>
</object> </object>
<object class="IBNSLayoutConstraint" id="97094814"> <object class="IBNSLayoutConstraint" id="97094814">
<reference key="firstItem" ref="660673733"/> <reference key="firstItem" ref="660673733"/>
@@ -705,28 +641,27 @@
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int> <int key="contentType">3</int>
</object> </object>
<object class="IBNSLayoutConstraint" id="498913549"> <object class="IBNSLayoutConstraint" id="781301592">
<reference key="firstItem" ref="660673733"/> <reference key="firstItem" ref="662046682"/>
<int key="firstAttribute">6</int> <int key="firstAttribute">5</int>
<int key="relation">0</int> <int key="relation">1</int>
<reference key="secondItem" ref="219521947"/> <reference key="secondItem" ref="1005"/>
<int key="secondAttribute">6</int> <int key="secondAttribute">5</int>
<float key="multiplier">1</float> <float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant"> <object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">0.0</double> <double key="value">20</double>
</object> </object>
<float key="priority">1000</float> <float key="priority">1000</float>
<reference key="containingView" ref="1005"/> <reference key="containingView" ref="1005"/>
<int key="scoringType">6</int> <int key="scoringType">9</int>
<float key="scoringTypeFloat">24</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">2</int> <int key="contentType">3</int>
</object> </object>
<reference ref="769513826"/> <reference ref="769513826"/>
<reference ref="662046682"/> <reference ref="662046682"/>
<reference ref="219521947"/> <reference ref="219521947"/>
<reference ref="1034097047"/> <reference ref="1034097047"/>
<reference ref="333885704"/> <reference ref="333885704"/>
<reference ref="132133585"/>
<reference ref="204058255"/> <reference ref="204058255"/>
<reference ref="660673733"/> <reference ref="660673733"/>
</array> </array>
@@ -883,29 +818,6 @@
<reference key="object" ref="197250307"/> <reference key="object" ref="197250307"/>
<reference key="parent" ref="1005"/> <reference key="parent" ref="1005"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">257</int>
<reference key="object" ref="132133585"/>
<array class="NSMutableArray" key="children">
<reference ref="859948829"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">258</int>
<reference key="object" ref="859948829"/>
<reference key="parent" ref="132133585"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">259</int>
<reference key="object" ref="821938949"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">260</int>
<reference key="object" ref="441240653"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">262</int> <int key="objectID">262</int>
<reference key="object" ref="204058255"/> <reference key="object" ref="204058255"/>
@@ -984,11 +896,6 @@
<reference key="object" ref="912203343"/> <reference key="object" ref="912203343"/>
<reference key="parent" ref="1005"/> <reference key="parent" ref="1005"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">287</int>
<reference key="object" ref="498913549"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">288</int> <int key="objectID">288</int>
<reference key="object" ref="975314961"/> <reference key="object" ref="975314961"/>
@@ -1004,17 +911,22 @@
<reference key="object" ref="97094814"/> <reference key="object" ref="97094814"/>
<reference key="parent" ref="1005"/> <reference key="parent" ref="1005"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">296</int>
<reference key="object" ref="46265369"/>
<reference key="parent" ref="1005"/>
</object>
</array> </array>
</object> </object>
<dictionary class="NSMutableDictionary" key="flattenedProperties"> <dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="1.IBNSViewMetadataConstraints"> <array class="NSMutableArray" key="1.IBNSViewMetadataConstraints">
<reference ref="498913549"/> <reference ref="781301592"/>
<reference ref="975314961"/> <reference ref="975314961"/>
<reference ref="97094814"/> <reference ref="97094814"/>
<reference ref="781301592"/> <reference ref="46265369"/>
<reference ref="151404172"/> <reference ref="151404172"/>
<reference ref="649511608"/> <reference ref="649511608"/>
<reference ref="207368608"/> <reference ref="207368608"/>
@@ -1027,12 +939,12 @@
<reference ref="1040549598"/> <reference ref="1040549598"/>
<reference ref="644024823"/> <reference ref="644024823"/>
<reference ref="761790265"/> <reference ref="761790265"/>
<reference ref="441240653"/>
<reference ref="1001566026"/> <reference ref="1001566026"/>
<reference ref="1041224580"/> <reference ref="1041224580"/>
<reference ref="197250307"/> <reference ref="197250307"/>
<reference ref="821938949"/>
</array> </array>
<boolean value="NO" key="1.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<boolean value="NO" key="1.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="122.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1062,11 +974,6 @@
<string key="254.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="254.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="255.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="255.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="256.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="256.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="257.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="257.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="258.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="259.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="260.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="262.IBNSViewMetadataConstraints"> <array class="NSMutableArray" key="262.IBNSViewMetadataConstraints">
<reference ref="587044612"/> <reference ref="587044612"/>
<reference ref="472179646"/> <reference ref="472179646"/>
@@ -1081,10 +988,10 @@
<string key="274.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="274.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="287.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="288.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="288.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="289.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="289.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="290.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="290.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="31.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <boolean value="NO" key="31.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1094,7 +1001,7 @@
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/> <dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">295</int> <int key="maxID">296</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">

242
MacPass/WelcomeView.xib
View File

@@ -1,242 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string>
<string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="NSCustomObject" id="1001">
<string key="NSClassName">MPDocumentWindowController</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
</object>
<object class="NSCustomObject" id="1004">
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="1005">
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="86698766">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{223, 214}, {152, 29}}</string>
<reference key="NSSuperview" ref="1005"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="726130946">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">No Database</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">24</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:1535</string>
<reference key="NSControlView" ref="86698766"/>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">disabledControlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{597, 456}</string>
<reference key="NSNextKeyView" ref="86698766"/>
<string key="NSClassName">NSView</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">welcomeView</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="1005"/>
</object>
<int key="connectionID">12</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">welcomeText</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="86698766"/>
</object>
<int key="connectionID">17</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="1001"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="1003"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="1004"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">1</int>
<reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
<object class="IBNSLayoutConstraint" id="7631442">
<reference key="firstItem" ref="86698766"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
<int key="secondAttribute">9</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="790404227">
<reference key="firstItem" ref="86698766"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
<int key="secondAttribute">10</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<reference ref="86698766"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2</int>
<reference key="object" ref="86698766"/>
<array class="NSMutableArray" key="children">
<reference ref="726130946"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3</int>
<reference key="object" ref="726130946"/>
<reference key="parent" ref="86698766"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">21</int>
<reference key="object" ref="790404227"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">22</int>
<reference key="object" ref="7631442"/>
<reference key="parent" ref="1005"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="1.IBNSViewMetadataConstraints">
<reference ref="790404227"/>
<reference ref="7631442"/>
</array>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="2.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<real value="0.0" key="2.IBViewIntegration.shadowBlurRadius"/>
<object class="NSColor" key="2.IBViewIntegration.shadowColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<real value="1" key="2.IBViewIntegration.shadowOffsetHeight"/>
<real value="0.0" key="2.IBViewIntegration.shadowOffsetWidth"/>
<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">22</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>

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

Binary file not shown.