• query favorite manager

- first step to allow to manage global favs (stored in the prefs) and connection-based (not yet implemented - will be stored in ApplicationSupport/SequelPro)
- fav table is now a grouped table à la Table List
- second column in fav table will be used soon ;)
- now the sheet has two buttons "Save" and "Cancel" in order to be able to dismiss changes
- enabled table view inline editing of query names

1 files changed, 214 insertions, 253 deletions

diff --git a/Interfaces/English.lproj/QueryFavoriteManager.xib b/Interfaces/English.lproj/QueryFavoriteManager.xib
index e33fd010..b943f8d3 100644
--- a/Interfaces/English.lproj/QueryFavoriteManager.xib
+++ b/Interfaces/English.lproj/QueryFavoriteManager.xib
@@ -45,7 +45,7 @@
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{500, 371}</string>
 				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -62,9 +62,8 @@
 										<object class="NSButton" id="478413208">
 											<reference key="NSNextResponder" ref="813298639"/>
 											<int key="NSvFlags">292</int>
-											<string key="NSFrame">{{0, -1}, {32, 25}}</string>
+											<string key="NSFrame">{{0, -2}, {32, 25}}</string>
 											<reference key="NSSuperview" ref="813298639"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="63587388">
 												<int key="NSCellFlags">67239424</int>
@@ -91,9 +90,8 @@
 										<object class="NSButton" id="960187291">
 											<reference key="NSNextResponder" ref="813298639"/>
 											<int key="NSvFlags">292</int>
-											<string key="NSFrame">{{31, -1}, {32, 25}}</string>
+											<string key="NSFrame">{{31, -2}, {32, 25}}</string>
 											<reference key="NSSuperview" ref="813298639"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="1023807891">
 												<int key="NSCellFlags">67239424</int>
@@ -126,20 +124,27 @@
 														<object class="NSTableView" id="522643855">
 															<reference key="NSNextResponder" ref="106335880"/>
 															<int key="NSvFlags">4352</int>
-															<string key="NSFrameSize">{190, 338}</string>
+															<string key="NSFrameSize">{162, 323}</string>
 															<reference key="NSSuperview" ref="106335880"/>
-															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
-															<object class="_NSCornerView" key="NSCornerView">
-																<nil key="NSNextResponder"/>
+															<object class="NSTableHeaderView" key="NSHeaderView" id="724842455">
+																<reference key="NSNextResponder" ref="642947098"/>
+																<int key="NSvFlags">4352</int>
+																<string key="NSFrameSize">{162, 17}</string>
+																<reference key="NSSuperview" ref="642947098"/>
+																<reference key="NSTableView" ref="522643855"/>
+															</object>
+															<object class="_NSCornerView" key="NSCornerView" id="299150059">
+																<reference key="NSNextResponder" ref="205303038"/>
 																<int key="NSvFlags">-2147483392</int>
-																<string key="NSFrame">{{176, 0}, {16, 17}}</string>
+																<string key="NSFrame">{{-22, 0}, {12, 17}}</string>
+																<reference key="NSSuperview" ref="205303038"/>
 															</object>
 															<object class="NSMutableArray" key="NSTableColumns">
 																<bool key="EncodedWithXMLCoder">YES</bool>
 																<object class="NSTableColumn" id="901293108">
 																	<string key="NSIdentifier">name</string>
-																	<double key="NSWidth">1.870000e+02</double>
+																	<double key="NSWidth">1.300000e+02</double>
 																	<double key="NSMinWidth">4.000000e+01</double>
 																	<double key="NSMaxWidth">1.000000e+03</double>
 																	<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -155,7 +160,7 @@
 																			<int key="NSColorSpace">3</int>
 																			<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
 																		</object>
-																		<object class="NSColor" key="NSTextColor">
+																		<object class="NSColor" key="NSTextColor" id="75208904">
 																			<int key="NSColorSpace">6</int>
 																			<string key="NSCatalogName">System</string>
 																			<string key="NSColorName">headerTextColor</string>
@@ -166,7 +171,7 @@
 																		</object>
 																	</object>
 																	<object class="NSTextFieldCell" key="NSDataCell" id="56401947">
-																		<int key="NSCellFlags">69336641</int>
+																		<int key="NSCellFlags">337772097</int>
 																		<int key="NSCellFlags2">133120</int>
 																		<string key="NSContents">Text Cell</string>
 																		<reference key="NSSupport" ref="26"/>
@@ -187,6 +192,43 @@
 																			<reference key="NSColor" ref="646528321"/>
 																		</object>
 																	</object>
+																	<int key="NSResizingMask">3</int>
+																	<bool key="NSIsResizeable">YES</bool>
+																	<bool key="NSIsEditable">YES</bool>
+																	<reference key="NSTableView" ref="522643855"/>
+																</object>
+																<object class="NSTableColumn" id="183746003">
+																	<string key="NSIdentifier">tabtrigger</string>
+																	<double key="NSWidth">2.600000e+01</double>
+																	<double key="NSMinWidth">1.000000e+01</double>
+																	<double key="NSMaxWidth">3.402823e+38</double>
+																	<object class="NSTableHeaderCell" key="NSHeaderCell">
+																		<int key="NSCellFlags">75628032</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents"/>
+																		<reference key="NSSupport" ref="26"/>
+																		<object class="NSColor" key="NSBackgroundColor">
+																			<int key="NSColorSpace">6</int>
+																			<string key="NSCatalogName">System</string>
+																			<string key="NSColorName">headerColor</string>
+																			<object class="NSColor" key="NSColor" id="359131077">
+																				<int key="NSColorSpace">3</int>
+																				<bytes key="NSWhite">MQA</bytes>
+																			</object>
+																		</object>
+																		<reference key="NSTextColor" ref="75208904"/>
+																	</object>
+																	<object class="NSTextFieldCell" key="NSDataCell" id="577317691">
+																		<int key="NSCellFlags">337772096</int>
+																		<int key="NSCellFlags2">133120</int>
+																		<string key="NSContents">Text Cell</string>
+																		<reference key="NSSupport" ref="26"/>
+																		<reference key="NSControlView" ref="522643855"/>
+																		<reference key="NSBackgroundColor" ref="392588142"/>
+																		<reference key="NSTextColor" ref="810868150"/>
+																	</object>
+																	<int key="NSResizingMask">3</int>
+																	<bool key="NSIsResizeable">YES</bool>
 																	<reference key="NSTableView" ref="522643855"/>
 																</object>
 															</object>
@@ -211,18 +253,17 @@
 																</object>
 															</object>
 															<double key="NSRowHeight">1.600000e+01</double>
-															<int key="NSTvFlags">442499072</int>
-															<int key="NSColumnAutoresizingStyle">0</int>
+															<int key="NSTvFlags">1245741056</int>
+															<string key="NSAutosaveName">SPQueryFavoriteManagerTable</string>
+															<int key="NSColumnAutoresizingStyle">1</int>
 															<int key="NSDraggingSourceMaskForLocal">15</int>
 															<int key="NSDraggingSourceMaskForNonLocal">0</int>
-															<bool key="NSAllowsTypeSelect">NO</bool>
+															<bool key="NSAllowsTypeSelect">YES</bool>
 															<int key="NSTableViewSelectionHighlightStyle">1</int>
 														</object>
 													</object>
-													<string key="NSFrame">{{1, 1}, {168, 338}}</string>
+													<string key="NSFrame">{{0, 17}, {162, 323}}</string>
 													<reference key="NSSuperview" ref="205303038"/>
-													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="522643855"/>
 													<reference key="NSDocView" ref="522643855"/>
 													<reference key="NSBGColor" ref="392588142"/>
 													<int key="NScvFlags">4</int>
@@ -230,35 +271,46 @@
 												<object class="NSScroller" id="322405876">
 													<reference key="NSNextResponder" ref="205303038"/>
 													<int key="NSvFlags">-2147483392</int>
-													<string key="NSFrame">{{183, 1}, {11, 317}}</string>
+													<string key="NSFrame">{{158, 17}, {11, 322}}</string>
 													<reference key="NSSuperview" ref="205303038"/>
-													<reference key="NSWindow"/>
 													<int key="NSsFlags">256</int>
 													<reference key="NSTarget" ref="205303038"/>
 													<string key="NSAction">_doScroller:</string>
-													<double key="NSPercent">9.964158e-01</double>
+													<double key="NSPercent">9.968944e-01</double>
 												</object>
 												<object class="NSScroller" id="336819166">
 													<reference key="NSNextResponder" ref="205303038"/>
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{-100, -100}, {311, 15}}</string>
 													<reference key="NSSuperview" ref="205303038"/>
-													<reference key="NSWindow"/>
-													<bool key="NSEnabled">YES</bool>
 													<int key="NSsFlags">1</int>
 													<reference key="NSTarget" ref="205303038"/>
 													<string key="NSAction">_doScroller:</string>
 													<double key="NSPercent">9.953271e-01</double>
 												</object>
+												<object class="NSClipView" id="642947098">
+													<reference key="NSNextResponder" ref="205303038"/>
+													<int key="NSvFlags">2304</int>
+													<object class="NSMutableArray" key="NSSubviews">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<reference ref="724842455"/>
+													</object>
+													<string key="NSFrameSize">{162, 17}</string>
+													<reference key="NSSuperview" ref="205303038"/>
+													<reference key="NSDocView" ref="724842455"/>
+													<reference key="NSBGColor" ref="392588142"/>
+													<int key="NScvFlags">4</int>
+												</object>
+												<reference ref="299150059"/>
 											</object>
-											<string key="NSFrame">{{-2, 22}, {170, 340}}</string>
+											<string key="NSFrame">{{0, 21}, {162, 340}}</string>
 											<reference key="NSSuperview" ref="813298639"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="106335880"/>
-											<int key="NSsFlags">658</int>
+											<int key="NSsFlags">528</int>
 											<reference key="NSVScroller" ref="322405876"/>
 											<reference key="NSHScroller" ref="336819166"/>
 											<reference key="NSContentView" ref="106335880"/>
+											<reference key="NSHeaderClipView" ref="642947098"/>
+											<reference key="NSCornerView" ref="299150059"/>
 											<bytes key="NSScrollAmts">QSAAAEEgAABBkAAAQZAAAA</bytes>
 										</object>
 										<object class="NSImageView" id="545397681">
@@ -276,9 +328,8 @@
 													<string>NeXT TIFF v4.0 pasteboard type</string>
 												</object>
 											</object>
-											<string key="NSFrame">{{94, 0}, {73, 23}}</string>
+											<string key="NSFrame">{{94, 0}, {68, 23}}</string>
 											<reference key="NSSuperview" ref="813298639"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSImageCell" key="NSCell" id="177143920">
 												<int key="NSCellFlags">130560</int>
@@ -297,9 +348,8 @@
 										<object class="BWAnchoredPopUpButton" id="482670840">
 											<reference key="NSNextResponder" ref="813298639"/>
 											<int key="NSvFlags">292</int>
-											<string key="NSFrame">{{62, -1}, {32, 24}}</string>
+											<string key="NSFrame">{{62, -2}, {32, 24}}</string>
 											<reference key="NSSuperview" ref="813298639"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="BWAnchoredPopUpButtonCell" key="NSCell" id="929623756">
 												<int key="NSCellFlags">71433792</int>
@@ -422,6 +472,7 @@
 															<reference key="NSMenu" ref="299613786"/>
 															<bool key="NSIsDisabled">YES</bool>
 															<bool key="NSIsSeparator">YES</bool>
+															<bool key="NSIsHidden">YES</bool>
 															<string key="NSTitle"/>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
@@ -432,6 +483,7 @@
 														</object>
 														<object class="NSMenuItem" id="846349687">
 															<reference key="NSMenu" ref="299613786"/>
+															<bool key="NSIsHidden">YES</bool>
 															<string key="NSTitle">Remove All...</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
@@ -442,7 +494,6 @@
 														</object>
 													</object>
 												</object>
-												<int key="NSSelectedIndex">5</int>
 												<bool key="NSPullDown">YES</bool>
 												<int key="NSPreferredEdge">1</int>
 												<bool key="NSUsesItemFromMenu">YES</bool>
@@ -450,9 +501,8 @@
 											</object>
 										</object>
 									</object>
-									<string key="NSFrameSize">{167, 361}</string>
+									<string key="NSFrameSize">{162, 361}</string>
 									<reference key="NSSuperview" ref="141381185"/>
-									<reference key="NSWindow"/>
 									<string key="NSClassName">NSView</string>
 								</object>
 								<object class="NSCustomView" id="36799862">
@@ -465,7 +515,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{17, 327}, {45, 14}}</string>
 											<reference key="NSSuperview" ref="36799862"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="448987091">
 												<int key="NSCellFlags">68288064</int>
@@ -485,25 +534,22 @@
 										<object class="NSTextField" id="247897226">
 											<reference key="NSNextResponder" ref="36799862"/>
 											<int key="NSvFlags">266</int>
-											<string key="NSFrame">{{58, 325}, {254, 19}}</string>
+											<string key="NSFrame">{{58, 325}, {259, 19}}</string>
 											<reference key="NSSuperview" ref="36799862"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="474077606">
 												<int key="NSCellFlags">-1804468671</int>
 												<int key="NSCellFlags2">272761856</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="26"/>
+												<string key="NSPlaceholderString">[no selection]</string>
 												<reference key="NSControlView" ref="247897226"/>
 												<bool key="NSDrawsBackground">YES</bool>
 												<object class="NSColor" key="NSBackgroundColor" id="570692726">
 													<int key="NSColorSpace">6</int>
 													<string key="NSCatalogName">System</string>
 													<string key="NSColorName">textBackgroundColor</string>
-													<object class="NSColor" key="NSColor" id="359131077">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MQA</bytes>
-													</object>
+													<reference key="NSColor" ref="359131077"/>
 												</object>
 												<object class="NSColor" key="NSTextColor">
 													<int key="NSColorSpace">6</int>
@@ -526,32 +572,8 @@
 														<object class="NSTextView" id="556251150">
 															<reference key="NSNextResponder" ref="221447089"/>
 															<int key="NSvFlags">2322</int>
-															<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">{290, 14}</string>
+															<string key="NSFrameSize">{295, 14}</string>
 															<reference key="NSSuperview" ref="221447089"/>
-															<reference key="NSWindow"/>
 															<object class="NSTextContainer" key="NSTextContainer" id="74289808">
 																<object class="NSLayoutManager" key="NSLayoutManager">
 																	<object class="NSTextStorage" key="NSTextStorage">
@@ -568,7 +590,7 @@
 																	<nil key="NSDelegate"/>
 																</object>
 																<reference key="NSTextView" ref="556251150"/>
-																<double key="NSWidth">2.900000e+02</double>
+																<double key="NSWidth">2.950000e+02</double>
 																<int key="NSTCFlags">1</int>
 															</object>
 															<object class="NSTextViewSharedData" key="NSSharedData">
@@ -618,15 +640,13 @@
 																<nil key="NSDefaultParagraphStyle"/>
 															</object>
 															<int key="NSTVFlags">6</int>
-															<string key="NSMaxSize">{582, 1e+07}</string>
+															<string key="NSMaxSize">{592, 1e+07}</string>
 															<string key="NSMinize">{223, 0}</string>
 															<nil key="NSDelegate"/>
 														</object>
 													</object>
-													<string key="NSFrame">{{1, 1}, {290, 270}}</string>
+													<string key="NSFrame">{{1, 1}, {295, 270}}</string>
 													<reference key="NSSuperview" ref="407061848"/>
-													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="556251150"/>
 													<reference key="NSDocView" ref="556251150"/>
 													<reference key="NSBGColor" ref="359131077"/>
 													<object class="NSCursor" key="NSCursor">
@@ -640,7 +660,6 @@
 													<int key="NSvFlags">256</int>
 													<string key="NSFrame">{{-100, -100}, {11, 133}}</string>
 													<reference key="NSSuperview" ref="407061848"/>
-													<reference key="NSWindow"/>
 													<int key="NSsFlags">256</int>
 													<reference key="NSTarget" ref="407061848"/>
 													<string key="NSAction">_doScroller:</string>
@@ -651,7 +670,6 @@
 													<int key="NSvFlags">256</int>
 													<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 													<reference key="NSSuperview" ref="407061848"/>
-													<reference key="NSWindow"/>
 													<int key="NSsFlags">1</int>
 													<reference key="NSTarget" ref="407061848"/>
 													<string key="NSAction">_doScroller:</string>
@@ -659,10 +677,8 @@
 													<double key="NSPercent">9.456522e-01</double>
 												</object>
 											</object>
-											<string key="NSFrame">{{20, 45}, {292, 272}}</string>
+											<string key="NSFrame">{{20, 45}, {297, 272}}</string>
 											<reference key="NSSuperview" ref="36799862"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="221447089"/>
 											<int key="NSsFlags">514</int>
 											<reference key="NSVScroller" ref="978638217"/>
 											<reference key="NSHScroller" ref="1008017707"/>
@@ -671,14 +687,14 @@
 										<object class="NSButton" id="556514169">
 											<reference key="NSNextResponder" ref="36799862"/>
 											<int key="NSvFlags">289</int>
-											<string key="NSFrame">{{230, 7}, {87, 28}}</string>
+											<string key="NSFrame">{{235, 7}, {87, 28}}</string>
 											<reference key="NSSuperview" ref="36799862"/>
-											<reference key="NSWindow"/>
+											<int key="NSTag">1</int>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="908635119">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">134348800</int>
-												<string key="NSContents">Close</string>
+												<string key="NSContents">Save</string>
 												<reference key="NSSupport" ref="26"/>
 												<reference key="NSControlView" ref="556514169"/>
 												<int key="NSButtonFlags">-2038284033</int>
@@ -689,16 +705,34 @@
 												<int key="NSPeriodicInterval">25</int>
 											</object>
 										</object>
+										<object class="NSButton" id="602197876">
+											<reference key="NSNextResponder" ref="36799862"/>
+											<int key="NSvFlags">289</int>
+											<string key="NSFrame">{{150, 7}, {87, 28}}</string>
+											<reference key="NSSuperview" ref="36799862"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="615814080">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">134348800</int>
+												<string key="NSContents">Close</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="602197876"/>
+												<int key="NSButtonFlags">-2038284033</int>
+												<int key="NSButtonFlags2">129</int>
+												<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="NSFrame">{{168, 0}, {332, 361}}</string>
+									<string key="NSFrame">{{163, 0}, {337, 361}}</string>
 									<reference key="NSSuperview" ref="141381185"/>
-									<reference key="NSWindow"/>
 									<string key="NSClassName">NSView</string>
 								</object>
 							</object>
 							<string key="NSFrameSize">{500, 361}</string>
 							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
 							<bool key="NSIsVertical">YES</bool>
 							<int key="NSDividerStyle">2</int>
 						</object>
@@ -707,7 +741,6 @@
 							<int key="NSvFlags">10</int>
 							<string key="NSFrame">{{0, 358}, {500, 5}}</string>
 							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -727,29 +760,15 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{500, 371}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{500, 393}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSFrameAutosaveName">SPQueryFavoriteManagerWindow</string>
 			</object>
 			<object class="NSUserDefaultsController" id="592597522">
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
-			<object class="NSArrayController" id="524128400">
-				<object class="NSMutableArray" key="NSDeclaredKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>name</string>
-					<string>query</string>
-				</object>
-				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-				<bool key="NSPreservesSelection">YES</bool>
-				<bool key="NSSelectsInsertedObjects">YES</bool>
-				<bool key="NSFilterRestrictsInsertion">YES</bool>
-				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
-			</object>
 			<object class="NSMenu" id="855448788">
 				<string key="NSTitle"/>
 				<object class="NSMutableArray" key="NSMenuItems">
@@ -855,91 +874,6 @@
 					<int key="connectionID">146</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: values.queryFavorites</string>
-						<reference key="source" ref="524128400"/>
-						<reference key="destination" ref="592597522"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="524128400"/>
-							<reference key="NSDestination" ref="592597522"/>
-							<string key="NSLabel">contentArray: values.queryFavorites</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">values.queryFavorites</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMutableArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSDeletesObjectsOnRemove</string>
-									<string>NSHandlesContentAsCompoundValue</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<boolean value="YES" id="5"/>
-									<reference ref="5"/>
-								</object>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">152</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">queryFavoritesController</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="524128400"/>
-					</object>
-					<int key="connectionID">157</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.name</string>
-						<reference key="source" ref="901293108"/>
-						<reference key="destination" ref="524128400"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="901293108"/>
-							<reference key="NSDestination" ref="524128400"/>
-							<string key="NSLabel">value: arrangedObjects.name</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.name</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">165</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canRemove</string>
-						<reference key="source" ref="960187291"/>
-						<reference key="destination" ref="524128400"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="960187291"/>
-							<reference key="NSDestination" ref="524128400"/>
-							<string key="NSLabel">enabled: canRemove</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canRemove</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">169</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canAdd</string>
-						<reference key="source" ref="478413208"/>
-						<reference key="destination" ref="524128400"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="478413208"/>
-							<reference key="NSDestination" ref="524128400"/>
-							<string key="NSLabel">enabled: canAdd</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canAdd</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">171</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">addQueryFavorite:</string>
 						<reference key="source" ref="1001"/>
@@ -997,14 +931,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="522643855"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">192</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="522643855"/>
 						<reference key="destination" ref="1001"/>
@@ -1052,51 +978,6 @@
 					<int key="connectionID">213</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.name</string>
-						<reference key="source" ref="247897226"/>
-						<reference key="destination" ref="524128400"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="247897226"/>
-							<reference key="NSDestination" ref="524128400"/>
-							<string key="NSLabel">value: selection.name</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.name</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMutableArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSContinuouslyUpdatesValue</string>
-									<string>NSNoSelectionPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="5"/>
-									<string>no selection</string>
-								</object>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">232</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.query</string>
-						<reference key="source" ref="556251150"/>
-						<reference key="destination" ref="524128400"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="556251150"/>
-							<reference key="NSDestination" ref="524128400"/>
-							<string key="NSLabel">value: selection.query</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.query</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">237</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">saveFavoriteToFile:</string>
 						<reference key="source" ref="1001"/>
@@ -1152,6 +1033,38 @@
 					</object>
 					<int key="connectionID">262</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeQueryManagerSheet:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="602197876"/>
+					</object>
+					<int key="connectionID">273</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="522643855"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">274</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">removeButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="960187291"/>
+					</object>
+					<int key="connectionID">275</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="522643855"/>
+						<reference key="destination" ref="556251150"/>
+					</object>
+					<int key="connectionID">277</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1217,11 +1130,11 @@
 						<reference key="object" ref="813298639"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="205303038"/>
 							<reference ref="960187291"/>
 							<reference ref="478413208"/>
 							<reference ref="545397681"/>
 							<reference ref="482670840"/>
+							<reference ref="205303038"/>
 						</object>
 						<reference key="parent" ref="141381185"/>
 					</object>
@@ -1233,6 +1146,7 @@
 							<reference ref="522643855"/>
 							<reference ref="322405876"/>
 							<reference ref="336819166"/>
+							<reference ref="724842455"/>
 						</object>
 						<reference key="parent" ref="813298639"/>
 					</object>
@@ -1270,6 +1184,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="901293108"/>
+							<reference ref="183746003"/>
 						</object>
 						<reference key="parent" ref="205303038"/>
 					</object>
@@ -1306,6 +1221,7 @@
 							<reference ref="350107303"/>
 							<reference ref="407061848"/>
 							<reference ref="556514169"/>
+							<reference ref="602197876"/>
 						</object>
 						<reference key="parent" ref="141381185"/>
 					</object>
@@ -1402,12 +1318,6 @@
 						<reference key="parent" ref="1002"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">148</int>
-						<reference key="object" ref="524128400"/>
-						<reference key="parent" ref="1002"/>
-						<string key="objectName">Query Favorites</string>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">205</int>
 						<reference key="object" ref="855448788"/>
 						<object class="NSMutableArray" key="children">
@@ -1526,6 +1436,39 @@
 						<reference key="object" ref="335130454"/>
 						<reference key="parent" ref="299613786"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">263</int>
+						<reference key="object" ref="183746003"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="577317691"/>
+						</object>
+						<reference key="parent" ref="522643855"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">264</int>
+						<reference key="object" ref="577317691"/>
+						<reference key="parent" ref="183746003"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">265</int>
+						<reference key="object" ref="724842455"/>
+						<reference key="parent" ref="205303038"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">271</int>
+						<reference key="object" ref="602197876"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="615814080"/>
+						</object>
+						<reference key="parent" ref="36799862"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">272</int>
+						<reference key="object" ref="615814080"/>
+						<reference key="parent" ref="602197876"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1560,7 +1503,6 @@
 					<string>14.ImportedFromIB2</string>
 					<string>142.IBPluginDependency</string>
 					<string>143.IBPluginDependency</string>
-					<string>148.IBPluginDependency</string>
 					<string>15.IBPluginDependency</string>
 					<string>17.IBAttributePlaceholdersKey</string>
 					<string>17.IBPluginDependency</string>
@@ -1605,20 +1547,26 @@
 					<string>26.ImportedFromIB2</string>
 					<string>260.IBAttributePlaceholdersKey</string>
 					<string>260.IBPluginDependency</string>
+					<string>263.IBPluginDependency</string>
+					<string>264.IBPluginDependency</string>
+					<string>265.IBPluginDependency</string>
+					<string>27.CustomClassName</string>
 					<string>27.IBPluginDependency</string>
 					<string>27.ImportedFromIB2</string>
+					<string>271.IBPluginDependency</string>
+					<string>272.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{296, 167}, {500, 371}}</string>
-					<string>{{296, 167}, {500, 371}}</string>
+					<string>{{455, 97}, {500, 371}}</string>
+					<string>{{455, 97}, {500, 371}}</string>
 					<boolean value="NO"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
-					<reference ref="5"/>
+					<boolean value="YES"/>
 					<string>{500, 371}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1639,7 +1587,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
@@ -1681,7 +1628,7 @@
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{347, 38}, {241, 152}}</string>
+					<string>{{312, -3}, {241, 152}}</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<object class="NSMutableDictionary">
@@ -1741,7 +1688,13 @@ cGxhY2luZyBhbGwgY3VycmVudCBmYXZvcml0ZXMgcHJlc3Mg4oyYKQ</string>
 					</object>
 					<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>ImageAndTextCell</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -1764,7 +1717,7 @@ cGxhY2luZyBhbGwgY3VycmVudCBmYXZvcml0ZXMgcHJlc3Mg4oyYKQ</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">262</int>
+			<int key="maxID">277</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1931,6 +1884,14 @@ cGxhY2luZyBhbGwgY3VycmVudCBmYXZvcml0ZXMgcHJlc3Mg4oyYKQ</string>
 			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
+					<string key="className">ImageAndTextCell</string>
+					<string key="superclassName">NSTextFieldCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBDocumentRelativeSource</string>
+						<string key="minorKey">../../Source/ImageAndTextCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="348289768">
 						<string key="majorKey">IBDocumentRelativeSource</string>
@@ -1976,7 +1937,7 @@ cGxhY2luZyBhbGwgY3VycmVudCBmYXZvcml0ZXMgcHJlc3Mg4oyYKQ</string>
 							<string>favoriteNameTextField</string>
 							<string>favoriteQueryTextView</string>
 							<string>favoritesTableView</string>
-							<string>queryFavoritesController</string>
+							<string>removeButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1985,7 +1946,7 @@ cGxhY2luZyBhbGwgY3VycmVudCBmYXZvcml0ZXMgcHJlc3Mg4oyYKQ</string>
 							<string>NSTextField</string>
 							<string>NSTextView</string>
 							<string>NSTableView</string>
-							<string>NSArrayController</string>
+							<string>id</string>
 						</object>
 					</object>
 					<reference key="sourceIdentifier" ref="348289768"/>