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

Minor layout fixes

Browse Source
This commit is contained in:
michael starke
2013-06-15 13:15:55 +02:00
parent 665167cf42
commit bb7b621a0e
5 changed files with 138 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,7 +332,6 @@
<string key="NSFrameSize">{265, 30}</string> <string key="NSFrameSize">{265, 30}</string>
<reference key="NSSuperview" ref="87082330"/> <reference key="NSSuperview" ref="87082330"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">HNHGradientView</string> <string key="NSClassName">HNHGradientView</string>
</object> </object>
@@ -456,6 +455,14 @@
</object> </object>
<int key="connectionID">711</int> <int key="connectionID">711</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">generatePasswordButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="945692232"/>
</object>
<int key="connectionID">733</int>
</object>
</array> </array>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects"> <array key="orderedObjects">
@@ -1647,7 +1654,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">732</int> <int key="maxID">733</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">
@@ -1694,9 +1701,21 @@
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">MPInspectorViewController</string> <string key="className">MPInspectorViewController</string>
<string key="superclassName">MPViewController</string> <string key="superclassName">MPViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">_popUpPasswordGenerator:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">_popUpPasswordGenerator:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">_popUpPasswordGenerator:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets"> <dictionary class="NSMutableDictionary" key="outlets">
<string key="URLTextField">NSTextField</string> <string key="URLTextField">NSTextField</string>
<string key="bottomBar">HNHGradientView</string> <string key="bottomBar">HNHGradientView</string>
<string key="generatePasswordButton">NSButton</string>
<string key="itemImageView">MPPopupImageView</string> <string key="itemImageView">MPPopupImageView</string>
<string key="itemNameTextfield">NSTextField</string> <string key="itemNameTextfield">NSTextField</string>
<string key="passwordTextField">NSTextField</string> <string key="passwordTextField">NSTextField</string>
@@ -1713,6 +1732,10 @@
<string key="name">bottomBar</string> <string key="name">bottomBar</string>
<string key="candidateClassName">HNHGradientView</string> <string key="candidateClassName">HNHGradientView</string>
</object> </object>
<object class="IBToOneOutletInfo" key="generatePasswordButton">
<string key="name">generatePasswordButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="itemImageView"> <object class="IBToOneOutletInfo" key="itemImageView">
<string key="name">itemImageView</string> <string key="name">itemImageView</string>
<string key="candidateClassName">MPPopupImageView</string> <string key="candidateClassName">MPPopupImageView</string>

4
MacPass/MPInspectorViewController.m
View File

@@ -28,8 +28,7 @@
@property (assign, nonatomic) BOOL showsEntry; @property (assign, nonatomic) BOOL showsEntry;
@property (retain) NSPopover *activePopover; @property (retain) NSPopover *activePopover;
@property (retain) NSLayoutConstraint *showConstraint; @property (assign) IBOutlet NSButton *generatePasswordButton;
@property (retain) NSLayoutConstraint *hideConstraint;
@end @end
@@ -150,6 +149,7 @@
[self.passwordTextField setEnabled:enabled]; [self.passwordTextField setEnabled:enabled];
[self.usernameTextField setEnabled:enabled]; [self.usernameTextField setEnabled:enabled];
[self.URLTextField setEnabled:enabled]; [self.URLTextField setEnabled:enabled];
[self.generatePasswordButton setEnabled:enabled];
} }

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>CFD</string> <string>D06</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string> <string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>

217
MacPass/PasswordCreatorView.xib
View File

@@ -114,6 +114,7 @@
<string key="NSFrame">{{182, 18}, {100, 25}}</string> <string key="NSFrame">{{182, 18}, {100, 25}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<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="669469783"> <object class="NSButtonCell" key="NSCell" id="669469783">
@@ -445,7 +446,6 @@
<string key="NSCellIdentifier">_NS:9</string> <string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="463914374"/> <reference key="NSControlView" ref="463914374"/>
<bool key="NSDrawsBackground">YES</bool> <bool key="NSDrawsBackground">YES</bool>
<int key="NSTextBezelStyle">1</int>
<reference key="NSBackgroundColor" ref="63051389"/> <reference key="NSBackgroundColor" ref="63051389"/>
<reference key="NSTextColor" ref="839943459"/> <reference key="NSTextColor" ref="839943459"/>
</object> </object>
@@ -665,6 +665,54 @@
<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="365940709">
<reference key="firstItem" ref="61212046"/>
<int key="firstAttribute">3</int>
<int key="relation">1</int>
<reference key="secondItem" ref="905443674"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">16</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="480123715">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="61212046"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="862995552">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="61212046"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="863998657"> <object class="IBNSLayoutConstraint" id="863998657">
<reference key="firstItem" ref="240019321"/> <reference key="firstItem" ref="240019321"/>
<int key="firstAttribute">3</int> <int key="firstAttribute">3</int>
@@ -793,54 +841,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="365940709">
<reference key="firstItem" ref="61212046"/>
<int key="firstAttribute">3</int>
<int key="relation">1</int>
<reference key="secondItem" ref="905443674"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">16</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="480123715">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="61212046"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="862995552">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="61212046"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="1063769769"> <object class="IBNSLayoutConstraint" id="1063769769">
<reference key="firstItem" ref="905443674"/> <reference key="firstItem" ref="905443674"/>
<int key="firstAttribute">5</int> <int key="firstAttribute">5</int>
@@ -1045,40 +1045,6 @@
</array> </array>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">148</int>
<reference key="object" ref="973670028"/>
<array class="NSMutableArray" key="children">
<reference ref="303503711"/>
<object class="IBNSLayoutConstraint" id="715367974">
<reference key="firstItem" ref="973670028"/>
<int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">58</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="973670028"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">1</int>
</object>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">149</int>
<reference key="object" ref="303503711"/>
<reference key="parent" ref="973670028"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">151</int>
<reference key="object" ref="379078002"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">152</int> <int key="objectID">152</int>
<reference key="object" ref="463914374"/> <reference key="object" ref="463914374"/>
@@ -1087,12 +1053,12 @@
<object class="IBNSLayoutConstraint" id="622977230"> <object class="IBNSLayoutConstraint" id="622977230">
<reference key="firstItem" ref="463914374"/> <reference key="firstItem" ref="463914374"/>
<int key="firstAttribute">7</int> <int key="firstAttribute">7</int>
<int key="relation">1</int> <int key="relation">0</int>
<nil key="secondItem"/> <nil key="secondItem"/>
<int key="secondAttribute">0</int> <int key="secondAttribute">0</int>
<float key="multiplier">1</float> <float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant"> <object class="IBLayoutConstant" key="constant">
<double key="value">100</double> <double key="value">160</double>
</object> </object>
<float key="priority">1000</float> <float key="priority">1000</float>
<reference key="containingView" ref="463914374"/> <reference key="containingView" ref="463914374"/>
@@ -1172,11 +1138,6 @@
<reference key="object" ref="584992259"/> <reference key="object" ref="584992259"/>
<reference key="parent" ref="1005"/> <reference key="parent" ref="1005"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">283</int>
<reference key="object" ref="622977230"/>
<reference key="parent" ref="463914374"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">332</int> <int key="objectID">332</int>
<reference key="object" ref="466385152"/> <reference key="object" ref="466385152"/>
@@ -1558,11 +1519,6 @@
<reference key="object" ref="407360511"/> <reference key="object" ref="407360511"/>
<reference key="parent" ref="543688888"/> <reference key="parent" ref="543688888"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">191</int>
<reference key="object" ref="970232352"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">158</int> <int key="objectID">158</int>
<reference key="object" ref="681302048"/> <reference key="object" ref="681302048"/>
@@ -1708,11 +1664,6 @@
<reference key="object" ref="359277414"/> <reference key="object" ref="359277414"/>
<reference key="parent" ref="466385152"/> <reference key="parent" ref="466385152"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">585</int>
<reference key="object" ref="138202930"/>
<reference key="parent" ref="466385152"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">414</int> <int key="objectID">414</int>
<reference key="object" ref="215632955"/> <reference key="object" ref="215632955"/>
@@ -1724,15 +1675,64 @@
<reference key="parent" ref="1005"/> <reference key="parent" ref="1005"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">605</int> <int key="objectID">585</int>
<reference key="object" ref="715367974"/> <reference key="object" ref="138202930"/>
<reference key="parent" ref="973670028"/> <reference key="parent" ref="466385152"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">283</int>
<reference key="object" ref="622977230"/>
<reference key="parent" ref="463914374"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">148</int>
<reference key="object" ref="973670028"/>
<array class="NSMutableArray" key="children">
<reference ref="303503711"/>
<object class="IBNSLayoutConstraint" id="715367974">
<reference key="firstItem" ref="973670028"/>
<int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">58</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="973670028"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">1</int>
</object>
</array>
<reference key="parent" ref="1005"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">606</int> <int key="objectID">606</int>
<reference key="object" ref="991295754"/> <reference key="object" ref="991295754"/>
<reference key="parent" ref="1005"/> <reference key="parent" ref="1005"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">191</int>
<reference key="object" ref="970232352"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">151</int>
<reference key="object" ref="379078002"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">605</int>
<reference key="object" ref="715367974"/>
<reference key="parent" ref="973670028"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">149</int>
<reference key="object" ref="303503711"/>
<reference key="parent" ref="973670028"/>
</object>
</array> </array>
</object> </object>
<dictionary class="NSMutableDictionary" key="flattenedProperties"> <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1752,9 +1752,6 @@
<reference ref="991295754"/> <reference ref="991295754"/>
<reference ref="400509775"/> <reference ref="400509775"/>
<reference ref="1063769769"/> <reference ref="1063769769"/>
<reference ref="862995552"/>
<reference ref="480123715"/>
<reference ref="365940709"/>
<reference ref="816661204"/> <reference ref="816661204"/>
<reference ref="707712943"/> <reference ref="707712943"/>
<reference ref="860333310"/> <reference ref="860333310"/>
@@ -1763,6 +1760,9 @@
<reference ref="265426486"/> <reference ref="265426486"/>
<reference ref="992911618"/> <reference ref="992911618"/>
<reference ref="863998657"/> <reference ref="863998657"/>
<reference ref="862995552"/>
<reference ref="480123715"/>
<reference ref="365940709"/>
</array> </array>
<boolean value="YES" key="1.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/> <boolean value="YES" key="1.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1773,11 +1773,12 @@
<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="152.IBNSViewMetadataConstraints"> <array key="152.IBNSViewMetadataConstraints">
<reference ref="622977230"/> <reference ref="622977230"/>
</array> </array>
<boolean value="NO" key="152.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <boolean value="NO" key="152.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="153.CustomClassName">HNHRoundedTextFieldCell</string>
<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="158.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="158.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="173.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <boolean value="NO" key="173.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1883,7 +1884,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">607</int> <int key="maxID">612</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">

2
MacPass/PasswordCreatorWindow.xib
View File

@@ -33,7 +33,7 @@
<string key="NSClassName">NSApplication</string> <string key="NSClassName">NSApplication</string>
</object> </object>
<object class="NSWindowTemplate" id="1005"> <object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int> <int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int> <int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{196, 240}, {338, 216}}</string> <string key="NSWindowRect">{{196, 240}, {338, 216}}</string>
<int key="NSWTFlags">1618477056</int> <int key="NSWTFlags">1618477056</int>