* renaming a table/view/proc/func now doesn't open a sheet anymore

* table name checks now correctly consider only functions when working with functions
* when an empty table name is entered, the change is ignored (like in finder)

1 files changed, 101 insertions, 443 deletions

diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index cec05aa8..a4db02ad 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -18,7 +18,7 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<string>740</string>
 				<string>740</string>
-				<string>1.2.1</string>
+				<string>1.2.5</string>
 			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
@@ -1691,6 +1691,7 @@
 																				<bool key="BWGBHasTopBorder">NO</bool>
 																				<bool key="BWGBHasBottomBorder">NO</bool>
 																				<bool key="BWGBHasGradient">NO</bool>
+																				<bool key="BWGBHasFillColor">NO</bool>
 																				<float key="BWGBTopInsetAlpha">0.0</float>
 																				<float key="BWGBBottomInsetAlpha">0.0</float>
 																			</object>
@@ -5956,107 +5957,6 @@
 				<string key="NSMinSize">{260, 149}</string>
 				<string key="NSMaxSize">{600, 149}</string>
 			</object>
-			<object class="NSWindowTemplate" id="399092485">
-				<int key="NSWindowStyleMask">9</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{343, 483}, {260, 112}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">Rename Table</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<string key="NSWindowContentMaxSize">{600, 112}</string>
-				<string key="NSWindowContentMinSize">{260, 112}</string>
-				<object class="NSView" key="NSWindowView" id="44272488">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="731300775">
-							<reference key="NSNextResponder" ref="44272488"/>
-							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{17, 78}, {235, 14}}</string>
-							<reference key="NSSuperview" ref="44272488"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="487237473">
-								<int key="NSCellFlags">67239488</int>
-								<int key="NSCellFlags2">4196864</int>
-								<string key="NSContents">Rename table %@ to:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="731300775"/>
-								<reference key="NSBackgroundColor" ref="62854682"/>
-								<reference key="NSTextColor" ref="454249633"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="272856728">
-							<reference key="NSNextResponder" ref="44272488"/>
-							<int key="NSvFlags">258</int>
-							<string key="NSFrame">{{20, 52}, {220, 18}}</string>
-							<reference key="NSSuperview" ref="44272488"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="859957158">
-								<int key="NSCellFlags">-1804468671</int>
-								<int key="NSCellFlags2">4326400</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="272856728"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="480189472"/>
-								<reference key="NSTextColor" ref="690893883"/>
-							</object>
-						</object>
-						<object class="NSButton" id="994798282">
-							<reference key="NSNextResponder" ref="44272488"/>
-							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{166, 13}, {79, 28}}</string>
-							<reference key="NSSuperview" ref="44272488"/>
-							<int key="NSTag">1</int>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="825486974">
-								<int key="NSCellFlags">604110336</int>
-								<int key="NSCellFlags2">138018816</int>
-								<string key="NSContents">Rename</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="994798282"/>
-								<int key="NSTag">1</int>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="932958253"/>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSButton" id="88145988">
-							<reference key="NSNextResponder" ref="44272488"/>
-							<int key="NSvFlags">257</int>
-							<string key="NSFrame">{{91, 13}, {77, 28}}</string>
-							<reference key="NSSuperview" ref="44272488"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="875831639">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">138018816</int>
-								<string key="NSContents">Cancel</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="88145988"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="932958253"/>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{260, 112}</string>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMinSize">{260, 134}</string>
-				<string key="NSMaxSize">{600, 134}</string>
-			</object>
 			<object class="NSWindowTemplate" id="549044462">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
@@ -12973,30 +12873,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<int key="connectionID">5605</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tableRenameSheet</string>
-						<reference key="source" ref="438574515"/>
-						<reference key="destination" ref="399092485"/>
-					</object>
-					<int key="connectionID">5685</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tableRenameText</string>
-						<reference key="source" ref="438574515"/>
-						<reference key="destination" ref="731300775"/>
-					</object>
-					<int key="connectionID">5686</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">closeSheet:</string>
-						<reference key="source" ref="438574515"/>
-						<reference key="destination" ref="88145988"/>
-					</object>
-					<int key="connectionID">5691</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">closeSheet:</string>
 						<reference key="source" ref="438574515"/>
@@ -13005,30 +12881,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<int key="connectionID">5692</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">closeSheet:</string>
-						<reference key="source" ref="438574515"/>
-						<reference key="destination" ref="994798282"/>
-					</object>
-					<int key="connectionID">5693</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="272856728"/>
-						<reference key="destination" ref="438574515"/>
-					</object>
-					<int key="connectionID">5694</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tableRenameField</string>
-						<reference key="source" ref="438574515"/>
-						<reference key="destination" ref="272856728"/>
-					</object>
-					<int key="connectionID">5697</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">tableNameField</string>
 						<reference key="source" ref="438574515"/>
@@ -13762,14 +13614,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">renameTableButton</string>
-						<reference key="source" ref="438574515"/>
-						<reference key="destination" ref="994798282"/>
-					</object>
-					<int key="connectionID">6206</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">databaseDataInstance</string>
 						<reference key="source" ref="438574515"/>
 						<reference key="destination" ref="631714493"/>
@@ -19025,84 +18869,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="parent" ref="81525228"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">5675</int>
-						<reference key="object" ref="399092485"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="44272488"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Rename Table Sheet</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5676</int>
-						<reference key="object" ref="44272488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="994798282"/>
-							<reference ref="731300775"/>
-							<reference ref="272856728"/>
-							<reference ref="88145988"/>
-						</object>
-						<reference key="parent" ref="399092485"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5677</int>
-						<reference key="object" ref="88145988"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="875831639"/>
-						</object>
-						<reference key="parent" ref="44272488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5678</int>
-						<reference key="object" ref="272856728"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="859957158"/>
-						</object>
-						<reference key="parent" ref="44272488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5679</int>
-						<reference key="object" ref="731300775"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="487237473"/>
-						</object>
-						<reference key="parent" ref="44272488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5680</int>
-						<reference key="object" ref="994798282"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="825486974"/>
-						</object>
-						<reference key="parent" ref="44272488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5681</int>
-						<reference key="object" ref="825486974"/>
-						<reference key="parent" ref="994798282"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5682</int>
-						<reference key="object" ref="487237473"/>
-						<reference key="parent" ref="731300775"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5683</int>
-						<reference key="object" ref="859957158"/>
-						<reference key="parent" ref="272856728"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5684</int>
-						<reference key="object" ref="875831639"/>
-						<reference key="parent" ref="88145988"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">5701</int>
 						<reference key="object" ref="799840790"/>
 						<object class="NSMutableArray" key="children">
@@ -21862,28 +21628,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>5658.IBPluginDependency</string>
 					<string>5659.IBPluginDependency</string>
 					<string>5660.IBPluginDependency</string>
-					<string>5675.IBEditorWindowLastContentRect</string>
-					<string>5675.IBPluginDependency</string>
-					<string>5675.IBWindowTemplateEditedContentRect</string>
-					<string>5675.ImportedFromIB2</string>
-					<string>5675.windowTemplate.hasMaxSize</string>
-					<string>5675.windowTemplate.hasMinSize</string>
-					<string>5675.windowTemplate.maxSize</string>
-					<string>5675.windowTemplate.minSize</string>
-					<string>5676.IBPluginDependency</string>
-					<string>5676.ImportedFromIB2</string>
-					<string>5677.IBPluginDependency</string>
-					<string>5677.ImportedFromIB2</string>
-					<string>5678.IBPluginDependency</string>
-					<string>5678.ImportedFromIB2</string>
-					<string>5679.IBPluginDependency</string>
-					<string>5679.ImportedFromIB2</string>
-					<string>5680.IBPluginDependency</string>
-					<string>5680.ImportedFromIB2</string>
-					<string>5681.IBPluginDependency</string>
-					<string>5682.IBPluginDependency</string>
-					<string>5683.IBPluginDependency</string>
-					<string>5684.IBPluginDependency</string>
 					<string>5701.IBPluginDependency</string>
 					<string>5701.ImportedFromIB2</string>
 					<string>5702.IBPluginDependency</string>
@@ -23544,28 +23288,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{654, 442}, {260, 112}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{654, 442}, {260, 112}}</string>
-					<integer value="1"/>
-					<boolean value="YES"/>
-					<integer value="1"/>
-					<string>{600, 112}</string>
-					<string>{260, 112}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -24258,14 +23980,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>mySQLConnection</string>
-							<string>tableData</string>
 							<string>tableInstance</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -24314,7 +24034,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>chooseQueryFavorite:</string>
 							<string>chooseQueryHistory:</string>
+							<string>clearQueryHistory:</string>
 							<string>closeSheet:</string>
+							<string>copyQueryHistory:</string>
 							<string>filterQueryFavorites:</string>
 							<string>filterQueryHistory:</string>
 							<string>gearMenuItemSelected:</string>
@@ -24327,6 +24049,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>helpTargetDispatcher:</string>
 							<string>runAllQueries:</string>
 							<string>runSelectedQueries:</string>
+							<string>saveQueryHistory:</string>
 							<string>showAutoHelpForCurrentWord:</string>
 							<string>showHelpForCurrentWord:</string>
 							<string>showHelpForSearchString:</string>
@@ -24351,6 +24074,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -24366,8 +24092,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>commentCurrentQueryMenuItem</string>
 							<string>commentLineOrSelectionMenuItem</string>
 							<string>completionListMenuItem</string>
+							<string>copyHistoryMenuItem</string>
+							<string>customQueryScrollView</string>
 							<string>customQueryView</string>
 							<string>editorFontMenuItem</string>
+							<string>encodingPopUp</string>
 							<string>errorText</string>
 							<string>helpNavigator</string>
 							<string>helpSearchField</string>
@@ -24392,6 +24121,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>runAllMenuItem</string>
 							<string>runSelectionButton</string>
 							<string>runSelectionMenuItem</string>
+							<string>saveHistoryMenuItem</string>
 							<string>saveQueryFavoriteButton</string>
 							<string>saveQueryFavoriteGlobal</string>
 							<string>shiftLeftMenuItem</string>
@@ -24413,8 +24143,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
+							<string>NSMenuItem</string>
+							<string>NSScrollView</string>
 							<string>CMCopyTable</string>
 							<string>NSMenuItem</string>
+							<string>NSPopUpButton</string>
 							<string>id</string>
 							<string>NSSegmentedControl</string>
 							<string>NSSearchField</string>
@@ -24439,6 +24172,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>NSMenuItem</string>
 							<string>id</string>
 							<string>NSMenuItem</string>
+							<string>NSMenuItem</string>
 							<string>NSButton</string>
 							<string>id</string>
 							<string>NSMenuItem</string>
@@ -25080,7 +24814,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>NSView</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
+							<string>NSPopUpButton</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
@@ -25743,173 +25477,76 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 				</object>
 			</object>
-			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
-					<string key="className">CustomQuery</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>chooseQueryFavorite:</string>
-							<string>chooseQueryHistory:</string>
-							<string>clearQueryHistory:</string>
-							<string>closeSheet:</string>
-							<string>copyQueryHistory:</string>
-							<string>filterQueryFavorites:</string>
-							<string>filterQueryHistory:</string>
-							<string>gearMenuItemSelected:</string>
-							<string>helpSearchFindNextInPage:</string>
-							<string>helpSearchFindPreviousInPage:</string>
-							<string>helpSegmentDispatcher:</string>
-							<string>helpSelectHelpTargetMySQL:</string>
-							<string>helpSelectHelpTargetPage:</string>
-							<string>helpSelectHelpTargetWeb:</string>
-							<string>helpTargetDispatcher:</string>
-							<string>runAllQueries:</string>
-							<string>runSelectedQueries:</string>
-							<string>saveQueryHistory:</string>
-							<string>showAutoHelpForCurrentWord:</string>
-							<string>showHelpForCurrentWord:</string>
-							<string>showHelpForSearchString:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
+					<string key="className">BWAnchoredButton</string>
+					<string key="superclassName">NSButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/BWAnchoredButton.h</string>
 					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>affectedRowsText</string>
-							<string>autohelpMenuItem</string>
-							<string>autoindentMenuItem</string>
-							<string>autopairMenuItem</string>
-							<string>autouppercaseKeywordsMenuItem</string>
-							<string>clearHistoryMenuItem</string>
-							<string>commentCurrentQueryMenuItem</string>
-							<string>commentLineOrSelectionMenuItem</string>
-							<string>completionListMenuItem</string>
-							<string>copyHistoryMenuItem</string>
-							<string>customQueryScrollView</string>
-							<string>customQueryView</string>
-							<string>editorFontMenuItem</string>
-							<string>errorText</string>
-							<string>helpNavigator</string>
-							<string>helpSearchField</string>
-							<string>helpSearchFieldCell</string>
-							<string>helpTargetSelector</string>
-							<string>helpWebView</string>
-							<string>helpWebViewWindow</string>
-							<string>multipleLineEditingButton</string>
-							<string>queryFavoriteNameTextField</string>
-							<string>queryFavoritesButton</string>
-							<string>queryFavoritesSaveAllMenuItem</string>
-							<string>queryFavoritesSaveAsMenuItem</string>
-							<string>queryFavoritesSearchField</string>
-							<string>queryFavoritesSearchFieldView</string>
-							<string>queryFavoritesSearchMenuItem</string>
-							<string>queryFavoritesSheet</string>
-							<string>queryHistoryButton</string>
-							<string>queryHistorySearchField</string>
-							<string>queryHistorySearchFieldView</string>
-							<string>queryHistorySearchMenuItem</string>
-							<string>runAllButton</string>
-							<string>runAllMenuItem</string>
-							<string>runSelectionButton</string>
-							<string>runSelectionMenuItem</string>
-							<string>saveHistoryMenuItem</string>
-							<string>saveQueryFavoriteButton</string>
-							<string>saveQueryFavoriteGlobal</string>
-							<string>shiftLeftMenuItem</string>
-							<string>shiftRightMenuItem</string>
-							<string>tableDocumentInstance</string>
-							<string>tableWindow</string>
-							<string>textView</string>
-							<string>valueSheet</string>
-							<string>valueTextField</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSScrollView</string>
-							<string>CMCopyTable</string>
-							<string>NSMenuItem</string>
-							<string>id</string>
-							<string>NSSegmentedControl</string>
-							<string>NSSearchField</string>
-							<string>NSSearchFieldCell</string>
-							<string>NSSegmentedControl</string>
-							<string>WebView</string>
-							<string>NSWindow</string>
-							<string>id</string>
-							<string>NSTextField</string>
-							<string>id</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSSearchField</string>
-							<string>id</string>
-							<string>NSMenuItem</string>
-							<string>NSWindow</string>
-							<string>id</string>
-							<string>NSSearchField</string>
-							<string>id</string>
-							<string>NSMenuItem</string>
-							<string>id</string>
-							<string>NSMenuItem</string>
-							<string>id</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>NSButton</string>
-							<string>id</string>
-							<string>NSMenuItem</string>
-							<string>NSMenuItem</string>
-							<string>id</string>
-							<string>id</string>
-							<string>CMTextView</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">BWAnchoredButtonBar</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/BWAnchoredButtonBar.h</string>
 					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">BWAnchoredButtonCell</string>
+					<string key="superclassName">NSButtonCell</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBDocumentRelativeSource</string>
-						<string key="minorKey">../../Source/CustomQuery.h</string>
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/BWAnchoredButtonCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">BWAnchoredPopUpButton</string>
+					<string key="superclassName">NSPopUpButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/BWAnchoredPopUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">BWAnchoredPopUpButtonCell</string>
+					<string key="superclassName">NSPopUpButtonCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/BWAnchoredPopUpButtonCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">BWGradientBox</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/BWGradientBox.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">BWInsetTextField</string>
+					<string key="superclassName">NSTextField</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/BWInsetTextField.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">BWSplitView</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="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/BWSplitView.h</string>
 					</object>
 				</object>
-			</object>
-			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
-				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSActionCell</string>
 					<string key="superclassName">NSCell</string>
@@ -25962,6 +25599,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">NSBox</string>
 					<string key="superclassName">NSView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -26715,6 +26359,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<reference key="sourceIdentifier" ref="559681503"/>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/NSView+BWAdditions.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">NSWindow</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
@@ -26737,6 +26388,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">NSWindowController</string>
 					<string key="superclassName">NSResponder</string>
 					<object class="NSMutableDictionary" key="actions">