Moved "query favourites", "query history" and "Run Query" buttons to the other side of the splitter handle. This allows you to collapse the Query text field and still have access to the favourites and history popups.

1 files changed, 276 insertions, 253 deletions

diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index aa299e49..d3b923ac 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="676"/>
+			<integer value="670"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2497,7 +2497,7 @@
 																	<object class="NSTabViewItem" id="624106058">
 																		<string key="NSIdentifier">content</string>
 																		<object class="NSView" key="NSView" id="1013108064">
-																			<reference key="NSNextResponder" ref="714795046"/>
+																			<nil key="NSNextResponder"/>
 																			<int key="NSvFlags">256</int>
 																			<object class="NSMutableArray" key="NSSubviews">
 																				<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3103,7 +3103,6 @@
 																				</object>
 																			</object>
 																			<string key="NSFrame">{{10, 7}, {638, 544}}</string>
-																			<reference key="NSSuperview" ref="714795046"/>
 																		</object>
 																		<string key="NSLabel">Content</string>
 																		<reference key="NSColor" ref="62854682"/>
@@ -3112,7 +3111,7 @@
 																	<object class="NSTabViewItem" id="105987292">
 																		<string key="NSIdentifier">customQuery</string>
 																		<object class="NSView" key="NSView" id="746504912">
-																			<nil key="NSNextResponder"/>
+																			<reference key="NSNextResponder" ref="714795046"/>
 																			<int key="NSvFlags">256</int>
 																			<object class="NSMutableArray" key="NSSubviews">
 																				<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3139,7 +3138,30 @@
 																												<object class="NSTextView" id="1055190999">
 																													<reference key="NSNextResponder" ref="1072692119"/>
 																													<int key="NSvFlags">6418</int>
-																													<string key="NSFrameSize">{626, 14}</string>
+																													<object class="NSMutableSet" key="NSDragTypes">
+																														<bool key="EncodedWithXMLCoder">YES</bool>
+																														<object class="NSMutableArray" key="set.sortedObjects">
+																															<bool key="EncodedWithXMLCoder">YES</bool>
+																															<string>Apple HTML pasteboard type</string>
+																															<string>Apple PDF pasteboard type</string>
+																															<string>Apple PICT pasteboard type</string>
+																															<string>Apple PNG pasteboard type</string>
+																															<string>Apple URL pasteboard type</string>
+																															<string>CorePasteboardFlavorType 0x6D6F6F76</string>
+																															<string>CorePasteboardFlavorType 0x75726C20</string>
+																															<string>NSColor pasteboard type</string>
+																															<string>NSFilenamesPboardType</string>
+																															<string>NSStringPboardType</string>
+																															<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+																															<string>NeXT RTFD pasteboard type</string>
+																															<string>NeXT Rich Text Format v1.0 pasteboard type</string>
+																															<string>NeXT TIFF v4.0 pasteboard type</string>
+																															<string>NeXT font pasteboard type</string>
+																															<string>NeXT ruler pasteboard type</string>
+																															<string>WebURLsWithTitlesPboardType</string>
+																														</object>
+																													</object>
+																													<string key="NSFrameSize">{626, 41}</string>
 																													<reference key="NSSuperview" ref="1072692119"/>
 																													<object class="NSTextContainer" key="NSTextContainer" id="326170846">
 																														<object class="NSLayoutManager" key="NSLayoutManager">
@@ -3197,7 +3219,7 @@
 																													<nil key="NSDelegate"/>
 																												</object>
 																											</object>
-																											<string key="NSFrame">{{1, 1}, {626, 128}}</string>
+																											<string key="NSFrame">{{1, 1}, {626, 155}}</string>
 																											<reference key="NSSuperview" ref="71560786"/>
 																											<reference key="NSNextKeyView" ref="1055190999"/>
 																											<reference key="NSDocView" ref="1055190999"/>
@@ -3229,7 +3251,7 @@
 																											<double key="NSPercent">9.456522e-01</double>
 																										</object>
 																									</object>
-																									<string key="NSFrame">{{0, 27}, {628, 130}}</string>
+																									<string key="NSFrameSize">{628, 157}</string>
 																									<reference key="NSSuperview" ref="873437769"/>
 																									<reference key="NSNextKeyView" ref="1072692119"/>
 																									<int key="NSsFlags">530</int>
@@ -3237,14 +3259,146 @@
 																									<reference key="NSHScroller" ref="783638826"/>
 																									<reference key="NSContentView" ref="1072692119"/>
 																								</object>
+																							</object>
+																							<string key="NSFrameSize">{628, 156}</string>
+																							<reference key="NSSuperview" ref="894339536"/>
+																							<string key="NSClassName">NSView</string>
+																						</object>
+																						<object class="NSCustomView" id="345834048">
+																							<reference key="NSNextResponder" ref="894339536"/>
+																							<int key="NSvFlags">274</int>
+																							<object class="NSMutableArray" key="NSSubviews">
+																								<bool key="EncodedWithXMLCoder">YES</bool>
+																								<object class="NSScrollView" id="678281118">
+																									<reference key="NSNextResponder" ref="345834048"/>
+																									<int key="NSvFlags">4370</int>
+																									<object class="NSMutableArray" key="NSSubviews">
+																										<bool key="EncodedWithXMLCoder">YES</bool>
+																										<object class="NSClipView" id="90844306">
+																											<reference key="NSNextResponder" ref="678281118"/>
+																											<int key="NSvFlags">2304</int>
+																											<object class="NSMutableArray" key="NSSubviews">
+																												<bool key="EncodedWithXMLCoder">YES</bool>
+																												<object class="NSTableView" id="581095761">
+																													<reference key="NSNextResponder" ref="90844306"/>
+																													<int key="NSvFlags">4352</int>
+																													<string key="NSFrameSize">{626, 226}</string>
+																													<reference key="NSSuperview" ref="90844306"/>
+																													<bool key="NSEnabled">YES</bool>
+																													<object class="NSTableHeaderView" key="NSHeaderView" id="1038415606">
+																														<reference key="NSNextResponder" ref="533922066"/>
+																														<int key="NSvFlags">256</int>
+																														<string key="NSFrameSize">{626, 17}</string>
+																														<reference key="NSSuperview" ref="533922066"/>
+																														<reference key="NSTableView" ref="581095761"/>
+																													</object>
+																													<object class="_NSCornerView" key="NSCornerView" id="151074124">
+																														<reference key="NSNextResponder" ref="678281118"/>
+																														<int key="NSvFlags">-2147483392</int>
+																														<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
+																														<reference key="NSSuperview" ref="678281118"/>
+																													</object>
+																													<object class="NSMutableArray" key="NSTableColumns">
+																														<bool key="EncodedWithXMLCoder">YES</bool>
+																														<object class="NSTableColumn" id="544095042">
+																															<double key="NSWidth">6.230000e+02</double>
+																															<double key="NSMinWidth">4.000000e+01</double>
+																															<double key="NSMaxWidth">1.000000e+03</double>
+																															<object class="NSTableHeaderCell" key="NSHeaderCell">
+																																<int key="NSCellFlags">75628032</int>
+																																<int key="NSCellFlags2">0</int>
+																																<string key="NSContents"/>
+																																<reference key="NSSupport" ref="26"/>
+																																<reference key="NSBackgroundColor" ref="799519821"/>
+																																<reference key="NSTextColor" ref="222976159"/>
+																															</object>
+																															<object class="NSTextFieldCell" key="NSDataCell" id="451753495">
+																																<int key="NSCellFlags">70385217</int>
+																																<int key="NSCellFlags2">132096</int>
+																																<string key="NSContents">Text Cell</string>
+																																<reference key="NSSupport" ref="26"/>
+																																<reference key="NSControlView" ref="581095761"/>
+																																<reference key="NSBackgroundColor" ref="480189472"/>
+																																<reference key="NSTextColor" ref="454249633"/>
+																															</object>
+																															<int key="NSResizingMask">3</int>
+																															<bool key="NSIsResizeable">YES</bool>
+																															<reference key="NSTableView" ref="581095761"/>
+																														</object>
+																													</object>
+																													<double key="NSIntercellSpacingWidth">3.000000e+00</double>
+																													<double key="NSIntercellSpacingHeight">2.000000e+00</double>
+																													<reference key="NSBackgroundColor" ref="1024678221"/>
+																													<reference key="NSGridColor" ref="864903678"/>
+																													<double key="NSRowHeight">1.300000e+01</double>
+																													<int key="NSTvFlags">-88080384</int>
+																													<int key="NSColumnAutoresizingStyle">4</int>
+																													<int key="NSDraggingSourceMaskForLocal">15</int>
+																													<int key="NSDraggingSourceMaskForNonLocal">0</int>
+																													<bool key="NSAllowsTypeSelect">YES</bool>
+																												</object>
+																											</object>
+																											<string key="NSFrame">{{1, 17}, {626, 226}}</string>
+																											<reference key="NSSuperview" ref="678281118"/>
+																											<reference key="NSNextKeyView" ref="581095761"/>
+																											<reference key="NSDocView" ref="581095761"/>
+																											<reference key="NSBGColor" ref="1024678221"/>
+																											<int key="NScvFlags">4</int>
+																										</object>
+																										<object class="NSScroller" id="472831765">
+																											<reference key="NSNextResponder" ref="678281118"/>
+																											<int key="NSvFlags">-2147483392</int>
+																											<string key="NSFrame">{{598, 17}, {15, 212}}</string>
+																											<reference key="NSSuperview" ref="678281118"/>
+																											<reference key="NSTarget" ref="678281118"/>
+																											<string key="NSAction">_doScroller:</string>
+																											<double key="NSPercent">9.800000e-01</double>
+																										</object>
+																										<object class="NSScroller" id="851610321">
+																											<reference key="NSNextResponder" ref="678281118"/>
+																											<int key="NSvFlags">-2147483392</int>
+																											<string key="NSFrame">{{1, 229}, {597, 15}}</string>
+																											<reference key="NSSuperview" ref="678281118"/>
+																											<int key="NSsFlags">1</int>
+																											<reference key="NSTarget" ref="678281118"/>
+																											<string key="NSAction">_doScroller:</string>
+																											<double key="NSPercent">9.904762e-01</double>
+																										</object>
+																										<object class="NSClipView" id="533922066">
+																											<reference key="NSNextResponder" ref="678281118"/>
+																											<int key="NSvFlags">2304</int>
+																											<object class="NSMutableArray" key="NSSubviews">
+																												<bool key="EncodedWithXMLCoder">YES</bool>
+																												<reference ref="1038415606"/>
+																											</object>
+																											<string key="NSFrame">{{1, 0}, {626, 17}}</string>
+																											<reference key="NSSuperview" ref="678281118"/>
+																											<reference key="NSNextKeyView" ref="1038415606"/>
+																											<reference key="NSDocView" ref="1038415606"/>
+																											<reference key="NSBGColor" ref="1024678221"/>
+																											<int key="NScvFlags">4</int>
+																										</object>
+																										<reference ref="151074124"/>
+																									</object>
+																									<string key="NSFrameSize">{628, 244}</string>
+																									<reference key="NSSuperview" ref="345834048"/>
+																									<reference key="NSNextKeyView" ref="90844306"/>
+																									<int key="NSsFlags">562</int>
+																									<reference key="NSVScroller" ref="472831765"/>
+																									<reference key="NSHScroller" ref="851610321"/>
+																									<reference key="NSContentView" ref="90844306"/>
+																									<reference key="NSHeaderClipView" ref="533922066"/>
+																									<reference key="NSCornerView" ref="151074124"/>
+																									<bytes key="NSScrollAmts">QSAAAEEgAABBcAAAQXAAAA</bytes>
+																								</object>
 																								<object class="NSButton" id="811536132">
-																									<reference key="NSNextResponder" ref="873437769"/>
-																									<int key="NSvFlags">257</int>
-																									<string key="NSFrame">{{523, -5}, {90, 28}}</string>
-																									<reference key="NSSuperview" ref="873437769"/>
+																									<reference key="NSNextResponder" ref="345834048"/>
+																									<int key="NSvFlags">265</int>
+																									<string key="NSFrame">{{523, 245}, {90, 28}}</string>
+																									<reference key="NSSuperview" ref="345834048"/>
 																									<bool key="NSEnabled">YES</bool>
 																									<object class="NSButtonCell" key="NSCell" id="177866566">
-																										<int key="NSCellFlags">67239424</int>
+																										<int key="NSCellFlags">-2080244224</int>
 																										<int key="NSCellFlags2">134348800</int>
 																										<string key="NSContents">Run Query</string>
 																										<reference key="NSSupport" ref="26"/>
@@ -3259,10 +3413,10 @@
 																									</object>
 																								</object>
 																								<object class="NSPopUpButton" id="86760255">
-																									<reference key="NSNextResponder" ref="873437769"/>
-																									<int key="NSvFlags">290</int>
-																									<string key="NSFrame">{{264, -2}, {259, 22}}</string>
-																									<reference key="NSSuperview" ref="873437769"/>
+																									<reference key="NSNextResponder" ref="345834048"/>
+																									<int key="NSvFlags">266</int>
+																									<string key="NSFrame">{{264, 248}, {259, 22}}</string>
+																									<reference key="NSSuperview" ref="345834048"/>
 																									<bool key="NSEnabled">YES</bool>
 																									<object class="NSPopUpButtonCell" key="NSCell" id="830957297">
 																										<int key="NSCellFlags">-2076049856</int>
@@ -3308,10 +3462,10 @@
 																									</object>
 																								</object>
 																								<object class="NSPopUpButton" id="872178320">
-																									<reference key="NSNextResponder" ref="873437769"/>
-																									<int key="NSvFlags">288</int>
-																									<string key="NSFrame">{{17, -2}, {245, 22}}</string>
-																									<reference key="NSSuperview" ref="873437769"/>
+																									<reference key="NSNextResponder" ref="345834048"/>
+																									<int key="NSvFlags">264</int>
+																									<string key="NSFrame">{{17, 248}, {245, 22}}</string>
+																									<reference key="NSSuperview" ref="345834048"/>
 																									<bool key="NSEnabled">YES</bool>
 																									<object class="NSPopUpButtonCell" key="NSCell" id="416049103">
 																										<int key="NSCellFlags">-2076049856</int>
@@ -3392,138 +3546,6 @@
 																									</object>
 																								</object>
 																							</object>
-																							<string key="NSFrameSize">{628, 156}</string>
-																							<reference key="NSSuperview" ref="894339536"/>
-																							<string key="NSClassName">NSView</string>
-																						</object>
-																						<object class="NSCustomView" id="345834048">
-																							<reference key="NSNextResponder" ref="894339536"/>
-																							<int key="NSvFlags">274</int>
-																							<object class="NSMutableArray" key="NSSubviews">
-																								<bool key="EncodedWithXMLCoder">YES</bool>
-																								<object class="NSScrollView" id="678281118">
-																									<reference key="NSNextResponder" ref="345834048"/>
-																									<int key="NSvFlags">4370</int>
-																									<object class="NSMutableArray" key="NSSubviews">
-																										<bool key="EncodedWithXMLCoder">YES</bool>
-																										<object class="NSClipView" id="90844306">
-																											<reference key="NSNextResponder" ref="678281118"/>
-																											<int key="NSvFlags">2304</int>
-																											<object class="NSMutableArray" key="NSSubviews">
-																												<bool key="EncodedWithXMLCoder">YES</bool>
-																												<object class="NSTableView" id="581095761">
-																													<reference key="NSNextResponder" ref="90844306"/>
-																													<int key="NSvFlags">4352</int>
-																													<string key="NSFrameSize">{626, 251}</string>
-																													<reference key="NSSuperview" ref="90844306"/>
-																													<bool key="NSEnabled">YES</bool>
-																													<object class="NSTableHeaderView" key="NSHeaderView" id="1038415606">
-																														<reference key="NSNextResponder" ref="533922066"/>
-																														<int key="NSvFlags">256</int>
-																														<string key="NSFrameSize">{626, 17}</string>
-																														<reference key="NSSuperview" ref="533922066"/>
-																														<reference key="NSTableView" ref="581095761"/>
-																													</object>
-																													<object class="_NSCornerView" key="NSCornerView" id="151074124">
-																														<reference key="NSNextResponder" ref="678281118"/>
-																														<int key="NSvFlags">-2147483392</int>
-																														<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
-																														<reference key="NSSuperview" ref="678281118"/>
-																													</object>
-																													<object class="NSMutableArray" key="NSTableColumns">
-																														<bool key="EncodedWithXMLCoder">YES</bool>
-																														<object class="NSTableColumn" id="544095042">
-																															<double key="NSWidth">6.230000e+02</double>
-																															<double key="NSMinWidth">4.000000e+01</double>
-																															<double key="NSMaxWidth">1.000000e+03</double>
-																															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																																<int key="NSCellFlags">75628032</int>
-																																<int key="NSCellFlags2">0</int>
-																																<string key="NSContents"/>
-																																<reference key="NSSupport" ref="26"/>
-																																<reference key="NSBackgroundColor" ref="799519821"/>
-																																<reference key="NSTextColor" ref="222976159"/>
-																															</object>
-																															<object class="NSTextFieldCell" key="NSDataCell" id="451753495">
-																																<int key="NSCellFlags">70385217</int>
-																																<int key="NSCellFlags2">132096</int>
-																																<string key="NSContents">Text Cell</string>
-																																<reference key="NSSupport" ref="26"/>
-																																<reference key="NSControlView" ref="581095761"/>
-																																<reference key="NSBackgroundColor" ref="480189472"/>
-																																<reference key="NSTextColor" ref="454249633"/>
-																															</object>
-																															<int key="NSResizingMask">3</int>
-																															<bool key="NSIsResizeable">YES</bool>
-																															<reference key="NSTableView" ref="581095761"/>
-																														</object>
-																													</object>
-																													<double key="NSIntercellSpacingWidth">3.000000e+00</double>
-																													<double key="NSIntercellSpacingHeight">2.000000e+00</double>
-																													<reference key="NSBackgroundColor" ref="1024678221"/>
-																													<reference key="NSGridColor" ref="864903678"/>
-																													<double key="NSRowHeight">1.300000e+01</double>
-																													<int key="NSTvFlags">-88080384</int>
-																													<int key="NSColumnAutoresizingStyle">4</int>
-																													<int key="NSDraggingSourceMaskForLocal">15</int>
-																													<int key="NSDraggingSourceMaskForNonLocal">0</int>
-																													<bool key="NSAllowsTypeSelect">YES</bool>
-																												</object>
-																											</object>
-																											<string key="NSFrame">{{1, 17}, {626, 251}}</string>
-																											<reference key="NSSuperview" ref="678281118"/>
-																											<reference key="NSNextKeyView" ref="581095761"/>
-																											<reference key="NSDocView" ref="581095761"/>
-																											<reference key="NSBGColor" ref="1024678221"/>
-																											<int key="NScvFlags">4</int>
-																										</object>
-																										<object class="NSScroller" id="472831765">
-																											<reference key="NSNextResponder" ref="678281118"/>
-																											<int key="NSvFlags">-2147483392</int>
-																											<string key="NSFrame">{{598, 17}, {15, 212}}</string>
-																											<reference key="NSSuperview" ref="678281118"/>
-																											<reference key="NSTarget" ref="678281118"/>
-																											<string key="NSAction">_doScroller:</string>
-																											<double key="NSPercent">9.800000e-01</double>
-																										</object>
-																										<object class="NSScroller" id="851610321">
-																											<reference key="NSNextResponder" ref="678281118"/>
-																											<int key="NSvFlags">-2147483392</int>
-																											<string key="NSFrame">{{1, 229}, {597, 15}}</string>
-																											<reference key="NSSuperview" ref="678281118"/>
-																											<int key="NSsFlags">1</int>
-																											<reference key="NSTarget" ref="678281118"/>
-																											<string key="NSAction">_doScroller:</string>
-																											<double key="NSPercent">9.904762e-01</double>
-																										</object>
-																										<object class="NSClipView" id="533922066">
-																											<reference key="NSNextResponder" ref="678281118"/>
-																											<int key="NSvFlags">2304</int>
-																											<object class="NSMutableArray" key="NSSubviews">
-																												<bool key="EncodedWithXMLCoder">YES</bool>
-																												<reference ref="1038415606"/>
-																											</object>
-																											<string key="NSFrame">{{1, 0}, {626, 17}}</string>
-																											<reference key="NSSuperview" ref="678281118"/>
-																											<reference key="NSNextKeyView" ref="1038415606"/>
-																											<reference key="NSDocView" ref="1038415606"/>
-																											<reference key="NSBGColor" ref="1024678221"/>
-																											<int key="NScvFlags">4</int>
-																										</object>
-																										<reference ref="151074124"/>
-																									</object>
-																									<string key="NSFrameSize">{628, 269}</string>
-																									<reference key="NSSuperview" ref="345834048"/>
-																									<reference key="NSNextKeyView" ref="90844306"/>
-																									<int key="NSsFlags">562</int>
-																									<reference key="NSVScroller" ref="472831765"/>
-																									<reference key="NSHScroller" ref="851610321"/>
-																									<reference key="NSContentView" ref="90844306"/>
-																									<reference key="NSHeaderClipView" ref="533922066"/>
-																									<reference key="NSCornerView" ref="151074124"/>
-																									<bytes key="NSScrollAmts">QSAAAEEgAABBcAAAQXAAAA</bytes>
-																								</object>
-																							</object>
 																							<string key="NSFrame">{{0, 165}, {628, 269}}</string>
 																							<reference key="NSSuperview" ref="894339536"/>
 																							<string key="NSClassName">NSView</string>
@@ -3596,6 +3618,7 @@
 																				</object>
 																			</object>
 																			<string key="NSFrame">{{10, 7}, {638, 544}}</string>
+																			<reference key="NSSuperview" ref="714795046"/>
 																		</object>
 																		<string key="NSLabel">Custom Query</string>
 																		<reference key="NSColor" ref="62854682"/>
@@ -3968,14 +3991,14 @@
 																		<reference key="NSTabView" ref="714795046"/>
 																	</object>
 																</object>
-																<reference key="NSSelectedTabViewItem" ref="624106058"/>
+																<reference key="NSSelectedTabViewItem" ref="105987292"/>
 																<reference key="NSFont" ref="26"/>
 																<int key="NSTvFlags">134217731</int>
 																<bool key="NSAllowTruncatedLabels">YES</bool>
 																<bool key="NSDrawsBackground">YES</bool>
 																<object class="NSMutableArray" key="NSSubviews">
 																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<reference ref="1013108064"/>
+																	<reference ref="746504912"/>
 																</object>
 															</object>
 														</object>
@@ -16045,6 +16068,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="678281118"/>
+							<reference ref="872178320"/>
+							<reference ref="86760255"/>
+							<reference ref="811536132"/>
 						</object>
 						<reference key="parent" ref="894339536"/>
 					</object>
@@ -16053,41 +16079,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="object" ref="873437769"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="872178320"/>
-							<reference ref="86760255"/>
-							<reference ref="811536132"/>
 							<reference ref="71560786"/>
 						</object>
 						<reference key="parent" ref="894339536"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1182</int>
-						<reference key="object" ref="872178320"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="416049103"/>
-						</object>
-						<reference key="parent" ref="873437769"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1175</int>
-						<reference key="object" ref="86760255"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="830957297"/>
-						</object>
-						<reference key="parent" ref="873437769"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">125</int>
-						<reference key="object" ref="811536132"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="177866566"/>
-						</object>
-						<reference key="parent" ref="873437769"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">121</int>
 						<reference key="object" ref="71560786"/>
 						<object class="NSMutableArray" key="children">
@@ -16114,75 +16110,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="parent" ref="71560786"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">3779</int>
-						<reference key="object" ref="177866566"/>
-						<reference key="parent" ref="811536132"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3780</int>
-						<reference key="object" ref="830957297"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="766637184"/>
-						</object>
-						<reference key="parent" ref="86760255"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1183</int>
-						<reference key="object" ref="766637184"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="13183167"/>
-						</object>
-						<reference key="parent" ref="830957297"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1177</int>
-						<reference key="object" ref="13183167"/>
-						<reference key="parent" ref="766637184"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3781</int>
-						<reference key="object" ref="416049103"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="960790892"/>
-						</object>
-						<reference key="parent" ref="872178320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1178</int>
-						<reference key="object" ref="960790892"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="923183582"/>
-							<reference ref="829073375"/>
-							<reference ref="5128219"/>
-							<reference ref="560786252"/>
-						</object>
-						<reference key="parent" ref="416049103"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1176</int>
-						<reference key="object" ref="923183582"/>
-						<reference key="parent" ref="960790892"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1179</int>
-						<reference key="object" ref="829073375"/>
-						<reference key="parent" ref="960790892"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1180</int>
-						<reference key="object" ref="5128219"/>
-						<reference key="parent" ref="960790892"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1181</int>
-						<reference key="object" ref="560786252"/>
-						<reference key="parent" ref="960790892"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">133</int>
 						<reference key="object" ref="678281118"/>
 						<object class="NSMutableArray" key="children">
@@ -16949,6 +16876,102 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="parent" ref="1043842561"/>
 						<string key="objectName">SPTableData</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">125</int>
+						<reference key="object" ref="811536132"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="177866566"/>
+						</object>
+						<reference key="parent" ref="345834048"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3779</int>
+						<reference key="object" ref="177866566"/>
+						<reference key="parent" ref="811536132"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1175</int>
+						<reference key="object" ref="86760255"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="830957297"/>
+						</object>
+						<reference key="parent" ref="345834048"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3780</int>
+						<reference key="object" ref="830957297"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="766637184"/>
+						</object>
+						<reference key="parent" ref="86760255"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1183</int>
+						<reference key="object" ref="766637184"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="13183167"/>
+						</object>
+						<reference key="parent" ref="830957297"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1177</int>
+						<reference key="object" ref="13183167"/>
+						<reference key="parent" ref="766637184"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1182</int>
+						<reference key="object" ref="872178320"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="416049103"/>
+						</object>
+						<reference key="parent" ref="345834048"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3781</int>
+						<reference key="object" ref="416049103"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="960790892"/>
+						</object>
+						<reference key="parent" ref="872178320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1178</int>
+						<reference key="object" ref="960790892"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="560786252"/>
+							<reference ref="5128219"/>
+							<reference ref="829073375"/>
+							<reference ref="923183582"/>
+						</object>
+						<reference key="parent" ref="416049103"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1181</int>
+						<reference key="object" ref="560786252"/>
+						<reference key="parent" ref="960790892"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1180</int>
+						<reference key="object" ref="5128219"/>
+						<reference key="parent" ref="960790892"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1179</int>
+						<reference key="object" ref="829073375"/>
+						<reference key="parent" ref="960790892"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1176</int>
+						<reference key="object" ref="923183582"/>
+						<reference key="parent" ref="960790892"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">