diff options
| author | rowanbeentje <rowan@beent.je> | 2013-04-28 12:33:02 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2013-04-28 12:33:02 +0000 |
| commit | 0a7ac2792eafc65b59bf156defb322526adf79d7 (patch) | |
| tree | 1f4b06c0f7001d13ef1e66769dbf91bd36bf2e91 | |
| parent | 3a440aa512f3524545dc0b1ec39362d052ed4806 (diff) | |
| download | sequelpro-0a7ac2792eafc65b59bf156defb322526adf79d7.tar.gz sequelpro-0a7ac2792eafc65b59bf156defb322526adf79d7.tar.bz2 sequelpro-0a7ac2792eafc65b59bf156defb322526adf79d7.zip | |
Merge a number of revisions from trunk back to the 1.0.x release branch:
- r4021: Add a check for SPNotLoaded values when automatically generating new tables when importing CSVs, fixing Issue #1621 (SPNotLoaded values are generated when rows shorter than the header row are seen)
- r4022: Fix crashes when importing favorites on the connection view, addressing Issue #1556; Select and scroll to newly created favorites after import
- r4023: Default to disabling SSH multiplexing to avoid connection issues as per Issue #1457; leave multiplexing code present, but behind a preference. Run `defaults write com.sequelpro.SequelPro SSHMultiplexingEnabled -boolean YES` to re-enable
- r4024: Fix handling of double-dash style comments within field names, addressing Issue #1554
- r4025: When favorites in the connection view gave no password, no longer set the focus to the password field as soon as they're selected; instead, make the password field the next responder for tab keys. This addresses Issue #1555
- r4028: Fix escaping of backlsashes in non-LIKE clauses, addressing string matching with the = and RegExp operators - addresses Issue #1563
- r4029: Fix handling of primary keys listing multiple fields of which an early field has a specified length, addressing Issue #1641
- r4030: Alter the database creation sheet to correctly use the selected new database encoding; Clean up the database creation logic and remove redundant selection logic; Correctly reset and detect the database encoding when creating and switching databases
- r4031: Fix blurry text in a number of text views in 1.0.x (Possibly caused by IB mangling; recreated new text views with the same settings to address). This fixes Issue #1560
- r4032: Detect deleted or non-writable folders for export targets and give appropriate errors (particularly for saved paths), addressing Issue #1566
- r4033: Add support for export path tokens containing non-alphanumeric characters, automatically grouping and tokenising as required for both dragged and typed tokens. This addresses Issue #1567
| -rw-r--r-- | Interfaces/English.lproj/DBView.xib | 1546 | ||||
| -rw-r--r-- | Resources/Plists/PreferenceDefaults.plist | 2 | ||||
| -rw-r--r-- | Source/SPConnectionController.m | 29 | ||||
| -rw-r--r-- | Source/SPConnectionControllerDelegate.m | 25 | ||||
| -rw-r--r-- | Source/SPConnectionHandler.m | 7 | ||||
| -rw-r--r-- | Source/SPConstants.h | 1 | ||||
| -rw-r--r-- | Source/SPConstants.m | 1 | ||||
| -rw-r--r-- | Source/SPDatabaseData.m | 4 | ||||
| -rw-r--r-- | Source/SPDatabaseDocument.m | 59 | ||||
| -rw-r--r-- | Source/SPExportControllerDelegate.m | 27 | ||||
| -rw-r--r-- | Source/SPExportFileUtilities.m | 38 | ||||
| -rw-r--r-- | Source/SPExportFilenameUtilities.m | 55 | ||||
| -rw-r--r-- | Source/SPFavoritesImporter.m | 4 | ||||
| -rw-r--r-- | Source/SPFavoritesOutlineView.h | 2 | ||||
| -rw-r--r-- | Source/SPFavoritesOutlineView.m | 21 | ||||
| -rw-r--r-- | Source/SPFieldMapperController.m | 2 | ||||
| -rw-r--r-- | Source/SPSQLParser.m | 5 | ||||
| -rw-r--r-- | Source/SPSSHTunnel.h | 1 | ||||
| -rw-r--r-- | Source/SPSSHTunnel.m | 8 | ||||
| -rw-r--r-- | Source/SPTableContent.m | 33 | ||||
| -rw-r--r-- | Source/SPTableData.m | 2 |
21 files changed, 1067 insertions, 805 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 67909468..9304f088 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -21,9 +21,10 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="6704"/> - <integer value="500"/> + <integer value="7210"/> <integer value="6991"/> + <integer value="6766"/> + <integer value="500"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1154,11 +1155,10 @@ <reference key="NSSuperview" ref="639957061"/> <reference key="NSTableView" ref="715508012"/> </object> - <object class="_NSCornerView" key="NSCornerView" id="7811742"> - <reference key="NSNextResponder" ref="22340145"/> + <object class="_NSCornerView" key="NSCornerView"> + <nil key="NSNextResponder"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-26, 0}, {16, 17}}</string> - <reference key="NSSuperview" ref="22340145"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1711,7 +1711,7 @@ <int key="NSTableViewGroupRowStyle">1</int> </object> </object> - <string key="NSFrame">{{1, 17}, {693, 288}}</string> + <string key="NSFrame">{{1.5, 17}, {693, 288}}</string> <reference key="NSSuperview" ref="22340145"/> <reference key="NSNextKeyView" ref="715508012"/> <reference key="NSDocView" ref="715508012"/> @@ -1745,14 +1745,13 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="926883367"/> </object> - <string key="NSFrame">{{1, 0}, {693, 17}}</string> + <string key="NSFrame">{{1.5, 0}, {693, 17}}</string> <reference key="NSSuperview" ref="22340145"/> <reference key="NSNextKeyView" ref="926883367"/> <reference key="NSDocView" ref="926883367"/> <reference key="NSBGColor" ref="1024678221"/> <int key="NScvFlags">4</int> </object> - <reference ref="7811742"/> </object> <string key="NSFrame">{{-1, 22}, {695, 306}}</string> <reference key="NSSuperview" ref="220777809"/> @@ -2116,11 +2115,10 @@ <reference key="NSSuperview" ref="1038672854"/> <reference key="NSTableView" ref="584834515"/> </object> - <object class="_NSCornerView" key="NSCornerView" id="935537188"> - <reference key="NSNextResponder" ref="376224367"/> + <object class="_NSCornerView" key="NSCornerView"> + <nil key="NSNextResponder"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-26, 0}, {16, 17}}</string> - <reference key="NSSuperview" ref="376224367"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2375,7 +2373,7 @@ <int key="NSTableViewGroupRowStyle">1</int> </object> </object> - <string key="NSFrame">{{1, 17}, {693, 141}}</string> + <string key="NSFrame">{{1.5, 17}, {693, 141}}</string> <reference key="NSSuperview" ref="376224367"/> <reference key="NSNextKeyView" ref="584834515"/> <reference key="NSDocView" ref="584834515"/> @@ -2408,14 +2406,13 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="459548655"/> </object> - <string key="NSFrame">{{1, 0}, {693, 17}}</string> + <string key="NSFrame">{{1.5, 0}, {693, 17}}</string> <reference key="NSSuperview" ref="376224367"/> <reference key="NSNextKeyView" ref="459548655"/> <reference key="NSDocView" ref="459548655"/> <reference key="NSBGColor" ref="1024678221"/> <int key="NScvFlags">4</int> </object> - <reference ref="935537188"/> </object> <string key="NSFrame">{{-1, 22}, {695, 159}}</string> <reference key="NSSuperview" ref="1063281455"/> @@ -3171,11 +3168,10 @@ <reference key="NSSuperview" ref="498696185"/> <reference key="NSTableView" ref="22576329"/> </object> - <object class="_NSCornerView" key="NSCornerView" id="777389091"> - <reference key="NSNextResponder" ref="33038697"/> + <object class="_NSCornerView" key="NSCornerView"> + <nil key="NSNextResponder"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-26, 0}, {16, 17}}</string> - <reference key="NSSuperview" ref="33038697"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3222,7 +3218,7 @@ <int key="NSTableViewGroupRowStyle">1</int> </object> </object> - <string key="NSFrame">{{1, 17}, {693, 456}}</string> + <string key="NSFrame">{{1.5, 17}, {693, 456}}</string> <reference key="NSSuperview" ref="33038697"/> <reference key="NSNextKeyView" ref="22576329"/> <reference key="NSDocView" ref="22576329"/> @@ -3256,14 +3252,13 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="457166030"/> </object> - <string key="NSFrame">{{1, 0}, {693, 17}}</string> + <string key="NSFrame">{{1.5, 0}, {693, 17}}</string> <reference key="NSSuperview" ref="33038697"/> <reference key="NSNextKeyView" ref="457166030"/> <reference key="NSDocView" ref="457166030"/> <reference key="NSBGColor" ref="1024678221"/> <int key="NScvFlags">4</int> </object> - <reference ref="777389091"/> </object> <string key="NSFrame">{{6, 32}, {695, 474}}</string> <reference key="NSSuperview" ref="1013108064"/> @@ -3285,7 +3280,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> @@ -3469,23 +3464,46 @@ <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSScrollView" id="274248101"> + <object class="NSScrollView" id="4997736"> <reference key="NSNextResponder" ref="815597998"/> <int key="NSvFlags">4370</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="888807510"> - <reference key="NSNextResponder" ref="274248101"/> + <object class="NSClipView" id="665594557"> + <reference key="NSNextResponder" ref="4997736"/> <int key="NSvFlags">2304</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="793890647"> - <reference key="NSNextResponder" ref="888807510"/> + <object class="NSTextView" id="87307329"> + <reference key="NSNextResponder" ref="665594557"/> <int key="NSvFlags">6418</int> + <object class="NSMutableSet" key="NSDragTypes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" 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>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> + <string>public.url</string> + </object> + </object> <string key="NSFrameSize">{693, 141}</string> - <reference key="NSSuperview" ref="888807510"/> - <reference key="NSNextKeyView" ref="74062067"/> - <object class="NSTextContainer" key="NSTextContainer" id="845974686"> + <reference key="NSSuperview" ref="665594557"/> + <string key="NSReuseIdentifierKey">_NS:1498</string> + <object class="NSTextContainer" key="NSTextContainer" id="457488585"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> <object class="NSMutableString" key="NSString"> @@ -3495,12 +3513,12 @@ </object> <object class="NSMutableArray" key="NSTextContainers"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="845974686"/> + <reference ref="457488585"/> </object> - <int key="NSLMFlags">38</int> + <int key="NSLMFlags">6</int> <nil key="NSDelegate"/> </object> - <reference key="NSTextView" ref="793890647"/> + <reference key="NSTextView" ref="87307329"/> <double key="NSWidth">693</double> <int key="NSTCFlags">1</int> </object> @@ -3533,7 +3551,24 @@ </object> </object> <reference key="NSInsertionColor" ref="304829493"/> - <nil key="NSLinkAttributes"/> + <object class="NSDictionary" key="NSLinkAttributes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSColor</string> + <string>NSCursor</string> + <string>NSUnderline</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="114422645"/> + <object class="NSCursor" id="2186"> + <string key="NSHotSpot">{8, -8}</string> + <int key="NSCursorType">13</int> + </object> + <integer value="1"/> + </object> + </object> <nil key="NSDefaultParagraphStyle"/> <nil key="NSTextFinder"/> <int key="NSPreferredTextFinderStyle">1</int> @@ -3543,204 +3578,54 @@ <nil key="NSDelegate"/> </object> </object> - <string key="NSFrame">{{1.5, 1}, {693, 141}}</string> - <reference key="NSSuperview" ref="274248101"/> - <reference key="NSNextKeyView" ref="793890647"/> - <reference key="NSDocView" ref="793890647"/> + <string key="NSFrame">{{1.5, 0.5}, {693, 141}}</string> + <reference key="NSSuperview" ref="4997736"/> + <reference key="NSNextKeyView" ref="87307329"/> + <string key="NSReuseIdentifierKey">_NS:1496</string> + <reference key="NSDocView" ref="87307329"/> <reference key="NSBGColor" ref="449903125"/> - <object class="NSCursor" key="NSCursor" id="32917531"> - <string key="NSHotSpot">{4, 5}</string> - <object class="NSImage" key="NSImage"> - <int key="NSImageFlags">12582912</int> - <object class="NSMutableArray" key="NSReps"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray"> - <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="0"/> - <object class="NSBitmapImageRep"> - <object class="NSData" key="NSTIFFRepresentation"> - <bytes key="NS.bytes">TU0AKgAAEAj///8A////qwAAAP8AAAD/AwMD/BYWFtIFBQVuAAAABv///wD///8E6+vrTGhoaLYtLS3p -BAQE/QAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/AAAA/wAAAP8EBATSX19fK9HR0ZciIiLv -AAAA/wAAAP8AAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////CsPDw0CRkZG1FxcX9AAAAP8bGxvr -ICAg8AAAAP8ICAjlFRUVVQAAAA////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wrm5uab -FxcX9AAAAP8AAAD/AQEB3wAAAA////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///zaXl5fGAAAA/wAAAP8AAABR////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////CO7u7q8AAAD/AAAA/wAAAAz///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///+rAAAA/wAAAP////8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///6sAAAD/AAAA/////wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/ -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+r -AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///6sAAAD/AAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////qwAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///+rAAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///6sAAAD/AAAA/////wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/AAAA/wAAAP8AAAD/ -AAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/ -AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////qwAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///+rAAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///6sAAAD/AAAA/////wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///+rAAAA/wAAAP////8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///6sAAAD/AAAA/////wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/ -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+r -AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////CO7u7q8AAAD/AAAA/wAAAAz///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///80mpqaxQAAAP8AAAD/AAAATv///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////CuXl5ZYeHh7xAAAA/wAAAP8CAgLXAAAAD////wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////EKurq0mOjo63FxcX9AAAAP8bGxvrICAg8AAAAP8ICAjlHh4eXAAAABj///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////qwAAAP8AAAD/AAAA/wAAAP8AAAD/BAQE1V9fXyvS0tKZICAg8AAAAP8AAAD/ -AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/FBQU1AUFBXEAAAAG////AP///wTr6+tO -ZWVluC4uLuoAAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8AABABAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA -EM4BAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE -AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB -AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA -AAAAIAAAAAEAAQABAAE</bytes> - </object> - </object> - </object> - <object class="NSArray"> - <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="0"/> - <object class="NSBitmapImageRep"> - <object class="NSData" key="NSTIFFRepresentation"> - <bytes key="NS.bytes">TU0AKgAABAj///9VQ0ND/wAAAP////8A////AP///6pDQ0P/AAAA/////wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///+qAAAA/////6oAAAD/////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///6oAAAD/////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///+qAAAA/////wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////qgAAAP////8A////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///6oAAAD/////AP///wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+qAAAA/////wD///8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////qgAAAP////8A -////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////qgAAAP8AAAD/ -AAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+q -AAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////qgAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///6oAAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///+qAAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////qgAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////qgAAAP////+qAAAA/////wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///9VQ0ND/wAAAP////8A////AP///6pDQ0P/AAAA/////wD///8A////AP///wD///8A -////AP///wD///8AAA4BAAADAAAAAQAQAAABAQADAAAAAQAQAAABAgADAAAABAAABLYBAwADAAAAAQAB -AAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAEAAABFgADAAAAAQAQ -AAABFwAEAAAAAQAABAABHAADAAAAAQABAAABUgADAAAAAQACAAABUwADAAAABAAABL6HcwAHAAAHqAAA -BMYAAAAAAAgACAAIAAgAAQABAAEAAQAAB6hhcHBsAiAAAG1udHJSR0IgWFlaIAfZAAIAGQALABoAC2Fj -c3BBUFBMAAAAAGFwcGwAAAAAAAAAAAAAAAAAAAAAAAD21gABAAAAANMtYXBwbAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC2Rlc2MAAAEIAAAAb2RzY20AAAF4AAAFbGNw -cnQAAAbkAAAAOHd0cHQAAAccAAAAFHJYWVoAAAcwAAAAFGdYWVoAAAdEAAAAFGJYWVoAAAdYAAAAFHJU -UkMAAAdsAAAADmNoYWQAAAd8AAAALGJUUkMAAAdsAAAADmdUUkMAAAdsAAAADmRlc2MAAAAAAAAAFEdl -bmVyaWMgUkdCIFByb2ZpbGUAAAAAAAAAAAAAABRHZW5lcmljIFJHQiBQcm9maWxlAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAB4AAAAMc2tTSwAA -ACgAAAF4aHJIUgAAACgAAAGgY2FFUwAAACQAAAHIcHRCUgAAACYAAAHsdWtVQQAAACoAAAISZnJGVQAA -ACgAAAI8emhUVwAAABYAAAJkaXRJVAAAACgAAAJ6bmJOTwAAACYAAAKia29LUgAAABYAAALIY3NDWgAA -ACIAAALeaGVJTAAAAB4AAAMAZGVERQAAACwAAAMeaHVIVQAAACgAAANKc3ZTRQAAACYAAAKiemhDTgAA -ABYAAANyamFKUAAAABoAAAOIcm9STwAAACQAAAOiZWxHUgAAACIAAAPGcHRQTwAAACYAAAPobmxOTAAA -ACgAAAQOZXNFUwAAACYAAAPodGhUSAAAACQAAAQ2dHJUUgAAACIAAARaZmlGSQAAACgAAAR8cGxQTAAA -ACwAAASkcnVSVQAAACIAAATQYXJFRwAAACYAAATyZW5VUwAAACYAAAUYZGFESwAAAC4AAAU+AFYBYQBl -AG8AYgBlAGMAbgD9ACAAUgBHAEIAIABwAHIAbwBmAGkAbABHAGUAbgBlAHIAaQENAGsAaQAgAFIARwBC -ACAAcAByAG8AZgBpAGwAUABlAHIAZgBpAGwAIABSAEcAQgAgAGcAZQBuAOgAcgBpAGMAUABlAHIAZgBp -AGwAIABSAEcAQgAgAEcAZQBuAOkAcgBpAGMAbwQXBDAEMwQwBDsETAQ9BDgEOQAgBD8EQAQ+BEQEMAQ5 -BDsAIABSAEcAQgBQAHIAbwBmAGkAbAAgAGcA6QBuAOkAcgBpAHEAdQBlACAAUgBWAEKQGnUoACAAUgBH -AEIAIIJyX2ljz4/wAFAAcgBvAGYAaQBsAG8AIABSAEcAQgAgAGcAZQBuAGUAcgBpAGMAbwBHAGUAbgBl -AHIAaQBzAGsAIABSAEcAQgAtAHAAcgBvAGYAaQBsx3y8GAAgAFIARwBCACDVBLhc0wzHfABPAGIAZQBj -AG4A/QAgAFIARwBCACAAcAByAG8AZgBpAGwF5AXoBdUF5AXZBdwAIABSAEcAQgAgBdsF3AXcBdkAQQBs -AGwAZwBlAG0AZQBpAG4AZQBzACAAUgBHAEIALQBQAHIAbwBmAGkAbADBAGwAdABhAGwA4QBuAG8AcwAg -AFIARwBCACAAcAByAG8AZgBpAGxmbpAaACAAUgBHAEIAIGPPj/Blh072TgCCLAAgAFIARwBCACAw1zDt -MNUwoTCkMOsAUAByAG8AZgBpAGwAIABSAEcAQgAgAGcAZQBuAGUAcgBpAGMDkwO1A70DuQO6A8wAIAPA -A8EDvwPGA68DuwAgAFIARwBCAFAAZQByAGYAaQBsACAAUgBHAEIAIABnAGUAbgDpAHIAaQBjAG8AQQBs -AGcAZQBtAGUAZQBuACAAUgBHAEIALQBwAHIAbwBmAGkAZQBsDkIOGw4jDkQOHw4lDkwAIABSAEcAQgAg -DhcOMQ5IDicORA4bAEcAZQBuAGUAbAAgAFIARwBCACAAUAByAG8AZgBpAGwAaQBZAGwAZQBpAG4AZQBu -ACAAUgBHAEIALQBwAHIAbwBmAGkAaQBsAGkAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBp -AGwAIABSAEcAQgQeBDEESQQ4BDkAIAQ/BEAEPgREBDgEOwRMACAAUgBHAEIGRQZEBkEAIAYqBjkGMQZK -BkEAIABSAEcAQgAgBicGRAY5BicGRQBHAGUAbgBlAHIAaQBjACAAUgBHAEIAIABQAHIAbwBmAGkAbABl -AEcAZQBuAGUAcgBlAGwAIABSAEcAQgAtAGIAZQBzAGsAcgBpAHYAZQBsAHMAZXRleHQAAAAAQ29weXJp -Z2h0IDIwMDcgQXBwbGUgSW5jLiwgYWxsIHJpZ2h0cyByZXNlcnZlZC4AWFlaIAAAAAAAAPNSAAEAAAAB -Fs9YWVogAAAAAAAAdE0AAD3uAAAD0FhZWiAAAAAAAABadQAArHMAABc0WFlaIAAAAAAAACgaAAAVnwAA -uDZjdXJ2AAAAAAAAAAEBzQAAc2YzMgAAAAAAAQxCAAAF3v//8yYAAAeSAAD9kf//+6L///2jAAAD3AAA -wGw</bytes> - </object> - </object> - </object> - </object> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwAA</bytes> - </object> - </object> + <object class="NSCursor" key="NSCursor" id="852124105"> + <string key="NSHotSpot">{4, -5}</string> + <int key="NSCursorType">1</int> </object> <int key="NScvFlags">4</int> </object> - <object class="NSScroller" id="243558888"> - <reference key="NSNextResponder" ref="274248101"/> + <object class="NSScroller" id="691452503"> + <reference key="NSNextResponder" ref="4997736"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{598, 1}, {15, 68}}</string> - <reference key="NSSuperview" ref="274248101"/> - <reference key="NSNextKeyView" ref="539474293"/> - <reference key="NSTarget" ref="274248101"/> + <string key="NSFrame">{{224, 1}, {15, 133}}</string> + <reference key="NSSuperview" ref="4997736"/> + <string key="NSReuseIdentifierKey">_NS:1512</string> + <reference key="NSTarget" ref="4997736"/> <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1</double> + <double key="NSPercent">0.98496240601503759</double> </object> - <object class="NSScroller" id="74062067"> - <reference key="NSNextResponder" ref="274248101"/> + <object class="NSScroller" id="534514906"> + <reference key="NSNextResponder" ref="4997736"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{-100, -100}, {601, 11}}</string> - <reference key="NSSuperview" ref="274248101"/> - <reference key="NSNextKeyView" ref="888807510"/> - <int key="NSsFlags">257</int> - <reference key="NSTarget" ref="274248101"/> + <string key="NSFrame">{{-100, -100}, {87, 18}}</string> + <reference key="NSSuperview" ref="4997736"/> + <string key="NSReuseIdentifierKey">_NS:1514</string> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="4997736"/> <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">0.99979895353317261</double> + <double key="NSCurValue">1</double> <double key="NSPercent">0.94565218687057495</double> </object> </object> - <string key="NSFrameSize">{695, 143}</string> + <string key="NSFrame">{{0, 0.5}, {695, 143}}</string> <reference key="NSSuperview" ref="815597998"/> - <reference key="NSNextKeyView" ref="888807510"/> + <reference key="NSNextKeyView" ref="665594557"/> + <string key="NSReuseIdentifierKey">_NS:1494</string> <int key="NSsFlags">133650</int> - <reference key="NSVScroller" ref="243558888"/> - <reference key="NSHScroller" ref="74062067"/> - <reference key="NSContentView" ref="888807510"/> + <reference key="NSVScroller" ref="691452503"/> + <reference key="NSHScroller" ref="534514906"/> + <reference key="NSContentView" ref="665594557"/> </object> </object> <string key="NSFrameSize">{695, 143}</string> <reference key="NSSuperview" ref="727658473"/> - <reference key="NSNextKeyView" ref="274248101"/> + <reference key="NSNextKeyView"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="539474293"> @@ -4658,10 +4543,7 @@ wGw</bytes> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="114422645"/> - <object class="NSCursor" id="2186"> - <string key="NSHotSpot">{8, -8}</string> - <int key="NSCursorType">13</int> - </object> + <reference ref="2186"/> <integer value="1"/> </object> </object> @@ -4679,7 +4561,162 @@ wGw</bytes> <reference key="NSNextKeyView" ref="714539623"/> <reference key="NSDocView" ref="714539623"/> <reference key="NSBGColor" ref="449903125"/> - <reference key="NSCursor" ref="32917531"/> + <object class="NSCursor" key="NSCursor" id="32917531"> + <string key="NSHotSpot">{4, 5}</string> + <object class="NSImage" key="NSImage"> + <int key="NSImageFlags">12582912</int> + <object class="NSMutableArray" key="NSReps"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <object class="NSBitmapImageRep"> + <object class="NSData" key="NSTIFFRepresentation"> + <bytes key="NS.bytes">TU0AKgAAEAj///8A////qwAAAP8AAAD/AwMD/BYWFtIFBQVuAAAABv///wD///8E6+vrTGhoaLYtLS3p +BAQE/QAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/AAAA/wAAAP8EBATSX19fK9HR0ZciIiLv +AAAA/wAAAP8AAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////CsPDw0CRkZG1FxcX9AAAAP8bGxvr +ICAg8AAAAP8ICAjlFRUVVQAAAA////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wrm5uab +FxcX9AAAAP8AAAD/AQEB3wAAAA////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///zaXl5fGAAAA/wAAAP8AAABR////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////CO7u7q8AAAD/AAAA/wAAAAz///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///+rAAAA/wAAAP////8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///6sAAAD/AAAA/////wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/ +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+r +AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///6sAAAD/AAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////qwAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///+rAAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///6sAAAD/AAAA/////wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/AAAA/wAAAP8AAAD/ +AAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/ +AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////qwAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///+rAAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///6sAAAD/AAAA/////wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///+rAAAA/wAAAP////8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///6sAAAD/AAAA/////wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////qwAAAP8AAAD/ +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+r +AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////CO7u7q8AAAD/AAAA/wAAAAz///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///80mpqaxQAAAP8AAAD/AAAATv///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////CuXl5ZYeHh7xAAAA/wAAAP8CAgLXAAAAD////wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////EKurq0mOjo63FxcX9AAAAP8bGxvrICAg8AAAAP8ICAjlHh4eXAAAABj///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////qwAAAP8AAAD/AAAA/wAAAP8AAAD/BAQE1V9fXyvS0tKZICAg8AAAAP8AAAD/ +AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/FBQU1AUFBXEAAAAG////AP///wTr6+tO +ZWVluC4uLuoAAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8AABABAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA +EM4BAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE +AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB +AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA +AAAAIAAAAAEAAQABAAE</bytes> + </object> + </object> + </object> + <object class="NSArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <object class="NSBitmapImageRep"> + <object class="NSData" key="NSTIFFRepresentation"> + <bytes key="NS.bytes">TU0AKgAABAj///9VQ0ND/wAAAP////8A////AP///6pDQ0P/AAAA/////wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///+qAAAA/////6oAAAD/////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///6oAAAD/////AP///wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///+qAAAA/////wD///8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////qgAAAP////8A////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///6oAAAD/////AP///wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+qAAAA/////wD///8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////qgAAAP////8A +////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////qgAAAP8AAAD/ +AAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///+q +AAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////qgAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///6oAAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///+qAAAA/////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////qgAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///8A////qgAAAP////+qAAAA/////wD///8A////AP///wD///8A////AP///wD///8A +////AP///wD///9VQ0ND/wAAAP////8A////AP///6pDQ0P/AAAA/////wD///8A////AP///wD///8A +////AP///wD///8AAA4BAAADAAAAAQAQAAABAQADAAAAAQAQAAABAgADAAAABAAABLYBAwADAAAAAQAB +AAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAEAAABFgADAAAAAQAQ +AAABFwAEAAAAAQAABAABHAADAAAAAQABAAABUgADAAAAAQACAAABUwADAAAABAAABL6HcwAHAAAHqAAA +BMYAAAAAAAgACAAIAAgAAQABAAEAAQAAB6hhcHBsAiAAAG1udHJSR0IgWFlaIAfZAAIAGQALABoAC2Fj +c3BBUFBMAAAAAGFwcGwAAAAAAAAAAAAAAAAAAAAAAAD21gABAAAAANMtYXBwbAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC2Rlc2MAAAEIAAAAb2RzY20AAAF4AAAFbGNw +cnQAAAbkAAAAOHd0cHQAAAccAAAAFHJYWVoAAAcwAAAAFGdYWVoAAAdEAAAAFGJYWVoAAAdYAAAAFHJU +UkMAAAdsAAAADmNoYWQAAAd8AAAALGJUUkMAAAdsAAAADmdUUkMAAAdsAAAADmRlc2MAAAAAAAAAFEdl +bmVyaWMgUkdCIFByb2ZpbGUAAAAAAAAAAAAAABRHZW5lcmljIFJHQiBQcm9maWxlAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAB4AAAAMc2tTSwAA +ACgAAAF4aHJIUgAAACgAAAGgY2FFUwAAACQAAAHIcHRCUgAAACYAAAHsdWtVQQAAACoAAAISZnJGVQAA +ACgAAAI8emhUVwAAABYAAAJkaXRJVAAAACgAAAJ6bmJOTwAAACYAAAKia29LUgAAABYAAALIY3NDWgAA +ACIAAALeaGVJTAAAAB4AAAMAZGVERQAAACwAAAMeaHVIVQAAACgAAANKc3ZTRQAAACYAAAKiemhDTgAA +ABYAAANyamFKUAAAABoAAAOIcm9STwAAACQAAAOiZWxHUgAAACIAAAPGcHRQTwAAACYAAAPobmxOTAAA +ACgAAAQOZXNFUwAAACYAAAPodGhUSAAAACQAAAQ2dHJUUgAAACIAAARaZmlGSQAAACgAAAR8cGxQTAAA +ACwAAASkcnVSVQAAACIAAATQYXJFRwAAACYAAATyZW5VUwAAACYAAAUYZGFESwAAAC4AAAU+AFYBYQBl +AG8AYgBlAGMAbgD9ACAAUgBHAEIAIABwAHIAbwBmAGkAbABHAGUAbgBlAHIAaQENAGsAaQAgAFIARwBC +ACAAcAByAG8AZgBpAGwAUABlAHIAZgBpAGwAIABSAEcAQgAgAGcAZQBuAOgAcgBpAGMAUABlAHIAZgBp +AGwAIABSAEcAQgAgAEcAZQBuAOkAcgBpAGMAbwQXBDAEMwQwBDsETAQ9BDgEOQAgBD8EQAQ+BEQEMAQ5 +BDsAIABSAEcAQgBQAHIAbwBmAGkAbAAgAGcA6QBuAOkAcgBpAHEAdQBlACAAUgBWAEKQGnUoACAAUgBH +AEIAIIJyX2ljz4/wAFAAcgBvAGYAaQBsAG8AIABSAEcAQgAgAGcAZQBuAGUAcgBpAGMAbwBHAGUAbgBl +AHIAaQBzAGsAIABSAEcAQgAtAHAAcgBvAGYAaQBsx3y8GAAgAFIARwBCACDVBLhc0wzHfABPAGIAZQBj +AG4A/QAgAFIARwBCACAAcAByAG8AZgBpAGwF5AXoBdUF5AXZBdwAIABSAEcAQgAgBdsF3AXcBdkAQQBs +AGwAZwBlAG0AZQBpAG4AZQBzACAAUgBHAEIALQBQAHIAbwBmAGkAbADBAGwAdABhAGwA4QBuAG8AcwAg +AFIARwBCACAAcAByAG8AZgBpAGxmbpAaACAAUgBHAEIAIGPPj/Blh072TgCCLAAgAFIARwBCACAw1zDt +MNUwoTCkMOsAUAByAG8AZgBpAGwAIABSAEcAQgAgAGcAZQBuAGUAcgBpAGMDkwO1A70DuQO6A8wAIAPA +A8EDvwPGA68DuwAgAFIARwBCAFAAZQByAGYAaQBsACAAUgBHAEIAIABnAGUAbgDpAHIAaQBjAG8AQQBs +AGcAZQBtAGUAZQBuACAAUgBHAEIALQBwAHIAbwBmAGkAZQBsDkIOGw4jDkQOHw4lDkwAIABSAEcAQgAg +DhcOMQ5IDicORA4bAEcAZQBuAGUAbAAgAFIARwBCACAAUAByAG8AZgBpAGwAaQBZAGwAZQBpAG4AZQBu +ACAAUgBHAEIALQBwAHIAbwBmAGkAaQBsAGkAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBp +AGwAIABSAEcAQgQeBDEESQQ4BDkAIAQ/BEAEPgREBDgEOwRMACAAUgBHAEIGRQZEBkEAIAYqBjkGMQZK +BkEAIABSAEcAQgAgBicGRAY5BicGRQBHAGUAbgBlAHIAaQBjACAAUgBHAEIAIABQAHIAbwBmAGkAbABl +AEcAZQBuAGUAcgBlAGwAIABSAEcAQgAtAGIAZQBzAGsAcgBpAHYAZQBsAHMAZXRleHQAAAAAQ29weXJp +Z2h0IDIwMDcgQXBwbGUgSW5jLiwgYWxsIHJpZ2h0cyByZXNlcnZlZC4AWFlaIAAAAAAAAPNSAAEAAAAB +Fs9YWVogAAAAAAAAdE0AAD3uAAAD0FhZWiAAAAAAAABadQAArHMAABc0WFlaIAAAAAAAACgaAAAVnwAA +uDZjdXJ2AAAAAAAAAAEBzQAAc2YzMgAAAAAAAQxCAAAF3v//8yYAAAeSAAD9kf//+6L///2jAAAD3AAA +wGw</bytes> + </object> + </object> + </object> + </object> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwAA</bytes> + </object> + </object> + </object> <int key="NScvFlags">2</int> </object> <object class="NSScroller" id="628306046"> @@ -4759,6 +4796,7 @@ wGw</bytes> </object> </object> <string key="NSFrame">{{10, 7}, {705, 544}}</string> + <reference key="NSSuperview" ref="714795046"/> <reference key="NSNextKeyView" ref="515194087"/> </object> <string key="NSLabel">Custom Query</string> @@ -4795,7 +4833,7 @@ wGw</bytes> <object class="NSTextView" id="69074373"> <reference key="NSNextResponder" ref="78677381"/> <int key="NSvFlags">2322</int> - <string key="NSFrameSize">{540, 70}</string> + <string key="NSFrameSize">{551, 70}</string> <reference key="NSSuperview" ref="78677381"/> <object class="NSTextContainer" key="NSTextContainer" id="708157837"> <object class="NSLayoutManager" key="NSLayoutManager"> @@ -4813,7 +4851,7 @@ wGw</bytes> <nil key="NSDelegate"/> </object> <reference key="NSTextView" ref="69074373"/> - <double key="NSWidth">540</double> + <double key="NSWidth">551</double> <int key="NSTCFlags">1</int> </object> <object class="NSTextViewSharedData" key="NSSharedData"> @@ -4854,10 +4892,11 @@ wGw</bytes> </object> <int key="NSTVFlags">6</int> <string key="NSMaxSize">{1097, 10000000}</string> + <string key="NSMinize">{540, 70}</string> <nil key="NSDelegate"/> </object> </object> - <string key="NSFrame">{{1, 1}, {540, 70}}</string> + <string key="NSFrame">{{1.5, 1}, {551, 70}}</string> <reference key="NSSuperview" ref="709531668"/> <reference key="NSNextKeyView" ref="69074373"/> <reference key="NSDocView" ref="69074373"/> @@ -4922,22 +4961,46 @@ wGw</bytes> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSScrollView" id="449863508"> + <object class="NSScrollView" id="450430872"> <reference key="NSNextResponder" ref="983998494"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="637054939"> - <reference key="NSNextResponder" ref="449863508"/> + <object class="NSClipView" id="585872781"> + <reference key="NSNextResponder" ref="450430872"/> <int key="NSvFlags">2304</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="421486962"> - <reference key="NSNextResponder" ref="637054939"/> + <object class="NSTextView" id="632372811"> + <reference key="NSNextResponder" ref="585872781"/> <int key="NSvFlags">2322</int> - <string key="NSFrameSize">{540, 197}</string> - <reference key="NSSuperview" ref="637054939"/> - <object class="NSTextContainer" key="NSTextContainer" id="194867362"> + <object class="NSMutableSet" key="NSDragTypes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" 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>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> + <string>public.url</string> + </object> + </object> + <string key="NSFrameSize">{551, 197}</string> + <reference key="NSSuperview" ref="585872781"/> + <string key="NSReuseIdentifierKey">_NS:1498</string> + <object class="NSTextContainer" key="NSTextContainer" id="811818228"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> <object class="NSMutableString" key="NSString"> @@ -4947,13 +5010,13 @@ wGw</bytes> </object> <object class="NSMutableArray" key="NSTextContainers"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="194867362"/> + <reference ref="811818228"/> </object> - <int key="NSLMFlags">38</int> + <int key="NSLMFlags">6</int> <nil key="NSDelegate"/> </object> - <reference key="NSTextView" ref="421486962"/> - <double key="NSWidth">540</double> + <reference key="NSTextView" ref="632372811"/> + <double key="NSWidth">551</double> <int key="NSTCFlags">1</int> </object> <object class="NSTextViewSharedData" key="NSSharedData"> @@ -4980,11 +5043,13 @@ wGw</bytes> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSColor</string> + <string>NSCursor</string> <string>NSUnderline</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="114422645"/> + <reference ref="2186"/> <integer value="1"/> </object> </object> @@ -4994,34 +5059,37 @@ wGw</bytes> </object> <int key="NSTVFlags">6</int> <string key="NSMaxSize">{1097, 10000000}</string> + <string key="NSMinize">{540, 197}</string> <nil key="NSDelegate"/> </object> </object> - <string key="NSFrame">{{1, 1}, {540, 197}}</string> - <reference key="NSSuperview" ref="449863508"/> - <reference key="NSNextKeyView" ref="421486962"/> - <reference key="NSDocView" ref="421486962"/> + <string key="NSFrame">{{1.5, 1}, {551, 197}}</string> + <reference key="NSSuperview" ref="450430872"/> + <reference key="NSNextKeyView" ref="632372811"/> + <string key="NSReuseIdentifierKey">_NS:1496</string> + <reference key="NSDocView" ref="632372811"/> <reference key="NSBGColor" ref="449903125"/> - <reference key="NSCursor" ref="32917531"/> + <reference key="NSCursor" ref="852124105"/> <int key="NScvFlags">4</int> </object> - <object class="NSScroller" id="633929130"> - <reference key="NSNextResponder" ref="449863508"/> + <object class="NSScroller" id="254222887"> + <reference key="NSNextResponder" ref="450430872"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{541, 1}, {11, 197}}</string> - <reference key="NSSuperview" ref="449863508"/> - <int key="NSsFlags">256</int> - <reference key="NSTarget" ref="449863508"/> + <string key="NSFrame">{{537, 1}, {15, 197}}</string> + <reference key="NSSuperview" ref="450430872"/> + <string key="NSReuseIdentifierKey">_NS:1512</string> + <reference key="NSTarget" ref="450430872"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.99315071105957031</double> + <double key="NSPercent">0.34586466165413532</double> </object> - <object class="NSScroller" id="883667132"> - <reference key="NSNextResponder" ref="449863508"/> + <object class="NSScroller" id="1073597605"> + <reference key="NSNextResponder" ref="450430872"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 18}}</string> - <reference key="NSSuperview" ref="449863508"/> + <reference key="NSSuperview" ref="450430872"/> + <string key="NSReuseIdentifierKey">_NS:1514</string> <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="449863508"/> + <reference key="NSTarget" ref="450430872"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">1</double> <double key="NSPercent">0.94565218687057495</double> @@ -5029,11 +5097,12 @@ wGw</bytes> </object> <string key="NSFrame">{{109, 0}, {553, 199}}</string> <reference key="NSSuperview" ref="983998494"/> - <reference key="NSNextKeyView" ref="637054939"/> + <reference key="NSNextKeyView" ref="585872781"/> + <string key="NSReuseIdentifierKey">_NS:1494</string> <int key="NSsFlags">133138</int> - <reference key="NSVScroller" ref="633929130"/> - <reference key="NSHScroller" ref="883667132"/> - <reference key="NSContentView" ref="637054939"/> + <reference key="NSVScroller" ref="254222887"/> + <reference key="NSHScroller" ref="1073597605"/> + <reference key="NSContentView" ref="585872781"/> </object> <object class="NSTextField" id="855588490"> <reference key="NSNextResponder" ref="983998494"/> @@ -6105,7 +6174,7 @@ wGw</bytes> <object class="NSTabViewItem" id="75945221"> <string key="NSIdentifier">triggers</string> <object class="NSView" key="NSView" id="776303855"> - <reference key="NSNextResponder" ref="714795046"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -6506,21 +6575,20 @@ wGw</bytes> </object> </object> <string key="NSFrame">{{10, 7}, {705, 544}}</string> - <reference key="NSSuperview" ref="714795046"/> </object> <string key="NSLabel">Triggers</string> <reference key="NSColor" ref="62854682"/> <reference key="NSTabView" ref="714795046"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="75945221"/> + <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="776303855"/> + <reference ref="746504912"/> </object> </object> </object> @@ -8391,7 +8459,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">268</int> <string key="NSFrame">{{1, 66}, {116, 14}}</string> <reference key="NSSuperview" ref="744559560"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="423785954"> <int key="NSCellFlags">68157504</int> @@ -8408,7 +8475,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">266</int> <string key="NSFrame">{{125, 64}, {181, 19}}</string> <reference key="NSSuperview" ref="744559560"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="868956191"> <int key="NSCellFlags">-1804599231</int> @@ -8426,7 +8492,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">268</int> <string key="NSFrame">{{121, 35}, {187, 22}}</string> <reference key="NSSuperview" ref="744559560"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="395583979"> <int key="NSCellFlags">-2076049856</int> @@ -8481,7 +8546,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">268</int> <string key="NSFrame">{{121, 10}, {187, 22}}</string> <reference key="NSSuperview" ref="744559560"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="545923807"> <int key="NSCellFlags">-2076049856</int> @@ -8547,7 +8611,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">268</int> <string key="NSFrame">{{1, 40}, {116, 14}}</string> <reference key="NSSuperview" ref="744559560"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="485839481"> <int key="NSCellFlags">68157504</int> @@ -8564,7 +8627,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">268</int> <string key="NSFrame">{{1, 15}, {116, 14}}</string> <reference key="NSSuperview" ref="744559560"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="972905785"> <int key="NSCellFlags">68157504</int> @@ -8579,12 +8641,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrame">{{1, 1}, {324, 93}}</string> <reference key="NSSuperview" ref="215249222"/> - <reference key="NSWindow"/> </object> </object> <string key="NSFrame">{{17, 219}, {326, 109}}</string> <reference key="NSSuperview" ref="729080358"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67108864</int> @@ -8608,7 +8668,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">289</int> <string key="NSFrame">{{249, 13}, {96, 28}}</string> <reference key="NSSuperview" ref="729080358"/> - <reference key="NSWindow"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1062269056"> @@ -8630,7 +8689,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">289</int> <string key="NSFrame">{{155, 13}, {96, 28}}</string> <reference key="NSSuperview" ref="729080358"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="442324996"> <int key="NSCellFlags">67108864</int> @@ -8646,18 +8704,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSScrollView" id="535637428"> + <object class="NSScrollView" id="392922998"> <reference key="NSNextResponder" ref="729080358"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="43515485"> - <reference key="NSNextResponder" ref="535637428"/> + <object class="NSClipView" id="1014021706"> + <reference key="NSNextResponder" ref="392922998"/> <int key="NSvFlags">2304</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="524621994"> - <reference key="NSNextResponder" ref="43515485"/> + <object class="NSTextView" id="352529597"> + <reference key="NSNextResponder" ref="1014021706"/> <int key="NSvFlags">2322</int> <object class="NSMutableSet" key="NSDragTypes"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -8683,9 +8741,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <string key="NSFrameSize">{318, 168}</string> - <reference key="NSSuperview" ref="43515485"/> - <reference key="NSWindow"/> - <object class="NSTextContainer" key="NSTextContainer" id="880430958"> + <reference key="NSSuperview" ref="1014021706"/> + <string key="NSReuseIdentifierKey">_NS:1498</string> + <object class="NSTextContainer" key="NSTextContainer" id="302677081"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> <object class="NSMutableString" key="NSString"> @@ -8695,12 +8753,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="NSMutableArray" key="NSTextContainers"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="880430958"/> + <reference ref="302677081"/> </object> - <int key="NSLMFlags">38</int> + <int key="NSLMFlags">6</int> <nil key="NSDelegate"/> </object> - <reference key="NSTextView" ref="524621994"/> + <reference key="NSTextView" ref="352529597"/> <double key="NSWidth">318</double> <int key="NSTCFlags">1</int> </object> @@ -8728,11 +8786,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSColor</string> + <string>NSCursor</string> <string>NSUnderline</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="114422645"/> + <reference ref="2186"/> <integer value="1"/> </object> </object> @@ -8746,33 +8806,32 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <string key="NSFrame">{{1, 1}, {318, 168}}</string> - <reference key="NSSuperview" ref="535637428"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="524621994"/> - <reference key="NSDocView" ref="524621994"/> + <reference key="NSSuperview" ref="392922998"/> + <reference key="NSNextKeyView" ref="352529597"/> + <string key="NSReuseIdentifierKey">_NS:1496</string> + <reference key="NSDocView" ref="352529597"/> <reference key="NSBGColor" ref="449903125"/> - <reference key="NSCursor" ref="32917531"/> + <reference key="NSCursor" ref="852124105"/> <int key="NScvFlags">4</int> </object> - <object class="NSScroller" id="410655922"> - <reference key="NSNextResponder" ref="535637428"/> + <object class="NSScroller" id="164784175"> + <reference key="NSNextResponder" ref="392922998"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{-100, -100}, {11, 133}}</string> - <reference key="NSSuperview" ref="535637428"/> - <reference key="NSWindow"/> - <int key="NSsFlags">256</int> - <reference key="NSTarget" ref="535637428"/> + <string key="NSFrame">{{304, 1}, {15, 168}}</string> + <reference key="NSSuperview" ref="392922998"/> + <string key="NSReuseIdentifierKey">_NS:1512</string> + <reference key="NSTarget" ref="392922998"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.73888891935348511</double> + <double key="NSPercent">0.99248120300751874</double> </object> - <object class="NSScroller" id="241216245"> - <reference key="NSNextResponder" ref="535637428"/> + <object class="NSScroller" id="270313163"> + <reference key="NSNextResponder" ref="392922998"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 18}}</string> - <reference key="NSSuperview" ref="535637428"/> - <reference key="NSWindow"/> + <reference key="NSSuperview" ref="392922998"/> + <string key="NSReuseIdentifierKey">_NS:1514</string> <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="535637428"/> + <reference key="NSTarget" ref="392922998"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">1</double> <double key="NSPercent">0.94565218687057495</double> @@ -8780,17 +8839,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrame">{{20, 45}, {320, 170}}</string> <reference key="NSSuperview" ref="729080358"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="43515485"/> + <reference key="NSNextKeyView" ref="1014021706"/> + <string key="NSReuseIdentifierKey">_NS:1494</string> <int key="NSsFlags">133650</int> - <reference key="NSVScroller" ref="410655922"/> - <reference key="NSHScroller" ref="241216245"/> - <reference key="NSContentView" ref="43515485"/> + <reference key="NSVScroller" ref="164784175"/> + <reference key="NSHScroller" ref="270313163"/> + <reference key="NSContentView" ref="1014021706"/> </object> </object> <string key="NSFrameSize">{360, 348}</string> <reference key="NSSuperview"/> - <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string> <string key="NSMinSize">{360, 370}</string> @@ -9014,7 +9072,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrame">{{1, 1}, {381, 204}}</string> <reference key="NSSuperview" ref="271089627"/> - <reference key="NSNextKeyView" ref="405634773"/> <reference key="NSDocView" ref="405634773"/> <reference key="NSBGColor" ref="449903125"/> <reference key="NSCursor" ref="32917531"/> @@ -9044,7 +9101,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrame">{{-1, 35}, {383, 206}}</string> <reference key="NSSuperview" ref="1052076676"/> - <reference key="NSNextKeyView" ref="240408862"/> <int key="NSsFlags">133138</int> <reference key="NSVScroller" ref="850107135"/> <reference key="NSHScroller" ref="937090729"/> @@ -9177,22 +9233,23 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="NSTextColor" ref="454249633"/> </object> </object> - <object class="NSScrollView" id="666283614"> + <object class="NSScrollView" id="272021798"> <reference key="NSNextResponder" ref="749598685"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="789153540"> - <reference key="NSNextResponder" ref="666283614"/> + <object class="NSClipView" id="648530676"> + <reference key="NSNextResponder" ref="272021798"/> <int key="NSvFlags">2304</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="843242867"> - <reference key="NSNextResponder" ref="789153540"/> + <object class="NSTextView" id="277018534"> + <reference key="NSNextResponder" ref="648530676"/> <int key="NSvFlags">2322</int> <string key="NSFrameSize">{411, 264}</string> - <reference key="NSSuperview" ref="789153540"/> - <object class="NSTextContainer" key="NSTextContainer" id="297140751"> + <reference key="NSSuperview" ref="648530676"/> + <string key="NSReuseIdentifierKey">_NS:1498</string> + <object class="NSTextContainer" key="NSTextContainer" id="848115206"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> <object class="NSMutableString" key="NSString"> @@ -9202,12 +9259,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="NSMutableArray" key="NSTextContainers"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="297140751"/> + <reference ref="848115206"/> </object> - <int key="NSLMFlags">38</int> + <int key="NSLMFlags">6</int> <nil key="NSDelegate"/> </object> - <reference key="NSTextView" ref="843242867"/> + <reference key="NSTextView" ref="277018534"/> <double key="NSWidth">411</double> <int key="NSTCFlags">1</int> </object> @@ -9235,11 +9292,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSColor</string> + <string>NSCursor</string> <string>NSUnderline</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="114422645"/> + <reference ref="2186"/> <integer value="1"/> </object> </object> @@ -9253,30 +9312,31 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <string key="NSFrame">{{1, 1}, {411, 264}}</string> - <reference key="NSSuperview" ref="666283614"/> - <reference key="NSNextKeyView" ref="843242867"/> - <reference key="NSDocView" ref="843242867"/> + <reference key="NSSuperview" ref="272021798"/> + <string key="NSReuseIdentifierKey">_NS:1496</string> + <reference key="NSDocView" ref="277018534"/> <reference key="NSBGColor" ref="449903125"/> - <reference key="NSCursor" ref="32917531"/> + <reference key="NSCursor" ref="852124105"/> <int key="NScvFlags">4</int> </object> - <object class="NSScroller" id="497829974"> - <reference key="NSNextResponder" ref="666283614"/> + <object class="NSScroller" id="240381411"> + <reference key="NSNextResponder" ref="272021798"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{-100, -100}, {11, 133}}</string> - <reference key="NSSuperview" ref="666283614"/> - <int key="NSsFlags">256</int> - <reference key="NSTarget" ref="666283614"/> + <string key="NSFrame">{{397, 1}, {15, 264}}</string> + <reference key="NSSuperview" ref="272021798"/> + <string key="NSReuseIdentifierKey">_NS:1512</string> + <reference key="NSTarget" ref="272021798"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.73888891935348511</double> + <double key="NSPercent">0.99248120300751874</double> </object> - <object class="NSScroller" id="246464134"> - <reference key="NSNextResponder" ref="666283614"/> + <object class="NSScroller" id="231859968"> + <reference key="NSNextResponder" ref="272021798"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 18}}</string> - <reference key="NSSuperview" ref="666283614"/> + <reference key="NSSuperview" ref="272021798"/> + <string key="NSReuseIdentifierKey">_NS:1514</string> <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="666283614"/> + <reference key="NSTarget" ref="272021798"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">1</double> <double key="NSPercent">0.94565218687057495</double> @@ -9284,11 +9344,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrame">{{-1, 42}, {413, 266}}</string> <reference key="NSSuperview" ref="749598685"/> - <reference key="NSNextKeyView" ref="789153540"/> + <string key="NSReuseIdentifierKey">_NS:1494</string> <int key="NSsFlags">133650</int> - <reference key="NSVScroller" ref="497829974"/> - <reference key="NSHScroller" ref="246464134"/> - <reference key="NSContentView" ref="789153540"/> + <reference key="NSVScroller" ref="240381411"/> + <reference key="NSHScroller" ref="231859968"/> + <reference key="NSContentView" ref="648530676"/> </object> <object class="NSButton" id="677148756"> <reference key="NSNextResponder" ref="749598685"/> @@ -9334,7 +9394,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="860968037"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -9343,6 +9403,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">264</int> <string key="NSFrame">{{20, 233}, {140, 14}}</string> <reference key="NSSuperview" ref="860968037"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="326519111"> <int key="NSCellFlags">67108864</int> @@ -9369,6 +9430,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">2322</int> <string key="NSFrameSize">{352, 178}</string> <reference key="NSSuperview" ref="158897172"/> + <reference key="NSWindow"/> <object class="NSTextContainer" key="NSTextContainer" id="197710090"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> @@ -9420,6 +9482,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrame">{{1, 1}, {363, 178}}</string> <reference key="NSSuperview" ref="972781700"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="347971361"/> <reference key="NSDocView" ref="347971361"/> <reference key="NSBGColor" ref="449903125"/> @@ -9431,6 +9494,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">256</int> <string key="NSFrame">{{353, 1}, {11, 178}}</string> <reference key="NSSuperview" ref="972781700"/> + <reference key="NSWindow"/> <int key="NSsFlags">256</int> <reference key="NSTarget" ref="972781700"/> <string key="NSAction">_doScroller:</string> @@ -9441,6 +9505,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 18}}</string> <reference key="NSSuperview" ref="972781700"/> + <reference key="NSWindow"/> <int key="NSsFlags">257</int> <reference key="NSTarget" ref="972781700"/> <string key="NSAction">_doScroller:</string> @@ -9450,6 +9515,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrame">{{20, 45}, {365, 180}}</string> <reference key="NSSuperview" ref="860968037"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="158897172"/> <int key="NSsFlags">133138</int> <reference key="NSVScroller" ref="84024470"/> @@ -9461,6 +9527,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">257</int> <string key="NSFrame">{{314, 13}, {76, 28}}</string> <reference key="NSSuperview" ref="860968037"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="693776804"> <int key="NSCellFlags">67108864</int> @@ -9482,6 +9549,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">257</int> <string key="NSFrame">{{350, -130}, {80, 28}}</string> <reference key="NSSuperview" ref="860968037"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="725784088"> <int key="NSCellFlags">67108864</int> @@ -9500,6 +9568,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <string key="NSFrameSize">{405, 267}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string> <string key="NSMinSize">{213, 129}</string> @@ -9929,7 +9999,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <string key="NSWindowContentMinSize">{600, 317}</string> <object class="NSView" key="NSWindowView" id="33825490"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -9958,19 +10028,20 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">274</int> <string key="NSFrameSize">{752, 125}</string> <reference key="NSSuperview" ref="747434365"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="754600648"> <reference key="NSNextResponder" ref="366873941"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{752, 17}</string> <reference key="NSSuperview" ref="366873941"/> + <reference key="NSWindow"/> <reference key="NSTableView" ref="222651223"/> </object> - <object class="_NSCornerView" key="NSCornerView" id="2175"> - <reference key="NSNextResponder" ref="296745018"/> + <object class="_NSCornerView" key="NSCornerView"> + <nil key="NSNextResponder"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{224, 0}, {16, 17}}</string> - <reference key="NSSuperview" ref="296745018"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -10023,6 +10094,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrame">{{0, 17}, {752, 125}}</string> <reference key="NSSuperview" ref="296745018"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="222651223"/> <reference key="NSDocView" ref="222651223"/> <reference key="NSBGColor" ref="1024678221"/> @@ -10033,6 +10105,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{224, 17}, {15, 102}}</string> <reference key="NSSuperview" ref="296745018"/> + <reference key="NSWindow"/> <reference key="NSTarget" ref="296745018"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">37</double> @@ -10043,6 +10116,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{1, 95.851600000000005}, {751.61300000000006, 15}}</string> <reference key="NSSuperview" ref="296745018"/> + <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="296745018"/> <string key="NSAction">_doScroller:</string> @@ -10057,15 +10131,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrameSize">{752, 17}</string> <reference key="NSSuperview" ref="296745018"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="754600648"/> <reference key="NSDocView" ref="754600648"/> <reference key="NSBGColor" ref="1024678221"/> <int key="NScvFlags">4</int> </object> - <reference ref="2175"/> </object> <string key="NSFrameSize">{752, 142}</string> <reference key="NSSuperview" ref="283822350"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="747434365"/> <int key="NSsFlags">133680</int> <reference key="NSVScroller" ref="244117436"/> @@ -10077,6 +10152,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrameSize">{752, 141}</string> <reference key="NSSuperview" ref="606481860"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="545289941"> @@ -10084,38 +10160,24 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="605371633"> - <reference key="NSNextResponder" ref="545289941"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 115}, {294, 14}}</string> - <reference key="NSSuperview" ref="545289941"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="829784890"> - <int key="NSCellFlags">68157504</int> - <int key="NSCellFlags2">272761856</int> - <string key="NSContents">WHERE query</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="605371633"/> - <reference key="NSBackgroundColor" ref="62854682"/> - <reference key="NSTextColor" ref="454249633"/> - </object> - </object> - <object class="NSScrollView" id="49246731"> + <object class="NSScrollView" id="443961873"> <reference key="NSNextResponder" ref="545289941"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="419374576"> - <reference key="NSNextResponder" ref="49246731"/> + <object class="NSClipView" id="504446282"> + <reference key="NSNextResponder" ref="443961873"/> <int key="NSvFlags">2304</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="925681857"> - <reference key="NSNextResponder" ref="419374576"/> + <object class="NSTextView" id="222342155"> + <reference key="NSNextResponder" ref="504446282"/> <int key="NSvFlags">2322</int> <string key="NSFrameSize">{510, 91}</string> - <reference key="NSSuperview" ref="419374576"/> - <object class="NSTextContainer" key="NSTextContainer" id="43041258"> + <reference key="NSSuperview" ref="504446282"/> + <reference key="NSWindow"/> + <string key="NSReuseIdentifierKey">_NS:1498</string> + <object class="NSTextContainer" key="NSTextContainer" id="373381726"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> <object class="NSMutableString" key="NSString"> @@ -10125,12 +10187,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="NSMutableArray" key="NSTextContainers"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="43041258"/> + <reference ref="373381726"/> </object> - <int key="NSLMFlags">166</int> + <int key="NSLMFlags">134</int> <nil key="NSDelegate"/> </object> - <reference key="NSTextView" ref="925681857"/> + <reference key="NSTextView" ref="222342155"/> <double key="NSWidth">510</double> <int key="NSTCFlags">1</int> </object> @@ -10177,49 +10239,75 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <nil key="NSDelegate"/> </object> </object> - <string key="NSFrame">{{1, 1}, {510, 91}}</string> - <reference key="NSSuperview" ref="49246731"/> - <reference key="NSNextKeyView" ref="925681857"/> - <reference key="NSDocView" ref="925681857"/> + <string key="NSFrame">{{1, 0.5}, {510, 91}}</string> + <reference key="NSSuperview" ref="443961873"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="222342155"/> + <string key="NSReuseIdentifierKey">_NS:1496</string> + <reference key="NSDocView" ref="222342155"/> <reference key="NSBGColor" ref="1024678221"/> - <reference key="NSCursor" ref="32917531"/> + <reference key="NSCursor" ref="852124105"/> <int key="NScvFlags">6</int> </object> - <object class="NSScroller" id="154551837"> - <reference key="NSNextResponder" ref="49246731"/> + <object class="NSScroller" id="758668169"> + <reference key="NSNextResponder" ref="443961873"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{464, 1}, {15, 91}}</string> - <reference key="NSSuperview" ref="49246731"/> - <reference key="NSTarget" ref="49246731"/> + <string key="NSFrame">{{496, 1}, {15, 85}}</string> + <reference key="NSSuperview" ref="443961873"/> + <reference key="NSWindow"/> + <string key="NSReuseIdentifierKey">_NS:1512</string> + <reference key="NSTarget" ref="443961873"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">1</double> <double key="NSPercent">0.85256409645080566</double> </object> - <object class="NSScroller" id="985200970"> - <reference key="NSNextResponder" ref="49246731"/> + <object class="NSScroller" id="373237506"> + <reference key="NSNextResponder" ref="443961873"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{0, 68.296899999999994}, {511.55500000000001, 15}}</string> - <reference key="NSSuperview" ref="49246731"/> + <string key="NSFrame">{{1, 77}, {504, 15}}</string> + <reference key="NSSuperview" ref="443961873"/> + <reference key="NSWindow"/> + <string key="NSReuseIdentifierKey">_NS:1514</string> <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="49246731"/> + <reference key="NSTarget" ref="443961873"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">1</double> <double key="NSPercent">0.94565218687057495</double> </object> </object> - <string key="NSFrame">{{20, 20}, {512, 93}}</string> + <string key="NSFrame">{{20, 20.5}, {512, 93}}</string> <reference key="NSSuperview" ref="545289941"/> - <reference key="NSNextKeyView" ref="419374576"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="504446282"/> + <string key="NSReuseIdentifierKey">_NS:1494</string> <int key="NSsFlags">133682</int> - <reference key="NSVScroller" ref="154551837"/> - <reference key="NSHScroller" ref="985200970"/> - <reference key="NSContentView" ref="419374576"/> + <reference key="NSVScroller" ref="758668169"/> + <reference key="NSHScroller" ref="373237506"/> + <reference key="NSContentView" ref="504446282"/> + </object> + <object class="NSTextField" id="605371633"> + <reference key="NSNextResponder" ref="545289941"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 115}, {294, 14}}</string> + <reference key="NSSuperview" ref="545289941"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="829784890"> + <int key="NSCellFlags">68157504</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">WHERE query</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="605371633"/> + <reference key="NSBackgroundColor" ref="62854682"/> + <reference key="NSTextColor" ref="454249633"/> + </object> </object> <object class="NSTextField" id="771219057"> <reference key="NSNextResponder" ref="545289941"/> <int key="NSvFlags">265</int> <string key="NSFrame">{{554, 19}, {181, 14}}</string> <reference key="NSSuperview" ref="545289941"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="835048461"> <int key="NSCellFlags">68157504</int> @@ -10244,6 +10332,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">265</int> <string key="NSFrame">{{678, 35}, {55, 16}}</string> <reference key="NSSuperview" ref="545289941"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="861700580"> <int key="NSCellFlags">67108864</int> @@ -10268,6 +10357,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">265</int> <string key="NSFrame">{{537, 37}, {137, 14}}</string> <reference key="NSSuperview" ref="545289941"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="666450807"> <int key="NSCellFlags">68157504</int> @@ -10284,6 +10374,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">265</int> <string key="NSFrame">{{537, 57}, {197, 18}}</string> <reference key="NSSuperview" ref="545289941"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="63832401"> <int key="NSCellFlags">67108864</int> @@ -10306,6 +10397,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">265</int> <string key="NSFrame">{{537, 77}, {197, 18}}</string> <reference key="NSSuperview" ref="545289941"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="316413636"> <int key="NSCellFlags">67108864</int> @@ -10328,6 +10420,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">265</int> <string key="NSFrame">{{537, 97}, {197, 18}}</string> <reference key="NSSuperview" ref="545289941"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="823615563"> <int key="NSCellFlags">67108864</int> @@ -10348,11 +10441,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSFrame">{{0, 142}, {752, 135}}</string> <reference key="NSSuperview" ref="606481860"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrame">{{0, 40}, {752, 277}}</string> <reference key="NSSuperview" ref="33825490"/> + <reference key="NSWindow"/> <int key="NSDividerStyle">2</int> </object> <object class="NSButton" id="240782658"> @@ -10360,6 +10455,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">289</int> <string key="NSFrame">{{595, 12}, {143, 32}}</string> <reference key="NSSuperview" ref="33825490"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="600965340"> <int key="NSCellFlags">67108864</int> @@ -10381,6 +10477,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">292</int> <string key="NSFrame">{{14, 12}, {216, 32}}</string> <reference key="NSSuperview" ref="33825490"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="893458788"> <int key="NSCellFlags">67108864</int> @@ -10402,6 +10499,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">289</int> <string key="NSFrame">{{452, 12}, {143, 32}}</string> <reference key="NSSuperview" ref="33825490"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="635556811"> <int key="NSCellFlags">67108864</int> @@ -10420,6 +10518,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <string key="NSFrameSize">{752, 317}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string> <string key="NSMinSize">{600, 339}</string> @@ -11391,6 +11491,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>CustomQueryEditorTextColor</string> + </object> <bool key="NSSharedInstance">YES</bool> </object> <object class="NSCustomObject" id="601471102"> @@ -12894,14 +12998,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">5823</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">tableCreateSyntaxTextView</string> - <reference key="source" ref="936957743"/> - <reference key="destination" ref="421486962"/> - </object> - <int key="connectionID">5831</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">updateTableType:</string> <reference key="source" ref="936957743"/> @@ -13832,14 +13928,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">scrollView</string> - <reference key="source" ref="843242867"/> - <reference key="destination" ref="666283614"/> - </object> - <int key="connectionID">6586</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">createTableSyntaxWindow</string> <reference key="source" ref="427689665"/> <reference key="destination" ref="828950706"/> @@ -13848,14 +13936,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">createTableSyntaxTextView</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="843242867"/> - </object> - <int key="connectionID">6596</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">createTableSyntaxTextField</string> <reference key="source" ref="427689665"/> <reference key="destination" ref="964799848"/> @@ -14128,14 +14208,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">scrollView</string> - <reference key="source" ref="524621994"/> - <reference key="destination" ref="535637428"/> - </object> - <int key="connectionID">6795</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">tableTriggersInstance</string> <reference key="source" ref="427689665"/> <reference key="destination" ref="33487092"/> @@ -14176,14 +14248,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">triggerStatementTextView</string> - <reference key="source" ref="33487092"/> - <reference key="destination" ref="524621994"/> - </object> - <int key="connectionID">6801</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="923241940"/> <reference key="destination" ref="33487092"/> @@ -14543,14 +14607,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">6904</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="421486962"/> - <reference key="destination" ref="936957743"/> - </object> - <int key="connectionID">6921</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">showCreateTableSyntax:</string> <reference key="source" ref="427689665"/> @@ -15007,14 +15063,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">7284</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">scrollView</string> - <reference key="source" ref="793890647"/> - <reference key="destination" ref="274248101"/> - </object> - <int key="connectionID">7285</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">performClick:</string> <reference key="source" ref="768193117"/> @@ -15040,26 +15088,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">textColor: values.CustomQueryEditorTextColor</string> - <reference key="source" ref="793890647"/> - <reference key="destination" ref="461189245"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="793890647"/> - <reference key="NSDestination" ref="461189245"/> - <string key="NSLabel">textColor: values.CustomQueryEditorTextColor</string> - <string key="NSBinding">textColor</string> - <string key="NSKeyPath">values.CustomQueryEditorTextColor</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">7288</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">value: values.CustomQueryAutoUppercaseKeywords</string> <reference key="source" ref="1064627204"/> <reference key="destination" ref="461189245"/> @@ -15176,22 +15204,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">customQueryInstance</string> - <reference key="source" ref="793890647"/> - <reference key="destination" ref="601471102"/> - </object> - <int key="connectionID">7296</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">tableDocumentInstance</string> - <reference key="source" ref="793890647"/> - <reference key="destination" ref="427689665"/> - </object> - <int key="connectionID">7297</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="727658473"/> <reference key="destination" ref="601471102"/> @@ -15209,22 +15221,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> - <reference key="source" ref="793890647"/> - <reference key="destination" ref="601471102"/> - </object> - <int key="connectionID">7300</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">tablesListInstance</string> - <reference key="source" ref="793890647"/> - <reference key="destination" ref="438574515"/> - </object> - <int key="connectionID">7301</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> <reference key="source" ref="974240681"/> <reference key="destination" ref="601471102"/> </object> @@ -15464,14 +15460,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">textView</string> - <reference key="source" ref="601471102"/> - <reference key="destination" ref="793890647"/> - </object> - <int key="connectionID">7347</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">shiftRightMenuItem</string> <reference key="source" ref="601471102"/> <reference key="destination" ref="111215177"/> @@ -15680,14 +15668,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">customQueryTextView</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="793890647"/> - </object> - <int key="connectionID">7456</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">indexesShowButton</string> <reference key="source" ref="103234030"/> <reference key="destination" ref="168895907"/> @@ -16424,14 +16404,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="925681857"/> - <reference key="destination" ref="392169872"/> - </object> - <int key="connectionID">8156</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">dataSource</string> <reference key="source" ref="222651223"/> <reference key="destination" ref="392169872"/> @@ -16471,14 +16443,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">8161</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">filterTableWhereClause</string> - <reference key="source" ref="392169872"/> - <reference key="destination" ref="925681857"/> - </object> - <int key="connectionID">8162</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">setDefaultOperator:</string> <reference key="source" ref="392169872"/> @@ -16606,6 +16570,146 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <int key="connectionID">8185</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="222342155"/> + <reference key="destination" ref="392169872"/> + </object> + <int key="connectionID">8190</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">filterTableWhereClause</string> + <reference key="source" ref="392169872"/> + <reference key="destination" ref="222342155"/> + </object> + <int key="connectionID">8191</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">scrollView</string> + <reference key="source" ref="277018534"/> + <reference key="destination" ref="272021798"/> + </object> + <int key="connectionID">8196</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">createTableSyntaxTextView</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="277018534"/> + </object> + <int key="connectionID">8197</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">scrollView</string> + <reference key="source" ref="352529597"/> + <reference key="destination" ref="392922998"/> + </object> + <int key="connectionID">8207</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">triggerStatementTextView</string> + <reference key="source" ref="33487092"/> + <reference key="destination" ref="352529597"/> + </object> + <int key="connectionID">8208</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">tableCreateSyntaxTextView</string> + <reference key="source" ref="936957743"/> + <reference key="destination" ref="632372811"/> + </object> + <int key="connectionID">8213</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="632372811"/> + <reference key="destination" ref="936957743"/> + </object> + <int key="connectionID">8214</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">scrollView</string> + <reference key="source" ref="87307329"/> + <reference key="destination" ref="4997736"/> + </object> + <int key="connectionID">8219</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">textColor: values.CustomQueryEditorTextColor</string> + <reference key="source" ref="87307329"/> + <reference key="destination" ref="461189245"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="87307329"/> + <reference key="NSDestination" ref="461189245"/> + <string key="NSLabel">textColor: values.CustomQueryEditorTextColor</string> + <string key="NSBinding">textColor</string> + <string key="NSKeyPath">values.CustomQueryEditorTextColor</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSUnarchiveFromData</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">8222</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">customQueryInstance</string> + <reference key="source" ref="87307329"/> + <reference key="destination" ref="601471102"/> + </object> + <int key="connectionID">8223</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="87307329"/> + <reference key="destination" ref="601471102"/> + </object> + <int key="connectionID">8224</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">tableDocumentInstance</string> + <reference key="source" ref="87307329"/> + <reference key="destination" ref="427689665"/> + </object> + <int key="connectionID">8225</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">tablesListInstance</string> + <reference key="source" ref="87307329"/> + <reference key="destination" ref="438574515"/> + </object> + <int key="connectionID">8226</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">textView</string> + <reference key="source" ref="601471102"/> + <reference key="destination" ref="87307329"/> + </object> + <int key="connectionID">8227</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">customQueryTextView</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="87307329"/> + </object> + <int key="connectionID">8228</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -18500,11 +18604,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="964799848"/> - <reference ref="666283614"/> <reference ref="390798481"/> <reference ref="1045688777"/> <reference ref="677148756"/> <reference ref="281286750"/> + <reference ref="272021798"/> </object> <reference key="parent" ref="828950706"/> </object> @@ -18551,32 +18655,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="964799848"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6582</int> - <reference key="object" ref="666283614"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="843242867"/> - <reference ref="246464134"/> - <reference ref="497829974"/> - </object> - <reference key="parent" ref="749598685"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6583</int> - <reference key="object" ref="843242867"/> - <reference key="parent" ref="666283614"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6584</int> - <reference key="object" ref="246464134"/> - <reference key="parent" ref="666283614"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6585</int> - <reference key="object" ref="497829974"/> - <reference key="parent" ref="666283614"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">6606</int> <reference key="object" ref="677148756"/> <object class="NSMutableArray" key="children"> @@ -18627,10 +18705,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="object" ref="729080358"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="535637428"/> <reference ref="215249222"/> <reference ref="512753622"/> <reference ref="497835077"/> + <reference ref="392922998"/> </object> <reference key="parent" ref="437271354"/> </object> @@ -18653,17 +18731,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="729080358"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6769</int> - <reference key="object" ref="535637428"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="410655922"/> - <reference ref="241216245"/> - <reference ref="524621994"/> - </object> - <reference key="parent" ref="729080358"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">6770</int> <reference key="object" ref="215249222"/> <object class="NSMutableArray" key="children"> @@ -18816,21 +18883,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="467991826"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6790</int> - <reference key="object" ref="410655922"/> - <reference key="parent" ref="535637428"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6791</int> - <reference key="object" ref="241216245"/> - <reference key="parent" ref="535637428"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6792</int> - <reference key="object" ref="524621994"/> - <reference key="parent" ref="535637428"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">6793</int> <reference key="object" ref="1062269056"/> <reference key="parent" ref="512753622"/> @@ -20773,7 +20825,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="object" ref="815597998"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="274248101"/> + <reference ref="4997736"/> </object> <reference key="parent" ref="727658473"/> </object> @@ -21215,32 +21267,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="974240681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7280</int> - <reference key="object" ref="274248101"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="74062067"/> - <reference ref="243558888"/> - <reference ref="793890647"/> - </object> - <reference key="parent" ref="815597998"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7283</int> - <reference key="object" ref="74062067"/> - <reference key="parent" ref="274248101"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7282</int> - <reference key="object" ref="243558888"/> - <reference key="parent" ref="274248101"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7281</int> - <reference key="object" ref="793890647"/> - <reference key="parent" ref="274248101"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">1246</int> <reference key="object" ref="730602982"/> <object class="NSMutableArray" key="children"> @@ -21707,8 +21733,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="object" ref="983998494"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="449863508"/> <reference ref="855588490"/> + <reference ref="450430872"/> </object> <reference key="parent" ref="501779393"/> </object> @@ -21763,17 +21789,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="231853805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5824</int> - <reference key="object" ref="449863508"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="421486962"/> - <reference ref="883667132"/> - <reference ref="633929130"/> - </object> - <reference key="parent" ref="983998494"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">5828</int> <reference key="object" ref="855588490"/> <object class="NSMutableArray" key="children"> @@ -21788,21 +21803,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="855588490"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5825</int> - <reference key="object" ref="421486962"/> - <reference key="parent" ref="449863508"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5826</int> - <reference key="object" ref="883667132"/> - <reference key="parent" ref="449863508"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5827</int> - <reference key="object" ref="633929130"/> - <reference key="parent" ref="449863508"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">6857</int> <reference key="object" ref="342819810"/> <object class="NSMutableArray" key="children"> @@ -23074,8 +23074,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference ref="248633086"/> <reference ref="967789882"/> <reference ref="771219057"/> - <reference ref="49246731"/> <reference ref="605371633"/> + <reference ref="443961873"/> </object> <reference key="parent" ref="606481860"/> </object> @@ -23256,44 +23256,148 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="560496866"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8152</int> - <reference key="object" ref="49246731"/> + <int key="objectID">8180</int> + <reference key="object" ref="605371633"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="925681857"/> - <reference ref="985200970"/> - <reference ref="154551837"/> + <reference ref="829784890"/> </object> <reference key="parent" ref="545289941"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8155</int> - <reference key="object" ref="925681857"/> - <reference key="parent" ref="49246731"/> + <int key="objectID">8181</int> + <reference key="object" ref="829784890"/> + <reference key="parent" ref="605371633"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8154</int> - <reference key="object" ref="985200970"/> - <reference key="parent" ref="49246731"/> + <int key="objectID">8186</int> + <reference key="object" ref="443961873"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="758668169"/> + <reference ref="373237506"/> + <reference ref="222342155"/> + </object> + <reference key="parent" ref="545289941"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8153</int> - <reference key="object" ref="154551837"/> - <reference key="parent" ref="49246731"/> + <int key="objectID">8187</int> + <reference key="object" ref="758668169"/> + <reference key="parent" ref="443961873"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8180</int> - <reference key="object" ref="605371633"/> + <int key="objectID">8188</int> + <reference key="object" ref="373237506"/> + <reference key="parent" ref="443961873"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8189</int> + <reference key="object" ref="222342155"/> + <reference key="parent" ref="443961873"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8192</int> + <reference key="object" ref="272021798"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="829784890"/> + <reference ref="240381411"/> + <reference ref="231859968"/> + <reference ref="277018534"/> </object> - <reference key="parent" ref="545289941"/> + <reference key="parent" ref="749598685"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8181</int> - <reference key="object" ref="829784890"/> - <reference key="parent" ref="605371633"/> + <int key="objectID">8193</int> + <reference key="object" ref="240381411"/> + <reference key="parent" ref="272021798"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8194</int> + <reference key="object" ref="231859968"/> + <reference key="parent" ref="272021798"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8195</int> + <reference key="object" ref="277018534"/> + <reference key="parent" ref="272021798"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8203</int> + <reference key="object" ref="392922998"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="164784175"/> + <reference ref="270313163"/> + <reference ref="352529597"/> + </object> + <reference key="parent" ref="729080358"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8204</int> + <reference key="object" ref="164784175"/> + <reference key="parent" ref="392922998"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8205</int> + <reference key="object" ref="270313163"/> + <reference key="parent" ref="392922998"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8206</int> + <reference key="object" ref="352529597"/> + <reference key="parent" ref="392922998"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8209</int> + <reference key="object" ref="450430872"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="254222887"/> + <reference ref="1073597605"/> + <reference ref="632372811"/> + </object> + <reference key="parent" ref="983998494"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8210</int> + <reference key="object" ref="254222887"/> + <reference key="parent" ref="450430872"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8211</int> + <reference key="object" ref="1073597605"/> + <reference key="parent" ref="450430872"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8212</int> + <reference key="object" ref="632372811"/> + <reference key="parent" ref="450430872"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8215</int> + <reference key="object" ref="4997736"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="691452503"/> + <reference ref="534514906"/> + <reference ref="87307329"/> + </object> + <reference key="parent" ref="815597998"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8216</int> + <reference key="object" ref="691452503"/> + <reference key="parent" ref="4997736"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8217</int> + <reference key="object" ref="534514906"/> + <reference key="parent" ref="4997736"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8218</int> + <reference key="object" ref="87307329"/> + <reference key="parent" ref="4997736"/> </object> </object> </object> @@ -23419,6 +23523,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>3926.IBShouldRemoveOnLegacySave</string> <string>3939.IBPluginDependency</string> <string>3939.IBShouldRemoveOnLegacySave</string> + <string>3939.IBViewBoundsToFrameTransform</string> <string>3940.IBPluginDependency</string> <string>3940.IBShouldRemoveOnLegacySave</string> <string>3953.IBPluginDependency</string> @@ -23738,11 +23843,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>582.IBPluginDependency</string> <string>5820.IBPluginDependency</string> <string>5821.IBPluginDependency</string> - <string>5824.IBPluginDependency</string> - <string>5825.CustomClassName</string> - <string>5825.IBPluginDependency</string> - <string>5826.IBPluginDependency</string> - <string>5827.IBPluginDependency</string> <string>5828.IBPluginDependency</string> <string>5829.IBPluginDependency</string> <string>5904.IBPluginDependency</string> @@ -23862,6 +23962,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>6517.IBPluginDependency</string> <string>654.IBPluginDependency</string> <string>655.IBPluginDependency</string> + <string>6557.IBEditorWindowLastContentRect</string> <string>6557.IBPluginDependency</string> <string>6557.IBWindowTemplateEditedContentRect</string> <string>6557.windowTemplate.hasMinSize</string> @@ -23873,11 +23974,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>6565.IBPluginDependency</string> <string>6566.IBPluginDependency</string> <string>6567.IBPluginDependency</string> - <string>6582.IBPluginDependency</string> - <string>6583.CustomClassName</string> - <string>6583.IBPluginDependency</string> - <string>6584.IBPluginDependency</string> - <string>6585.IBPluginDependency</string> <string>6606.IBPluginDependency</string> <string>6607.IBPluginDependency</string> <string>6647.IBAttributePlaceholdersKey</string> @@ -23950,7 +24046,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>6766.IBUserGuides</string> <string>6767.IBPluginDependency</string> <string>6768.IBPluginDependency</string> - <string>6769.IBPluginDependency</string> <string>6770.IBPluginDependency</string> <string>6771.IBPluginDependency</string> <string>6772.IBPluginDependency</string> @@ -23971,10 +24066,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>6787.IBPluginDependency</string> <string>6788.IBPluginDependency</string> <string>6789.IBPluginDependency</string> - <string>6790.IBPluginDependency</string> - <string>6791.IBPluginDependency</string> - <string>6792.CustomClassName</string> - <string>6792.IBPluginDependency</string> <string>6793.IBPluginDependency</string> <string>6794.IBPluginDependency</string> <string>68.IBPluginDependency</string> @@ -24077,6 +24168,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>7073.IBPluginDependency</string> <string>711.IBPluginDependency</string> <string>713.IBPluginDependency</string> + <string>714.IBEditorWindowLastContentRect</string> <string>714.IBPluginDependency</string> <string>714.IBWindowTemplateEditedContentRect</string> <string>714.windowTemplate.hasMinSize</string> @@ -24169,13 +24261,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>7278.IBPluginDependency</string> <string>7279.IBAttributePlaceholdersKey</string> <string>7279.IBPluginDependency</string> - <string>7280.IBPluginDependency</string> - <string>7281.CustomClassName</string> - <string>7281.IBPluginDependency</string> - <string>7282.IBPluginDependency</string> - <string>7282.IBShouldRemoveOnLegacySave</string> - <string>7283.IBPluginDependency</string> - <string>7283.IBShouldRemoveOnLegacySave</string> <string>7429.IBPluginDependency</string> <string>7430.IBPluginDependency</string> <string>7438.IBPluginDependency</string> @@ -24340,6 +24425,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>8058.IBPluginDependency</string> <string>8059.IBPluginDependency</string> <string>8060.IBPluginDependency</string> + <string>8068.IBEditorWindowLastContentRect</string> <string>8068.IBPluginDependency</string> <string>8068.IBWindowTemplateEditedContentRect</string> <string>8068.NSWindowTemplate.visibleAtLaunch</string> @@ -24383,14 +24469,37 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>8145.IBPluginDependency</string> <string>8146.IBPluginDependency</string> <string>8149.IBPluginDependency</string> - <string>8152.IBPluginDependency</string> - <string>8153.IBPluginDependency</string> - <string>8154.IBPluginDependency</string> - <string>8155.CustomClassName</string> - <string>8155.IBPluginDependency</string> <string>8180.IBPluginDependency</string> <string>8181.IBPluginDependency</string> + <string>8186.IBPluginDependency</string> + <string>8187.IBPluginDependency</string> + <string>8188.IBPluginDependency</string> + <string>8189.CustomClassName</string> + <string>8189.IBPluginDependency</string> + <string>8192.IBPluginDependency</string> + <string>8192.IBViewBoundsToFrameTransform</string> + <string>8193.IBPluginDependency</string> + <string>8194.IBPluginDependency</string> + <string>8195.CustomClassName</string> + <string>8195.IBPluginDependency</string> + <string>8203.IBPluginDependency</string> + <string>8204.IBPluginDependency</string> + <string>8205.IBPluginDependency</string> + <string>8206.CustomClassName</string> + <string>8206.IBPluginDependency</string> + <string>8209.IBPluginDependency</string> + <string>8210.IBPluginDependency</string> + <string>8211.IBPluginDependency</string> + <string>8212.CustomClassName</string> + <string>8212.IBPluginDependency</string> + <string>8215.IBPluginDependency</string> + <string>8215.IBViewBoundsToFrameTransform</string> + <string>8216.IBPluginDependency</string> + <string>8217.IBPluginDependency</string> + <string>8218.CustomClassName</string> + <string>8218.IBPluginDependency</string> <string>858.IBPluginDependency</string> + <string>959.IBEditorWindowLastContentRect</string> <string>959.IBPluginDependency</string> <string>959.IBWindowTemplateEditedContentRect</string> <string>959.windowTemplate.hasMinSize</string> @@ -24546,6 +24655,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">AUO5gAA/gAAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -24616,9 +24728,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{1180, 729}, {260, 127}}</string> + <string>{{813, 729}, {260, 127}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{1180, 729}, {260, 127}}</string> + <string>{{813, 729}, {260, 127}}</string> <boolean value="YES"/> <boolean value="YES"/> <string>{600, 127}</string> @@ -24987,11 +25099,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>SPTextView</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> @@ -25164,8 +25271,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{68, 410}, {411, 341}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{329, 114}, {411, 341}}</string> + <string>{{68, 410}, {411, 341}}</string> <boolean value="YES"/> <string>{350, 200}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -25176,11 +25284,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>SPTextView</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -25329,11 +25432,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>SPTextView</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> @@ -25419,9 +25517,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{1126, 744}, {314, 112}}</string> + <string>{{759, 744}, {314, 112}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{1126, 744}, {314, 112}}</string> + <string>{{759, 744}, {314, 112}}</string> <boolean value="YES"/> <boolean value="YES"/> <string>{650, 112}</string> @@ -25449,8 +25547,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{77, 518}, {381, 247}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{196, 262}, {381, 247}}</string> + <string>{{77, 518}, {381, 247}}</string> <boolean value="YES"/> <string>{213, 107}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -25618,13 +25717,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>SPTextView</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -25858,8 +25950,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{14, 517}, {752, 317}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{225, 480}, {752, 317}}</string> + <string>{{14, 517}, {752, 317}}</string> <boolean value="NO"/> <boolean value="YES"/> <string>{600, 317}</string> @@ -25953,13 +26046,40 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</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>SPTextView</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCogAAw3AAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>SPTextView</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>SPTextView</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>SPTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDY4AAwwkAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>SPTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{35, 544}, {405, 267}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{265, 489}, {405, 267}}</string> + <string>{{35, 544}, {405, 267}}</string> <boolean value="YES"/> <string>{213, 107}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -25985,7 +26105,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <nil key="sourceID"/> - <int key="maxID">8185</int> + <int key="maxID">8228</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/Resources/Plists/PreferenceDefaults.plist b/Resources/Plists/PreferenceDefaults.plist index 7ac9c3d7..c77ec08e 100644 --- a/Resources/Plists/PreferenceDefaults.plist +++ b/Resources/Plists/PreferenceDefaults.plist @@ -175,6 +175,8 @@ <true/> <key>SQLExportUseCompression</key> <false/> + <key>SSHMultiplexingEnabled</key> + <false/> <key>TableInformationPanelCollapsed</key> <false/> <key>TableRowCountCheapLookupSizeBoundary</key> diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 752c0c00..1cefeaf7 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -635,8 +635,33 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [prefs setInteger:[[fav objectForKey:SPFavoriteIDKey] integerValue] forKey:SPLastFavoriteID]; - // Set first responder to password field if it is empty - [self performSelector:@selector(_updateFavoriteFirstResponder) withObject:nil afterDelay:0.0]; + // Set the next KeyView to password field if the password is empty + switch ([self type]) + { + case SPTCPIPConnection: + if (![[standardPasswordField stringValue] length]) { + [favoritesOutlineView setNextKeyView:standardPasswordField]; + } else { + [favoritesOutlineView setNextKeyView:standardNameField]; + } + break; + case SPSocketConnection: + if (![[socketPasswordField stringValue] length]) { + [favoritesOutlineView setNextKeyView:socketPasswordField]; + } else { + [favoritesOutlineView setNextKeyView:socketNameField]; + } + break; + case SPSSHTunnelConnection: + if (![[sshPasswordField stringValue] length]) { + [favoritesOutlineView setNextKeyView:sshPasswordField]; + } else if (![[sshSSHPasswordField stringValue] length]) { + [favoritesOutlineView setNextKeyView:sshSSHPasswordField]; + } else { + [favoritesOutlineView setNextKeyView:sshNameField]; + } + break; + } #endif } diff --git a/Source/SPConnectionControllerDelegate.m b/Source/SPConnectionControllerDelegate.m index ac9ef296..4733b03b 100644 --- a/Source/SPConnectionControllerDelegate.m +++ b/Source/SPConnectionControllerDelegate.m @@ -40,6 +40,7 @@ #import "SPFavoriteNode.h" #import "SPGroupNode.h" #import "SPTreeNode.h" +#import "SPFavoritesOutlineView.h" #endif static NSString *SPDatabaseImage = @"database-small"; @@ -55,6 +56,7 @@ static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf"; - (void)_sortFavorites; - (void)_favoriteTypeDidChange; - (void)_reloadFavoritesViewData; +- (void)_scrollToSelectedNode; - (NSString *)_stripInvalidCharactersFromString:(NSString *)subject; @@ -257,6 +259,13 @@ static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf"; - (BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item { + NSEvent *event = [NSApp currentEvent]; + BOOL shiftTabbedIn = ([event type] == NSKeyDown && [[event characters] length] && [[event characters] characterAtIndex:0] == NSBackTabCharacter); + + if (shiftTabbedIn && [(SPFavoritesOutlineView *)outlineView justGainedFocus]) { + return NO; + } + return (item != quickConnectItem); } @@ -663,17 +672,29 @@ static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf"; */ - (void)favoritesImportData:(NSArray *)data { + SPTreeNode *newNode; + NSMutableArray *importedNodes = [NSMutableArray array]; + NSMutableIndexSet *importedIndexSet = [NSMutableIndexSet indexSet]; + // Add each of the imported favorites to the root node for (NSMutableDictionary *favorite in data) { - [favoritesController addFavoriteNodeWithData:favorite asChildOfNode:nil]; + newNode = [favoritesController addFavoriteNodeWithData:favorite asChildOfNode:nil]; + [importedNodes addObject:newNode]; } if (currentSortItem > SPFavoritesSortUnsorted) { [self _sortFavorites]; } - + [self _reloadFavoritesViewData]; + + // Select the new nodes and scroll into view + for (SPTreeNode *eachNode in importedNodes) { + [importedIndexSet addIndex:[favoritesOutlineView rowForItem:eachNode]]; + } + [favoritesOutlineView selectRowIndexes:importedIndexSet byExtendingSelection:NO]; + [self _scrollToSelectedNode]; } /** diff --git a/Source/SPConnectionHandler.m b/Source/SPConnectionHandler.m index 29c6e8fe..0fc1d684 100644 --- a/Source/SPConnectionHandler.m +++ b/Source/SPConnectionHandler.m @@ -378,13 +378,6 @@ static NSString *SPLocalhostAddress = @"127.0.0.1"; if (newState == SPMySQLProxyIdle) { - // If the connection closed unexpectedly, and muxing was enabled, disable muxing an re-try. - if ([theTunnel taskExitedUnexpectedly] && [theTunnel connectionMuxingEnabled]) { - [theTunnel setConnectionMuxingEnabled:NO]; - [theTunnel connect]; - return; - } - #ifndef SP_REFACTOR [dbDocument setTitlebarStatus:NSLocalizedString(@"SSH Disconnected", @"SSH disconnected titlebar marker")]; #endif diff --git a/Source/SPConstants.h b/Source/SPConstants.h index 91e2492f..c321d1fa 100644 --- a/Source/SPConstants.h +++ b/Source/SPConstants.h @@ -418,6 +418,7 @@ extern NSString *SPBundleDeletedDefaultBundlesKey; extern NSString *SPHiddenKeyFileVisibilityKey; extern NSString *SPSelectionDetailTypeIndexed; extern NSString *SPSelectionDetailTypePrimaryKeyed; +extern NSString *SPSSHEnableMuxingPreference; // URLs extern NSString *SPDonationsURL; diff --git a/Source/SPConstants.m b/Source/SPConstants.m index 24065072..74468d5a 100644 --- a/Source/SPConstants.m +++ b/Source/SPConstants.m @@ -224,6 +224,7 @@ NSString *SPBundleDeletedDefaultBundlesKey = @"deletedDefaultBundles"; NSString *SPHiddenKeyFileVisibilityKey = @"KeySelectionHiddenFilesVisibility"; NSString *SPSelectionDetailTypeIndexed = @"SelectionDetailTypeNSIndexSet"; NSString *SPSelectionDetailTypePrimaryKeyed = @"SelectionDetailTypePrimaryKeyedDetails"; +NSString *SPSSHEnableMuxingPreference = @"SSHMultiplexingEnabled"; // URLs NSString *SPDonationsURL = @"http://www.sequelpro.com/donate/"; diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m index 6bf72d5e..202f56ce 100644 --- a/Source/SPDatabaseData.m +++ b/Source/SPDatabaseData.m @@ -79,7 +79,9 @@ NSInteger _sortStorageEngineEntry(NSDictionary *itemOne, NSDictionary *itemTwo, */ - (void)resetAllData { - if (characterSetEncoding != nil) [characterSetEncoding release], characterSetEncoding = nil; + if (characterSetEncoding != nil) [characterSetEncoding release], characterSetEncoding = nil; + if (defaultCollation != nil) [defaultCollation release], defaultCollation = nil; + if (defaultCharacterSetEncoding != nil) [defaultCharacterSetEncoding release], defaultCharacterSetEncoding = nil; [collations removeAllObjects]; [characterSetCollations removeAllObjects]; diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 92e45d18..7ddc4083 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -98,6 +98,7 @@ enum { #import "SPConnectionDelegate.h" #endif #import "SPThreadAdditions.h" +#import "RegexKitLite.h" #ifdef SP_REFACTOR /* headers */ #import "SPAlertSheets.h" @@ -4152,6 +4153,13 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; // Add the progress window to this window [self centerTaskWindow]; [parentWindow addChildWindow:taskProgressWindow ordered:NSWindowAbove]; + +#ifndef SP_CODA + // If not connected, update the favorite selection + if (!_isConnected) { + [connectionController updateFavoriteSelection:self]; + } +#endif } /** @@ -4196,7 +4204,6 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; // If the window is being set for the first time - connection controller is visible - update focus if (!parentWindow && !mySQLConnection) { [aWindow makeFirstResponder:(NSResponder *)[connectionController favoritesOutlineView]]; - [connectionController updateFavoriteSelection:self]; } #endif @@ -5830,7 +5837,11 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; // If there is an encoding selected other than the default we must specify it in CREATE DATABASE statement if ([databaseEncodingButton indexOfSelectedItem] > 0) { - createStatement = [NSString stringWithFormat:@"%@ DEFAULT CHARACTER SET %@", createStatement, [[self mysqlEncodingFromEncodingTag:[NSNumber numberWithInteger:[databaseEncodingButton tag]]] backtickQuotedString]]; + NSString *encodingName = [[databaseEncodingButton title] stringByMatching:@"\\((.*)\\)\\Z" capture:1L]; + if (!encodingName) encodingName = [databaseEncodingButton title]; + if (!encodingName) encodingName = @"utf8"; + + createStatement = [NSString stringWithFormat:@"%@ DEFAULT CHARACTER SET %@", createStatement, [encodingName backtickQuotedString]]; } // Create the database @@ -5842,41 +5853,15 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; return; } - - // Error while selecting the new database (is this even possible?) - if (![mySQLConnection selectDatabase:[databaseNameField stringValue]] ) { - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, parentWindow, self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"Unable to connect to database %@.\nBe sure that you have the necessary privileges.", @"message of panel when connection to db failed after selecting from popupbutton"), [databaseNameField stringValue]]); - - [self setDatabases:self]; - - return; - } - - // Select the new database - if (selectedDatabase) [selectedDatabase release], selectedDatabase = nil; - - - selectedDatabase = [[NSString alloc] initWithString:[databaseNameField stringValue]]; + [self setDatabases:self]; - - [tablesListInstance setConnection:mySQLConnection]; - [tableDumpInstance setConnection:mySQLConnection]; - -#ifndef SP_REFACTOR - [self updateWindowTitle:self]; -#endif #ifdef SP_REFACTOR /* glue */ if ( delegate && [delegate respondsToSelector:@selector(refreshDatabasePopup)] ) [delegate performSelector:@selector(refreshDatabasePopup) withObject:nil]; - - if ( delegate && [delegate respondsToSelector:@selector(selectDatabaseInPopup:)] ) - { - if ( [allDatabases count] > 0 ) - { - [delegate performSelector:@selector(selectDatabaseInPopup:) withObject:selectedDatabase]; - } - } #endif + + // Select the database + [self selectDatabase:[databaseNameField stringValue] item:nil]; } /** @@ -5913,7 +5898,6 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; [self setDatabases:self]; [tablesListInstance setConnection:mySQLConnection]; - [tableDumpInstance setConnection:mySQLConnection]; #ifndef SP_REFACTOR [self updateWindowTitle:self]; @@ -5980,11 +5964,9 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; [[chooseDatabaseButton onMainThread] selectItemWithTitle:targetDatabaseName]; #endif if (selectedDatabase) [selectedDatabase release], selectedDatabase = nil; -#ifndef SP_REFACTOR /* patch */ - selectedDatabase = [[NSString alloc] initWithString:[chooseDatabaseButton titleOfSelectedItem]]; -#else selectedDatabase = [[NSString alloc] initWithString:targetDatabaseName]; -#endif + + [databaseDataInstance resetAllData]; #ifndef SP_REFACTOR /* update database encoding */ @@ -5993,9 +5975,8 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; [self detectDatabaseEncoding]; #endif - // Set the connection of SPTablesList and TablesDump to reload tables in db + // Set the connection of SPTablesList to reload tables in db [tablesListInstance setConnection:mySQLConnection]; - [tableDumpInstance setConnection:mySQLConnection]; #ifndef SP_REFACTOR /* update history controller and ui manip */ // Update the window title diff --git a/Source/SPExportControllerDelegate.m b/Source/SPExportControllerDelegate.m index ef084283..8c273813 100644 --- a/Source/SPExportControllerDelegate.m +++ b/Source/SPExportControllerDelegate.m @@ -112,8 +112,10 @@ - (NSArray *)tokenField:(NSTokenField *)tokenField shouldAddObjects:(NSArray *)tokens atIndex:(NSUInteger)index { NSUInteger i, j; + NSInteger k; NSMutableArray *processedTokens = [NSMutableArray array]; NSCharacterSet *alphanumericSet = [NSCharacterSet alphanumericCharacterSet]; + id groupToken; for (NSString *inputToken in tokens) { @@ -137,6 +139,31 @@ } } + // Check to see whether unprocessed strings can be combined to form tokens + for (i = 1; i < [processedTokens count]; i++) { + + // If this is a token object, skip + if ([[processedTokens objectAtIndex:i] isKindOfClass:[SPExportFileNameTokenObject class]]) { + continue; + } + + for (k = i - 1; k >= 0; k--) { + + // If this is a token object, stop processing + if ([[processedTokens objectAtIndex:k] isKindOfClass:[SPExportFileNameTokenObject class]]) { + break; + } + + // Check whether the group of items make up a token + groupToken = [self tokenObjectForString:[[processedTokens subarrayWithRange:NSMakeRange(k, 1 + i - k)] componentsJoinedByString:@""]]; + if ([groupToken isKindOfClass:[SPExportFileNameTokenObject class]]) { + [processedTokens replaceObjectsInRange:NSMakeRange(k, 1 + i - k) withObjectsFromArray:[NSArray arrayWithObject:groupToken]]; + i = k + 1; + break; + } + } + } + return processedTokens; } diff --git a/Source/SPExportFileUtilities.m b/Source/SPExportFileUtilities.m index 13959ca1..ea5bee2e 100644 --- a/Source/SPExportFileUtilities.m +++ b/Source/SPExportFileUtilities.m @@ -143,6 +143,8 @@ SPExportErrorChoice; { // Get the number of files that already exist as well as couldn't be created because of other reasons NSUInteger filesAlreadyExisting = 0; + NSUInteger parentFoldersMissing = 0; + NSUInteger parentFoldersNotWritable = 0; NSUInteger filesFailed = 0; for (SPExportFile *file in files) @@ -168,6 +170,14 @@ SPExportErrorChoice; [exporters removeObjectsInArray:exportersToRemove]; [exportersToRemove release]; + + // Check the parent folder to see if it still is present + BOOL parentIsFolder = NO; + if (![[NSFileManager defaultManager] fileExistsAtPath:[[[file exportFilePath] stringByDeletingLastPathComponent] stringByExpandingTildeInPath] isDirectory:&parentIsFolder] || !parentIsFolder) { + parentFoldersMissing++; + } else if (![[NSFileManager defaultManager] isWritableFileAtPath:[[[file exportFilePath] stringByDeletingLastPathComponent] stringByExpandingTildeInPath]]) { + parentFoldersNotWritable++; + } } } @@ -208,20 +218,40 @@ SPExportErrorChoice; [[[alert buttons] objectAtIndex:2] setKeyEquivalent:@"s"]; [[[alert buttons] objectAtIndex:2] setKeyEquivalentModifierMask:NSCommandKeyMask]; } - } + } // If one or multiple files failed, but only due to unhandled errors, show a short dialog else { if (filesFailed == 1) { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"“%@” could not be created", @"Export file creation error title"), [[[files objectAtIndex:0] exportFilePath] lastPathComponent]]]; - [alert setInformativeText:NSLocalizedString(@"An unhandled error occurred when attempting to create the export file. Please check the details and try again.", @"Export file creation error explanatory text")]; + if (parentFoldersMissing) { + [alert setInformativeText:NSLocalizedString(@"The target export folder no longer exists. Please select a new export location and try again.", @"Export folder missing explanatory text")]; + } else if (parentFoldersNotWritable) { + [alert setInformativeText:NSLocalizedString(@"The target export folder is not writable. Please select a new export location and try again.", @"Export folder not writable explanatory text")]; + } else { + [alert setInformativeText:NSLocalizedString(@"An unhandled error occurred when attempting to create the export file. Please check the details and try again.", @"Export file creation error explanatory text")]; + } } else if (filesFailed == [exportFiles count]) { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"No files could be created", @"All export files creation error title")]]; - [alert setInformativeText:NSLocalizedString(@"An unhandled error occurred when attempting to create each of the export files. Please check the details and try again.", @"All export files creation error explanatory text")]; + if (parentFoldersMissing == [exportFiles count]) { + [alert setInformativeText:NSLocalizedString(@"The target export folder no longer exists. Please select a new export location and try again.", @"Export folder missing explanatory text")]; + } else if (parentFoldersMissing) { + [alert setInformativeText:NSLocalizedString(@"Some of the target export folders no longer exist. Please select a new export location and try again.", @"Some export folders missing explanatory text")]; + } else if (parentFoldersNotWritable) { + [alert setInformativeText:NSLocalizedString(@"Some of the target export folders are not writable. Please select a new export location and try again.", @"Some export folders not writable explanatory text")]; + } else { + [alert setInformativeText:NSLocalizedString(@"An unhandled error occurred when attempting to create each of the export files. Please check the details and try again.", @"All export files creation error explanatory text")]; + } } else { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"%lu files could not be created", @"Export files creation error title"), filesFailed]]; - [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"An unhandled error occurred when attempting to create %lu of the export files. Please check the details and try again.", @"Export files creation error explanatory text"), filesFailed]]; + if (parentFoldersMissing) { + [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"%lu of the export files could not be created because their target export folder no longer exists; please select a new export location and try again.", @"Export folder missing for some files explanatory text"), parentFoldersMissing]]; + } else if (parentFoldersNotWritable) { + [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"%lu of the export files could not be created because their target export folder is not writable; please select a new export location and try again.", @"Export folder not writable for some files explanatory text"), parentFoldersNotWritable]]; + } else { + [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"An unhandled error occurred when attempting to create %lu of the export files. Please check the details and try again.", @"Export files creation error explanatory text"), filesFailed]]; + } } [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"cancel button")]; diff --git a/Source/SPExportFilenameUtilities.m b/Source/SPExportFilenameUtilities.m index 1a14ef6c..5ea5bb44 100644 --- a/Source/SPExportFilenameUtilities.m +++ b/Source/SPExportFilenameUtilities.m @@ -150,8 +150,7 @@ */ - (void)tokenizeCustomFilenameTokenField { - NSCharacterSet *nonAlphanumericSet = [[NSCharacterSet alphanumericCharacterSet] invertedSet]; - NSArray *validTokens = [exportCustomFilenameTokensField objectValue]; + NSCharacterSet *alphanumericSet = [NSCharacterSet alphanumericCharacterSet]; if ([exportCustomFilenameTokenField currentEditor] == nil) return; @@ -163,21 +162,49 @@ // Retrieve the object value of the token field. This consists of plain text and recognised tokens interspersed. NSArray *representedObjects = [exportCustomFilenameTokenField objectValue]; - // Walk through the strings - not the tokens - and determine whether any need tokenizing + // Walk through the strings - not the tokens - and determine whether any need tokenizing, + // including scanning for groups of strings which make up a single token BOOL tokenizingRequired = NO; - - for (id representedObject in representedObjects) - { - if ([representedObject isKindOfClass:[SPExportFileNameTokenObject class]]) continue; - - NSArray *tokenParts = [representedObject componentsSeparatedByCharactersInSet:nonAlphanumericSet]; - - for (NSString *tokenPart in tokenParts) - { - if ([validTokens containsObject:tokenPart]) { - tokenizingRequired = YES; + NSUInteger i, j; + NSInteger k; + id tokenCheck; + NSMutableArray *tokenParts = [NSMutableArray array]; + + // Add all tokens, words, and separators to the array to process + for (id eachObject in representedObjects) { + if ([eachObject isKindOfClass:[SPExportFileNameTokenObject class]]) { + [tokenParts addObject:eachObject]; + } else { + for (i = 0, j = 0; i < [(NSString *)eachObject length]; i++) { + if ([alphanumericSet characterIsMember:[eachObject characterAtIndex:i]]) { + continue; + } + if (i > j) { + [tokenParts addObject:[eachObject substringWithRange:NSMakeRange(j, i - j)]]; + } + [tokenParts addObject:[eachObject substringWithRange:NSMakeRange(i, 1)]]; + j = i + 1; + } + if (j < i) { + [tokenParts addObject:[eachObject substringWithRange:NSMakeRange(j, i - j)]]; + } + } + } + + // Walk through the array to process, scanning it for words or groups which are tokens + for (i = 0; i < [tokenParts count]; i++) { + for (k = i; k >= 0; k--) { + + // Don't process existing token objects + if ([[tokenParts objectAtIndex:k] isKindOfClass:[SPExportFileNameTokenObject class]]) { break; } + + // Check whether this item, or group of adjacent items, make up a token + tokenCheck = [self tokenObjectForString:[[tokenParts subarrayWithRange:NSMakeRange(k, 1 + i - k)] componentsJoinedByString:@""]]; + if ([tokenCheck isKindOfClass:[SPExportFileNameTokenObject class]]) { + tokenizingRequired = YES; + } } } diff --git a/Source/SPFavoritesImporter.m b/Source/SPFavoritesImporter.m index 3a0c2099..8c2809e8 100644 --- a/Source/SPFavoritesImporter.m +++ b/Source/SPFavoritesImporter.m @@ -73,12 +73,10 @@ NSFileManager *fileManager = [NSFileManager defaultManager]; if ([fileManager fileExistsAtPath:[self importPath]]) { - importData = [[NSDictionary alloc] initWithContentsOfFile:[self importPath]]; + importData = [[[NSDictionary alloc] initWithContentsOfFile:[self importPath]] autorelease]; NSArray *favorites = [importData valueForKey:SPFavoritesDataRootKey]; - [importData release]; - if (favorites) { [self _informDelegateOfImportDataAvailable:favorites]; } diff --git a/Source/SPFavoritesOutlineView.h b/Source/SPFavoritesOutlineView.h index c2d8a8eb..d2fa0846 100644 --- a/Source/SPFavoritesOutlineView.h +++ b/Source/SPFavoritesOutlineView.h @@ -35,4 +35,6 @@ SInt32 systemVersion; } +@property (assign) BOOL justGainedFocus; + @end diff --git a/Source/SPFavoritesOutlineView.m b/Source/SPFavoritesOutlineView.m index 3688f769..812451f8 100644 --- a/Source/SPFavoritesOutlineView.m +++ b/Source/SPFavoritesOutlineView.m @@ -37,6 +37,8 @@ static NSUInteger SPFavoritesOutlineViewUnindent = 14; @implementation SPFavoritesOutlineView +@synthesize justGainedFocus; + - (void) awakeFromNib { systemVersion = 0; @@ -45,9 +47,19 @@ static NSUInteger SPFavoritesOutlineViewUnindent = 14; - (BOOL)acceptsFirstResponder { + if ([[self window] firstResponder] != self) { + [self setJustGainedFocus:YES]; + } + return YES; } +- (BOOL)resignFirstResponder +{ + [self setJustGainedFocus:NO]; + return [super resignFirstResponder];; +} + /** * Right-click at row will select that row before ordering out the contextual menu * if not more than one row is selected. @@ -76,6 +88,15 @@ static NSUInteger SPFavoritesOutlineViewUnindent = 14; [[self delegate] performSelector:[self doubleAction]]; return; + + // If the Tab key is used, change focus rather than entering edit mode. + } else if ([[event characters] length] && [[event characters] characterAtIndex:0] == NSTabCharacter) { + if (([event modifierFlags] & NSShiftKeyMask) != NSShiftKeyMask) { + [[self window] selectKeyViewFollowingView:self]; + } else { + [[self window] selectKeyViewPrecedingView:self]; + } + return; } [super keyDown:event]; diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index ec2cf6a0..e7b8d0a6 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -848,7 +848,7 @@ static NSString *SPTableViewSqlColumnID = @"sql"; } columnCounter = 0; for(id col in row) { - if(col && ![col isNSNull]) { + if(col && ![col isNSNull] && ![col isSPNotLoaded]) { if([col isKindOfClass:[NSString class]] && maxLengthOfSourceColumns[columnCounter] < (NSInteger)[(NSString*)col length]) { maxLengthOfSourceColumns[columnCounter] = [(NSString*)col length]; } diff --git a/Source/SPSQLParser.m b/Source/SPSQLParser.m index 31466c9a..e0abf319 100644 --- a/Source/SPSQLParser.m +++ b/Source/SPSQLParser.m @@ -731,6 +731,7 @@ TO_BUFFER_STATE to_scan_string (const char *); // For comments starting "--[\s]", ensure the start syntax is valid before proceeding. case '-': + if (ignoreCommentStrings) break; if (stringLength < currentStringIndex + 2) break; if ((unichar)(long)(*charAtIndex)(self, charAtIndexSEL, currentStringIndex+1) != '-') break; if (![[NSCharacterSet whitespaceCharacterSet] characterIsMember:(unichar)(long)(*charAtIndex)(self, charAtIndexSEL, currentStringIndex+2)]) break; @@ -738,13 +739,13 @@ TO_BUFFER_STATE to_scan_string (const char *); break; case '#': - if(ignoreCommentStrings) break; + if (ignoreCommentStrings) break; currentStringIndex = [self endIndexOfCommentOfType:SPHashComment startingAtIndex:currentStringIndex]; break; // For comments starting "/*", ensure the start syntax is valid before proceeding. case '/': - if(ignoreCommentStrings) break; + if (ignoreCommentStrings) break; if (stringLength < currentStringIndex + 1) break; if ((unichar)(long)(*charAtIndex)(self, charAtIndexSEL, currentStringIndex+1) != '*') break; currentStringIndex = [self endIndexOfCommentOfType:SPCStyleComment startingAtIndex:currentStringIndex]; diff --git a/Source/SPSSHTunnel.h b/Source/SPSSHTunnel.h index 25a98cc4..08c39c07 100644 --- a/Source/SPSSHTunnel.h +++ b/Source/SPSSHTunnel.h @@ -82,7 +82,6 @@ } @property (readonly) BOOL passwordPromptCancelled; -@property (readwrite) BOOL connectionMuxingEnabled; @property (readonly) BOOL taskExitedUnexpectedly; - (id)initToHost:(NSString *)theHost port:(NSInteger)thePort login:(NSString *)theLogin tunnellingToPort:(NSInteger)targetPort onHost:(NSString *)targetHost; diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m index 448325de..536f2f43 100644 --- a/Source/SPSSHTunnel.m +++ b/Source/SPSSHTunnel.m @@ -44,7 +44,6 @@ @implementation SPSSHTunnel @synthesize passwordPromptCancelled; -@synthesize connectionMuxingEnabled; @synthesize taskExitedUnexpectedly; /* @@ -75,8 +74,9 @@ debugMessagesLock = [[NSLock alloc] init]; answerAvailableLock = [[NSLock alloc] init]; - // Enable connection muxing on 10.7+, as 10.6 has problems with muxing (see Issue #1457) - connectionMuxingEnabled = (systemVersion >= 0x1070); + // Enable connection muxing on 10.7+, but only if a preference is enabled; this is because + // muxing causes connection instability for a large number of users (see Issue #1457) + connectionMuxingEnabled = (systemVersion >= 0x1070) && [[NSUserDefaults standardUserDefaults] boolForKey:SPSSHEnableMuxingPreference]; // Set up a connection for use by the tunnel process tunnelConnectionName = [[NSString alloc] initWithFormat:@"SequelPro-%lu", (unsigned long)[[NSString stringWithFormat:@"%f", [[NSDate date] timeIntervalSince1970]] hash]]; @@ -322,6 +322,8 @@ // Ensure that the connection can be used for only tunnels, not interactive [taskArguments addObject:@"-N"]; + // If explicitly enabled, activate connection multiplexing - note that this can cause connection + // instability on some setups, so is currently disabled by default. if (connectionMuxingEnabled) { // Enable automatic connection muxing/sharing, for faster connections diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 9c03618e..5e7ecd12 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -1258,7 +1258,9 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper } /** - * Esacpe argument by looking for used quoting strings in clause + * Escape argument by looking for used quoting strings in a clause. Attempt to + * be smart - use a single escape for most clauses, doubling up for LIKE clauses. + * Also attempt to not escape what look like common escape sequences - \n, \r, \t. * * @param argument The to be used filter argument which should be be escaped * @@ -1267,26 +1269,33 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper */ - (NSString *)escapeFilterArgument:(NSString *)argument againstClause:(NSString *)clause { + BOOL clauseIsLike = [clause isMatchedByRegex:@"(?i)\\blike\\b.*?%(?!@)"]; + NSString *recognizedEscapeSequences, *escapeSequence, *regexTerm; + NSMutableString *arg = [argument mutableCopy]; + + // Determine the character set not to escape slashes before, and the escape depth + if (clauseIsLike) { + recognizedEscapeSequences = @"nrt_%"; + escapeSequence = @"\\\\\\\\\\\\\\\\"; + } else { + recognizedEscapeSequences = @"nrt"; + escapeSequence = @"\\\\\\\\"; + } + regexTerm = [NSString stringWithFormat:@"(\\\\)(?![%@])", recognizedEscapeSequences]; - NSMutableString *arg = [[NSMutableString alloc] init]; - [arg setString:argument]; - - [arg replaceOccurrencesOfRegex:@"(\\\\)(?![nrt_%])" withString:@"\\\\\\\\\\\\\\\\"]; - [arg flushCachedRegexData]; - [arg replaceOccurrencesOfRegex:@"(\\\\)(?=[nrt])" withString:@"\\\\\\"]; + // Escape slashes appropriately + [arg replaceOccurrencesOfRegex:regexTerm withString:escapeSequence]; [arg flushCachedRegexData]; // Get quote sign for escaping - this should work for 99% of all cases NSString *quoteSign = [clause stringByMatching:@"([\"'])[^\\1]*?%@[^\\1]*?\\1" capture:1L]; - // Esape argument + + // Escape argument if(quoteSign != nil && [quoteSign length] == 1) { [arg replaceOccurrencesOfRegex:[NSString stringWithFormat:@"(%@)", quoteSign] withString:@"\\\\$1"]; [arg flushCachedRegexData]; } - // if([clause isMatchedByRegex:@"(?i)\\blike\\b.*?%(?!@)"]) { - // [arg replaceOccurrencesOfRegex:@"([_%])" withString:@"\\\\$1"]; - // [arg flushCachedRegexData]; - // } + return [arg autorelease]; } diff --git a/Source/SPTableData.m b/Source/SPTableData.m index 04aaaed6..a591226e 100644 --- a/Source/SPTableData.m +++ b/Source/SPTableData.m @@ -718,7 +718,7 @@ // add dict root "primarykeyfield" = <field> for faster accessing else if( [NSArrayObjectAtIndex(parts, 0) hasPrefix:@"PRIMARY"] && [parts count] == 3) { SPSQLParser *keyParser = [SPSQLParser stringWithString:NSArrayObjectAtIndex(parts, 2)]; - keyParser = [SPSQLParser stringWithString:[keyParser stringFromCharacter:'(' toCharacter:')' inclusively:NO]]; + keyParser = [SPSQLParser stringWithString:[keyParser stringFromCharacter:'(' toCharacter:')' inclusively:NO skippingBrackets:YES]]; NSArray *primaryKeyQuotedNames = [keyParser splitStringByCharacter:',']; if ([keyParser length]) { NSMutableArray *primaryKeyFields = [NSMutableArray array]; |