Bring outline view branch up to date with trunk (r3227:r3233).

1 files changed, 62 insertions, 35 deletions

diff --git a/Interfaces/English.lproj/DatabaseServerVariables.xib b/Interfaces/English.lproj/DatabaseServerVariables.xib
index 6981e74d..6164b81c 100644
--- a/Interfaces/English.lproj/DatabaseServerVariables.xib
+++ b/Interfaces/English.lproj/DatabaseServerVariables.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.SystemVersion">10J567</string>
+		<string key="IBDocument.InterfaceBuilderVersion">804</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
@@ -15,14 +15,14 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>788</string>
+				<string>804</string>
 				<string>1.2.2</string>
 			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="33"/>
 			<integer value="2"/>
+			<integer value="33"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -30,13 +30,8 @@
 			<string>com.brandonwalkin.BWToolkit</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -52,7 +47,7 @@
 			<object class="NSWindowTemplate" id="314035875">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{386, 508}, {411, 341}}</string>
+				<string key="NSWindowRect">{{386, 508}, {433, 341}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">Variables</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -60,7 +55,7 @@
 					<characters key="NS.bytes">View</characters>
 				</object>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<string key="NSWindowContentMinSize">{400, 200}</string>
+				<string key="NSWindowContentMinSize">{433, 341}</string>
 				<object class="NSView" key="NSWindowView" id="605976451">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -79,27 +74,27 @@
 										<object class="NSTableView" id="567086457">
 											<reference key="NSNextResponder" ref="892724959"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{399, 251}</string>
+											<string key="NSFrameSize">{421, 251}</string>
 											<reference key="NSSuperview" ref="892724959"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="710723896">
 												<reference key="NSNextResponder" ref="551149994"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{399, 17}</string>
+												<string key="NSFrameSize">{421, 17}</string>
 												<reference key="NSSuperview" ref="551149994"/>
 												<reference key="NSTableView" ref="567086457"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="682935021">
 												<reference key="NSNextResponder" ref="365271629"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{400, 0}, {12, 17}}</string>
+												<string key="NSFrame">{{422, 0}, {12, 17}}</string>
 												<reference key="NSSuperview" ref="365271629"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="1016923668">
 													<string key="NSIdentifier">Variable_name</string>
-													<double key="NSWidth">202</double>
+													<double key="NSWidth">224</double>
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -204,7 +199,7 @@
 											<int key="NSTableViewDraggingDestinationStyle">0</int>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {399, 251}}</string>
+									<string key="NSFrame">{{1, 17}, {421, 251}}</string>
 									<reference key="NSSuperview" ref="365271629"/>
 									<reference key="NSNextKeyView" ref="567086457"/>
 									<reference key="NSDocView" ref="567086457"/>
@@ -214,7 +209,7 @@
 								<object class="NSScroller" id="935382091">
 									<reference key="NSNextResponder" ref="365271629"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{400, 17}, {11, 251}}</string>
+									<string key="NSFrame">{{422, 17}, {11, 251}}</string>
 									<reference key="NSSuperview" ref="365271629"/>
 									<int key="NSsFlags">256</int>
 									<reference key="NSTarget" ref="365271629"/>
@@ -238,7 +233,7 @@
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<reference ref="710723896"/>
 									</object>
-									<string key="NSFrame">{{1, 0}, {399, 17}}</string>
+									<string key="NSFrame">{{1, 0}, {421, 17}}</string>
 									<reference key="NSSuperview" ref="365271629"/>
 									<reference key="NSNextKeyView" ref="710723896"/>
 									<reference key="NSDocView" ref="710723896"/>
@@ -247,7 +242,7 @@
 								</object>
 								<reference ref="682935021"/>
 							</object>
-							<string key="NSFrame">{{-1, 39}, {412, 269}}</string>
+							<string key="NSFrame">{{-1, 39}, {434, 269}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<reference key="NSNextKeyView" ref="892724959"/>
 							<int key="NSsFlags">18</int>
@@ -261,7 +256,7 @@
 						<object class="NSButton" id="980756321">
 							<reference key="NSNextResponder" ref="605976451"/>
 							<int key="NSvFlags">257</int>
-							<string key="NSFrame">{{320, 5}, {76, 28}}</string>
+							<string key="NSFrame">{{342, 5}, {77, 28}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="183553689">
@@ -306,7 +301,7 @@
 						<object class="BWInsetTextField" id="708108585">
 							<reference key="NSNextResponder" ref="605976451"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{9, 316}, {140, 14}}</string>
+							<string key="NSFrame">{{9, 316}, {156, 14}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="395355434">
@@ -331,7 +326,7 @@
 						<object class="NSSearchField" id="674859294">
 							<reference key="NSNextResponder" ref="605976451"/>
 							<int key="NSvFlags">265</int>
-							<string key="NSFrame">{{229, 314}, {170, 19}}</string>
+							<string key="NSFrame">{{251, 314}, {170, 19}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSearchFieldCell" key="NSCell" id="623709875">
@@ -399,7 +394,7 @@
 						<object class="NSTextField" id="393483135">
 							<reference key="NSNextResponder" ref="605976451"/>
 							<int key="NSvFlags">-2147483382</int>
-							<string key="NSFrame">{{151, 316}, {73, 14}}</string>
+							<string key="NSFrame">{{167, 316}, {79, 14}}</string>
 							<reference key="NSSuperview" ref="605976451"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="690211055">
@@ -413,11 +408,11 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{411, 341}</string>
+					<string key="NSFrameSize">{433, 341}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMinSize">{400, 222}</string>
+				<string key="NSMinSize">{433, 363}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 			</object>
 			<object class="NSMenu" id="136439297">
@@ -596,7 +591,9 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
@@ -819,6 +816,7 @@
 					<string>-3.IBPluginDependency</string>
 					<string>1.IBEditorWindowLastContentRect</string>
 					<string>1.IBPluginDependency</string>
+					<string>1.IBViewEditorWindowController.showingBoundsRectangles</string>
 					<string>1.IBWindowTemplateEditedContentRect</string>
 					<string>1.ImportedFromIB2</string>
 					<string>1.editorWindowContentRectSynchronizationRect</string>
@@ -867,15 +865,16 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{426, 162}, {411, 341}}</string>
+					<string>{{440, 258}, {433, 341}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{426, 162}, {411, 341}}</string>
+					<boolean value="YES"/>
+					<string>{{440, 258}, {433, 341}}</string>
 					<integer value="1"/>
 					<string>{{321, 508}, {411, 341}}</string>
 					<integer value="0"/>
 					<integer value="1"/>
 					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>{400, 200}</string>
+					<string>{433, 341}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -944,10 +943,10 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
+					<string key="className">NSMenu</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h</string>
+						<string key="minorKey">Source/SPMenuAdditions.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -975,6 +974,13 @@
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">Source/SPConnectionController.h</string>
 					</object>
 				</object>
@@ -1539,6 +1545,27 @@
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRValidator.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
 						<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
 					</object>
 				</object>