Reduced complexity of inspector view

Added simple separator line view App is currently very unstable :(
2025-12-13 19:22:25 +00:00 · 2013-06-01 00:23:14 +02:00
parent b969baa7fb
commit 19a518b3bd
10 changed files with 1361 additions and 1621 deletions
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -20,6 +20,7 @@
 		4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; };
 		4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */; };
 		4C3CD2A8175570C9005F911C /* DMSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3CD2A7175570C9005F911C /* DMSplitView.m */; };
+		4C3D4C0817594CA40038DAAC /* MPSeparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D4C0717594CA40038DAAC /* MPSeparator.m */; };
 		4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */; };
 		4C40AC5C170782730073D1C3 /* MPAbstractSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C40AC5B170782730073D1C3 /* MPAbstractSettingsViewController.m */; };
 		4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */; };
@@ -142,6 +143,8 @@
 		4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarDelegate.m; sourceTree = "<group>"; };
 		4C3CD2A6175570C9005F911C /* DMSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DMSplitView.h; sourceTree = "<group>"; };
 		4C3CD2A7175570C9005F911C /* DMSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DMSplitView.m; sourceTree = "<group>"; };
+		4C3D4C0617594CA40038DAAC /* MPSeparator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSeparator.h; sourceTree = "<group>"; };
+		4C3D4C0717594CA40038DAAC /* MPSeparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSeparator.m; sourceTree = "<group>"; };
 		4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterBar.xib; sourceTree = "<group>"; };
 		4C40AC581707819A0073D1C3 /* MPAbstractSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAbstractSettingsViewController.h; sourceTree = "<group>"; };
 		4C40AC5B170782730073D1C3 /* MPAbstractSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAbstractSettingsViewController.m; sourceTree = "<group>"; };
@@ -365,6 +368,8 @@
 				4CFC53BE16E94729007396BE /* MPShadowBox.m */,
 				4CE39AC216ECE4F7000FE29D /* MPPopupImageView.h */,
 				4CE39AC316ECE4F7000FE29D /* MPPopupImageView.m */,
+				4C3D4C0617594CA40038DAAC /* MPSeparator.h */,
+				4C3D4C0717594CA40038DAAC /* MPSeparator.m */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -958,6 +963,7 @@
 				4CCF9754173EFBA500460BD2 /* KdbEntry+Undo.m in Sources */,
 				4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */,
 				4C3CD2A8175570C9005F911C /* DMSplitView.m in Sources */,
+				4C3D4C0817594CA40038DAAC /* MPSeparator.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/MacPass/DocumentWindow.xib
+++ b/MacPass/DocumentWindow.xib
@@ -39,7 +39,7 @@
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{196, 240}, {727, 548}}</string>
-				<int key="NSWTFlags">544735232</int>
+				<int key="NSWTFlags">1618477056</int>
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
@@ -57,7 +57,7 @@
 									<reference key="NSNextResponder" ref="947682332"/>
 									<int key="NSvFlags">12</int>
 									<array class="NSMutableArray" key="NSSubviews"/>
-									<string key="NSFrameSize">{200, 526}</string>
+									<string key="NSFrameSize">{200, 516}</string>
 									<reference key="NSSuperview" ref="947682332"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="938782220"/>
@@ -68,7 +68,7 @@
 									<reference key="NSNextResponder" ref="947682332"/>
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews"/>
-									<string key="NSFrame">{{201, 0}, {325, 526}}</string>
+									<string key="NSFrame">{{201, 0}, {325, 516}}</string>
 									<reference key="NSSuperview" ref="947682332"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="350501330"/>
@@ -78,14 +78,14 @@
 								<object class="NSCustomView" id="350501330">
 									<reference key="NSNextResponder" ref="947682332"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{527, 0}, {200, 526}}</string>
+									<string key="NSFrame">{{527, 0}, {200, 516}}</string>
 									<reference key="NSSuperview" ref="947682332"/>
 									<reference key="NSWindow"/>
 									<string key="NSReuseIdentifierKey">_NS:9</string>
 									<string key="NSClassName">NSView</string>
 								</object>
 							</array>
-							<string key="NSFrame">{{0, 22}, {727, 526}}</string>
+							<string key="NSFrame">{{0, 32}, {727, 516}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="425088172"/>
@@ -110,11 +110,11 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="947682332"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{400, 422}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSAutorecalculatesContentBorderThicknessMinY">NO</bool>
-				<double key="NSContentBorderThicknessMinY">22</double>
+				<double key="NSContentBorderThicknessMinY">32</double>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 		</array>
@@ -200,7 +200,7 @@
 						<reference key="object" ref="1006"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="947682332"/>
-							<object class="IBNSLayoutConstraint" id="1003148324">
+							<object class="IBNSLayoutConstraint" id="264666698">
 								<reference key="firstItem" ref="1006"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
@@ -208,7 +208,7 @@
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">22</double>
+									<double key="value">32</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1006"/>
@@ -309,8 +309,8 @@
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">682</int>
-						<reference key="object" ref="1003148324"/>
+						<int key="objectID">687</int>
+						<reference key="object" ref="264666698"/>
 						<reference key="parent" ref="1006"/>
 					</object>
 				</array>
@@ -328,7 +328,7 @@
 					<reference ref="667679916"/>
 					<reference ref="855545557"/>
 					<reference ref="631622849"/>
-					<reference ref="1003148324"/>
+					<reference ref="264666698"/>
 				</array>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="603.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -339,13 +339,13 @@
 				<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="682.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="687.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">682</int>
+			<int key="maxID">695</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
--- a/MacPass/InspectorTabView.xib
+++ b/MacPass/InspectorTabView.xib
--- a/MacPass/MPInspectorTabViewController.h
+++ b/MacPass/MPInspectorTabViewController.h
@@ -14,8 +14,6 @@

@property (assign) IBOutlet MPPopupImageView *itemImageView;
@property (assign) IBOutlet NSTextField *itemNameTextfield;
-@property (assign) IBOutlet NSTabView *tabView;
-@property (assign) IBOutlet NSSegmentedControl *tabControl;

@property (assign) IBOutlet NSTextField *titleTextField;
@property (assign) IBOutlet NSTextField *usernameTextField;
--- a/MacPass/MPInspectorTabViewController.m
+++ b/MacPass/MPInspectorTabViewController.m
@@ -20,7 +20,6 @@
  BOOL _visible;
 }

-@property (assign) NSUInteger selectedTabIndex;
@property (assign, nonatomic) KdbEntry *selectedEntry;
@property (assign, nonatomic) KdbGroup *selectedGroup;
@property (assign) BOOL showsEntry;
@@ -63,12 +62,7 @@

 - (void)didLoadView {
  
-  for( NSTabViewItem *item in  [self.tabView tabViewItems]){
-    ((MPShadowBox *)[item view]).shadowDisplay = MPShadowTop;
-  }
  [[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
-  [self.tabControl bind:NSSelectedIndexBinding toObject:self withKeyPath:@"selectedTabIndex" options:nil];
-  [self.tabView bind:NSSelectedIndexBinding toObject:self withKeyPath:@"selectedTabIndex" options:nil];
  [self.itemImageView setTarget:self];
  
  /* Register for Entry selection */
--- a/MacPass/MPSeparator.h
+++ b/MacPass/MPSeparator.h
@@ -0,0 +1,16 @@
+//
+//  MPSeparator.h
+//  MacPass
+//
+//  Created by Michael Starke on 31.05.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+/*
+ Simple Separator Line with highlighting
+ */
+@interface MPSeparator : NSView
+
+@end
--- a/MacPass/MPSeparator.m
+++ b/MacPass/MPSeparator.m
@@ -0,0 +1,24 @@
+//
+//  MPSeparator.m
+//  MacPass
+//
+//  Created by Michael Starke on 31.05.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPSeparator.h"
+
+@implementation MPSeparator
+
+- (void)drawRect:(NSRect)dirtyRect {
+  
+  NSRect bounds = [self bounds];
+  [[NSColor lightGrayColor] set];
+  NSRectFill(NSMakeRect(0, 1, NSWidth(bounds), 1));
+  
+  [[NSColor whiteColor] set];
+  NSRectFill(NSMakeRect(0, 0, NSWidth(bounds), 1));
+  
+}
+
+@end
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -46,7 +46,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>72F</string>
+	<string>74B</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
--- a/MacPass/PasswordCreatorView.xib
+++ b/MacPass/PasswordCreatorView.xib
@@ -54,9 +54,10 @@
 									<object class="NSTextField" id="483164497">
 										<reference key="NSNextResponder" ref="317361033"/>
 										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{18, 155}, {322, 22}}</string>
+										<string key="NSFrame">{{18, 19}, {230, 22}}</string>
 										<reference key="NSSuperview" ref="317361033"/>
 										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTextFieldCell" key="NSCell" id="358808223">
@@ -95,7 +96,7 @@
 									<object class="NSButton" id="184485481">
 										<reference key="NSNextResponder" ref="317361033"/>
 										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{18, 185}, {37, 19}}</string>
+										<string key="NSFrame">{{18, 49}, {37, 19}}</string>
 										<reference key="NSSuperview" ref="317361033"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="40816840"/>
@@ -125,7 +126,7 @@
 									<object class="NSButton" id="40816840">
 										<reference key="NSNextResponder" ref="317361033"/>
 										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{63, 185}, {35, 19}}</string>
+										<string key="NSFrame">{{63, 49}, {35, 19}}</string>
 										<reference key="NSSuperview" ref="317361033"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="58039731"/>
@@ -151,7 +152,7 @@
 									<object class="NSButton" id="58039731">
 										<reference key="NSNextResponder" ref="317361033"/>
 										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{106, 185}, {36, 19}}</string>
+										<string key="NSFrame">{{106, 49}, {36, 19}}</string>
 										<reference key="NSSuperview" ref="317361033"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="944576634"/>
@@ -177,7 +178,7 @@
 									<object class="NSButton" id="944576634">
 										<reference key="NSNextResponder" ref="317361033"/>
 										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{150, 185}, {31, 19}}</string>
+										<string key="NSFrame">{{150, 49}, {31, 19}}</string>
 										<reference key="NSSuperview" ref="317361033"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="543688888"/>
@@ -203,7 +204,7 @@
 									<object class="NSButton" id="543688888">
 										<reference key="NSNextResponder" ref="317361033"/>
 										<int key="NSvFlags">268</int>
-										<string key="NSFrame">{{189, 185}, {59, 19}}</string>
+										<string key="NSFrame">{{189, 49}, {59, 19}}</string>
 										<reference key="NSSuperview" ref="317361033"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="483164497"/>
@@ -226,14 +227,14 @@
 										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									</object>
 								</array>
-								<string key="NSFrame">{{1, 1}, {358, 214}}</string>
+								<string key="NSFrame">{{1, 1}, {266, 78}}</string>
 								<reference key="NSSuperview" ref="466385152"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="184485481"/>
 								<string key="NSReuseIdentifierKey">_NS:11</string>
 							</object>
 						</array>
-						<string key="NSFrame">{{17, 16}, {360, 230}}</string>
+						<string key="NSFrame">{{17, 16}, {268, 94}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="317361033"/>
@@ -263,7 +264,7 @@
 					<object class="NSTextField" id="240019321">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{340, 251}, {34, 22}}</string>
+						<string key="NSFrame">{{254, 115}, {28, 22}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="466385152"/>
@@ -285,7 +286,7 @@
 					<object class="NSTextField" id="426379228">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{17, 254}, {48, 17}}</string>
+						<string key="NSFrame">{{17, 118}, {48, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="975737719"/>
@@ -319,7 +320,7 @@
 					<object class="NSSlider" id="975737719">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{84, 252}, {250, 21}}</string>
+						<string key="NSFrame">{{84, 116}, {164, 21}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="240019321"/>
@@ -345,7 +346,7 @@
 					<object class="NSButton" id="592848424">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{334, 274}, {46, 32}}</string>
+						<string key="NSFrame">{{248, 138}, {40, 32}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="426379228"/>
@@ -358,7 +359,7 @@
 							<reference key="NSSupport" ref="510117885"/>
 							<string key="NSCellIdentifier">_NS:9</string>
 							<reference key="NSControlView" ref="592848424"/>
-							<int key="NSButtonFlags">-2033434624</int>
+							<int key="NSButtonFlags">-2033303552</int>
 							<int key="NSButtonFlags2">129</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
@@ -374,7 +375,7 @@
 					<object class="NSTextField" id="463914374">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{86, 281}, {246, 22}}</string>
+						<string key="NSFrame">{{86, 145}, {160, 22}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="592848424"/>
@@ -397,7 +398,7 @@
 					<object class="NSTextField" id="973670028">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{17, 284}, {64, 17}}</string>
+						<string key="NSFrame">{{17, 148}, {64, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="463914374"/>
@@ -416,7 +417,7 @@
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{394, 323}</string>
+				<string key="NSFrameSize">{302, 187}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="973670028"/>
@@ -756,8 +757,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="344085975">
@@ -772,8 +773,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">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="455825070">
@@ -913,16 +914,6 @@
 						<reference key="object" ref="932376285"/>
 						<reference key="parent" ref="463914374"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">158</int>
-						<reference key="object" ref="681302048"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">162</int>
-						<reference key="object" ref="991295754"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">163</int>
 						<reference key="object" ref="592848424"/>
@@ -931,11 +922,6 @@
 						</array>
 						<reference key="parent" ref="1005"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">169</int>
-						<reference key="object" ref="135824971"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">165</int>
 						<reference key="object" ref="1036031809"/>
@@ -990,21 +976,11 @@
 						<reference key="object" ref="608946496"/>
 						<reference key="parent" ref="240019321"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">188</int>
-						<reference key="object" ref="523821235"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">189</int>
 						<reference key="object" ref="747356697"/>
 						<reference key="parent" ref="1005"/>
 					</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">196</int>
 						<reference key="object" ref="707712943"/>
@@ -1030,11 +1006,6 @@
 						<reference key="object" ref="584992259"/>
 						<reference key="parent" ref="1005"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">201</int>
-						<reference key="object" ref="393765935"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">283</int>
 						<reference key="object" ref="622977230"/>
@@ -1044,6 +1015,22 @@
 						<int key="objectID">332</int>
 						<reference key="object" ref="466385152"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="625001220">
+								<reference key="firstItem" ref="466385152"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">1</int>
+								<reference key="secondItem" ref="543688888"/>
+								<int key="secondAttribute">6</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="466385152"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="359277414">
 								<reference key="firstItem" ref="543688888"/>
 								<int key="firstAttribute">3</int>
@@ -1072,8 +1059,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="466385152"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="187347139">
@@ -1088,8 +1075,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="466385152"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="594912893">
@@ -1120,8 +1107,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="466385152"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="861757039">
@@ -1152,8 +1139,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="466385152"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="725933067">
@@ -1172,6 +1159,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="831439350">
+								<reference key="firstItem" ref="466385152"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">1</int>
+								<reference key="secondItem" ref="483164497"/>
+								<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="466385152"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="822721597">
 								<reference key="firstItem" ref="483164497"/>
 								<int key="firstAttribute">3</int>
@@ -1184,8 +1187,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="466385152"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="814874129">
@@ -1232,8 +1235,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="466385152"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="44634017">
@@ -1424,6 +1427,46 @@
 						<reference key="object" ref="359277414"/>
 						<reference key="parent" ref="466385152"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">201</int>
+						<reference key="object" ref="393765935"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">162</int>
+						<reference key="object" ref="991295754"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">188</int>
+						<reference key="object" ref="523821235"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="135824971"/>
+						<reference key="parent" ref="1005"/>
+					</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">158</int>
+						<reference key="object" ref="681302048"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">491</int>
+						<reference key="object" ref="625001220"/>
+						<reference key="parent" ref="466385152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">492</int>
+						<reference key="object" ref="831439350"/>
+						<reference key="parent" ref="466385152"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1495,6 +1538,7 @@
 					<reference ref="215632955"/>
 					<reference ref="814874129"/>
 					<reference ref="822721597"/>
+					<reference ref="831439350"/>
 					<reference ref="725933067"/>
 					<reference ref="45609705"/>
 					<reference ref="861757039"/>
@@ -1503,6 +1547,7 @@
 					<reference ref="187347139"/>
 					<reference ref="348034690"/>
 					<reference ref="359277414"/>
+					<reference ref="625001220"/>
 				</array>
 				<boolean value="NO" key="332.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="332.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1541,12 +1586,14 @@
 				<string key="469.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="470.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="471.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="491.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">483</int>
+			<int key="maxID">492</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
--- a/MacPass/PasswordCreatorWindow.xib
+++ b/MacPass/PasswordCreatorWindow.xib
@@ -35,7 +35,7 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {300, 350}}</string>
+				<string key="NSWindowRect">{{196, 240}, {338, 216}}</string>
 				<int key="NSWTFlags">544735232</int>
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -44,7 +44,7 @@
 				<object class="NSView" key="NSWindowView" id="1006">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
-					<string key="NSFrameSize">{300, 350}</string>
+					<string key="NSFrameSize">{338, 216}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 				</object>