Another attempt to fix the cog menus on 10.10

Previously our cog menus have been Round Rect (borderless) NSPopupButtons with text aligned to the left of the image as that combination would allow us to make the box of the button exactly as big as the image.
However in 10.10 Apple changed the layout so that a padding is always added on the right border of a popup button (except if the menu is attached to the left).
From playing around I found the only setting to be compatible between 10.9 and 10.10 to be the button type Bevel (borderless).
This commit changes all cog buttons to Bevel type in hopes those will also look the same on 10.8, 10.7, 10.6.

1 files changed, 457 insertions, 81 deletions

diff --git a/Interfaces/English.lproj/UserManagerView.xib b/Interfaces/English.lproj/UserManagerView.xib
index 6f19dbdb..7f0e0d6a 100644
--- a/Interfaces/English.lproj/UserManagerView.xib
+++ b/Interfaces/English.lproj/UserManagerView.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">13B3116</string>
-		<string key="IBDocument.InterfaceBuilderVersion">4514</string>
-		<string key="IBDocument.AppKitVersion">1265</string>
-		<string key="IBDocument.HIToolboxVersion">696.00</string>
+		<string key="IBDocument.SystemVersion">13F34</string>
+		<string key="IBDocument.InterfaceBuilderVersion">5056</string>
+		<string key="IBDocument.AppKitVersion">1265.21</string>
+		<string key="IBDocument.HIToolboxVersion">698.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">4514</string>
+			<string key="NS.object.0">5056</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSArrayController</string>
@@ -70,7 +70,7 @@
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<string key="NSWindowContentMinSize">{752, 506}</string>
 				<object class="NSView" key="NSWindowView" id="846307432">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSSplitView" id="138392961">
@@ -92,8 +92,9 @@
 												<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
 												<string>NeXT TIFF v4.0 pasteboard type</string>
 											</set>
-											<string key="NSFrame">{{162, 1}, {15, 22}}</string>
+											<string key="NSFrame">{{162, 0}, {15, 23}}</string>
 											<reference key="NSSuperview" ref="490248567"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSImageCell" key="NSCell" id="1021988120">
 												<int key="NSCellFlags">134217728</int>
@@ -115,6 +116,7 @@
 											<int key="NSvFlags">292</int>
 											<string key="NSFrame">{{-1, -1}, {32, 25}}</string>
 											<reference key="NSSuperview" ref="490248567"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="1071084871">
 												<int key="NSCellFlags">67108864</int>
@@ -144,6 +146,7 @@
 											<int key="NSvFlags">292</int>
 											<string key="NSFrame">{{30, -1}, {32, 25}}</string>
 											<reference key="NSSuperview" ref="490248567"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="919252154">
 												<int key="NSCellFlags">67108864</int>
@@ -167,11 +170,12 @@
 										<object class="NSPopUpButton" id="308755440">
 											<reference key="NSNextResponder" ref="490248567"/>
 											<int key="NSvFlags">292</int>
-											<string key="NSFrame">{{61, -1}, {36, 25}}</string>
+											<string key="NSFrame">{{60, 0}, {36, 23}}</string>
 											<reference key="NSSuperview" ref="490248567"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="761492830">
-												<int key="NSCellFlags">71303232</int>
+												<int key="NSCellFlags">67108928</int>
 												<int key="NSCellFlags2">134350848</int>
 												<object class="NSFont" key="NSSupport" id="26">
 													<string key="NSName">.LucidaGrandeUI</string>
@@ -180,7 +184,7 @@
 												</object>
 												<reference key="NSControlView" ref="308755440"/>
 												<int key="NSButtonFlags">-2044051456</int>
-												<int key="NSButtonFlags2">35</int>
+												<int key="NSButtonFlags2">2</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -278,8 +282,9 @@
 												<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
 												<string>NeXT TIFF v4.0 pasteboard type</string>
 											</set>
-											<string key="NSFrame">{{1, 1}, {176, 22}}</string>
+											<string key="NSFrame">{{1, 0}, {176, 23}}</string>
 											<reference key="NSSuperview" ref="490248567"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSImageCell" key="NSCell" id="53771228">
 												<int key="NSCellFlags">134217728</int>
@@ -309,6 +314,7 @@
 															<int key="NSvFlags">4352</int>
 															<string key="NSFrameSize">{177, 466}</string>
 															<reference key="NSSuperview" ref="310332121"/>
+															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
 															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 															<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -317,12 +323,15 @@
 																<int key="NSvFlags">256</int>
 																<string key="NSFrameSize">{177, 17}</string>
 																<reference key="NSSuperview" ref="283216473"/>
+																<reference key="NSWindow"/>
 																<reference key="NSTableView" ref="265138544"/>
 															</object>
-															<object class="_NSCornerView" key="NSCornerView">
-																<nil key="NSNextResponder"/>
+															<object class="_NSCornerView" key="NSCornerView" id="489521961">
+																<reference key="NSNextResponder" ref="848314643"/>
 																<int key="NSvFlags">-2147483392</int>
 																<string key="NSFrame">{{183, 0}, {12, 17}}</string>
+																<reference key="NSSuperview" ref="848314643"/>
+																<reference key="NSWindow"/>
 															</object>
 															<array class="NSMutableArray" key="NSTableColumns">
 																<object class="NSTableColumn" id="716100442">
@@ -423,16 +432,32 @@
 													</array>
 													<string key="NSFrame">{{0, 17}, {177, 466}}</string>
 													<reference key="NSSuperview" ref="848314643"/>
+													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="265138544"/>
 													<reference key="NSDocView" ref="265138544"/>
 													<reference key="NSBGColor" ref="898983655"/>
 													<int key="NScvFlags">4</int>
 												</object>
+												<object class="NSClipView" id="283216473">
+													<reference key="NSNextResponder" ref="848314643"/>
+													<int key="NSvFlags">2338</int>
+													<array class="NSMutableArray" key="NSSubviews">
+														<reference ref="98886535"/>
+													</array>
+													<string key="NSFrameSize">{177, 17}</string>
+													<reference key="NSSuperview" ref="848314643"/>
+													<reference key="NSWindow"/>
+													<reference key="NSNextKeyView" ref="98886535"/>
+													<reference key="NSDocView" ref="98886535"/>
+													<reference key="NSBGColor" ref="898983655"/>
+													<int key="NScvFlags">4</int>
+												</object>
 												<object class="NSScroller" id="710626046">
 													<reference key="NSNextResponder" ref="848314643"/>
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{183, 17}, {11, 456}}</string>
 													<reference key="NSSuperview" ref="848314643"/>
+													<reference key="NSWindow"/>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<int key="NSsFlags">256</int>
 													<reference key="NSTarget" ref="848314643"/>
@@ -444,34 +469,25 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{0, 473}, {183, 11}}</string>
 													<reference key="NSSuperview" ref="848314643"/>
+													<reference key="NSWindow"/>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<int key="NSsFlags">257</int>
 													<reference key="NSTarget" ref="848314643"/>
 													<string key="NSAction">_doScroller:</string>
 													<double key="NSPercent">0.99487179517745972</double>
 												</object>
-												<object class="NSClipView" id="283216473">
-													<reference key="NSNextResponder" ref="848314643"/>
-													<int key="NSvFlags">2338</int>
-													<array class="NSMutableArray" key="NSSubviews">
-														<reference ref="98886535"/>
-													</array>
-													<string key="NSFrameSize">{177, 17}</string>
-													<reference key="NSSuperview" ref="848314643"/>
-													<reference key="NSNextKeyView" ref="98886535"/>
-													<reference key="NSDocView" ref="98886535"/>
-													<reference key="NSBGColor" ref="898983655"/>
-													<int key="NScvFlags">4</int>
-												</object>
+												<reference ref="489521961"/>
 											</array>
 											<string key="NSFrame">{{0, 23}, {177, 483}}</string>
 											<reference key="NSSuperview" ref="490248567"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="310332121"/>
 											<int key="NSsFlags">133680</int>
 											<reference key="NSVScroller" ref="710626046"/>
 											<reference key="NSHScroller" ref="851800246"/>
 											<reference key="NSContentView" ref="310332121"/>
 											<reference key="NSHeaderClipView" ref="283216473"/>
+											<reference key="NSCornerView" ref="489521961"/>
 											<bytes key="NSScrollAmts">QSAAAEEgAABBoAAAQaAAAA</bytes>
 											<double key="NSMinMagnification">0.25</double>
 											<double key="NSMaxMagnification">4</double>
@@ -480,6 +496,7 @@
 									</array>
 									<string key="NSFrameSize">{177, 506}</string>
 									<reference key="NSSuperview" ref="138392961"/>
+									<reference key="NSWindow"/>
 									<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
 									<string key="NSClassName">NSView</string>
 								</object>
@@ -492,6 +509,7 @@
 											<int key="NSvFlags">274</int>
 											<string key="NSFrame">{{13, 40}, {611, 460}}</string>
 											<reference key="NSSuperview" ref="755335467"/>
+											<reference key="NSWindow"/>
 											<array class="NSMutableArray" key="NSTabViewItems">
 												<object class="NSTabViewItem" id="820796939">
 													<string key="NSIdentifier">General</string>
@@ -1498,6 +1516,7 @@
 																				<int key="NSvFlags">256</int>
 																				<string key="NSFrameSize">{163, 363}</string>
 																				<reference key="NSSuperview" ref="380397569"/>
+																				<reference key="NSWindow"/>
 																				<bool key="NSEnabled">YES</bool>
 																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																				<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -1506,12 +1525,15 @@
 																					<int key="NSvFlags">256</int>
 																					<string key="NSFrameSize">{163, 17}</string>
 																					<reference key="NSSuperview" ref="999658386"/>
+																					<reference key="NSWindow"/>
 																					<reference key="NSTableView" ref="280739950"/>
 																				</object>
-																				<object class="_NSCornerView" key="NSCornerView">
-																					<nil key="NSNextResponder"/>
+																				<object class="_NSCornerView" key="NSCornerView" id="636326150">
+																					<reference key="NSNextResponder" ref="307214944"/>
 																					<int key="NSvFlags">-2147483392</int>
 																					<string key="NSFrame">{{110, 0}, {12, 17}}</string>
+																					<reference key="NSSuperview" ref="307214944"/>
+																					<reference key="NSWindow"/>
 																				</object>
 																				<array class="NSMutableArray" key="NSTableColumns">
 																					<object class="NSTableColumn" id="919609640">
@@ -1562,16 +1584,32 @@
 																		</array>
 																		<string key="NSFrame">{{1, 17}, {163, 363}}</string>
 																		<reference key="NSSuperview" ref="307214944"/>
+																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="280739950"/>
 																		<reference key="NSDocView" ref="280739950"/>
 																		<reference key="NSBGColor" ref="898983655"/>
 																		<int key="NScvFlags">4</int>
 																	</object>
+																	<object class="NSClipView" id="999658386">
+																		<reference key="NSNextResponder" ref="307214944"/>
+																		<int key="NSvFlags">2338</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<reference ref="406943647"/>
+																		</array>
+																		<string key="NSFrame">{{1, 0}, {163, 17}}</string>
+																		<reference key="NSSuperview" ref="307214944"/>
+																		<reference key="NSWindow"/>
+																		<reference key="NSNextKeyView" ref="406943647"/>
+																		<reference key="NSDocView" ref="406943647"/>
+																		<reference key="NSBGColor" ref="898983655"/>
+																		<int key="NScvFlags">4</int>
+																	</object>
 																	<object class="NSScroller" id="304497597">
 																		<reference key="NSNextResponder" ref="307214944"/>
 																		<int key="NSvFlags">-2147483392</int>
 																		<string key="NSFrame">{{110, 17}, {11, 352}}</string>
 																		<reference key="NSSuperview" ref="307214944"/>
+																		<reference key="NSWindow"/>
 																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																		<int key="NSsFlags">256</int>
 																		<reference key="NSTarget" ref="307214944"/>
@@ -1584,34 +1622,25 @@
 																		<int key="NSvFlags">-2147483392</int>
 																		<string key="NSFrame">{{1, 369}, {109, 11}}</string>
 																		<reference key="NSSuperview" ref="307214944"/>
+																		<reference key="NSWindow"/>
 																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																		<int key="NSsFlags">257</int>
 																		<reference key="NSTarget" ref="307214944"/>
 																		<string key="NSAction">_doScroller:</string>
 																		<double key="NSPercent">0.57142859697341919</double>
 																	</object>
-																	<object class="NSClipView" id="999658386">
-																		<reference key="NSNextResponder" ref="307214944"/>
-																		<int key="NSvFlags">2338</int>
-																		<array class="NSMutableArray" key="NSSubviews">
-																			<reference ref="406943647"/>
-																		</array>
-																		<string key="NSFrame">{{1, 0}, {163, 17}}</string>
-																		<reference key="NSSuperview" ref="307214944"/>
-																		<reference key="NSNextKeyView" ref="406943647"/>
-																		<reference key="NSDocView" ref="406943647"/>
-																		<reference key="NSBGColor" ref="898983655"/>
-																		<int key="NScvFlags">4</int>
-																	</object>
+																	<reference ref="636326150"/>
 																</array>
 																<string key="NSFrame">{{17, 17}, {165, 381}}</string>
 																<reference key="NSSuperview" ref="601698335"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="380397569"/>
 																<int key="NSsFlags">133682</int>
 																<reference key="NSVScroller" ref="304497597"/>
 																<reference key="NSHScroller" ref="1067950228"/>
 																<reference key="NSContentView" ref="380397569"/>
 																<reference key="NSHeaderClipView" ref="999658386"/>
+																<reference key="NSCornerView" ref="636326150"/>
 																<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
 																<double key="NSMinMagnification">0.25</double>
 																<double key="NSMaxMagnification">4</double>
@@ -1630,6 +1659,7 @@
 																				<int key="NSvFlags">256</int>
 																				<string key="NSFrameSize">{163, 363}</string>
 																				<reference key="NSSuperview" ref="239762482"/>
+																				<reference key="NSWindow"/>
 																				<bool key="NSEnabled">YES</bool>
 																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																				<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -1638,12 +1668,15 @@
 																					<int key="NSvFlags">256</int>
 																					<string key="NSFrameSize">{163, 17}</string>
 																					<reference key="NSSuperview" ref="2173"/>
+																					<reference key="NSWindow"/>
 																					<reference key="NSTableView" ref="64638447"/>
 																				</object>
-																				<object class="_NSCornerView" key="NSCornerView">
-																					<nil key="NSNextResponder"/>
+																				<object class="_NSCornerView" key="NSCornerView" id="222006363">
+																					<reference key="NSNextResponder" ref="728294866"/>
 																					<int key="NSvFlags">-2147483392</int>
 																					<string key="NSFrame">{{110, 0}, {12, 17}}</string>
+																					<reference key="NSSuperview" ref="728294866"/>
+																					<reference key="NSWindow"/>
 																				</object>
 																				<array class="NSMutableArray" key="NSTableColumns">
 																					<object class="NSTableColumn" id="1048567781">
@@ -1694,16 +1727,32 @@
 																		</array>
 																		<string key="NSFrame">{{1, 17}, {163, 363}}</string>
 																		<reference key="NSSuperview" ref="728294866"/>
+																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="64638447"/>
 																		<reference key="NSDocView" ref="64638447"/>
 																		<reference key="NSBGColor" ref="898983655"/>
 																		<int key="NScvFlags">4</int>
 																	</object>
+																	<object class="NSClipView" id="2173">
+																		<reference key="NSNextResponder" ref="728294866"/>
+																		<int key="NSvFlags">2338</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<reference ref="599931188"/>
+																		</array>
+																		<string key="NSFrame">{{1, 0}, {163, 17}}</string>
+																		<reference key="NSSuperview" ref="728294866"/>
+																		<reference key="NSWindow"/>
+																		<reference key="NSNextKeyView" ref="599931188"/>
+																		<reference key="NSDocView" ref="599931188"/>
+																		<reference key="NSBGColor" ref="898983655"/>
+																		<int key="NScvFlags">4</int>
+																	</object>
 																	<object class="NSScroller" id="210192488">
 																		<reference key="NSNextResponder" ref="728294866"/>
 																		<int key="NSvFlags">-2147483392</int>
 																		<string key="NSFrame">{{110, 17}, {11, 352}}</string>
 																		<reference key="NSSuperview" ref="728294866"/>
+																		<reference key="NSWindow"/>
 																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																		<int key="NSsFlags">256</int>
 																		<reference key="NSTarget" ref="728294866"/>
@@ -1715,34 +1764,25 @@
 																		<int key="NSvFlags">-2147483392</int>
 																		<string key="NSFrame">{{1, 369}, {109, 11}}</string>
 																		<reference key="NSSuperview" ref="728294866"/>
+																		<reference key="NSWindow"/>
 																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																		<int key="NSsFlags">257</int>
 																		<reference key="NSTarget" ref="728294866"/>
 																		<string key="NSAction">_doScroller:</string>
 																		<double key="NSPercent">0.99236643314361572</double>
 																	</object>
-																	<object class="NSClipView" id="2173">
-																		<reference key="NSNextResponder" ref="728294866"/>
-																		<int key="NSvFlags">2338</int>
-																		<array class="NSMutableArray" key="NSSubviews">
-																			<reference ref="599931188"/>
-																		</array>
-																		<string key="NSFrame">{{1, 0}, {163, 17}}</string>
-																		<reference key="NSSuperview" ref="728294866"/>
-																		<reference key="NSNextKeyView" ref="599931188"/>
-																		<reference key="NSDocView" ref="599931188"/>
-																		<reference key="NSBGColor" ref="898983655"/>
-																		<int key="NScvFlags">4</int>
-																	</object>
+																	<reference ref="222006363"/>
 																</array>
 																<string key="NSFrame">{{190, 17}, {165, 381}}</string>
 																<reference key="NSSuperview" ref="601698335"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="239762482"/>
 																<int key="NSsFlags">133682</int>
 																<reference key="NSVScroller" ref="210192488"/>
 																<reference key="NSHScroller" ref="253008686"/>
 																<reference key="NSContentView" ref="239762482"/>
 																<reference key="NSHeaderClipView" ref="2173"/>
+																<reference key="NSCornerView" ref="222006363"/>
 																<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
 																<double key="NSMinMagnification">0.25</double>
 																<double key="NSMaxMagnification">4</double>
@@ -1761,6 +1801,7 @@
 																				<int key="NSvFlags">256</int>
 																				<string key="NSFrameSize">{163, 363}</string>
 																				<reference key="NSSuperview" ref="728383964"/>
+																				<reference key="NSWindow"/>
 																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																				<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 																				<object class="NSTableHeaderView" key="NSHeaderView" id="120612996">
@@ -1768,12 +1809,15 @@
 																					<int key="NSvFlags">256</int>
 																					<string key="NSFrameSize">{163, 17}</string>
 																					<reference key="NSSuperview" ref="226879331"/>
+																					<reference key="NSWindow"/>
 																					<reference key="NSTableView" ref="443904239"/>
 																				</object>
-																				<object class="_NSCornerView" key="NSCornerView">
-																					<nil key="NSNextResponder"/>
+																				<object class="_NSCornerView" key="NSCornerView" id="41340999">
+																					<reference key="NSNextResponder" ref="898351365"/>
 																					<int key="NSvFlags">-2147483392</int>
 																					<string key="NSFrame">{{110, 0}, {12, 17}}</string>
+																					<reference key="NSSuperview" ref="898351365"/>
+																					<reference key="NSWindow"/>
 																				</object>
 																				<array class="NSMutableArray" key="NSTableColumns">
 																					<object class="NSTableColumn" id="408402649">
@@ -1824,16 +1868,32 @@
 																		</array>
 																		<string key="NSFrame">{{1, 17}, {163, 363}}</string>
 																		<reference key="NSSuperview" ref="898351365"/>
+																		<reference key="NSWindow"/>
 																		<reference key="NSNextKeyView" ref="443904239"/>
 																		<reference key="NSDocView" ref="443904239"/>
 																		<reference key="NSBGColor" ref="898983655"/>
 																		<int key="NScvFlags">4</int>
 																	</object>
+																	<object class="NSClipView" id="226879331">
+																		<reference key="NSNextResponder" ref="898351365"/>
+																		<int key="NSvFlags">2338</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<reference ref="120612996"/>
+																		</array>
+																		<string key="NSFrame">{{1, 0}, {163, 17}}</string>
+																		<reference key="NSSuperview" ref="898351365"/>
+																		<reference key="NSWindow"/>
+																		<reference key="NSNextKeyView" ref="120612996"/>
+																		<reference key="NSDocView" ref="120612996"/>
+																		<reference key="NSBGColor" ref="898983655"/>
+																		<int key="NScvFlags">4</int>
+																	</object>
 																	<object class="NSScroller" id="939829514">
 																		<reference key="NSNextResponder" ref="898351365"/>
 																		<int key="NSvFlags">-2147483392</int>
 																		<string key="NSFrame">{{110, 17}, {11, 352}}</string>
 																		<reference key="NSSuperview" ref="898351365"/>
+																		<reference key="NSWindow"/>
 																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																		<int key="NSsFlags">256</int>
 																		<reference key="NSTarget" ref="898351365"/>
@@ -1845,34 +1905,25 @@
 																		<int key="NSvFlags">-2147483392</int>
 																		<string key="NSFrame">{{1, 369}, {109, 11}}</string>
 																		<reference key="NSSuperview" ref="898351365"/>
+																		<reference key="NSWindow"/>
 																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																		<int key="NSsFlags">257</int>
 																		<reference key="NSTarget" ref="898351365"/>
 																		<string key="NSAction">_doScroller:</string>
 																		<double key="NSPercent">0.99280577898025513</double>
 																	</object>
-																	<object class="NSClipView" id="226879331">
-																		<reference key="NSNextResponder" ref="898351365"/>
-																		<int key="NSvFlags">2338</int>
-																		<array class="NSMutableArray" key="NSSubviews">
-																			<reference ref="120612996"/>
-																		</array>
-																		<string key="NSFrame">{{1, 0}, {163, 17}}</string>
-																		<reference key="NSSuperview" ref="898351365"/>
-																		<reference key="NSNextKeyView" ref="120612996"/>
-																		<reference key="NSDocView" ref="120612996"/>
-																		<reference key="NSBGColor" ref="898983655"/>
-																		<int key="NScvFlags">4</int>
-																	</object>
+																	<reference ref="41340999"/>
 																</array>
 																<string key="NSFrame">{{409, 17}, {165, 381}}</string>
 																<reference key="NSSuperview" ref="601698335"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="728383964"/>
 																<int key="NSsFlags">133682</int>
 																<reference key="NSVScroller" ref="939829514"/>
 																<reference key="NSHScroller" ref="1063461866"/>
 																<reference key="NSContentView" ref="728383964"/>
 																<reference key="NSHeaderClipView" ref="226879331"/>
+																<reference key="NSCornerView" ref="41340999"/>
 																<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
 																<double key="NSMinMagnification">0.25</double>
 																<double key="NSMaxMagnification">4</double>
@@ -1883,6 +1934,7 @@
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{363, 206}, {31, 32}}</string>
 																<reference key="NSSuperview" ref="601698335"/>
+																<reference key="NSWindow"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSButtonCell" key="NSCell" id="402609054">
 																	<int key="NSCellFlags">603979776</int>
@@ -1908,6 +1960,7 @@
 																<int key="NSvFlags">268</int>
 																<string key="NSFrame">{{363, 177}, {31, 32}}</string>
 																<reference key="NSSuperview" ref="601698335"/>
+																<reference key="NSWindow"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSButtonCell" key="NSCell" id="847011406">
 																	<int key="NSCellFlags">603979776</int>
@@ -1931,6 +1984,7 @@
 														</array>
 														<string key="NSFrame">{{10, 33}, {591, 414}}</string>
 														<reference key="NSSuperview" ref="716372522"/>
+														<reference key="NSWindow"/>
 													</object>
 													<string key="NSLabel">Schema Privileges</string>
 													<reference key="NSColor" ref="409859189"/>
@@ -2055,8 +2109,8 @@
 																							<bool key="NS.raise.underflow">YES</bool>
 																							<bool key="NS.raise.dividebyzero">YES</bool>
 																						</object>
-																						<string key="NS.decimal">.</string>
-																						<string key="NS.thousand">,</string>
+																						<string key="NS.decimal">,</string>
+																						<string key="NS.thousand">'</string>
 																						<bool key="NS.hasthousands">NO</bool>
 																						<bool key="NS.localized">YES</bool>
 																						<bool key="NS.allowsfloats">NO</bool>
@@ -2111,8 +2165,8 @@
 																							<bool key="NS.raise.underflow">YES</bool>
 																							<bool key="NS.raise.dividebyzero">YES</bool>
 																						</object>
-																						<string key="NS.decimal">.</string>
-																						<string key="NS.thousand">,</string>
+																						<string key="NS.decimal">,</string>
+																						<string key="NS.thousand">'</string>
 																						<bool key="NS.hasthousands">NO</bool>
 																						<bool key="NS.localized">YES</bool>
 																						<bool key="NS.allowsfloats">NO</bool>
@@ -2167,8 +2221,8 @@
 																							<bool key="NS.raise.underflow">YES</bool>
 																							<bool key="NS.raise.dividebyzero">YES</bool>
 																						</object>
-																						<string key="NS.decimal">.</string>
-																						<string key="NS.thousand">,</string>
+																						<string key="NS.decimal">,</string>
+																						<string key="NS.thousand">'</string>
 																						<bool key="NS.hasthousands">NO</bool>
 																						<bool key="NS.localized">YES</bool>
 																						<bool key="NS.allowsfloats">NO</bool>
@@ -2227,6 +2281,7 @@
 											<int key="NSvFlags">289</int>
 											<string key="NSFrame">{{476, 12}, {147, 32}}</string>
 											<reference key="NSSuperview" ref="755335467"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="289173129">
 												<int key="NSCellFlags">-2080374784</int>
@@ -2249,6 +2304,7 @@
 											<int key="NSvFlags">289</int>
 											<string key="NSFrame">{{329, 12}, {147, 32}}</string>
 											<reference key="NSSuperview" ref="755335467"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="1067684076">
 												<int key="NSCellFlags">-2080374784</int>
@@ -2269,19 +2325,23 @@
 									</array>
 									<string key="NSFrame">{{178, 0}, {637, 506}}</string>
 									<reference key="NSSuperview" ref="138392961"/>
+									<reference key="NSWindow"/>
 									<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
 									<string key="NSClassName">NSView</string>
 								</object>
 							</array>
 							<string key="NSFrameSize">{815, 506}</string>
 							<reference key="NSSuperview" ref="846307432"/>
+							<reference key="NSWindow"/>
 							<bool key="NSIsVertical">YES</bool>
 							<int key="NSDividerStyle">2</int>
 						</object>
 					</array>
 					<string key="NSFrameSize">{815, 506}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{752, 528}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -2539,7 +2599,7 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">67111173</int>
+												<int key="NSFlags">2309</int>
 												<int key="NSTextCheckingTypes">0</int>
 												<nil key="NSMarkedAttributes"/>
 												<reference key="NSBackgroundColor" ref="888720323"/>
@@ -2660,7 +2720,7 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 					</array>
 					<string key="NSFrameSize">{447, 300}</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{447, 322}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -5823,7 +5883,323 @@ IGVycm9ycyBiZWxvdyBiZWZvcmUgcHJvY2VlZGluZy4</string>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextView</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="doDecomposedStringWithCanonicalMapping:">id</string>
+						<string key="doDecomposedStringWithCompatibilityMapping:">id</string>
+						<string key="doPrecomposedStringWithCanonicalMapping:">id</string>
+						<string key="doPrecomposedStringWithCompatibilityMapping:">id</string>
+						<string key="doRemoveDiacritics:">id</string>
+						<string key="doSelectionLowerCase:">id</string>
+						<string key="doSelectionTitleCase:">id</string>
+						<string key="doSelectionUpperCase:">id</string>
+						<string key="doTranspose:">id</string>
+						<string key="executeBundleItemForInputField:">id</string>
+						<string key="insertNULLvalue:">id</string>
+						<string key="moveSelectionLineDown:">id</string>
+						<string key="moveSelectionLineUp:">id</string>
+						<string key="orderFrontSharingServicePicker:">id</string>
+						<string key="selectCurrentLine:">id</string>
+						<string key="selectCurrentWord:">id</string>
+						<string key="selectEnclosingBrackets:">id</string>
+						<string key="toggleQuickLookPreviewPanel:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="doDecomposedStringWithCanonicalMapping:">
+							<string key="name">doDecomposedStringWithCanonicalMapping:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doDecomposedStringWithCompatibilityMapping:">
+							<string key="name">doDecomposedStringWithCompatibilityMapping:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doPrecomposedStringWithCanonicalMapping:">
+							<string key="name">doPrecomposedStringWithCanonicalMapping:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doPrecomposedStringWithCompatibilityMapping:">
+							<string key="name">doPrecomposedStringWithCompatibilityMapping:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doRemoveDiacritics:">
+							<string key="name">doRemoveDiacritics:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doSelectionLowerCase:">
+							<string key="name">doSelectionLowerCase:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doSelectionTitleCase:">
+							<string key="name">doSelectionTitleCase:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doSelectionUpperCase:">
+							<string key="name">doSelectionUpperCase:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doTranspose:">
+							<string key="name">doTranspose:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="executeBundleItemForInputField:">
+							<string key="name">executeBundleItemForInputField:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="insertNULLvalue:">
+							<string key="name">insertNULLvalue:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="moveSelectionLineDown:">
+							<string key="name">moveSelectionLineDown:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="moveSelectionLineUp:">
+							<string key="name">moveSelectionLineUp:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="orderFrontSharingServicePicker:">
+							<string key="name">orderFrontSharingServicePicker:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="selectCurrentLine:">
+							<string key="name">selectCurrentLine:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="selectCurrentWord:">
+							<string key="name">selectCurrentWord:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="selectEnclosingBrackets:">
+							<string key="name">selectEnclosingBrackets:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="toggleQuickLookPreviewPanel:">
+							<string key="name">toggleQuickLookPreviewPanel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSTextView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SPOutlineView</string>
+					<string key="superclassName">NSOutlineView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/SPOutlineView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SPSplitView</string>
+					<string key="superclassName">NSSplitView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">toggleCollapse:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">toggleCollapse:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">toggleCollapse:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="additionalDragHandleView">NSView</string>
+						<string key="collapseToggleButton">NSButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="additionalDragHandleView">
+							<string key="name">additionalDragHandleView</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="collapseToggleButton">
+							<string key="name">collapseToggleButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/SPSplitView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SPUserManager</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="addHost:">id</string>
+						<string key="addSchemaPriv:">id</string>
+						<string key="addUser:">id</string>
+						<string key="checkAllPrivileges:">id</string>
+						<string key="closeErrorsSheet:">id</string>
+						<string key="doApply:">id</string>
+						<string key="doCancel:">id</string>
+						<string key="doubleClickSchemaPriv:">id</string>
+						<string key="refresh:">id</string>
+						<string key="removeHost:">id</string>
+						<string key="removeSchemaPriv:">id</string>
+						<string key="removeUser:">id</string>
+						<string key="uncheckAllPrivileges:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="addHost:">
+							<string key="name">addHost:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="addSchemaPriv:">
+							<string key="name">addSchemaPriv:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="addUser:">
+							<string key="name">addUser:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="checkAllPrivileges:">
+							<string key="name">checkAllPrivileges:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="closeErrorsSheet:">
+							<string key="name">closeErrorsSheet:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doApply:">
+							<string key="name">doApply:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doCancel:">
+							<string key="name">doCancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="doubleClickSchemaPriv:">
+							<string key="name">doubleClickSchemaPriv:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="refresh:">
+							<string key="name">refresh:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="removeHost:">
+							<string key="name">removeHost:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="removeSchemaPriv:">
+							<string key="name">removeSchemaPriv:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="removeUser:">
+							<string key="name">removeUser:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="uncheckAllPrivileges:">
+							<string key="name">uncheckAllPrivileges:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="addSchemaPrivButton">NSButton</string>
+						<string key="availableController">NSArrayController</string>
+						<string key="availableTableView">NSTableView</string>
+						<string key="errorsSheet">NSWindow</string>
+						<string key="errorsTextView">NSTextView</string>
+						<string key="grantedController">NSArrayController</string>
+						<string key="grantedTableView">NSTableView</string>
+						<string key="maxConnectionsTextField">NSTextField</string>
+						<string key="maxQuestionsTextField">NSTextField</string>
+						<string key="maxUpdatesTextField">NSTextField</string>
+						<string key="outlineView">NSOutlineView</string>
+						<string key="privsSupportedByServer">NSMutableDictionary</string>
+						<string key="removeSchemaPrivButton">NSButton</string>
+						<string key="schemasTableView">NSTableView</string>
+						<string key="splitView">SPSplitView</string>
+						<string key="tabView">NSTabView</string>
+						<string key="treeController">NSTreeController</string>
+						<string key="userNameTextField">NSTextField</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="addSchemaPrivButton">
+							<string key="name">addSchemaPrivButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="availableController">
+							<string key="name">availableController</string>
+							<string key="candidateClassName">NSArrayController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="availableTableView">
+							<string key="name">availableTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="errorsSheet">
+							<string key="name">errorsSheet</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="errorsTextView">
+							<string key="name">errorsTextView</string>
+							<string key="candidateClassName">NSTextView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="grantedController">
+							<string key="name">grantedController</string>
+							<string key="candidateClassName">NSArrayController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="grantedTableView">
+							<string key="name">grantedTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="maxConnectionsTextField">
+							<string key="name">maxConnectionsTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="maxQuestionsTextField">
+							<string key="name">maxQuestionsTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="maxUpdatesTextField">
+							<string key="name">maxUpdatesTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="outlineView">
+							<string key="name">outlineView</string>
+							<string key="candidateClassName">NSOutlineView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="privsSupportedByServer">
+							<string key="name">privsSupportedByServer</string>
+							<string key="candidateClassName">NSMutableDictionary</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="removeSchemaPrivButton">
+							<string key="name">removeSchemaPrivButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="schemasTableView">
+							<string key="name">schemasTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="splitView">
+							<string key="name">splitView</string>
+							<string key="candidateClassName">SPSplitView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="tabView">
+							<string key="name">tabView</string>
+							<string key="candidateClassName">NSTabView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="treeController">
+							<string key="name">treeController</string>
+							<string key="candidateClassName">NSTreeController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="userNameTextField">
+							<string key="name">userNameTextField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/SPUserManager.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>