diff options
| -rw-r--r-- | Interfaces/English.lproj/Preferences.xib | 1179 | ||||
| -rw-r--r-- | Source/SPColorWellCell.h | 32 | ||||
| -rw-r--r-- | Source/SPColorWellCell.m | 51 | ||||
| -rw-r--r-- | Source/SPPreferenceController.h | 9 | ||||
| -rw-r--r-- | Source/SPPreferenceController.m | 163 | ||||
| -rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 6 |
6 files changed, 500 insertions, 940 deletions
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 82a09c77..f900f44d 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -604,7 +604,7 @@ <reference key="NSNextResponder" ref="594324362"/> <int key="NSvFlags">12</int> <string key="NSFrame">{{202.5, 176}, {360, 5}}</string> - <string key="NSBounds">{{2.5, 0}, {355, 5}}</string> + <string key="NSBounds">{{3, 0}, {354, 5}}</string> <reference key="NSSuperview" ref="594324362"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -1798,7 +1798,7 @@ <bytes key="NSRGB">MC44MzkyMTU2OTU5IDAuODY2NjY2Njc0NiAwLjg5ODAzOTIyMTgAA</bytes> </object> </object> - <object class="NSColor" key="NSGridColor"> + <object class="NSColor" key="NSGridColor" id="651588562"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">gridColor</string> @@ -3279,10 +3279,141 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSScrollView" id="288292400"> + <reference key="NSNextResponder" ref="1033452264"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSClipView" id="25515031"> + <reference key="NSNextResponder" ref="288292400"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableView" id="953919633"> + <reference key="NSNextResponder" ref="25515031"/> + <int key="NSvFlags">256</int> + <string key="NSFrameSize">{194, 242}</string> + <reference key="NSSuperview" ref="25515031"/> + <bool key="NSEnabled">YES</bool> + <object class="_NSCornerView" key="NSCornerView"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{224, 0}, {16, 17}}</string> + </object> + <object class="NSMutableArray" key="NSTableColumns"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableColumn" id="1021385850"> + <string key="NSIdentifier">name</string> + <double key="NSWidth">142</double> + <double key="NSMinWidth">40</double> + <double key="NSMaxWidth">1000</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <object class="NSColor" key="NSBackgroundColor" id="317402114"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes> + </object> + <reference key="NSTextColor" ref="263643234"/> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="208478618"> + <int key="NSCellFlags">337772096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents">Text Cell</string> + <reference key="NSSupport" ref="320262838"/> + <reference key="NSControlView" ref="953919633"/> + <reference key="NSBackgroundColor" ref="887465699"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + <int key="NSResizingMask">3</int> + <bool key="NSIsResizeable">YES</bool> + <bool key="NSIsEditable">YES</bool> + <reference key="NSTableView" ref="953919633"/> + </object> + <object class="NSTableColumn" id="78796435"> + <string key="NSIdentifier">color</string> + <double key="NSWidth">40</double> + <double key="NSMinWidth">40</double> + <double key="NSMaxWidth">1000</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSBackgroundColor" ref="317402114"/> + <reference key="NSTextColor" ref="263643234"/> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="709533762"> + <int key="NSCellFlags">337772096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents">Text Cell</string> + <reference key="NSSupport" ref="320262838"/> + <reference key="NSControlView" ref="953919633"/> + <reference key="NSBackgroundColor" ref="887465699"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + <int key="NSResizingMask">3</int> + <bool key="NSIsResizeable">YES</bool> + <reference key="NSTableView" ref="953919633"/> + </object> + </object> + <double key="NSIntercellSpacingWidth">3</double> + <double key="NSIntercellSpacingHeight">2</double> + <reference key="NSBackgroundColor" ref="887465699"/> + <reference key="NSGridColor" ref="651588562"/> + <double key="NSRowHeight">20</double> + <int key="NSTvFlags">304087040</int> + <reference key="NSDelegate"/> + <reference key="NSDataSource"/> + <int key="NSColumnAutoresizingStyle">0</int> + <int key="NSDraggingSourceMaskForLocal">15</int> + <int key="NSDraggingSourceMaskForNonLocal">0</int> + <bool key="NSAllowsTypeSelect">YES</bool> + <int key="NSTableViewDraggingDestinationStyle">0</int> + </object> + </object> + <string key="NSFrame">{{1, 1}, {194, 242}}</string> + <reference key="NSSuperview" ref="288292400"/> + <reference key="NSNextKeyView" ref="953919633"/> + <reference key="NSDocView" ref="953919633"/> + <reference key="NSBGColor" ref="887465699"/> + <int key="NScvFlags">2</int> + </object> + <object class="NSScroller" id="662661535"> + <reference key="NSNextResponder" ref="288292400"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{-100, -100}, {15, 102}}</string> + <reference key="NSSuperview" ref="288292400"/> + <reference key="NSTarget" ref="288292400"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.99658703804016113</double> + </object> + <object class="NSScroller" id="913479800"> + <reference key="NSNextResponder" ref="288292400"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{-100, -100}, {223, 15}}</string> + <reference key="NSSuperview" ref="288292400"/> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="288292400"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.57142859697341919</double> + </object> + </object> + <string key="NSFrame">{{32, 20}, {196, 244}}</string> + <reference key="NSSuperview" ref="1033452264"/> + <reference key="NSNextKeyView" ref="25515031"/> + <int key="NSsFlags">2</int> + <reference key="NSVScroller" ref="662661535"/> + <reference key="NSHScroller" ref="913479800"/> + <reference key="NSContentView" ref="25515031"/> + <bytes key="NSScrollAmts">QSAAAEEgAABBsAAAQbAAAA</bytes> + </object> <object class="NSPopUpButton" id="748242000"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{32, 20}, {24, 24}}</string> + <string key="NSFrame">{{204, 275}, {24, 24}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="373813305"> @@ -3355,7 +3486,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="1018119488"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{407, 88}, {23, 19}}</string> + <string key="NSFrame">{{407, 21}, {23, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="248584789"> @@ -3427,7 +3558,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="304684720"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{269, 90}, {133, 17}}</string> + <string key="NSFrame">{{269, 23}, {133, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="273262177"> @@ -3443,7 +3574,7 @@ AQAAAAA</bytes> <object class="NSStepper" id="161634003"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{437, 86}, {15, 22}}</string> + <string key="NSFrame">{{437, 19}, {15, 22}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSStepperCell" key="NSCell" id="93125704"> @@ -3458,378 +3589,10 @@ AQAAAAA</bytes> <bool key="NSAutorepeat">YES</bool> </object> </object> - <object class="NSColorWell" id="868179656"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 232}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSColorWell" id="384284042"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 261}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSColorWell" id="959599099"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 174}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSColorWell" id="397713661"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 145}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSColorWell" id="752066946"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 319}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSColorWell" id="873950148"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 203}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSColorWell" id="427231908"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 116}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSColorWell" id="454916588"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 58}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSTextField" id="556464668"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 62}, {181, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="159666212"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Selection:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="556464668"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> - <object class="NSColorWell" id="775043265"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 87}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSColorWell" id="298138417"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 348}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSColorWell" id="859016270"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{204, 290}, {44, 23}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes> - </object> - </object> - <object class="NSTextField" id="99482303"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 235}, {182, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="465390474"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Keyword:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="99482303"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> - <object class="NSTextField" id="568872772"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 206}, {182, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="629129203"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Numeric:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="568872772"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> - <object class="NSTextField" id="246467941"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 264}, {182, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="841770398"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Comment:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="246467941"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> - <object class="NSTextField" id="481169742"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 119}, {182, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="837982163"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Variable:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="481169742"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> - <object class="NSTextField" id="923591695"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 91}, {181, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="554509386"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Query Background:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="923591695"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> - <object class="NSTextField" id="8892598"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 177}, {182, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="728610506"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Quote:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="8892598"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> - <object class="NSTextField" id="55746852"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 351}, {182, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="693342907"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Text:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="55746852"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> - <object class="NSTextField" id="496117397"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 148}, {182, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="336899348"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Backtick Quote:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="496117397"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> - <object class="NSTextField" id="477643899"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 322}, {182, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="896659768"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Background:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="477643899"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> <object class="NSTextField" id="676806550"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 390}, {182, 17}}</string> + <string key="NSFrame">{{17, 323}, {182, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="10706281"> @@ -3845,7 +3608,7 @@ AQAAAAA</bytes> <object class="NSButton" id="462361579"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{69, 14}, {185, 32}}</string> + <string key="NSFrame">{{26, 269}, {176, 32}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="603963569"> @@ -3865,7 +3628,7 @@ AQAAAAA</bytes> <object class="NSButton" id="742042283"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{433, 380}, {133, 32}}</string> + <string key="NSFrame">{{433, 313}, {133, 32}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="345790946"> @@ -3885,7 +3648,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="751188139"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{204, 388}, {207, 19}}</string> + <string key="NSFrame">{{204, 321}, {207, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="66452133"> @@ -3899,26 +3662,10 @@ AQAAAAA</bytes> <reference key="NSTextColor" ref="6928728"/> </object> </object> - <object class="NSTextField" id="34959322"> - <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 293}, {182, 17}}</string> - <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="632150824"> - <int key="NSCellFlags">605158976</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Caret:</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="34959322"/> - <reference key="NSBackgroundColor" ref="700609571"/> - <reference key="NSTextColor" ref="1035618107"/> - </object> - </object> <object class="NSButton" id="7445657"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{270, 350}, {292, 18}}</string> + <string key="NSFrame">{{270, 283}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="823431848"> @@ -3940,7 +3687,7 @@ AQAAAAA</bytes> <object class="NSButton" id="571822117"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{270, 321}, {292, 18}}</string> + <string key="NSFrame">{{270, 254}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="743257684"> @@ -3962,7 +3709,7 @@ AQAAAAA</bytes> <object class="NSButton" id="1030846368"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{270, 263}, {292, 18}}</string> + <string key="NSFrame">{{270, 196}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="231642073"> @@ -3984,7 +3731,7 @@ AQAAAAA</bytes> <object class="NSButton" id="397485802"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{270, 292}, {292, 18}}</string> + <string key="NSFrame">{{270, 225}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="491730308"> @@ -4006,7 +3753,7 @@ AQAAAAA</bytes> <object class="NSButton" id="787536920"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{270, 206}, {292, 18}}</string> + <string key="NSFrame">{{270, 139}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="496801621"> @@ -4028,7 +3775,7 @@ AQAAAAA</bytes> <object class="NSButton" id="782193237"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{270, 119}, {292, 18}}</string> + <string key="NSFrame">{{270, 52}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="131748905"> @@ -4050,7 +3797,7 @@ AQAAAAA</bytes> <object class="NSButton" id="827082642"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{270, 177}, {292, 18}}</string> + <string key="NSFrame">{{270, 110}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="92164221"> @@ -4072,7 +3819,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="184945490"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{370, 152}, {29, 19}}</string> + <string key="NSFrame">{{370, 85}, {29, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="409964321"> @@ -4145,7 +3892,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="892250776"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{269, 154}, {96, 14}}</string> + <string key="NSFrame">{{269, 87}, {96, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1060023867"> @@ -4161,7 +3908,7 @@ AQAAAAA</bytes> <object class="NSStepper" id="107658761"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{405, 150}, {15, 22}}</string> + <string key="NSFrame">{{405, 83}, {15, 22}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSStepperCell" key="NSCell" id="171005061"> @@ -4179,7 +3926,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="1009372112"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{423, 154}, {140, 14}}</string> + <string key="NSFrame">{{423, 87}, {140, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="201150384"> @@ -4195,7 +3942,7 @@ AQAAAAA</bytes> <object class="NSButton" id="774563613"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">-2147483380</int> - <string key="NSFrame">{{270, 57}, {292, 18}}</string> + <string key="NSFrame">{{270, -10}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="420702000"> @@ -4217,7 +3964,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="16021182"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{370, 238}, {29, 19}}</string> + <string key="NSFrame">{{370, 171}, {29, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="992523117"> @@ -4290,7 +4037,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="140155660"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{269, 240}, {96, 14}}</string> + <string key="NSFrame">{{269, 173}, {96, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="499174965"> @@ -4306,7 +4053,7 @@ AQAAAAA</bytes> <object class="NSStepper" id="682694750"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{405, 236}, {15, 22}}</string> + <string key="NSFrame">{{405, 169}, {15, 22}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSStepperCell" key="NSCell" id="266600395"> @@ -4324,7 +4071,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="659498064"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{423, 240}, {140, 14}}</string> + <string key="NSFrame">{{423, 173}, {140, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="516695546"> @@ -4340,7 +4087,7 @@ AQAAAAA</bytes> <object class="NSBox" id="863604695"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">12</int> - <string key="NSFrame">{{204, 377}, {356, 5}}</string> + <string key="NSFrame">{{204, 310}, {356, 5}}</string> <reference key="NSSuperview" ref="1033452264"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -4360,14 +4107,14 @@ AQAAAAA</bytes> <bool key="NSTransparent">NO</bool> </object> </object> - <string key="NSFrameSize">{580, 428}</string> + <string key="NSFrameSize">{580, 361}</string> <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSUserDefaultsController" id="151174232"> <object class="NSMutableArray" key="NSDeclaredKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>CustomQueryEditorSelectionColor</string> + <string>GlobalResultTableFont</string> </object> <bool key="NSSharedInstance">YES</bool> </object> @@ -4984,166 +4731,6 @@ AQAAAAA</bytes> <int key="connectionID">801</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorCommentColor</string> - <reference key="source" ref="384284042"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="384284042"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorCommentColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorCommentColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">841</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorNumericColor</string> - <reference key="source" ref="873950148"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="873950148"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorNumericColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorNumericColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">842</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorSQLKeywordColor</string> - <reference key="source" ref="868179656"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="868179656"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorSQLKeywordColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorSQLKeywordColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">843</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorVariableColor</string> - <reference key="source" ref="427231908"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="427231908"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorVariableColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorVariableColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">844</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorQuoteColor</string> - <reference key="source" ref="959599099"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="959599099"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorQuoteColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorQuoteColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">845</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorBacktickColor</string> - <reference key="source" ref="397713661"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="397713661"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorBacktickColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorBacktickColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">846</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorBackgroundColor</string> - <reference key="source" ref="752066946"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="752066946"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorBackgroundColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorBackgroundColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">847</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorTextColor</string> - <reference key="source" ref="298138417"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="298138417"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorTextColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorTextColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">848</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">editorView</string> <reference key="source" ref="1001"/> @@ -5204,26 +4791,6 @@ AQAAAAA</bytes> <int key="connectionID">961</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorCaretColor</string> - <reference key="source" ref="859016270"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="859016270"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorCaretColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorCaretColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">1007</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">setDefaultColors:</string> <reference key="source" ref="1001"/> @@ -5481,26 +5048,6 @@ AQAAAAA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorHighlightQueryColor</string> - <reference key="source" ref="775043265"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="775043265"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorHighlightQueryColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorHighlightQueryColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">1136</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">value: values.ConsoleEnableLogging</string> <reference key="source" ref="894039889"/> <reference key="destination" ref="151174232"/> @@ -6788,24 +6335,28 @@ AQAAAAA</bytes> <int key="connectionID">1676</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryEditorSelectionColor</string> - <reference key="source" ref="454916588"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="454916588"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryEditorSelectionColor</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryEditorSelectionColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="953919633"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">1691</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">dataSource</string> + <reference key="source" ref="953919633"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">1692</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">colorSettingTableView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="953919633"/> </object> - <int key="connectionID">1681</int> + <int key="connectionID">1693</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -7729,24 +7280,6 @@ AQAAAAA</bytes> <reference ref="751188139"/> <reference ref="676806550"/> <reference ref="863604695"/> - <reference ref="868179656"/> - <reference ref="384284042"/> - <reference ref="959599099"/> - <reference ref="397713661"/> - <reference ref="752066946"/> - <reference ref="873950148"/> - <reference ref="427231908"/> - <reference ref="298138417"/> - <reference ref="859016270"/> - <reference ref="99482303"/> - <reference ref="568872772"/> - <reference ref="246467941"/> - <reference ref="481169742"/> - <reference ref="8892598"/> - <reference ref="55746852"/> - <reference ref="496117397"/> - <reference ref="477643899"/> - <reference ref="34959322"/> <reference ref="7445657"/> <reference ref="571822117"/> <reference ref="1030846368"/> @@ -7754,10 +7287,7 @@ AQAAAAA</bytes> <reference ref="16021182"/> <reference ref="140155660"/> <reference ref="659498064"/> - <reference ref="462361579"/> <reference ref="682694750"/> - <reference ref="775043265"/> - <reference ref="923591695"/> <reference ref="787536920"/> <reference ref="161634003"/> <reference ref="304684720"/> @@ -7770,44 +7300,14 @@ AQAAAAA</bytes> <reference ref="774563613"/> <reference ref="782193237"/> <reference ref="742042283"/> + <reference ref="288292400"/> + <reference ref="462361579"/> <reference ref="748242000"/> - <reference ref="556464668"/> - <reference ref="454916588"/> </object> <reference key="parent" ref="0"/> <string key="objectName">Editor</string> </object> <object class="IBObjectRecord"> - <int key="objectID">803</int> - <reference key="object" ref="868179656"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">804</int> - <reference key="object" ref="384284042"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">805</int> - <reference key="object" ref="959599099"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">806</int> - <reference key="object" ref="873950148"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">807</int> - <reference key="object" ref="427231908"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">823</int> - <reference key="object" ref="397713661"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">950</int> <reference key="object" ref="761347322"/> <object class="NSMutableArray" key="children"> @@ -7836,65 +7336,6 @@ AQAAAAA</bytes> <reference key="parent" ref="302000957"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1000</int> - <reference key="object" ref="859016270"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1026</int> - <reference key="object" ref="99482303"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="465390474"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1027</int> - <reference key="object" ref="568872772"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="629129203"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1028</int> - <reference key="object" ref="246467941"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="841770398"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1029</int> - <reference key="object" ref="481169742"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="837982163"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1030</int> - <reference key="object" ref="8892598"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="728610506"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1032</int> - <reference key="object" ref="496117397"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="336899348"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">1034</int> <reference key="object" ref="676806550"/> <object class="NSMutableArray" key="children"> @@ -7931,15 +7372,6 @@ AQAAAAA</bytes> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1038</int> - <reference key="object" ref="34959322"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="632150824"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">1039</int> <reference key="object" ref="7445657"/> <object class="NSMutableArray" key="children"> @@ -8010,11 +7442,6 @@ AQAAAAA</bytes> <reference key="parent" ref="7445657"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1056</int> - <reference key="object" ref="632150824"/> - <reference key="parent" ref="34959322"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">1057</int> <reference key="object" ref="66452133"/> <reference key="parent" ref="751188139"/> @@ -8035,36 +7462,6 @@ AQAAAAA</bytes> <reference key="parent" ref="676806550"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1062</int> - <reference key="object" ref="336899348"/> - <reference key="parent" ref="496117397"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1064</int> - <reference key="object" ref="728610506"/> - <reference key="parent" ref="8892598"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1065</int> - <reference key="object" ref="837982163"/> - <reference key="parent" ref="481169742"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1066</int> - <reference key="object" ref="841770398"/> - <reference key="parent" ref="246467941"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1067</int> - <reference key="object" ref="629129203"/> - <reference key="parent" ref="568872772"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1068</int> - <reference key="object" ref="465390474"/> - <reference key="parent" ref="99482303"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">1046</int> <reference key="object" ref="682694750"/> <object class="NSMutableArray" key="children"> @@ -8116,44 +7513,6 @@ AQAAAAA</bytes> <reference key="parent" ref="992523117"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1033</int> - <reference key="object" ref="477643899"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="896659768"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1061</int> - <reference key="object" ref="896659768"/> - <reference key="parent" ref="477643899"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1031</int> - <reference key="object" ref="55746852"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="693342907"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1063</int> - <reference key="object" ref="693342907"/> - <reference key="parent" ref="55746852"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">808</int> - <reference key="object" ref="298138417"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">822</int> - <reference key="object" ref="752066946"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">1083</int> <reference key="object" ref="659498064"/> <object class="NSMutableArray" key="children"> @@ -8173,25 +7532,6 @@ AQAAAAA</bytes> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1125</int> - <reference key="object" ref="775043265"/> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1126</int> - <reference key="object" ref="923591695"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="554509386"/> - </object> - <reference key="parent" ref="1033452264"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1127</int> - <reference key="object" ref="554509386"/> - <reference key="parent" ref="923591695"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">1128</int> <reference key="object" ref="787536920"/> <object class="NSMutableArray" key="children"> @@ -9630,23 +8970,63 @@ AQAAAAA</bytes> <reference key="parent" ref="28667448"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1677</int> - <reference key="object" ref="556464668"/> + <int key="objectID">1682</int> + <reference key="object" ref="288292400"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="159666212"/> + <reference ref="662661535"/> + <reference ref="913479800"/> + <reference ref="953919633"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1678</int> - <reference key="object" ref="454916588"/> - <reference key="parent" ref="1033452264"/> + <int key="objectID">1683</int> + <reference key="object" ref="662661535"/> + <reference key="parent" ref="288292400"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1684</int> + <reference key="object" ref="913479800"/> + <reference key="parent" ref="288292400"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1685</int> + <reference key="object" ref="953919633"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1021385850"/> + <reference ref="78796435"/> + </object> + <reference key="parent" ref="288292400"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1687</int> + <reference key="object" ref="1021385850"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="208478618"/> + </object> + <reference key="parent" ref="953919633"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1688</int> + <reference key="object" ref="78796435"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="709533762"/> + </object> + <reference key="parent" ref="953919633"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1689</int> + <reference key="object" ref="709533762"/> + <reference key="parent" ref="78796435"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1679</int> - <reference key="object" ref="159666212"/> - <reference key="parent" ref="556464668"/> + <int key="objectID">1690</int> + <reference key="object" ref="208478618"/> + <reference key="parent" ref="1021385850"/> </object> </object> </object> @@ -9665,23 +9045,13 @@ AQAAAAA</bytes> <string>1.windowTemplate.minSize</string> <string>100.IBPluginDependency</string> <string>100.ImportedFromIB2</string> - <string>1000.IBPluginDependency</string> <string>101.IBPluginDependency</string> <string>102.IBPluginDependency</string> <string>102.ImportedFromIB2</string> - <string>1026.IBPluginDependency</string> - <string>1027.IBPluginDependency</string> - <string>1028.IBPluginDependency</string> - <string>1029.IBPluginDependency</string> - <string>1030.IBPluginDependency</string> - <string>1031.IBPluginDependency</string> - <string>1032.IBPluginDependency</string> - <string>1033.IBPluginDependency</string> <string>1034.IBPluginDependency</string> <string>1035.IBPluginDependency</string> <string>1036.IBPluginDependency</string> <string>1037.IBPluginDependency</string> - <string>1038.IBPluginDependency</string> <string>1039.IBPluginDependency</string> <string>1040.IBPluginDependency</string> <string>1041.IBPluginDependency</string> @@ -9700,27 +9070,15 @@ AQAAAAA</bytes> <string>1053.IBPluginDependency</string> <string>1054.IBPluginDependency</string> <string>1055.IBPluginDependency</string> - <string>1056.IBPluginDependency</string> <string>1057.IBPluginDependency</string> <string>1058.IBPluginDependency</string> <string>1059.IBPluginDependency</string> <string>1060.IBPluginDependency</string> - <string>1061.IBPluginDependency</string> - <string>1062.IBPluginDependency</string> - <string>1063.IBPluginDependency</string> - <string>1064.IBPluginDependency</string> - <string>1065.IBPluginDependency</string> - <string>1066.IBPluginDependency</string> - <string>1067.IBPluginDependency</string> - <string>1068.IBPluginDependency</string> <string>1083.IBPluginDependency</string> <string>1084.IBPluginDependency</string> <string>1085.IBPluginDependency</string> <string>110.IBPluginDependency</string> <string>111.IBPluginDependency</string> - <string>1125.IBPluginDependency</string> - <string>1126.IBPluginDependency</string> - <string>1127.IBPluginDependency</string> <string>1128.IBPluginDependency</string> <string>1129.IBPluginDependency</string> <string>1143.IBPluginDependency</string> @@ -9923,9 +9281,14 @@ AQAAAAA</bytes> <string>1673.IBAttributePlaceholdersKey</string> <string>1673.IBPluginDependency</string> <string>1674.IBPluginDependency</string> - <string>1677.IBPluginDependency</string> - <string>1678.IBPluginDependency</string> - <string>1679.IBPluginDependency</string> + <string>1682.IBPluginDependency</string> + <string>1683.IBPluginDependency</string> + <string>1684.IBPluginDependency</string> + <string>1685.IBPluginDependency</string> + <string>1687.IBPluginDependency</string> + <string>1688.IBPluginDependency</string> + <string>1689.IBPluginDependency</string> + <string>1690.IBPluginDependency</string> <string>17.IBEditorWindowLastContentRect</string> <string>17.IBPluginDependency</string> <string>17.IBUserGuides</string> @@ -10151,14 +9514,6 @@ AQAAAAA</bytes> <string>802.IBEditorWindowLastContentRect</string> <string>802.IBPluginDependency</string> <string>802.IBUserGuides</string> - <string>803.IBPluginDependency</string> - <string>804.IBPluginDependency</string> - <string>805.IBPluginDependency</string> - <string>806.IBPluginDependency</string> - <string>807.IBPluginDependency</string> - <string>808.IBPluginDependency</string> - <string>822.IBPluginDependency</string> - <string>823.IBPluginDependency</string> <string>94.IBPluginDependency</string> <string>94.ImportedFromIB2</string> <string>95.IBPluginDependency</string> @@ -10189,7 +9544,6 @@ AQAAAAA</bytes> <integer value="1"/> <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> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -10206,15 +9560,6 @@ AQAAAAA</bytes> <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> - <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> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -10245,18 +9590,6 @@ AQAAAAA</bytes> <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> - <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> - <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> <object class="NSMutableDictionary"> <string key="NS.key.0">InitialTabViewItem</string> <object class="IBInitialTabViewItemAttribute" key="NS.object.0"> @@ -10482,6 +9815,11 @@ AQAAAAA</bytes> <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> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{194, 257}, {580, 300}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> @@ -10772,7 +10110,7 @@ AQAAAAA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{1328, 433}, {580, 428}}</string> + <string>{{286, 419}, {580, 361}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -10788,14 +10126,6 @@ AQAAAAA</bytes> </object> </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>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> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -10833,7 +10163,7 @@ AQAAAAA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">1681</int> + <int key="maxID">1699</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -11505,6 +10835,7 @@ AQAAAAA</bytes> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>autoUpdateView</string> + <string>colorSettingTableView</string> <string>defaultFavoritePopup</string> <string>editorFontName</string> <string>editorView</string> @@ -11535,6 +10866,7 @@ AQAAAAA</bytes> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSView</string> + <string>NSTableView</string> <string>NSPopUpButton</string> <string>NSTextField</string> <string>NSView</string> @@ -11568,6 +10900,7 @@ AQAAAAA</bytes> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>autoUpdateView</string> + <string>colorSettingTableView</string> <string>defaultFavoritePopup</string> <string>editorFontName</string> <string>editorView</string> @@ -11602,6 +10935,10 @@ AQAAAAA</bytes> <string key="candidateClassName">NSView</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">colorSettingTableView</string> + <string key="candidateClassName">NSTableView</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">defaultFavoritePopup</string> <string key="candidateClassName">NSPopUpButton</string> </object> @@ -11865,14 +11202,6 @@ AQAAAAA</bytes> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSColorWell</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSColorWell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSControl</string> <string key="superclassName">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="449138115"> diff --git a/Source/SPColorWellCell.h b/Source/SPColorWellCell.h new file mode 100644 index 00000000..9be65828 --- /dev/null +++ b/Source/SPColorWellCell.h @@ -0,0 +1,32 @@ +// +// $Id$ +// +// SPColorWellCell.h +// sequel-pro +// +// Created by Hans-Jörg Bibiko on August 17, 2010 +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// More info at <http://code.google.com/p/sequel-pro/> + +#import <Cocoa/Cocoa.h> + + +@interface SPColorWellCell : NSActionCell { + +} + +@end diff --git a/Source/SPColorWellCell.m b/Source/SPColorWellCell.m new file mode 100644 index 00000000..d7f50006 --- /dev/null +++ b/Source/SPColorWellCell.m @@ -0,0 +1,51 @@ +// +// $Id$ +// +// SPColorWellCell.m +// sequel-pro +// +// Created by Hans-Jörg Bibiko on August 17, 2010 +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// More info at <http://code.google.com/p/sequel-pro/> + +#import "SPColorWellCell.h" + + +@implementation SPColorWellCell + +- (void) drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView +{ + NSRect square = NSInsetRect (cellFrame, 0.5, 0.5); + + if (square.size.height < square.size.width) { + square.size.width = square.size.height; + square.origin.x = square.origin.x + (cellFrame.size.width - + square.size.width) / 2.0; + } else { + square.size.height = square.size.width; + square.origin.y = square.origin.y + (cellFrame.size.height - + square.size.height) / 2.0; + } + + [[NSColor blackColor] set]; + [NSBezierPath strokeRect: square]; + + [(NSColor*) [self objectValue] set]; + [NSBezierPath fillRect: NSInsetRect (square, 2.0, 2.0)]; +} + +@end diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h index d5e22fd5..428bfd6d 100644 --- a/Source/SPPreferenceController.h +++ b/Source/SPPreferenceController.h @@ -60,7 +60,12 @@ IBOutlet NSMenuItem *favoritesSortByMenuItem; IBOutlet id tableCell; - + + IBOutlet NSTableView *colorSettingTableView; + NSArray *editorColors; + NSArray *editorNameForColors; + NSUInteger colorRow; + IBOutlet NSTextField *editorFontName; IBOutlet NSTextField *globalResultTableFontName; @@ -68,7 +73,7 @@ SPKeychain *keychain; NSDictionary *currentFavorite; - + NSToolbar *toolbar; NSToolbarItem *generalItem; diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index 3985681c..4f249723 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -30,6 +30,7 @@ #import "SPDatabaseDocument.h" #import "SPConnectionController.h" #import "SPColorAdditions.h" +#import "SPColorWellCell.h" @interface SPPreferenceController (PrivateAPI) @@ -103,6 +104,47 @@ if (currentSortItem > -1) { [self _sortFavorites]; } + + + NSTableColumn* column; + SPColorWellCell* colorCell; + + column = [[colorSettingTableView tableColumns] objectAtIndex: 1]; + colorCell = [[[SPColorWellCell alloc] init] autorelease]; + [colorCell setEditable: YES]; + [colorCell setTarget: self]; + [colorCell setAction:@selector(colorClick:)]; + [column setDataCell:colorCell]; + + editorColors = [[NSArray arrayWithObjects: + SPCustomQueryEditorTextColor, + SPCustomQueryEditorBackgroundColor, + SPCustomQueryEditorCaretColor, + SPCustomQueryEditorCommentColor, + SPCustomQueryEditorSQLKeywordColor, + SPCustomQueryEditorNumericColor, + SPCustomQueryEditorQuoteColor, + SPCustomQueryEditorBacktickColor, + SPCustomQueryEditorVariableColor, + SPCustomQueryEditorHighlightQueryColor, + SPCustomQueryEditorSelectionColor, + nil + ] retain]; + editorNameForColors = [[NSArray arrayWithObjects: + NSLocalizedString(@"Text",@"text lable for color table"), + NSLocalizedString(@"Background",@"background lable for color table"), + NSLocalizedString(@"Caret",@"caret lable for color table"), + NSLocalizedString(@"Comment",@"comment lable for color table"), + NSLocalizedString(@"Keyword",@"keyword lable for color table"), + NSLocalizedString(@"Numeric",@"numeric lable for color table"), + NSLocalizedString(@"Quote",@"quote lable for color table"), + NSLocalizedString(@"Backtick Quote",@"backtick quote lable for color table"), + NSLocalizedString(@"Variable",@"variable lable for color table"), + NSLocalizedString(@"Query Background",@"query background lable for color table"), + NSLocalizedString(@"Selection",@"selection lable for color table"), + nil + ] retain]; + } #pragma mark - @@ -646,6 +688,9 @@ // ------------------------------------------------------------------------------- - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView { + if(aTableView == colorSettingTableView) + return [editorColors count]; + return [[favoritesController arrangedObjects] count]; } @@ -654,14 +699,23 @@ // ------------------------------------------------------------------------------- - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex { - if ([[tableColumn identifier] isEqualToString:@"default"] && (rowIndex == [prefs integerForKey:SPDefaultFavorite])) { - return [NSImage imageNamed:@"blue-tick"]; - } - else { - return [[[favoritesController arrangedObjects] objectAtIndex:rowIndex] objectForKey:[tableColumn identifier]]; + if(tableView == colorSettingTableView) { + if ([[tableColumn identifier] isEqualToString:@"name"]) + return [editorNameForColors objectAtIndex:rowIndex]; + else + return [NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:[editorColors objectAtIndex:rowIndex]]]; + } else { + if ([[tableColumn identifier] isEqualToString:@"default"] && (rowIndex == [prefs integerForKey:SPDefaultFavorite])) { + return [NSImage imageNamed:@"blue-tick"]; + } + else { + return [[[favoritesController arrangedObjects] objectAtIndex:rowIndex] objectForKey:[tableColumn identifier]]; + } } + return nil; } + #pragma mark - #pragma mark TableView drag & drop delegate methods @@ -670,6 +724,9 @@ // ------------------------------------------------------------------------------- - (BOOL)tableView:(NSTableView *)aTableView writeRowsWithIndexes:(NSIndexSet *)rows toPasteboard:(NSPasteboard*)pboard { + + if(aTableView == colorSettingTableView) return; + if ([rows count] == 1) { [pboard declareTypes:[NSArray arrayWithObject:SPFavoritesPasteboardDragType] owner:nil]; [pboard setString:[[NSNumber numberWithInteger:[rows firstIndex]] stringValue] forType:SPFavoritesPasteboardDragType]; @@ -686,6 +743,9 @@ // ------------------------------------------------------------------------------- - (NSDragOperation)tableView:(NSTableView *)tv validateDrop:(id <NSDraggingInfo>)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)operation { + + if(tv == colorSettingTableView) return NSDragOperationNone; + NSInteger originalRow; NSArray *pboardTypes = [[info draggingPasteboard] types]; @@ -707,6 +767,9 @@ // ------------------------------------------------------------------------------- - (BOOL)tableView:(NSTableView *)tv acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation { + + if(tv == colorSettingTableView) return NO; + NSInteger originalRow; NSInteger destinationRow; NSInteger lastFavoriteIndexCached; @@ -763,20 +826,66 @@ #pragma mark - #pragma mark TableView delegate methods + +- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex +{ + if(aTableView == colorSettingTableView) { + + NSColorPanel* panel; + + colorRow = rowIndex; + panel = [NSColorPanel sharedColorPanel]; + [panel setTarget:self]; + [panel setAction:@selector(colorChanged:)]; + [panel setColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:[editorColors objectAtIndex:colorRow]]]]; + [colorSettingTableView deselectAll:nil]; + [panel makeKeyAndOrderFront:self]; + + return NO; + + } + return YES; +} + // ------------------------------------------------------------------------------- // tableView:willDisplayCell:forTableColumn:row: // ------------------------------------------------------------------------------- - (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)index { - if ([cell isKindOfClass:[SPFavoriteTextFieldCell class]]) { - [cell setFavoriteName:[[[favoritesController arrangedObjects] objectAtIndex:index] objectForKey:@"name"]]; + + if(tableView == colorSettingTableView && [[tableColumn identifier] isEqualToString:@"name"]) { + if ([cell isKindOfClass:[NSTextFieldCell class]]) { + [cell setDrawsBackground:YES]; + switch(index) { + case 1: + [cell setTextColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorTextColor]]]; + [cell setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorBackgroundColor]]]; + break; + case 9: + [cell setTextColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorTextColor]]]; + [cell setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorHighlightQueryColor]]]; + break; + case 10: + [cell setTextColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorTextColor]]]; + [cell setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorSelectionColor]]]; + break; + default: + [cell setTextColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:[editorColors objectAtIndex:index]]]]; + [cell setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorBackgroundColor]]]; + } + } + } else { + + if ([cell isKindOfClass:[SPFavoriteTextFieldCell class]]) { + [cell setFavoriteName:[[[favoritesController arrangedObjects] objectAtIndex:index] objectForKey:@"name"]]; - if ([[[[favoritesController arrangedObjects] objectAtIndex:index] objectForKey:@"type"] integerValue] == SPSocketConnection) { - [cell setFavoriteHost:@"localhost"]; - } - else { - [cell setFavoriteHost:[[[favoritesController arrangedObjects] objectAtIndex:index] objectForKey:@"host"]]; + if ([[[[favoritesController arrangedObjects] objectAtIndex:index] objectForKey:@"type"] integerValue] == SPSocketConnection) { + [cell setFavoriteHost:@"localhost"]; + } + else { + [cell setFavoriteHost:[[[favoritesController arrangedObjects] objectAtIndex:index] objectForKey:@"host"]]; + } } } } @@ -786,8 +895,11 @@ // ------------------------------------------------------------------------------- - (void)tableViewSelectionDidChange:(NSNotification *)notification { + + if([notification object] == colorSettingTableView) return; + if ([[favoritesTableView selectedRowIndexes] count] > 0) { - [favoritesController setSelectionIndexes:[favoritesTableView selectedRowIndexes]]; + [favoritesController setSelectionIndexes:[favoritesTableView selectedRowIndexes]]; } // If no selection is present, blank the password fields (which can't use bindings) @@ -1263,6 +1375,28 @@ [prefs setObject:[NSArchiver archivedDataWithRootObject:[NSColor blackColor]] forKey:SPCustomQueryEditorTextColor]; [prefs setObject:[NSArchiver archivedDataWithRootObject:[NSColor blackColor]] forKey:SPCustomQueryEditorCaretColor]; [prefs setObject:[NSArchiver archivedDataWithRootObject:[NSColor whiteColor]] forKey:SPCustomQueryEditorBackgroundColor]; + [colorSettingTableView reloadData]; +} + +- (void)colorClick:(id)sender +{ + NSColorPanel* panel; + + colorRow = [sender clickedRow]; + panel = [NSColorPanel sharedColorPanel]; + [panel setTarget:self]; + [panel setAction:@selector(colorChanged:)]; + [panel setColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:[editorColors objectAtIndex:colorRow]]]]; + [colorSettingTableView deselectAll:nil]; + [panel makeKeyAndOrderFront:self]; +} + +- (void)colorChanged:(id)sender +{ + if(![[NSColorPanel sharedColorPanel] isVisible]) return; + [prefs setObject:[NSArchiver archivedDataWithRootObject:[sender color]] forKey:[editorColors objectAtIndex:colorRow]]; + [colorSettingTableView reloadData]; + } // Set font panel's valid modes @@ -1530,6 +1664,7 @@ } [theme release]; + [colorSettingTableView reloadData]; } else { @@ -1555,6 +1690,8 @@ */ - (void)dealloc { + if(editorColors) [editorColors release], editorColors = nil; + if(editorNameForColors) [editorNameForColors release], editorNameForColors = nil; if (keychain) [keychain release], keychain = nil; if (currentFavorite) [currentFavorite release]; diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 8b6c7445..8bb17489 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -354,6 +354,7 @@ BC6D709D120C4C97008027B5 /* SPEditorTokens.h in Headers */ = {isa = PBXBuildFile; fileRef = 179F15040F7C433C00579954 /* SPEditorTokens.h */; }; BC6D709E120C4C9F008027B5 /* SPEditorTokens.l in Sources */ = {isa = PBXBuildFile; fileRef = 179F15050F7C433C00579954 /* SPEditorTokens.l */; }; BC85F5D012193B7D00E255B5 /* SPColorAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = BC85F5CF12193B7D00E255B5 /* SPColorAdditions.m */; }; + BC878A71121A836F00AE5066 /* SPColorWellCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC878A70121A836F00AE5066 /* SPColorWellCell.m */; }; BC8B0DAF104004F900FC02EC /* EncodingPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC8B0DAD104004F900FC02EC /* EncodingPopupView.xib */; }; BC8C8532100E0A8000D7A129 /* SPTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8C8531100E0A8000D7A129 /* SPTableView.m */; }; BC93FBBD11514ADE005F1D9F /* Navigator.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC93FBBB11514ADE005F1D9F /* Navigator.xib */; }; @@ -988,6 +989,8 @@ BC675A16107203BA00C5ACD4 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ContentFilterManager.xib; sourceTree = "<group>"; }; BC85F5CE12193B7D00E255B5 /* SPColorAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPColorAdditions.h; sourceTree = "<group>"; }; BC85F5CF12193B7D00E255B5 /* SPColorAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPColorAdditions.m; sourceTree = "<group>"; }; + BC878A6F121A836F00AE5066 /* SPColorWellCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPColorWellCell.h; sourceTree = "<group>"; }; + BC878A70121A836F00AE5066 /* SPColorWellCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPColorWellCell.m; sourceTree = "<group>"; }; BC8B0DAE104004F900FC02EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/EncodingPopupView.xib; sourceTree = "<group>"; }; BC8C8530100E0A8000D7A129 /* SPTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableView.h; sourceTree = "<group>"; }; BC8C8531100E0A8000D7A129 /* SPTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableView.m; sourceTree = "<group>"; }; @@ -1699,6 +1702,8 @@ BC05F1C4101241DF008A97F8 /* YRKSpinningProgressIndicator.m */, 584094CC1107BD0500260CFD /* SPAlertSheets.h */, 584095181107CB6600260CFD /* SPAlertSheets.m */, + BC878A6F121A836F00AE5066 /* SPColorWellCell.h */, + BC878A70121A836F00AE5066 /* SPColorWellCell.m */, ); name = GUI; sourceTree = "<group>"; @@ -2749,6 +2754,7 @@ 17F90E481210B42700274C98 /* SPExportFile.m in Sources */, 17F90E4B1210B43A00274C98 /* SPExportFileUtilities.m in Sources */, BC85F5D012193B7D00E255B5 /* SPColorAdditions.m in Sources */, + BC878A71121A836F00AE5066 /* SPColorWellCell.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; |