diff options
| author | avenjamin <avenjamin@gmail.com> | 2009-05-22 13:39:18 +0000 |
|---|---|---|
| committer | avenjamin <avenjamin@gmail.com> | 2009-05-22 13:39:18 +0000 |
| commit | 7e923280a2cc74d4e24d9e5049962ad28d06cbe1 (patch) | |
| tree | f004757a3d54b7eaf239f7b88057c3ba78c783ff | |
| parent | 205e60918c2cdc7be6c70ac71db9b85bf6301828 (diff) | |
| download | sequelpro-7e923280a2cc74d4e24d9e5049962ad28d06cbe1.tar.gz sequelpro-7e923280a2cc74d4e24d9e5049962ad28d06cbe1.tar.bz2 sequelpro-7e923280a2cc74d4e24d9e5049962ad28d06cbe1.zip | |
- Few Changes to Query Editor Preference
- Cleaned up a few preference keys
- Added Caret Color to Query Editor Prefs - disabled for now.
| -rw-r--r-- | Interfaces/English.lproj/DBView.xib | 197 | ||||
| -rw-r--r-- | Interfaces/English.lproj/Preferences.xib | 1259 | ||||
| -rw-r--r-- | Resources/PreferenceDefaults.plist | 10 | ||||
| -rw-r--r-- | Source/CMTextView.m | 26 | ||||
| -rw-r--r-- | Source/CustomQuery.m | 238 |
5 files changed, 973 insertions, 757 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 18983c6b..50e1bcde 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="5323"/> + <integer value="663"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -46,7 +46,7 @@ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{780, 480}</string> <object class="NSView" key="NSWindowView" id="579726586"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -387,7 +387,10 @@ <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSImage" ref="914174998"/> + <object class="NSCustomResource" key="NSImage" id="584753076"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_action</string> + </object> <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="753352469"/> </object> @@ -2536,7 +2539,7 @@ <object class="NSTabViewItem" id="105987292"> <string key="NSIdentifier">customQuery</string> <object class="NSView" key="NSView" id="746504912"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder" ref="714795046"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2563,6 +2566,29 @@ <object class="NSTextView" id="1055190999"> <reference key="NSNextResponder" ref="1072692119"/> <int key="NSvFlags">6418</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">{688, 14}</string> <reference key="NSSuperview" ref="1072692119"/> <object class="NSTextContainer" key="NSTextContainer" id="326170846"> @@ -2938,10 +2964,7 @@ <reference key="NSControlView" ref="363916571"/> <int key="NSButtonFlags">-2042609409</int> <int key="NSButtonFlags2">35</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_action</string> - </object> + <reference key="NSNormalImage" ref="914174998"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">400</int> @@ -2953,7 +2976,7 @@ <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSImage" ref="914174998"/> + <reference key="NSImage" ref="584753076"/> <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="984501775"/> </object> @@ -3120,7 +3143,7 @@ </object> <object class="NSMenuItem" id="620583791"> <reference key="NSMenu" ref="60735230"/> - <string key="NSTitle">Auto-pair Characters</string> + <string key="NSTitle">Auto Pair Characters</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <int key="NSState">1</int> @@ -3132,7 +3155,7 @@ </object> <object class="NSMenuItem" id="81663257"> <reference key="NSMenu" ref="60735230"/> - <string key="NSTitle">Auto-uppercase Keywords</string> + <string key="NSTitle">Auto Uppercase Keywords</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="285877316"/> @@ -3142,7 +3165,7 @@ </object> <object class="NSMenuItem" id="414081589"> <reference key="NSMenu" ref="60735230"/> - <string key="NSTitle">Update Help while typing</string> + <string key="NSTitle">Update Help while Typing</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="285877316"/> @@ -3153,7 +3176,7 @@ </object> <bool key="NSNoAutoenable">YES</bool> </object> - <int key="NSSelectedIndex">13</int> + <int key="NSSelectedIndex">14</int> <bool key="NSPullDown">YES</bool> <int key="NSPreferredEdge">1</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -3303,6 +3326,7 @@ </object> </object> <string key="NSFrame">{{10, 7}, {700, 544}}</string> + <reference key="NSSuperview" ref="714795046"/> </object> <string key="NSLabel">Custom Query</string> <reference key="NSColor" ref="62854682"/> @@ -3677,7 +3701,7 @@ <object class="NSTabViewItem" id="986490149"> <string key="NSIdentifier">relations</string> <object class="NSView" key="NSView" id="49633996"> - <reference key="NSNextResponder" ref="714795046"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -4080,21 +4104,20 @@ </object> </object> <string key="NSFrame">{{10, 7}, {700, 544}}</string> - <reference key="NSSuperview" ref="714795046"/> </object> <string key="NSLabel">Relations</string> <reference key="NSColor" ref="62854682"/> <reference key="NSTabView" ref="714795046"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="986490149"/> + <reference key="NSSelectedTabViewItem" ref="105987292"/> <reference key="NSFont" ref="26"/> <int key="NSTvFlags">134217731</int> <bool key="NSAllowTruncatedLabels">YES</bool> <bool key="NSDrawsBackground">YES</bool> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="49633996"/> + <reference ref="746504912"/> </object> </object> </object> @@ -4110,6 +4133,7 @@ </object> </object> <string key="NSFrameSize">{944, 550}</string> + <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{780, 502}</string> @@ -8275,7 +8299,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSWindowContentMaxSize">{600, 142}</string> <string key="NSWindowContentMinSize">{269, 142}</string> <object class="NSView" key="NSWindowView" id="846512394"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -8748,7 +8772,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <string key="NSFrameSize">{269, 142}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMinSize">{269, 164}</string> @@ -11681,6 +11704,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSClassName">NSView</string> </object> <object class="NSUserDefaultsController" id="461189245"> + <object class="NSMutableArray" key="NSDeclaredKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>CustomQueryAutoPairCharacters</string> + </object> <bool key="NSSharedInstance">YES</bool> </object> <object class="NSArrayController" id="302582105"> @@ -14611,54 +14638,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">5533</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutoindent</string> - <reference key="source" ref="820189134"/> - <reference key="destination" ref="461189245"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="820189134"/> - <reference key="NSDestination" ref="461189245"/> - <string key="NSLabel">value: values.CustomQueryAutoindent</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutoindent</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">5535</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutopair</string> - <reference key="source" ref="620583791"/> - <reference key="destination" ref="461189245"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="620583791"/> - <reference key="NSDestination" ref="461189245"/> - <string key="NSLabel">value: values.CustomQueryAutopair</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutopair</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">5536</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutouppercaseKeywords</string> - <reference key="source" ref="81663257"/> - <reference key="destination" ref="461189245"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="81663257"/> - <reference key="NSDestination" ref="461189245"/> - <string key="NSLabel">value: values.CustomQueryAutouppercaseKeywords</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutouppercaseKeywords</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">5537</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">autohelpMenuItem</string> <reference key="source" ref="601471102"/> @@ -14675,22 +14654,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">5540</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutohelp</string> - <reference key="source" ref="414081589"/> - <reference key="destination" ref="461189245"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="414081589"/> - <reference key="NSDestination" ref="461189245"/> - <string key="NSLabel">value: values.CustomQueryAutohelp</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutohelp</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">5541</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">addRow:</string> <reference key="source" ref="885866030"/> @@ -15042,6 +15005,70 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <int key="connectionID">5743</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.CustomQueryAutoIndent</string> + <reference key="source" ref="820189134"/> + <reference key="destination" ref="461189245"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="820189134"/> + <reference key="NSDestination" ref="461189245"/> + <string key="NSLabel">value: values.CustomQueryAutoIndent</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.CustomQueryAutoIndent</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5744</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.CustomQueryAutoUppercaseKeywords</string> + <reference key="source" ref="81663257"/> + <reference key="destination" ref="461189245"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="81663257"/> + <reference key="NSDestination" ref="461189245"/> + <string key="NSLabel">value: values.CustomQueryAutoUppercaseKeywords</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.CustomQueryAutoUppercaseKeywords</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5746</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.CustomQueryUpdateAutoHelp</string> + <reference key="source" ref="414081589"/> + <reference key="destination" ref="461189245"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="414081589"/> + <reference key="NSDestination" ref="461189245"/> + <string key="NSLabel">value: values.CustomQueryUpdateAutoHelp</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.CustomQueryUpdateAutoHelp</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5747</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.CustomQueryAutoPairCharacters</string> + <reference key="source" ref="620583791"/> + <reference key="destination" ref="461189245"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="620583791"/> + <reference key="NSDestination" ref="461189245"/> + <string key="NSLabel">value: values.CustomQueryAutoPairCharacters</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.CustomQueryAutoPairCharacters</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5748</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -24172,7 +24199,7 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{739, 296}, {236, 271}}</string> + <string>{{295, 478}, {236, 271}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -24769,7 +24796,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string> </object> </object> <nil key="sourceID"/> - <int key="maxID">5743</int> + <int key="maxID">5748</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 4c150993..42278fa3 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -8,8 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="17"/> - <integer value="512"/> + <integer value="802"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -54,7 +53,7 @@ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSCustomView" id="594324362"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -687,8 +686,8 @@ <bool key="NS.raise.underflow">YES</bool> <bool key="NS.raise.dividebyzero">YES</bool> </object> - <string key="NS.decimal">,</string> - <string key="NS.thousand">.</string> + <string key="NS.decimal">.</string> + <string key="NS.thousand">,</string> <bool key="NS.hasthousands">NO</bool> <bool key="NS.localized">YES</bool> <bool key="NS.allowsfloats">NO</bool> @@ -722,11 +721,10 @@ </object> </object> <string key="NSFrameSize">{500, 234}</string> - <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="395894064"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -923,8 +921,8 @@ <bool key="NS.raise.underflow">YES</bool> <bool key="NS.raise.dividebyzero">YES</bool> </object> - <string key="NS.decimal">,</string> - <string key="NS.thousand">.</string> + <string key="NS.decimal">.</string> + <string key="NS.thousand">,</string> <bool key="NS.hasthousands">NO</bool> <bool key="NS.localized">YES</bool> <bool key="NS.allowsfloats">NO</bool> @@ -1104,7 +1102,6 @@ </object> </object> <string key="NSFrameSize">{500, 259}</string> - <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="593732956"> @@ -2084,8 +2081,8 @@ AQAAAAA</bytes> <bool key="NS.raise.underflow">YES</bool> <bool key="NS.raise.dividebyzero">YES</bool> </object> - <string key="NS.decimal">,</string> - <string key="NS.thousand">.</string> + <string key="NS.decimal">.</string> + <string key="NS.thousand">,</string> <bool key="NS.hasthousands">NO</bool> <bool key="NS.localized">YES</bool> <bool key="NS.allowsfloats">YES</bool> @@ -2140,7 +2137,7 @@ AQAAAAA</bytes> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="1033452264"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2154,7 +2151,7 @@ AQAAAAA</bytes> <string>NSColor pasteboard type</string> </object> </object> - <string key="NSFrame">{{154, 269}, {44, 23}}</string> + <string key="NSFrame">{{154, 173}, {44, 23}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> @@ -2173,7 +2170,7 @@ AQAAAAA</bytes> <string>NSColor pasteboard type</string> </object> </object> - <string key="NSFrame">{{154, 210}, {44, 23}}</string> + <string key="NSFrame">{{154, 202}, {44, 23}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> @@ -2192,7 +2189,7 @@ AQAAAAA</bytes> <string>NSColor pasteboard type</string> </object> </object> - <string key="NSFrame">{{154, 148}, {44, 23}}</string> + <string key="NSFrame">{{154, 115}, {44, 23}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> @@ -2211,7 +2208,7 @@ AQAAAAA</bytes> <string>NSColor pasteboard type</string> </object> </object> - <string key="NSFrame">{{154, 119}, {44, 23}}</string> + <string key="NSFrame">{{154, 86}, {44, 23}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> @@ -2230,7 +2227,7 @@ AQAAAAA</bytes> <string>NSColor pasteboard type</string> </object> </object> - <string key="NSFrame">{{154, 57}, {44, 23}}</string> + <string key="NSFrame">{{154, 260}, {44, 23}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> @@ -2249,7 +2246,7 @@ AQAAAAA</bytes> <string>NSColor pasteboard type</string> </object> </object> - <string key="NSFrame">{{154, 239}, {44, 23}}</string> + <string key="NSFrame">{{154, 144}, {44, 23}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> @@ -2268,7 +2265,7 @@ AQAAAAA</bytes> <string>NSColor pasteboard type</string> </object> </object> - <string key="NSFrame">{{154, 179}, {44, 23}}</string> + <string key="NSFrame">{{154, 57}, {44, 23}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> @@ -2287,7 +2284,7 @@ AQAAAAA</bytes> <string>NSColor pasteboard type</string> </object> </object> - <string key="NSFrame">{{154, 88}, {44, 23}}</string> + <string key="NSFrame">{{154, 289}, {44, 23}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> @@ -2296,146 +2293,164 @@ AQAAAAA</bytes> <bytes key="NSRGB">MC4wNTgxMzA0OTkgMC4wNTU1NDE4OTkgMQA</bytes> </object> </object> - <object class="NSTextField" id="809667513"> + <object class="NSColorWell" id="859016270"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{58, 272}, {91, 17}}</string> + <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">{{154, 231}, {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">MC4wNTgxMzA0OTkgMC4wNTU1NDE4OTkgMQA</bytes> + </object> + </object> + <object class="NSTextField" id="99482303"> + <reference key="NSNextResponder" ref="1033452264"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{86, 176}, {63, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="184431884"> + <object class="NSTextFieldCell" key="NSCell" id="465390474"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">71304192</int> - <string key="NSContents">SQL Keyword:</string> + <string key="NSContents">Keyword:</string> <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="809667513"/> + <reference key="NSControlView" ref="99482303"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSTextField" id="1018180210"> + <object class="NSTextField" id="568872772"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{59, 242}, {90, 17}}</string> + <string key="NSFrame">{{88, 147}, {61, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="699025286"> + <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="1018180210"/> + <reference key="NSControlView" ref="568872772"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSTextField" id="517912602"> + <object class="NSTextField" id="246467941"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{58, 213}, {90, 17}}</string> + <string key="NSFrame">{{79, 205}, {70, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="993674697"> + <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="517912602"/> + <reference key="NSControlView" ref="246467941"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSTextField" id="249980112"> + <object class="NSTextField" id="481169742"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{59, 182}, {90, 17}}</string> + <string key="NSFrame">{{89, 60}, {60, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="98505250"> + <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="249980112"/> + <reference key="NSControlView" ref="481169742"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSTextField" id="43350429"> + <object class="NSTextField" id="8892598"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{59, 151}, {90, 17}}</string> + <string key="NSFrame">{{102, 118}, {47, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="251905330"> + <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="43350429"/> + <reference key="NSControlView" ref="8892598"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSTextField" id="456135086"> + <object class="NSTextField" id="55746852"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{59, 91}, {90, 17}}</string> + <string key="NSFrame">{{112, 292}, {37, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="477117553"> + <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="456135086"/> + <reference key="NSControlView" ref="55746852"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSTextField" id="933737778"> + <object class="NSTextField" id="496117397"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{40, 122}, {109, 17}}</string> + <string key="NSFrame">{{46, 89}, {103, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="984511657"> + <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="933737778"/> + <reference key="NSControlView" ref="496117397"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSTextField" id="1064728960"> + <object class="NSTextField" id="477643899"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{40, 60}, {109, 17}}</string> + <string key="NSFrame">{{66, 263}, {83, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="105589345"> + <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="1064728960"/> + <reference key="NSControlView" ref="477643899"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSTextField" id="260075995"> + <object class="NSTextField" id="676806550"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{230, 60}, {42, 17}}</string> + <string key="NSFrame">{{113, 331}, {36, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="390282422"> + <object class="NSTextFieldCell" key="NSCell" id="10706281"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">71304192</int> <string key="NSContents">Font:</string> <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="260075995"/> + <reference key="NSControlView" ref="676806550"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> @@ -2460,18 +2475,71 @@ AQAAAAA</bytes> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSButton" id="709518715"> + <object class="NSButton" id="742042283"> + <reference key="NSNextResponder" ref="1033452264"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{396, 321}, {90, 32}}</string> + <reference key="NSSuperview" ref="1033452264"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="345790946"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string type="base64-UTF8" key="NSContents">U2VsZWN04oCmA</string> + <reference key="NSSupport" ref="320262838"/> + <reference key="NSControlView" ref="742042283"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="751188139"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{252, 271}, {130, 18}}</string> + <string key="NSFrame">{{154, 329}, {240, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="280234954"> + <object class="NSTextFieldCell" key="NSCell" id="66452133"> + <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags2">4327424</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="751188139"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="1001357688"/> + <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">{{107, 234}, {42, 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">{{257, 291}, {126, 18}}</string> + <reference key="NSSuperview" ref="1033452264"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="823431848"> <int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Indent New Lines</string> + <string key="NSContents">Indent new lines</string> <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="709518715"/> + <reference key="NSControlView" ref="7445657"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> <reference key="NSNormalImage" ref="752798171"/> @@ -2482,18 +2550,18 @@ AQAAAAA</bytes> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSButton" id="608650319"> + <object class="NSButton" id="571822117"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{252, 241}, {156, 18}}</string> + <string key="NSFrame">{{257, 262}, {150, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="643662109"> + <object class="NSButtonCell" key="NSCell" id="743257684"> <int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Auto-pair Characters</string> + <string key="NSContents">Auto pair characters</string> <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="608650319"/> + <reference key="NSControlView" ref="571822117"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> <reference key="NSNormalImage" ref="752798171"/> @@ -2504,18 +2572,18 @@ AQAAAAA</bytes> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSButton" id="493235282"> + <object class="NSButton" id="1030846368"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{252, 181}, {181, 18}}</string> + <string key="NSFrame">{{257, 204}, {179, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="766191255"> - <int key="NSCellFlags">-2080244224</int> + <object class="NSButtonCell" key="NSCell" id="231642073"> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Update Help while typing</string> + <string key="NSContents">Update help while typing</string> <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="493235282"/> + <reference key="NSControlView" ref="1030846368"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> <reference key="NSNormalImage" ref="752798171"/> @@ -2526,18 +2594,18 @@ AQAAAAA</bytes> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSButton" id="908716921"> + <object class="NSButton" id="397485802"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{252, 212}, {202, 18}}</string> + <string key="NSFrame">{{257, 233}, {185, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="637310941"> + <object class="NSButtonCell" key="NSCell" id="491730308"> <int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Auto-uppercase Keywords</string> + <string key="NSContents">Auto uppercase keywords</string> <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="908716921"/> + <reference key="NSControlView" ref="397485802"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> <reference key="NSNormalImage" ref="752798171"/> @@ -2548,18 +2616,18 @@ AQAAAAA</bytes> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSButton" id="257938535"> + <object class="NSButton" id="774563613"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">-2147483380</int> - <string key="NSFrame">{{252, 121}, {197, 18}}</string> + <string key="NSFrame">{{257, 146}, {197, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="155841135"> + <object class="NSButtonCell" key="NSCell" id="420702000"> <int key="NSCellFlags">-1543373312</int> <int key="NSCellFlags2">0</int> <string key="NSContents">Balanced brace highlighting</string> <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="257938535"/> + <reference key="NSControlView" ref="774563613"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> <reference key="NSNormalImage" ref="752798171"/> @@ -2570,43 +2638,49 @@ AQAAAAA</bytes> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSTextField" id="114692874"> + <object class="NSTextField" id="16021182"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{287, 149}, {27, 19}}</string> + <string key="NSFrame">{{357, 179}, {29, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="765984818"> - <int key="NSCellFlags">-2075001280</int> + <object class="NSTextFieldCell" key="NSCell" id="992523117"> + <int key="NSCellFlags">-1538130368</int> <int key="NSCellFlags2">-2076048384</int> <string key="NSContents">0.1</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.100000e+01</double> - <int key="NSfFlags">16</int> - </object> - <object class="NSNumberFormatter" key="NSFormatter" id="901625043"> + <reference key="NSSupport" ref="26"/> + <object class="NSNumberFormatter" key="NSFormatter" id="223702941"> <object class="NSMutableDictionary" key="NS.attributes"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>allowsFloats</string> + <string>alwaysShowsDecimalSeparator</string> <string>decimalSeparator</string> <string>formatterBehavior</string> <string>groupingSeparator</string> + <string>maximum</string> + <string>maximumIntegerDigits</string> + <string>minimum</string> + <string>minimumFractionDigits</string> <string>positiveFormat</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="9"/> + <boolean value="YES" id="5"/> <string>.</string> <integer value="1040"/> <string/> - <string>#.#</string> + <real value="5.000000e+00" id="779025633"/> + <reference ref="9"/> + <real value="1.000000e-01" id="292993605"/> + <reference ref="9"/> + <string>#.0</string> </object> </object> - <string key="NS.positiveformat">#.#</string> - <string key="NS.negativeformat">#0.#</string> + <string key="NS.positiveformat">#.0</string> + <string key="NS.negativeformat">#.0</string> <nil key="NS.positiveattrs"/> <nil key="NS.negativeattrs"/> <object class="NSAttributedString" key="NS.zero"> @@ -2619,15 +2693,8 @@ AQAAAAA</bytes> <string key="NSString">NaN</string> <reference key="NSAttributes" ref="294865569"/> </object> - <object class="NSDecimalNumberPlaceholder" key="NS.min" id="25668506"> - <int key="NS.exponent">0</int> - <int key="NS.length">0</int> - <bool key="NS.negative">YES</bool> - <bool key="NS.compact">NO</bool> - <int key="NS.mantissa.bo">1</int> - <bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes> - </object> - <reference key="NS.max" ref="25668506"/> + <reference key="NS.min" ref="292993605"/> + <reference key="NS.max" ref="779025633"/> <object class="NSDecimalNumberHandler" key="NS.rounding"> <int key="NS.roundingmode">3</int> <bool key="NS.raise.overflow">YES</bool> @@ -2640,84 +2707,87 @@ AQAAAAA</bytes> <bool key="NS.localized">YES</bool> <bool key="NS.allowsfloats">YES</bool> </object> - <reference key="NSControlView" ref="114692874"/> + <reference key="NSControlView" ref="16021182"/> <bool key="NSDrawsBackground">YES</bool> <reference key="NSBackgroundColor" ref="1001357688"/> <reference key="NSTextColor" ref="6928728"/> </object> </object> - <object class="NSTextField" id="700415450"> + <object class="NSTextField" id="140155660"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{340, 152}, {113, 14}}</string> + <string key="NSFrame">{{298, 181}, {54, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="778006852"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272761856</int> - <string key="NSContents">Delay (0.1 - 5.0 sec)</string> + <object class="NSTextFieldCell" key="NSCell" id="499174965"> + <int key="NSCellFlags">605158976</int> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">Delay by:</string> <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="700415450"/> + <reference key="NSControlView" ref="140155660"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSButton" id="772670125"> + <object class="NSStepper" id="682694750"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{377, 12}, {109, 32}}</string> + <string key="NSFrame">{{392, 177}, {15, 22}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="801182743"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Select Font</string> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="772670125"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> + <object class="NSStepperCell" key="NSCell" id="266600395"> + <int key="NSCellFlags">604896800</int> + <int key="NSCellFlags2">131072</int> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="682694750"/> + <double key="NSValue">1.000000e+00</double> + <double key="NSMinValue">1.000000e-01</double> + <double key="NSMaxValue">5.000000e+00</double> + <double key="NSIncrement">1.000000e-01</double> + <bool key="NSAutorepeat">YES</bool> </object> </object> - <object class="NSTextField" id="370133248"> + <object class="NSTextField" id="659498064"> <reference key="NSNextResponder" ref="1033452264"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{277, 59}, {203, 19}}</string> + <string key="NSFrame">{{410, 181}, {27, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="836533593"> - <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">4327424</int> - <string key="NSContents"/> + <object class="NSTextFieldCell" key="NSCell" id="516695546"> + <int key="NSCellFlags">605158976</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">secs</string> <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="370133248"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="1001357688"/> - <reference key="NSTextColor" ref="6928728"/> + <reference key="NSControlView" ref="659498064"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> </object> </object> - <object class="NSStepper" id="856954183"> + <object class="NSBox" id="863604695"> <reference key="NSNextResponder" ref="1033452264"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{314, 145}, {19, 27}}</string> + <int key="NSvFlags">12</int> + <string key="NSFrame">{{154, 318}, {326, 5}}</string> <reference key="NSSuperview" ref="1033452264"/> - <bool key="NSEnabled">YES</bool> - <object class="NSStepperCell" key="NSCell" id="235545889"> - <int key="NSCellFlags">917024</int> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <reference key="NSControlView" ref="856954183"/> - <double key="NSValue">1.000000e+00</double> - <double key="NSMinValue">1.000000e-01</double> - <double key="NSMaxValue">5.000000e+00</double> - <double key="NSIncrement">1.000000e-01</double> - <bool key="NSAutorepeat">YES</bool> + <string key="NSContents">Box</string> + <reference key="NSSupport" ref="320262838"/> + <reference key="NSBackgroundColor" ref="1001357688"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> + </object> </object> + <int key="NSBorderType">3</int> + <int key="NSBoxType">2</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> </object> </object> - <string key="NSFrameSize">{500, 309}</string> + <string key="NSFrameSize">{500, 369}</string> + <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSUserDefaultsController" id="151174232"> @@ -3745,7 +3815,7 @@ AQAAAAA</bytes> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <boolean value="YES" id="5"/> + <reference ref="5"/> <reference ref="5"/> </object> </object> @@ -3939,224 +4009,284 @@ AQAAAAA</bytes> <int key="connectionID">848</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutoindent</string> - <reference key="source" ref="709518715"/> - <reference key="destination" ref="151174232"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="709518715"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryAutoindent</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutoindent</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> + <object class="IBOutletConnection" key="connection"> + <string key="label">editorView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="1033452264"/> </object> - <int key="connectionID">866</int> + <int key="connectionID">928</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutopair</string> - <reference key="source" ref="608650319"/> + <string key="label">value: values.NewFieldsAllowNulls</string> + <reference key="source" ref="761347322"/> <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="608650319"/> + <reference key="NSSource" ref="761347322"/> <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryAutopair</string> + <string key="NSLabel">value: values.NewFieldsAllowNulls</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutopair</string> + <string key="NSKeyPath">values.NewFieldsAllowNulls</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">870</int> + <int key="connectionID">953</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutouppercaseKeywords</string> - <reference key="source" ref="908716921"/> - <reference key="destination" ref="151174232"/> + <string key="label">value: growlEnabled</string> + <reference key="source" ref="624078196"/> + <reference key="destination" ref="1001"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="908716921"/> - <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryAutouppercaseKeywords</string> + <reference key="NSSource" ref="624078196"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">value: growlEnabled</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutouppercaseKeywords</string> + <string key="NSKeyPath">growlEnabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <reference key="NS.object.0" ref="9"/> + </object> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">871</int> + <int key="connectionID">956</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutohelp</string> - <reference key="source" ref="493235282"/> + <string key="label">value: values.DisplayTableViewVerticalGridlines</string> + <reference key="source" ref="302000957"/> <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="493235282"/> + <reference key="NSSource" ref="302000957"/> <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryAutohelp</string> + <string key="NSLabel">value: values.DisplayTableViewVerticalGridlines</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutohelp</string> + <string key="NSKeyPath">values.DisplayTableViewVerticalGridlines</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">872</int> + <int key="connectionID">961</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">enabled: values.CustomQueryAutohelp</string> - <reference key="source" ref="114692874"/> + <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="114692874"/> + <reference key="NSSource" ref="859016270"/> <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">enabled: values.CustomQueryAutohelp</string> - <string key="NSBinding">enabled</string> - <string key="NSKeyPath">values.CustomQueryAutohelp</string> + <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">876</int> + <int key="connectionID">1007</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">showCustomQueryFontPanel:</string> + <string key="label">setDefaultColors:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="772670125"/> + <reference key="destination" ref="462361579"/> </object> - <int key="connectionID">926</int> + <int key="connectionID">1086</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">editorView</string> + <object class="IBActionConnection" key="connection"> + <string key="label">showCustomQueryFontPanel:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="1033452264"/> + <reference key="destination" ref="742042283"/> </object> - <int key="connectionID">928</int> + <int key="connectionID">1087</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">editorFontName</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="370133248"/> + <reference key="destination" ref="751188139"/> </object> - <int key="connectionID">931</int> + <int key="connectionID">1088</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">setDefaultColors:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="462361579"/> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.CustomQueryAutoUppercaseKeywords</string> + <reference key="source" ref="397485802"/> + <reference key="destination" ref="151174232"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="397485802"/> + <reference key="NSDestination" ref="151174232"/> + <string key="NSLabel">value: values.CustomQueryAutoUppercaseKeywords</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.CustomQueryAutoUppercaseKeywords</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">932</int> + <int key="connectionID">1093</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">takeFloatValueFrom:</string> - <reference key="source" ref="114692874"/> - <reference key="destination" ref="856954183"/> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.CustomQueryAutoPairCharacters</string> + <reference key="source" ref="571822117"/> + <reference key="destination" ref="151174232"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="571822117"/> + <reference key="NSDestination" ref="151174232"/> + <string key="NSLabel">value: values.CustomQueryAutoPairCharacters</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.CustomQueryAutoPairCharacters</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">938</int> + <int key="connectionID">1096</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">enabled: values.CustomQueryAutohelp</string> - <reference key="source" ref="856954183"/> + <string key="label">value: values.CustomQueryAutoIndent</string> + <reference key="source" ref="7445657"/> <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="856954183"/> + <reference key="NSSource" ref="7445657"/> <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">enabled: values.CustomQueryAutohelp</string> - <string key="NSBinding">enabled</string> - <string key="NSKeyPath">values.CustomQueryAutohelp</string> + <string key="NSLabel">value: values.CustomQueryAutoIndent</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.CustomQueryAutoIndent</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">942</int> + <int key="connectionID">1098</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutohelpDelay</string> - <reference key="source" ref="114692874"/> + <string key="label">value: values.CustomQueryAutoHelpDelay</string> + <reference key="source" ref="682694750"/> <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="114692874"/> + <reference key="NSSource" ref="682694750"/> <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryAutohelpDelay</string> + <string key="NSLabel">value: values.CustomQueryAutoHelpDelay</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutohelpDelay</string> + <string key="NSKeyPath">values.CustomQueryAutoHelpDelay</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">948</int> + <int key="connectionID">1100</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.CustomQueryAutohelpDelay</string> - <reference key="source" ref="856954183"/> + <string key="label">value: values.CustomQueryAutoHelpDelay</string> + <reference key="source" ref="16021182"/> <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="856954183"/> + <reference key="NSSource" ref="16021182"/> <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.CustomQueryAutohelpDelay</string> + <string key="NSLabel">value: values.CustomQueryAutoHelpDelay</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">values.CustomQueryAutohelpDelay</string> + <string key="NSKeyPath">values.CustomQueryAutoHelpDelay</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">949</int> + <int key="connectionID">1104</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.NewFieldsAllowNulls</string> - <reference key="source" ref="761347322"/> + <string key="label">value: values.CustomQueryUpdateAutoHelp</string> + <reference key="source" ref="1030846368"/> <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="761347322"/> + <reference key="NSSource" ref="1030846368"/> <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.NewFieldsAllowNulls</string> + <string key="NSLabel">value: values.CustomQueryUpdateAutoHelp</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">values.NewFieldsAllowNulls</string> + <string key="NSKeyPath">values.CustomQueryUpdateAutoHelp</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">953</int> + <int key="connectionID">1107</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: growlEnabled</string> - <reference key="source" ref="624078196"/> - <reference key="destination" ref="1001"/> + <string key="label">enabled: values.CustomQueryUpdateAutoHelp</string> + <reference key="source" ref="140155660"/> + <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="624078196"/> - <reference key="NSDestination" ref="1001"/> - <string key="NSLabel">value: growlEnabled</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">growlEnabled</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSNullPlaceholder</string> - <reference key="NS.object.0" ref="9"/> - </object> + <reference key="NSSource" ref="140155660"/> + <reference key="NSDestination" ref="151174232"/> + <string key="NSLabel">enabled: values.CustomQueryUpdateAutoHelp</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">values.CustomQueryUpdateAutoHelp</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">956</int> + <int key="connectionID">1108</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.DisplayTableViewVerticalGridlines</string> - <reference key="source" ref="302000957"/> + <string key="label">enabled: values.CustomQueryUpdateAutoHelp</string> + <reference key="source" ref="16021182"/> <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="302000957"/> + <reference key="NSSource" ref="16021182"/> <reference key="NSDestination" ref="151174232"/> - <string key="NSLabel">value: values.DisplayTableViewVerticalGridlines</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.DisplayTableViewVerticalGridlines</string> + <string key="NSLabel">enabled: values.CustomQueryUpdateAutoHelp</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">values.CustomQueryUpdateAutoHelp</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">961</int> + <int key="connectionID">1109</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: values.CustomQueryUpdateAutoHelp</string> + <reference key="source" ref="682694750"/> + <reference key="destination" ref="151174232"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="682694750"/> + <reference key="NSDestination" ref="151174232"/> + <string key="NSLabel">enabled: values.CustomQueryUpdateAutoHelp</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">values.CustomQueryUpdateAutoHelp</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1110</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: values.CustomQueryUpdateAutoHelp</string> + <reference key="source" ref="659498064"/> + <reference key="destination" ref="151174232"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="659498064"/> + <reference key="NSDestination" ref="151174232"/> + <string key="NSLabel">enabled: values.CustomQueryUpdateAutoHelp</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">values.CustomQueryUpdateAutoHelp</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1112</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">takeFloatValueFrom:</string> + <reference key="source" ref="682694750"/> + <reference key="destination" ref="16021182"/> + </object> + <int key="connectionID">1113</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">takeFloatValueFrom:</string> + <reference key="source" ref="16021182"/> + <reference key="destination" ref="682694750"/> + </object> + <int key="connectionID">1114</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -5481,34 +5611,38 @@ AQAAAAA</bytes> <reference key="object" ref="1033452264"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="742042283"/> + <reference ref="751188139"/> + <reference ref="676806550"/> + <reference ref="863604695"/> <reference ref="868179656"/> - <reference ref="809667513"/> - <reference ref="700415450"/> - <reference ref="856954183"/> - <reference ref="114692874"/> - <reference ref="873950148"/> <reference ref="384284042"/> - <reference ref="427231908"/> <reference ref="959599099"/> <reference ref="397713661"/> - <reference ref="298138417"/> <reference ref="752066946"/> - <reference ref="1018180210"/> - <reference ref="517912602"/> - <reference ref="249980112"/> - <reference ref="43350429"/> - <reference ref="933737778"/> - <reference ref="456135086"/> - <reference ref="1064728960"/> - <reference ref="709518715"/> - <reference ref="608650319"/> - <reference ref="908716921"/> - <reference ref="493235282"/> - <reference ref="257938535"/> - <reference ref="260075995"/> - <reference ref="370133248"/> + <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"/> + <reference ref="397485802"/> + <reference ref="774563613"/> + <reference ref="16021182"/> + <reference ref="140155660"/> + <reference ref="659498064"/> <reference ref="462361579"/> - <reference ref="772670125"/> + <reference ref="682694750"/> </object> <reference key="parent" ref="1002"/> <string key="objectName">Editor</string> @@ -5539,134 +5673,108 @@ AQAAAAA</bytes> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">808</int> - <reference key="object" ref="298138417"/> + <int key="objectID">823</int> + <reference key="object" ref="397713661"/> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">809</int> - <reference key="object" ref="809667513"/> + <int key="objectID">950</int> + <reference key="object" ref="761347322"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="184431884"/> + <reference ref="542131730"/> </object> - <reference key="parent" ref="1033452264"/> + <reference key="parent" ref="395894064"/> </object> <object class="IBObjectRecord"> - <int key="objectID">810</int> - <reference key="object" ref="184431884"/> - <reference key="parent" ref="809667513"/> + <int key="objectID">951</int> + <reference key="object" ref="542131730"/> + <reference key="parent" ref="761347322"/> </object> <object class="IBObjectRecord"> - <int key="objectID">812</int> - <reference key="object" ref="1018180210"/> + <int key="objectID">957</int> + <reference key="object" ref="302000957"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="699025286"/> + <reference ref="218042555"/> </object> - <reference key="parent" ref="1033452264"/> + <reference key="parent" ref="594324362"/> </object> <object class="IBObjectRecord"> - <int key="objectID">813</int> - <reference key="object" ref="699025286"/> - <reference key="parent" ref="1018180210"/> + <int key="objectID">958</int> + <reference key="object" ref="218042555"/> + <reference key="parent" ref="302000957"/> </object> <object class="IBObjectRecord"> - <int key="objectID">814</int> - <reference key="object" ref="517912602"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="993674697"/> - </object> + <int key="objectID">1000</int> + <reference key="object" ref="859016270"/> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">815</int> - <reference key="object" ref="993674697"/> - <reference key="parent" ref="517912602"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">816</int> - <reference key="object" ref="249980112"/> + <int key="objectID">1026</int> + <reference key="object" ref="99482303"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="98505250"/> + <reference ref="465390474"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">817</int> - <reference key="object" ref="98505250"/> - <reference key="parent" ref="249980112"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">818</int> - <reference key="object" ref="43350429"/> + <int key="objectID">1027</int> + <reference key="object" ref="568872772"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="251905330"/> + <reference ref="629129203"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">819</int> - <reference key="object" ref="251905330"/> - <reference key="parent" ref="43350429"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">820</int> - <reference key="object" ref="456135086"/> + <int key="objectID">1028</int> + <reference key="object" ref="246467941"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="477117553"/> + <reference ref="841770398"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">821</int> - <reference key="object" ref="477117553"/> - <reference key="parent" ref="456135086"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">822</int> - <reference key="object" ref="752066946"/> + <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">823</int> - <reference key="object" ref="397713661"/> + <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">824</int> - <reference key="object" ref="933737778"/> + <int key="objectID">1032</int> + <reference key="object" ref="496117397"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="984511657"/> + <reference ref="336899348"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">825</int> - <reference key="object" ref="984511657"/> - <reference key="parent" ref="933737778"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">826</int> - <reference key="object" ref="1064728960"/> + <int key="objectID">1034</int> + <reference key="object" ref="676806550"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="105589345"/> + <reference ref="10706281"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">827</int> - <reference key="object" ref="105589345"/> - <reference key="parent" ref="1064728960"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">849</int> + <int key="objectID">1035</int> <reference key="object" ref="462361579"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -5675,200 +5783,264 @@ AQAAAAA</bytes> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">850</int> - <reference key="object" ref="603963569"/> - <reference key="parent" ref="462361579"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">851</int> - <reference key="object" ref="709518715"/> + <int key="objectID">1036</int> + <reference key="object" ref="742042283"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="280234954"/> + <reference ref="345790946"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">852</int> - <reference key="object" ref="280234954"/> - <reference key="parent" ref="709518715"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">853</int> - <reference key="object" ref="608650319"/> + <int key="objectID">1037</int> + <reference key="object" ref="751188139"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="643662109"/> + <reference ref="66452133"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">854</int> - <reference key="object" ref="643662109"/> - <reference key="parent" ref="608650319"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">855</int> - <reference key="object" ref="493235282"/> + <int key="objectID">1038</int> + <reference key="object" ref="34959322"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="766191255"/> + <reference ref="632150824"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">856</int> - <reference key="object" ref="766191255"/> - <reference key="parent" ref="493235282"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">857</int> - <reference key="object" ref="908716921"/> + <int key="objectID">1039</int> + <reference key="object" ref="7445657"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="637310941"/> + <reference ref="823431848"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">858</int> - <reference key="object" ref="637310941"/> - <reference key="parent" ref="908716921"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">859</int> - <reference key="object" ref="257938535"/> + <int key="objectID">1040</int> + <reference key="object" ref="571822117"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="155841135"/> + <reference ref="743257684"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">860</int> - <reference key="object" ref="155841135"/> - <reference key="parent" ref="257938535"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">861</int> - <reference key="object" ref="114692874"/> + <int key="objectID">1041</int> + <reference key="object" ref="1030846368"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="765984818"/> + <reference ref="231642073"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">862</int> - <reference key="object" ref="765984818"/> + <int key="objectID">1042</int> + <reference key="object" ref="397485802"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="901625043"/> + <reference ref="491730308"/> </object> - <reference key="parent" ref="114692874"/> + <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">863</int> - <reference key="object" ref="700415450"/> + <int key="objectID">1043</int> + <reference key="object" ref="774563613"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="778006852"/> + <reference ref="420702000"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">864</int> - <reference key="object" ref="778006852"/> - <reference key="parent" ref="700415450"/> + <int key="objectID">1051</int> + <reference key="object" ref="420702000"/> + <reference key="parent" ref="774563613"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1052</int> + <reference key="object" ref="491730308"/> + <reference key="parent" ref="397485802"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1053</int> + <reference key="object" ref="231642073"/> + <reference key="parent" ref="1030846368"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1054</int> + <reference key="object" ref="743257684"/> + <reference key="parent" ref="571822117"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1055</int> + <reference key="object" ref="823431848"/> + <reference key="parent" ref="7445657"/> </object> <object class="IBObjectRecord"> - <int key="objectID">882</int> - <reference key="object" ref="260075995"/> + <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"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1058</int> + <reference key="object" ref="345790946"/> + <reference key="parent" ref="742042283"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1059</int> + <reference key="object" ref="603963569"/> + <reference key="parent" ref="462361579"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1060</int> + <reference key="object" ref="10706281"/> + <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"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="390282422"/> + <reference ref="266600395"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">883</int> - <reference key="object" ref="390282422"/> - <reference key="parent" ref="260075995"/> + <int key="objectID">1047</int> + <reference key="object" ref="266600395"/> + <reference key="parent" ref="682694750"/> </object> <object class="IBObjectRecord"> - <int key="objectID">880</int> - <reference key="object" ref="772670125"/> + <int key="objectID">1045</int> + <reference key="object" ref="140155660"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="801182743"/> + <reference ref="499174965"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">881</int> - <reference key="object" ref="801182743"/> - <reference key="parent" ref="772670125"/> + <int key="objectID">1048</int> + <reference key="object" ref="499174965"/> + <reference key="parent" ref="140155660"/> </object> <object class="IBObjectRecord"> - <int key="objectID">929</int> - <reference key="object" ref="370133248"/> + <int key="objectID">1044</int> + <reference key="object" ref="16021182"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="836533593"/> + <reference ref="992523117"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">930</int> - <reference key="object" ref="836533593"/> - <reference key="parent" ref="370133248"/> + <int key="objectID">1049</int> + <reference key="object" ref="992523117"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="223702941"/> + </object> + <reference key="parent" ref="16021182"/> </object> <object class="IBObjectRecord"> - <int key="objectID">933</int> - <reference key="object" ref="856954183"/> + <int key="objectID">1050</int> + <reference key="object" ref="223702941"/> + <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="235545889"/> + <reference ref="896659768"/> </object> <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">934</int> - <reference key="object" ref="235545889"/> - <reference key="parent" ref="856954183"/> + <int key="objectID">1061</int> + <reference key="object" ref="896659768"/> + <reference key="parent" ref="477643899"/> </object> <object class="IBObjectRecord"> - <int key="objectID">943</int> - <reference key="object" ref="901625043"/> - <reference key="parent" ref="765984818"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">950</int> - <reference key="object" ref="761347322"/> + <int key="objectID">1031</int> + <reference key="object" ref="55746852"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="542131730"/> + <reference ref="693342907"/> </object> - <reference key="parent" ref="395894064"/> + <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">951</int> - <reference key="object" ref="542131730"/> - <reference key="parent" ref="761347322"/> + <int key="objectID">1063</int> + <reference key="object" ref="693342907"/> + <reference key="parent" ref="55746852"/> </object> <object class="IBObjectRecord"> - <int key="objectID">957</int> - <reference key="object" ref="302000957"/> + <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"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="218042555"/> + <reference ref="516695546"/> </object> - <reference key="parent" ref="594324362"/> + <reference key="parent" ref="1033452264"/> </object> <object class="IBObjectRecord"> - <int key="objectID">958</int> - <reference key="object" ref="218042555"/> - <reference key="parent" ref="302000957"/> + <int key="objectID">1084</int> + <reference key="object" ref="516695546"/> + <reference key="parent" ref="659498064"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1085</int> + <reference key="object" ref="863604695"/> + <reference key="parent" ref="1033452264"/> </object> </object> </object> @@ -5886,10 +6058,57 @@ AQAAAAA</bytes> <string>1.editorWindowContentRectSynchronizationRect</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>103.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> + <string>1042.IBPluginDependency</string> + <string>1043.IBPluginDependency</string> + <string>1044.IBPluginDependency</string> + <string>1045.IBPluginDependency</string> + <string>1046.IBPluginDependency</string> + <string>1047.IBPluginDependency</string> + <string>1048.IBPluginDependency</string> + <string>1049.IBPluginDependency</string> + <string>1050.IBPluginDependency</string> + <string>1051.IBPluginDependency</string> + <string>1052.IBPluginDependency</string> + <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>112.IBPluginDependency</string> @@ -6144,51 +6363,10 @@ AQAAAAA</bytes> <string>806.IBPluginDependency</string> <string>807.IBPluginDependency</string> <string>808.IBPluginDependency</string> - <string>809.IBPluginDependency</string> - <string>810.IBPluginDependency</string> - <string>812.IBPluginDependency</string> - <string>813.IBPluginDependency</string> - <string>814.IBPluginDependency</string> - <string>815.IBPluginDependency</string> - <string>816.IBPluginDependency</string> - <string>817.IBPluginDependency</string> - <string>818.IBPluginDependency</string> - <string>819.IBPluginDependency</string> - <string>820.IBPluginDependency</string> - <string>821.IBPluginDependency</string> <string>822.IBPluginDependency</string> <string>823.IBPluginDependency</string> - <string>824.IBPluginDependency</string> - <string>825.IBPluginDependency</string> - <string>826.IBPluginDependency</string> - <string>827.IBPluginDependency</string> - <string>849.IBPluginDependency</string> - <string>850.IBPluginDependency</string> - <string>851.IBPluginDependency</string> - <string>852.IBPluginDependency</string> - <string>853.IBPluginDependency</string> - <string>854.IBPluginDependency</string> - <string>855.IBPluginDependency</string> - <string>856.IBPluginDependency</string> - <string>857.IBPluginDependency</string> - <string>858.IBPluginDependency</string> - <string>859.IBPluginDependency</string> - <string>860.IBPluginDependency</string> - <string>861.IBPluginDependency</string> - <string>862.IBPluginDependency</string> - <string>863.IBPluginDependency</string> - <string>864.IBPluginDependency</string> - <string>880.IBPluginDependency</string> - <string>881.IBPluginDependency</string> - <string>882.IBPluginDependency</string> - <string>883.IBPluginDependency</string> - <string>929.IBPluginDependency</string> - <string>930.IBPluginDependency</string> - <string>933.IBPluginDependency</string> - <string>934.IBPluginDependency</string> <string>94.IBPluginDependency</string> <string>94.ImportedFromIB2</string> - <string>943.IBPluginDependency</string> <string>95.IBPluginDependency</string> <string>950.IBPluginDependency</string> <string>951.IBPluginDependency</string> @@ -6216,12 +6394,59 @@ AQAAAAA</bytes> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <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> + <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> + <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> + <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>{{408, 292}, {500, 234}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> @@ -6304,7 +6529,7 @@ AQAAAAA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{499, 188}, {500, 381}}</string> + <string>{{179, 460}, {500, 381}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -6555,7 +6780,7 @@ AQAAAAA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{113, 109}, {500, 309}}</string> + <string>{{428, 626}, {500, 369}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -6564,6 +6789,11 @@ AQAAAAA</bytes> <float key="location">1.450000e+02</float> <int key="affinity">0</int> </object> + <object class="IBUserGuide"> + <reference key="view" ref="1033452264"/> + <float key="location">2.500000e+02</float> + <int key="affinity">0</int> + </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -6574,51 +6804,10 @@ 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> - <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> - <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> <reference ref="9"/> <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"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -6658,7 +6847,7 @@ AQAAAAA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">961</int> + <int key="maxID">1114</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/Resources/PreferenceDefaults.plist b/Resources/PreferenceDefaults.plist index f930f058..0d89a164 100644 --- a/Resources/PreferenceDefaults.plist +++ b/Resources/PreferenceDefaults.plist @@ -56,15 +56,15 @@ <data>BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmAAAAAYY=</data> <key>CustomQueryEditorVariableColor</key> <data>BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmg3zv/T6DfO/9PoN87/0+AYY=</data> - <key>CustomQueryAutoindent</key> + <key>CustomQueryAutoIndent</key> <true/> - <key>CustomQueryAutopair</key> + <key>CustomQueryAutoPairCharacters</key> <true/> - <key>CustomQueryAutouppercaseKeywords</key> + <key>CustomQueryAutoUppercaseKeywords</key> <false/> - <key>CustomQueryAutohelp</key> + <key>CustomQueryUpdateAutoHelp</key> <false/> - <key>CustomQueryAutohelpDelay</key> + <key>CustomQueryAutoHelpDelay</key> <real>1</real> <key>SelectLastFavoriteUsed</key> <true/> diff --git a/Source/CMTextView.m b/Source/CMTextView.m index cdd612b8..3b06fcff 100644 --- a/Source/CMTextView.m +++ b/Source/CMTextView.m @@ -277,7 +277,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); { // Cancel autoHelp timer - if([prefs boolForKey:@"CustomQueryAutohelp"]) + if([prefs boolForKey:@"CustomQueryUpdateAutoHelp"]) [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(autoHelp) object:nil]; @@ -285,8 +285,8 @@ YY_BUFFER_STATE yy_scan_string (const char *); [super mouseDown:theEvent]; // Start autoHelp timer - if([prefs boolForKey:@"CustomQueryAutohelp"]) - [self performSelector:@selector(autoHelp) withObject:nil afterDelay:[[[prefs valueForKey:@"CustomQueryAutohelpDelay"] retain] floatValue]]; + if([prefs boolForKey:@"CustomQueryUpdateAutoHelp"]) + [self performSelector:@selector(autoHelp) withObject:nil afterDelay:[[[prefs valueForKey:@"CustomQueryAutoHelpDelay"] retain] floatValue]]; } @@ -296,12 +296,12 @@ YY_BUFFER_STATE yy_scan_string (const char *); - (void) keyDown:(NSEvent *)theEvent { - if([prefs boolForKey:@"CustomQueryAutohelp"]) {// restart autoHelp timer + if([prefs boolForKey:@"CustomQueryUpdateAutoHelp"]) {// restart autoHelp timer [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(autoHelp) object:nil]; [self performSelector:@selector(autoHelp) withObject:nil - afterDelay:[[[prefs valueForKey:@"CustomQueryAutohelpDelay"] retain] floatValue]]; + afterDelay:[[[prefs valueForKey:@"CustomQueryAutoHelpDelay"] retain] floatValue]]; } long allFlags = (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask); @@ -356,7 +356,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); } // Only process for character autopairing if autopairing is enabled and a single character is being added. - if ([prefs boolForKey:@"CustomQueryAutopair"] && characters && [characters length] == 1) { + if ([prefs boolForKey:@"CustomQueryAutoPairCharacters"] && characters && [characters length] == 1) { delBackwardsWasPressed = NO; @@ -516,7 +516,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); // Handle newlines, adding any indentation found on the current line to the new line - ignoring the enter key if appropriate if (aSelector == @selector(insertNewline:) - && [prefs boolForKey:@"CustomQueryAutoindent"] + && [prefs boolForKey:@"CustomQueryAutoIndent"] && (!autoindentIgnoresEnter || [[NSApp currentEvent] keyCode] != 0x4C)) { NSString *textViewString = [[self textStorage] string]; @@ -1870,7 +1870,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); - (void)autoHelp { - if(![prefs boolForKey:@"CustomQueryAutohelp"]) return; + if(![prefs boolForKey:@"CustomQueryUpdateAutoHelp"]) return; // If selection show Help for it if([self selectedRange].length) @@ -1897,7 +1897,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); NSTextStorage *textStore = [self textStorage]; NSRange textRange; - + // If text larger than SP_TEXT_SIZE_TRIGGER_FOR_PARTLY_PARSING // do highlighting partly (max SP_SYNTAX_HILITE_BIAS*2). // The approach is to take the middle position of the current view port @@ -1968,8 +1968,8 @@ YY_BUFFER_STATE yy_scan_string (const char *); NSColor *numericColor = [[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:@"CustomQueryEditorNumericColor"]] retain];//[NSColor colorWithDeviceRed:0.506 green:0.263 blue:0.0 alpha:1.000]; NSColor *variableColor = [[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:@"CustomQueryEditorVariableColor"]] retain];//[NSColor colorWithDeviceRed:0.5 green:0.5 blue:0.5 alpha:1.000]; NSColor *textColor = [[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:@"CustomQueryEditorTextColor"]] retain];//[NSColor colorWithDeviceRed:0.5 green:0.5 blue:0.5 alpha:1.000]; - - BOOL autouppercaseKeywords = [prefs boolForKey:@"CustomQueryAutouppercaseKeywords"]; + + BOOL autouppercaseKeywords = [prefs boolForKey:@"CustomQueryAutoUppercaseKeywords"]; unsigned long tokenEnd, token; NSRange tokenRange; @@ -2173,8 +2173,8 @@ YY_BUFFER_STATE yy_scan_string (const char *); //make sure that the notification is from the correct textStorage object if (textStore!=[self textStorage]) return; - if([prefs boolForKey:@"CustomQueryAutohelp"]) - [self performSelector:@selector(autoHelp) withObject:nil afterDelay:[[[prefs valueForKey:@"CustomQueryAutohelpDelay"] retain] floatValue]]; + if([prefs boolForKey:@"CustomQueryUpdateAutoHelp"]) + [self performSelector:@selector(autoHelp) withObject:nil afterDelay:[[[prefs valueForKey:@"CustomQueryAutoHelpDelay"] retain] floatValue]]; if([[self string] length] > SP_TEXT_SIZE_TRIGGER_FOR_PARTLY_PARSING) [NSObject cancelPreviousPerformRequestsWithTarget:self diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m index da538fe2..3b76aba7 100644 --- a/Source/CustomQuery.m +++ b/Source/CustomQuery.m @@ -121,11 +121,10 @@ [self performQueries:queries]; } - -- (IBAction)chooseQueryFavorite:(id)sender /* -insert the choosen favorite query in the query textView or save query to favorites or opens window to edit favorites -*/ + * Insert the choosen favorite query in the query textView or save query to favorites or opens window to edit favorites + */ +- (IBAction)chooseQueryFavorite:(id)sender { if ( [queryFavoritesButton indexOfSelectedItem] == 1) { //save query to favorites @@ -167,10 +166,10 @@ insert the choosen favorite query in the query textView or save query to favorit } } -- (IBAction)chooseQueryHistory:(id)sender /* -insert the choosen history query in the query textView -*/ + * Insert the choosen history query in the query textView + */ +- (IBAction)chooseQueryHistory:(id)sender { // Register the next action for undo [textView shouldChangeTextInRange:NSMakeRange(0,[[textView string] length]) replacementString:[queryHistoryButton titleOfSelectedItem]]; @@ -180,10 +179,10 @@ insert the choosen history query in the query textView [textView selectAll:self]; } -- (IBAction)closeSheet:(id)sender /* -closes the sheet -*/ + * Closes the sheet + */ +- (IBAction)closeSheet:(id)sender { [NSApp stopModal]; } @@ -227,7 +226,7 @@ closes the sheet // "Indent new lines" toggle if (sender == autoindentMenuItem) { BOOL enableAutoindent = !([autoindentMenuItem state] == NSOffState); - [prefs setBool:enableAutoindent forKey:@"CustomQueryAutoindent"]; + [prefs setBool:enableAutoindent forKey:@"CustomQueryAutoIndent"]; [prefs synchronize]; [autoindentMenuItem setState:enableAutoindent?NSOnState:NSOffState]; [textView setAutoindent:enableAutoindent]; @@ -236,7 +235,7 @@ closes the sheet // "Auto-pair characters" toggle if (sender == autopairMenuItem) { BOOL enableAutopair = !([autopairMenuItem state] == NSOffState); - [prefs setBool:enableAutopair forKey:@"CustomQueryAutopair"]; + [prefs setBool:enableAutopair forKey:@"CustomQueryAutoPair"]; [prefs synchronize]; [autopairMenuItem setState:enableAutopair?NSOnState:NSOffState]; [textView setAutopair:enableAutopair]; @@ -245,7 +244,7 @@ closes the sheet // "Auto-help" toggle if (sender == autohelpMenuItem) { BOOL enableAutohelp = !([autohelpMenuItem state] == NSOffState); - [prefs setBool:enableAutohelp forKey:@"CustomQueryAutohelp"]; + [prefs setBool:enableAutohelp forKey:@"CustomQueryUpdateAutoHelp"]; [prefs synchronize]; [autohelpMenuItem setState:enableAutohelp?NSOnState:NSOffState]; [textView setAutohelp:enableAutohelp]; @@ -254,22 +253,29 @@ closes the sheet // "Auto-uppercase keywords" toggle if (sender == autouppercaseKeywordsMenuItem) { BOOL enableAutouppercaseKeywords = !([autouppercaseKeywordsMenuItem state] == NSOffState); - [prefs setBool:enableAutouppercaseKeywords forKey:@"CustomQueryAutouppercaseKeywords"]; + [prefs setBool:enableAutouppercaseKeywords forKey:@"CustomQueryAutoUppercaseKeywords"]; [prefs synchronize]; [autouppercaseKeywordsMenuItem setState:enableAutouppercaseKeywords?NSOnState:NSOffState]; [textView setAutouppercaseKeywords:enableAutouppercaseKeywords]; } } +/* + * Set font panel's valid modes + */ +- (unsigned int)validModesForFontPanel:(NSFontPanel *)fontPanel +{ + return (NSFontPanelAllModesMask ^ NSFontPanelAllEffectsModeMask); +} + #pragma mark - #pragma mark queryFavoritesSheet methods - -- (IBAction)addQueryFavorite:(id)sender /* -adds a query favorite -*/ + * Adds a query favorite + */ +- (IBAction)addQueryFavorite:(id)sender { int row = [queryFavoritesView editedRow]; int column = [queryFavoritesView editedColumn]; @@ -289,10 +295,10 @@ adds a query favorite [queryFavoritesView editColumn:0 row:[queryFavoritesView numberOfRows]-1 withEvent:nil select:YES]; } -- (IBAction)removeQueryFavorite:(id)sender /* -removes a query favorite -*/ + * removes a query favorite + */ +- (IBAction)removeQueryFavorite:(id)sender { int row = [queryFavoritesView editedRow]; int column = [queryFavoritesView editedColumn]; @@ -312,10 +318,10 @@ removes a query favorite } } -- (IBAction)copyQueryFavorite:(id)sender /* -copies a query favorite -*/ + * Copies a query favorite + */ +- (IBAction)copyQueryFavorite:(id)sender { int row = [queryFavoritesView editedRow]; int column = [queryFavoritesView editedColumn]; @@ -339,10 +345,10 @@ copies a query favorite } } -- (IBAction)closeQueryFavoritesSheet:(id)sender /* -closes queryFavoritesSheet and saves favorites to preferences -*/ + * Closes queryFavoritesSheet and saves favorites to preferences + */ +- (IBAction)closeQueryFavoritesSheet:(id)sender { int row = [queryFavoritesView editedRow]; int column = [queryFavoritesView editedColumn]; @@ -365,12 +371,11 @@ closes queryFavoritesSheet and saves favorites to preferences #pragma mark - #pragma mark Query actions - -- (void)performQueries:(NSArray *)queries; /* -performs the mysql-query given by the user -sets the tableView columns corresponding to the mysql-result -*/ + * Performs the mysql-query given by the user + * sets the tableView columns corresponding to the mysql-result + */ +- (void)performQueries:(NSArray *)queries; { NSArray *theColumns; @@ -863,11 +868,12 @@ sets the tableView columns corresponding to the mysql-result #pragma mark - #pragma mark Accessors - -- (NSArray *)currentResult /* -returns the current result (as shown in custom result view) as array, the first object containing the field names as array, the following objects containing the rows as array -*/ + * Returns the current result (as shown in custom result view) as array, + * the first object containing the field names as array, + * the following objects containing the rows as array + */ +- (NSArray *)currentResult { NSArray *tableColumns = [customQueryView tableColumns]; NSEnumerator *enumerator = [tableColumns objectEnumerator]; @@ -898,11 +904,10 @@ returns the current result (as shown in custom result view) as array, the first #pragma mark - #pragma mark Additional methods - -- (void)setConnection:(CMMCPConnection *)theConnection /* -sets the connection (received from TableDocument) and makes things that have to be done only once -*/ + * Sets the connection (received from TableDocument) and makes things that have to be done only once + */ +- (void)setConnection:(CMMCPConnection *)theConnection { NSArray *tableColumns = [queryFavoritesView tableColumns]; NSEnumerator *enumerator = [tableColumns objectEnumerator]; @@ -932,15 +937,15 @@ sets the connection (received from TableDocument) and makes things that have to [customQueryView setVerticalMotionCanBeginDrag:NO]; [textView setContinuousSpellCheckingEnabled:NO]; - [autoindentMenuItem setState:([prefs boolForKey:@"CustomQueryAutoindent"]?NSOnState:NSOffState)]; - [textView setAutoindent:[prefs boolForKey:@"CustomQueryAutoindent"]]; + [autoindentMenuItem setState:([prefs boolForKey:@"CustomQueryAutoIndent"]?NSOnState:NSOffState)]; + [textView setAutoindent:[prefs boolForKey:@"CustomQueryAutoIndent"]]; [textView setAutoindentIgnoresEnter:YES]; - [autopairMenuItem setState:([prefs boolForKey:@"CustomQueryAutopair"]?NSOnState:NSOffState)]; - [textView setAutopair:[prefs boolForKey:@"CustomQueryAutopair"]]; - [autohelpMenuItem setState:([prefs boolForKey:@"CustomQueryAutohelp"]?NSOnState:NSOffState)]; - [textView setAutohelp:[prefs boolForKey:@"CustomQueryAutohelp"]]; - [autouppercaseKeywordsMenuItem setState:([prefs boolForKey:@"CustomQueryAutouppercaseKeywords"]?NSOnState:NSOffState)]; - [textView setAutouppercaseKeywords:[prefs boolForKey:@"CustomQueryAutouppercaseKeywords"]]; + [autopairMenuItem setState:([prefs boolForKey:@"CustomQueryAutoPair"]?NSOnState:NSOffState)]; + [textView setAutopair:[prefs boolForKey:@"CustomQueryAutoPair"]]; + [autohelpMenuItem setState:([prefs boolForKey:@"CustomQueryUpdateAutoHelp"]?NSOnState:NSOffState)]; + [textView setAutohelp:[prefs boolForKey:@"CustomQueryUpdateAutoHelp"]]; + [autouppercaseKeywordsMenuItem setState:([prefs boolForKey:@"CustomQueryAutoUppercaseKeywords"]?NSOnState:NSOffState)]; + [textView setAutouppercaseKeywords:[prefs boolForKey:@"CustomQueryAutoUppercaseKeywords"]]; [queryFavoritesView registerForDraggedTypes:[NSArray arrayWithObjects:@"SequelProPasteboard", nil]]; while ( (column = [enumerator nextObject]) ) { @@ -961,10 +966,10 @@ sets the connection (received from TableDocument) and makes things that have to } -- (void)setFavorites /* -set up the favorites popUpButton -*/ + * Set up the favorites popUpButton + */ +- (void)setFavorites { int i; @@ -975,10 +980,10 @@ set up the favorites popUpButton [queryFavoritesButton addItemsWithTitles:queryFavorites]; } -- (void)doPerformQueryService:(NSString *)query /* -inserts the query in the textView and performs query -*/ + * Inserts the query in the textView and performs query + */ +- (void)doPerformQueryService:(NSString *)query { [textView setString:query]; [self runAllQueries:self]; @@ -989,10 +994,10 @@ inserts the query in the textView and performs query return usedQuery; } + #pragma mark - #pragma mark TableView datasource methods - - (int)numberOfRowsInTableView:(NSTableView *)aTableView { if ( aTableView == customQueryView ) { @@ -1074,7 +1079,9 @@ inserts the query in the textView and performs query } -//tableView drag&drop datasource methods +#pragma mark - +#pragma mark TableView Drag & Drop datasource methods + - (BOOL)tableView:(NSTableView *)aTableView writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard { int originalRow; @@ -1165,11 +1172,13 @@ inserts the query in the textView and performs query } -//tableView delegate methods -- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex +#pragma mark - +#pragma mark TableView delegate methods + /* -opens sheet with value when double clicking on a field -*/ + * Opens sheet with value when double clicking on a field + */ +- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { if ( aTableView == customQueryView ) { NSArray *theRow; @@ -1209,54 +1218,30 @@ opens sheet with value when double clicking on a field } } - #pragma mark - -#pragma mark SplitView delegate methods - - -- (BOOL)splitView:(NSSplitView *)sender canCollapseSubview:(NSView *)subview -/* -tells the splitView that it can collapse views -*/ -{ - return YES; -} - -- (float)splitView:(NSSplitView *)sender constrainMaxCoordinate:(float)proposedMax ofSubviewAt:(int)offset -/* -defines max position of splitView -*/ -{ - if ( offset == 0 ) { - return proposedMax - 100; - } else { - return proposedMax - 73; - } -} +#pragma mark TableView notifications -- (float)splitView:(NSSplitView *)sender constrainMinCoordinate:(float)proposedMin ofSubviewAt:(int)offset /* -defines min position of splitView -*/ -{ - if ( offset == 0 ) { - return proposedMin + 100; - } else { - return proposedMin + 100; + * Updates various interface elements based on the current table view selection. + */ +- (void)tableViewSelectionDidChange:(NSNotification *)notification +{ + if ([notification object] == queryFavoritesView) { + + // Enable/disable buttons + [removeQueryFavoriteButton setEnabled:([queryFavoritesView numberOfSelectedRows] == 1)]; + [copyQueryFavoriteButton setEnabled:([queryFavoritesView numberOfSelectedRows] == 1)]; } } - #pragma mark - #pragma mark TextView delegate methods - -- (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector /* -traps enter key and - performs query instead of inserting a line break if aTextView == textView - closes valueSheet if aTextView == valueTextField -*/ + * Traps enter key and performs query instead of inserting a line break if aTextView == textView + * closes valueSheet if aTextView == valueTextField + */ +- (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector { if ( aTextView == textView ) { if ( [aTextView methodForSelector:aSelector] == [aTextView methodForSelector:@selector(insertNewline:)] && @@ -1280,6 +1265,9 @@ traps enter key and return NO; } +#pragma mark - +#pragma mark TextView notifications + /* * A notification posted when the selection changes within the text view; * used to control the run-currentrun-selection button state and action. @@ -1366,38 +1354,50 @@ traps enter key and } -#pragma mark - -#pragma mark TableView notifications +/* + * Save the custom query editor font if it is changed. + */ +- (void)textViewDidChangeTypingAttributes:(NSNotification *)aNotification +{ + // Only save the font if prefs have been loaded, ensuring the saved font has been applied once. + if (prefs) + [prefs setObject:[NSArchiver archivedDataWithRootObject:[textView font]] forKey:@"CustomQueryEditorFont"]; +} + +#pragma mark - +#pragma mark SplitView delegate methods /* - * Updates various interface elements based on the current table view selection. + * Tells the splitView that it can collapse views */ -- (void)tableViewSelectionDidChange:(NSNotification *)notification -{ - if ([notification object] == queryFavoritesView) { - - // Enable/disable buttons - [removeQueryFavoriteButton setEnabled:([queryFavoritesView numberOfSelectedRows] == 1)]; - [copyQueryFavoriteButton setEnabled:([queryFavoritesView numberOfSelectedRows] == 1)]; - } +- (BOOL)splitView:(NSSplitView *)sender canCollapseSubview:(NSView *)subview +{ + return YES; } /* - * Save the custom query editor font if it is changed. + * Defines max position of splitView */ -- (void)textViewDidChangeTypingAttributes:(NSNotification *)aNotification +- (float)splitView:(NSSplitView *)sender constrainMaxCoordinate:(float)proposedMax ofSubviewAt:(int)offset { - - // Only save the font if prefs have been loaded, ensuring the saved font has been applied once. - if (prefs) - [prefs setObject:[NSArchiver archivedDataWithRootObject:[textView font]] forKey:@"CustomQueryEditorFont"]; + if ( offset == 0 ) { + return proposedMax - 100; + } else { + return proposedMax - 73; + } } -// set font panel's valid modes -- (unsigned int)validModesForFontPanel:(NSFontPanel *)fontPanel +/* + * Defines min position of splitView + */ +- (float)splitView:(NSSplitView *)sender constrainMinCoordinate:(float)proposedMin ofSubviewAt:(int)offset { - return (NSFontPanelAllModesMask ^ NSFontPanelAllEffectsModeMask); + if ( offset == 0 ) { + return proposedMin + 100; + } else { + return proposedMin + 100; + } } @@ -1879,7 +1879,7 @@ traps enter key and #pragma mark - #pragma mark Other -/** +/* * This method is called as part of Key Value Observing which is used to watch for prefernce changes which effect the interface. */ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context |