nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 11:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated views to new Password input.

Browse Source
This commit is contained in:
michael starke
2013-07-09 02:41:22 +02:00
parent a98720a00c
commit 79a8c05e95
7 changed files with 866 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HNHUi

Submodule HNHUi updated: 3cce12f4bc...5655cb4519

654
MacPass/Base.lproj/PasswordInputView.xib
View File

@@ -46,48 +46,75 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="648904227">
<object class="NSButton" id="594061862">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{318, 132}, {61, 18}}</string>
<string key="NSFrame">{{366, 108}, {31, 25}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="NSNextKeyView" ref="769513826"/>
<string key="NSReuseIdentifierKey">_NS:22</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="629982740">
<object class="NSButtonCell" key="NSCell" id="324275584">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">268435456</int>
<string key="NSContents">Check</string>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport" id="786940182">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="648904227"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<string key="NSCellIdentifier">_NS:22</string>
<reference key="NSControlView" ref="594061862"/>
<int key="NSButtonFlags">-2033958912</int>
<int key="NSButtonFlags2">163</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
<object class="NSButtonImageSource" key="NSAlternateImage">
<string key="NSImageName">NSSwitch</string>
<string key="NSResourceName">NSStopProgressTemplate</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="145392176">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{366, 139}, {31, 25}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="333885704"/>
<string key="NSReuseIdentifierKey">_NS:22</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1067970444">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="786940182"/>
<string key="NSCellIdentifier">_NS:22</string>
<reference key="NSControlView" ref="145392176"/>
<int key="NSButtonFlags">-1228652544</int>
<int key="NSButtonFlags2">163</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSQuickLookTemplate</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSSecureTextField" id="843649698">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{121, 130}, {191, 22}}</string>
<string key="NSFrame">{{167, 141}, {191, 22}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="333885704"/>
<reference key="NSNextKeyView" ref="145392176"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="189635035">
@@ -125,7 +152,7 @@
<object class="NSTextField" id="660673733">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{160, 160}, {113, 17}}</string>
<string key="NSFrame">{{206, 171}, {113, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="662046682"/>
@@ -167,7 +194,7 @@
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</set>
<string key="NSFrame">{{193, 185}, {48, 48}}</string>
<string key="NSFrame">{{238, 196}, {48, 48}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="660673733"/>
@@ -196,20 +223,16 @@
<string>Apple URL pasteboard type</string>
<string>NSFilenamesPboardType</string>
</set>
<string key="NSFrame">{{118, 101}, {197, 22}}</string>
<string key="NSFrame">{{164, 109}, {197, 26}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="769513826"/>
<reference key="NSNextKeyView" ref="594061862"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSPathCell" key="NSCell" id="780802395">
<int key="NSCellFlags">337641473</int>
<int key="NSCellFlags2">131072</int>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<int key="NSCellFlags2">0</int>
<reference key="NSSupport" ref="786940182"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="1034097047"/>
<array class="NSMutableArray" key="NSPathComponentCells"/>
@@ -221,7 +244,7 @@
<object class="NSTextField" id="662046682">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{52, 132}, {64, 17}}</string>
<string key="NSFrame">{{98, 143}, {64, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="843649698"/>
@@ -242,7 +265,7 @@
<object class="NSTextField" id="333885704">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{70, 105}, {46, 17}}</string>
<string key="NSFrame">{{116, 113}, {46, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1034097047"/>
@@ -263,7 +286,7 @@
<object class="NSButton" id="769513826">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{235, 57}, {83, 32}}</string>
<string key="NSFrame">{{281, 65}, {83, 32}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -286,7 +309,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{434, 282}</string>
<string key="NSFrameSize">{524, 303}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="204058255"/>
@@ -353,12 +376,28 @@
<int key="connectionID">295</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleDisplayType:</string>
<reference key="source" ref="843649698"/>
<reference key="destination" ref="648904227"/>
<object class="IBOutletConnection" key="connection">
<string key="label">togglePasswordButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="145392176"/>
</object>
<int key="connectionID">407</int>
<int key="connectionID">493</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">_clearKey:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="594061862"/>
</object>
<int key="connectionID">494</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">passwordTextField</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="843649698"/>
</object>
<int key="connectionID">495</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -391,12 +430,12 @@
<int key="objectID">1</int>
<reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
<object class="IBNSLayoutConstraint" id="151404172">
<reference key="firstItem" ref="648904227"/>
<int key="firstAttribute">10</int>
<object class="IBNSLayoutConstraint" id="1040549598">
<reference key="firstItem" ref="594061862"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="843649698"/>
<int key="secondAttribute">10</int>
<reference key="secondItem" ref="145392176"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
@@ -408,7 +447,55 @@
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="761790265">
<reference key="firstItem" ref="648904227"/>
<reference key="firstItem" ref="594061862"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1034097047"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="511113311">
<reference key="firstItem" ref="594061862"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="333885704"/>
<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="1041224580">
<reference key="firstItem" ref="145392176"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="594061862"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="72235716">
<reference key="firstItem" ref="145392176"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="843649698"/>
@@ -423,6 +510,22 @@
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="466444110">
<reference key="firstItem" ref="145392176"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="843649698"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="641552480">
<reference key="firstItem" ref="769513826"/>
<int key="firstAttribute">3</int>
@@ -439,6 +542,22 @@
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="875982455">
<reference key="firstItem" ref="769513826"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1034097047"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="1001566026">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">4</int>
@@ -455,22 +574,6 @@
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="46265369">
<reference key="firstItem" ref="204058255"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="660673733"/>
<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">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="912203343">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">9</int>
@@ -503,38 +606,6 @@
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="140641566">
<reference key="firstItem" ref="1034097047"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="333885704"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="1041224580">
<reference key="firstItem" ref="1034097047"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="769513826"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="720709266">
<reference key="firstItem" ref="1034097047"/>
<int key="firstAttribute">3</int>
@@ -551,6 +622,54 @@
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="292242157">
<reference key="firstItem" ref="1034097047"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="333885704"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="98930949">
<reference key="firstItem" ref="1034097047"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="843649698"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="46265369">
<reference key="firstItem" ref="660673733"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="843649698"/>
<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">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="660462739">
<reference key="firstItem" ref="660673733"/>
<int key="firstAttribute">3</int>
@@ -567,8 +686,24 @@
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="636091823">
<reference key="firstItem" ref="660673733"/>
<object class="IBNSLayoutConstraint" id="827553010">
<reference key="firstItem" ref="843649698"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="662046682"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="240000218">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="843649698"/>
@@ -579,8 +714,8 @@
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="272604804">
@@ -599,54 +734,6 @@
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="661879651">
<reference key="firstItem" ref="843649698"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="662046682"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="288926534">
<reference key="firstItem" ref="843649698"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1034097047"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="1040549598">
<reference key="firstItem" ref="843649698"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1034097047"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="679367678">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">10</int>
@@ -663,12 +750,12 @@
<float key="scoringTypeFloat">40</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="288118947">
<object class="IBNSLayoutConstraint" id="915913759">
<reference key="firstItem" ref="333885704"/>
<int key="firstAttribute">3</int>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1034097047"/>
<int key="secondAttribute">3</int>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
@@ -711,14 +798,15 @@
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<reference ref="204058255"/>
<reference ref="843649698"/>
<reference ref="145392176"/>
<reference ref="1034097047"/>
<reference ref="333885704"/>
<reference ref="769513826"/>
<reference ref="662046682"/>
<reference ref="769513826"/>
<reference ref="594061862"/>
<reference ref="660673733"/>
<reference ref="204058255"/>
<reference ref="648904227"/>
</array>
<reference key="parent" ref="0"/>
</object>
@@ -847,21 +935,11 @@
<reference key="object" ref="587044612"/>
<reference key="parent" ref="204058255"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">274</int>
<reference key="object" ref="472179646"/>
<reference key="parent" ref="204058255"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">276</int>
<reference key="object" ref="273022298"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">286</int>
<reference key="object" ref="912203343"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">338</int>
<reference key="object" ref="843649698"/>
@@ -891,64 +969,92 @@
<reference key="object" ref="189635035"/>
<reference key="parent" ref="843649698"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">367</int>
<reference key="object" ref="636091823"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">373</int>
<reference key="object" ref="720709266"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">378</int>
<reference key="object" ref="288118947"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">379</int>
<reference key="object" ref="641552480"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">386</int>
<reference key="object" ref="679367678"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">389</int>
<reference key="object" ref="558409287"/>
<reference key="parent" ref="843649698"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">390</int>
<reference key="object" ref="1040549598"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">391</int>
<reference key="object" ref="288926534"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">392</int>
<reference key="object" ref="1041224580"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">393</int>
<reference key="object" ref="140641566"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">396</int>
<reference key="object" ref="335819100"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">398</int>
<reference key="object" ref="661879651"/>
<int key="objectID">402</int>
<reference key="object" ref="660462739"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">408</int>
<reference key="object" ref="145392176"/>
<array class="NSMutableArray" key="children">
<reference ref="1067970444"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">409</int>
<reference key="object" ref="1067970444"/>
<reference key="parent" ref="145392176"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">411</int>
<reference key="object" ref="466444110"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">389</int>
<reference key="object" ref="558409287"/>
<reference key="parent" ref="843649698"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">454</int>
<reference key="object" ref="98930949"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">456</int>
<reference key="object" ref="472179646"/>
<reference key="parent" ref="204058255"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">459</int>
<reference key="object" ref="292242157"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">462</int>
<reference key="object" ref="72235716"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">465</int>
<reference key="object" ref="875982455"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">286</int>
<reference key="object" ref="912203343"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">476</int>
<reference key="object" ref="720709266"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">478</int>
<reference key="object" ref="915913759"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">479</int>
<reference key="object" ref="240000218"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">447</int>
<reference key="object" ref="46265369"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
@@ -957,36 +1063,46 @@
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">401</int>
<reference key="object" ref="46265369"/>
<int key="objectID">484</int>
<reference key="object" ref="827553010"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">402</int>
<reference key="object" ref="660462739"/>
<int key="objectID">485</int>
<reference key="object" ref="641552480"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">403</int>
<reference key="object" ref="648904227"/>
<int key="objectID">486</int>
<reference key="object" ref="594061862"/>
<array class="NSMutableArray" key="children">
<reference ref="629982740"/>
<reference ref="324275584"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">404</int>
<reference key="object" ref="629982740"/>
<reference key="parent" ref="648904227"/>
<int key="objectID">487</int>
<reference key="object" ref="324275584"/>
<reference key="parent" ref="594061862"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">405</int>
<int key="objectID">488</int>
<reference key="object" ref="511113311"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">489</int>
<reference key="object" ref="761790265"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">406</int>
<reference key="object" ref="151404172"/>
<int key="objectID">490</int>
<reference key="object" ref="1040549598"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">492</int>
<reference key="object" ref="1041224580"/>
<reference key="parent" ref="1005"/>
</object>
</array>
@@ -998,24 +1114,27 @@
<array key="1.IBNSViewMetadataConstraints">
<reference ref="781301592"/>
<reference ref="335819100"/>
<reference ref="288118947"/>
<reference ref="915913759"/>
<reference ref="679367678"/>
<reference ref="1040549598"/>
<reference ref="288926534"/>
<reference ref="661879651"/>
<reference ref="272604804"/>
<reference ref="636091823"/>
<reference ref="240000218"/>
<reference ref="827553010"/>
<reference ref="660462739"/>
<reference ref="46265369"/>
<reference ref="98930949"/>
<reference ref="292242157"/>
<reference ref="720709266"/>
<reference ref="1041224580"/>
<reference ref="140641566"/>
<reference ref="273022298"/>
<reference ref="912203343"/>
<reference ref="46265369"/>
<reference ref="1001566026"/>
<reference ref="875982455"/>
<reference ref="641552480"/>
<reference ref="466444110"/>
<reference ref="72235716"/>
<reference ref="1041224580"/>
<reference ref="511113311"/>
<reference ref="761790265"/>
<reference ref="151404172"/>
<reference ref="1040549598"/>
</array>
<boolean value="NO" key="1.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<boolean value="NO" key="1.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1030,7 +1149,7 @@
<boolean value="NO" key="241.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="242.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="262.IBNSViewMetadataConstraints">
<array key="262.IBNSViewMetadataConstraints">
<reference ref="587044612"/>
<reference ref="472179646"/>
</array>
@@ -1041,7 +1160,6 @@
<string key="268.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="273.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="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1055,32 +1173,39 @@
<boolean value="NO" key="338.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="339.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="367.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="373.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="378.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="390.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="391.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="392.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="393.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="398.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="400.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="401.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="402.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="403.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="403.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="404.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="405.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="406.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="408.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="408.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="409.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="411.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="447.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="462.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="465.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="484.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="485.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="486.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="486.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="488.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="489.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="490.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="492.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">407</int>
<int key="maxID">495</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1088,13 +1213,13 @@
<string key="className">HNHRoundedSecureTextField</string>
<string key="superclassName">NSSecureTextField</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">toggleDisplayType:</string>
<string key="NS.key.0">toggleDisplay:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">toggleDisplayType:</string>
<string key="NS.key.0">toggleDisplay:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">toggleDisplayType:</string>
<string key="name">toggleDisplay:</string>
<string key="candidateClassName">id</string>
</object>
</object>
@@ -1106,22 +1231,26 @@
<object class="IBPartialClassDescription">
<string key="className">MPPasswordInputController</string>
<string key="superclassName">MPViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">_decrypt:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">_decrypt:</string>
<object class="IBActionInfo" key="NS.object.0">
<dictionary class="NSMutableDictionary" key="actions">
<string key="_clearKey:">id</string>
<string key="_decrypt:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="_clearKey:">
<string key="name">_clearKey:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="_decrypt:">
<string key="name">_decrypt:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="errorImageView">NSImageView</string>
<string key="errorInfoTextField">NSTextField</string>
<string key="keyPathControl">NSPathControl</string>
<string key="passwordTextField">NSTextField</string>
<string key="passwordTextField">HNHRoundedSecureTextField</string>
<string key="togglePasswordButton">NSButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="errorImageView">
@@ -1138,7 +1267,11 @@
</object>
<object class="IBToOneOutletInfo" key="passwordTextField">
<string key="name">passwordTextField</string>
<string key="candidateClassName">NSTextField</string>
<string key="candidateClassName">HNHRoundedSecureTextField</string>
</object>
<object class="IBToOneOutletInfo" key="togglePasswordButton">
<string key="name">togglePasswordButton</string>
<string key="candidateClassName">NSButton</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1170,7 +1303,8 @@
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="02_MessageBoxWarningTemplate">{128, 128}</string>
<string key="NSSwitch">{15, 15}</string>
<string key="NSQuickLookTemplate">{21, 16}</string>
<string key="NSStopProgressTemplate">{11, 11}</string>
</dictionary>
<bool key="IBDocument.UseAutolayout">YES</bool>
</data>

744
MacPass/DatabaseSettingsWindow.xib
View File

File diff suppressed because it is too large Load Diff

5
MacPass/MPDatabaseSettingsWindowController.h
View File

@@ -16,10 +16,10 @@ typedef NS_ENUM(NSUInteger, MPDatabaseSettingsTab) {
};
@class MPDocument;
@class HNHRoundedSecureTextField;
@interface MPDatabaseSettingsWindowController : NSWindowController
@property (weak) IBOutlet NSTabView *sectionTabView;
/* General Tab */
@@ -27,8 +27,9 @@ typedef NS_ENUM(NSUInteger, MPDatabaseSettingsTab) {
@property (unsafe_unretained) IBOutlet NSTextView *databaseDescriptionTextView;
/* Protection */
@property (weak) IBOutlet NSTextField *passwordTextField;
@property (weak) IBOutlet HNHRoundedSecureTextField *passwordTextField;
@property (weak) IBOutlet NSPathControl *keyfilePathControl;
@property (weak) IBOutlet NSButton *togglePasswordButton;
- (IBAction)clearKey:(id)sender;
- (IBAction)generateKey:(id)sender;

8
MacPass/MPDatabaseSettingsWindowController.m
View File

@@ -12,6 +12,8 @@
#import "MPDatabaseVersion.h"
#import "MPIconHelper.h"
#import "HNHRoundedSecureTextField.h"
#import "Kdb.h"
#import "Kdb4Node.h"
#import "KdbGroup+MPAdditions.h"
@@ -21,6 +23,7 @@
}
@property (nonatomic,assign) BOOL trashEnabled;
@property (nonatomic,assign) BOOL showPassword;
@end
@@ -34,6 +37,7 @@
self = [super initWithWindowNibName:@"DatabaseSettingsWindow"];
if(self) {
_document = document;
_showPassword = NO;
}
return self;
}
@@ -101,6 +105,7 @@
}
- (void)showSettingsTab:(MPDatabaseSettingsTab)tab {
self.showPassword = NO;
[self.sectionTabView selectTabViewItemAtIndex:tab];
}
@@ -136,6 +141,9 @@
- (void)_setupPasswordTab:(Kdb4Tree *)tree {
[self.passwordTextField setStringValue:_document.password ? _document.password : @""];
[self.keyfilePathControl setURL:_document.key];
[self.passwordTextField bind:@"showPassword" toObject:self withKeyPath:@"showPassword" options:nil];
[self.togglePasswordButton bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
}
- (void)_updateTrashFolders:(Kdb4Tree *)tree {

15
MacPass/MPPasswordInputController.m
View File

@@ -11,15 +11,20 @@
#import "MPDocument.h"
#import "MPKeyfilePathControlDelegate.h"
#import "HNHRoundedSecureTextField.h"
@interface MPPasswordInputController ()
@property (weak) IBOutlet NSTextField *passwordTextField;
@property (weak) IBOutlet HNHRoundedSecureTextField *passwordTextField;
@property (weak) IBOutlet NSPathControl *keyPathControl;
@property (strong) MPKeyfilePathControlDelegate *pathControlDelegate;
@property (weak) IBOutlet NSImageView *errorImageView;
@property (weak) IBOutlet NSTextField *errorInfoTextField;
@property (weak) IBOutlet NSButton *togglePasswordButton;
@property (assign) BOOL showPassword;
- (IBAction)_decrypt:(id)sender;
- (IBAction)_clearKey:(id)sender;
@end
@@ -33,6 +38,8 @@
- (void)didLoadView {
[self.keyPathControl setDelegate:self.pathControlDelegate];
[self.errorImageView setImage:[NSImage imageNamed:NSImageNameCaution]];
[self.passwordTextField bind:@"showPassword" toObject:self withKeyPath:@"showPassword" options:nil];
[self.togglePasswordButton bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
[self _reset];
}
@@ -72,7 +79,13 @@
}
}
}
- (IBAction)_clearKey:(id)sender {
[self.keyPathControl setURL:nil];
}
- (void)_reset {
self.showPassword = NO;
[self.passwordTextField setStringValue:@""];
[self.keyPathControl setURL:nil];
[self.errorInfoTextField setHidden:YES];

2
MacPass/MacPass-Info.plist
View File

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