diff options
author | stuconnolly <stuart02@gmail.com> | 2010-05-27 17:35:20 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2010-05-27 17:35:20 +0000 |
commit | c06ad0189beb544710b6d47b2978a5614d036cdc (patch) | |
tree | 421a234a435e7fb8ca4bb6983e285e333457698d | |
parent | 60ff002c794bc409c6c4db208cfbe1fe1c9fbe9f (diff) | |
download | sequelpro-c06ad0189beb544710b6d47b2978a5614d036cdc.tar.gz sequelpro-c06ad0189beb544710b6d47b2978a5614d036cdc.tar.bz2 sequelpro-c06ad0189beb544710b6d47b2978a5614d036cdc.zip |
Rename CMTextView to SPTextView.
-rw-r--r-- | Interfaces/English.lproj/ContentFilterManager.xib | 72 | ||||
-rw-r--r-- | Interfaces/English.lproj/DBView.xib | 100 | ||||
-rw-r--r-- | Interfaces/English.lproj/DataMigrationDialog.xib | 125 | ||||
-rw-r--r-- | Interfaces/English.lproj/MainMenu.xib | 63 | ||||
-rw-r--r-- | Interfaces/English.lproj/QueryFavoriteManager.xib | 101 | ||||
-rw-r--r-- | Source/CustomQuery.h | 4 | ||||
-rw-r--r-- | Source/SPContentFilterManager.m | 2 | ||||
-rw-r--r-- | Source/SPFieldMapperController.h | 4 | ||||
-rw-r--r-- | Source/SPFieldMapperController.m | 2 | ||||
-rw-r--r-- | Source/SPNarrowDownCompletion.m | 2 | ||||
-rw-r--r-- | Source/SPQueryFavoriteManager.h | 4 | ||||
-rw-r--r-- | Source/SPQueryFavoriteManager.m | 4 | ||||
-rw-r--r-- | Source/SPTextView.h (renamed from Source/CMTextView.h) | 7 | ||||
-rw-r--r-- | Source/SPTextView.m (renamed from Source/CMTextView.m) | 10 | ||||
-rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 12 |
15 files changed, 239 insertions, 273 deletions
diff --git a/Interfaces/English.lproj/ContentFilterManager.xib b/Interfaces/English.lproj/ContentFilterManager.xib index 251278b6..774453df 100644 --- a/Interfaces/English.lproj/ContentFilterManager.xib +++ b/Interfaces/English.lproj/ContentFilterManager.xib @@ -2,10 +2,10 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10C540</string> - <string key="IBDocument.InterfaceBuilderVersion">740</string> - <string key="IBDocument.AppKitVersion">1038.25</string> - <string key="IBDocument.HIToolboxVersion">458.00</string> + <string key="IBDocument.SystemVersion">10D573</string> + <string key="IBDocument.InterfaceBuilderVersion">762</string> + <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.HIToolboxVersion">460.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -15,13 +15,12 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>740</string> + <string>762</string> <string>1.2.5</string> </object> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="342"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -59,7 +58,7 @@ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{500, 371}</string> <object class="NSView" key="NSWindowView" id="1006"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -622,7 +621,7 @@ </object> <reference key="NSMenuFont" ref="1071840538"/> </object> - <int key="NSSelectedIndex">4</int> + <int key="NSSelectedIndex">1</int> <bool key="NSPullDown">YES</bool> <int key="NSPreferredEdge">1</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -980,7 +979,6 @@ </object> </object> <string key="NSFrameSize">{500, 371}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMinSize">{500, 393}</string> @@ -2034,7 +2032,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2216,22 +2214,6 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">CMTextView</string> - <string key="superclassName">NSTextView</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">scrollView</string> - <string key="NS.object.0">NSScrollView</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/CMTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">ImageAndTextCell</string> <string key="superclassName">NSTextFieldCell</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -2419,6 +2401,22 @@ <string key="minorKey">Source/SPTableView.h</string> </object> </object> + <object class="IBPartialClassDescription"> + <string key="className">SPTextView</string> + <string key="superclassName">NSTextView</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">scrollView</string> + <string key="NS.object.0">NSScrollView</string> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> </object> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3157,6 +3155,7 @@ </object> </object> <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -3172,5 +3171,26 @@ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSActionTemplate</string> + <string>NSMenuCheckmark</string> + <string>NSMenuMixedState</string> + <string>NSSwitch</string> + <string>button_add</string> + <string>button_remove</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{15, 15}</string> + <string>{9, 8}</string> + <string>{7, 2}</string> + <string>{15, 15}</string> + <string>{128, 128}</string> + <string>{128, 128}</string> + </object> + </object> </data> </archive> diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 74ed1eca..0416cbc0 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,8 +23,6 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="6147"/> - <integer value="6180"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -53,7 +51,7 @@ <string key="NSClassName">NSApplication</string> </object> <object class="NSCustomView" id="632807581"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -807,7 +805,9 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="450876295"/> <reference key="NSMixedImage" ref="414351669"/> + <string key="NSAction">_popUpItemAction:</string> <int key="NSTag">1</int> + <reference key="NSTarget" ref="321871356"/> </object> <object class="NSMenuItem" id="779058431"> <reference key="NSMenu" ref="593991505"/> @@ -816,7 +816,9 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="450876295"/> <reference key="NSMixedImage" ref="414351669"/> + <string key="NSAction">_popUpItemAction:</string> <int key="NSTag">2</int> + <reference key="NSTarget" ref="321871356"/> </object> <object class="NSMenuItem" id="752934580"> <reference key="NSMenu" ref="593991505"/> @@ -825,7 +827,9 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="450876295"/> <reference key="NSMixedImage" ref="414351669"/> + <string key="NSAction">_popUpItemAction:</string> <int key="NSTag">3</int> + <reference key="NSTarget" ref="321871356"/> </object> </object> </object> @@ -854,7 +858,6 @@ </object> </object> </object> - <int key="NSSelectedIndex">6</int> <bool key="NSPullDown">YES</bool> <int key="NSPreferredEdge">1</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -5620,7 +5623,6 @@ </object> </object> <string key="NSFrameSize">{943, 549}</string> - <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSWindowTemplate" id="554105051"> @@ -5636,7 +5638,7 @@ <string key="NSWindowContentMaxSize">{292, 112}</string> <string key="NSWindowContentMinSize">{292, 112}</string> <object class="NSView" key="NSWindowView" id="70075497"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -5645,7 +5647,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{36, 75}, {91, 14}}</string> <reference key="NSSuperview" ref="70075497"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="45988560"> <int key="NSCellFlags">68288064</int> @@ -5662,7 +5663,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{17, 50}, {110, 14}}</string> <reference key="NSSuperview" ref="70075497"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="410467805"> <int key="NSCellFlags">68288064</int> @@ -5679,7 +5679,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{135, 74}, {137, 18}}</string> <reference key="NSSuperview" ref="70075497"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="212969926"> <int key="NSCellFlags">-1804468671</int> @@ -5702,7 +5701,6 @@ <int key="NSvFlags">259</int> <string key="NSFrame">{{207, 13}, {70, 28}}</string> <reference key="NSSuperview" ref="70075497"/> - <reference key="NSWindow"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="169260261"> @@ -5730,7 +5728,6 @@ <int key="NSvFlags">259</int> <string key="NSFrame">{{139, 13}, {70, 28}}</string> <reference key="NSSuperview" ref="70075497"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="994559297"> <int key="NSCellFlags">67239424</int> @@ -5752,7 +5749,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{132, 45}, {143, 22}}</string> <reference key="NSSuperview" ref="70075497"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="1000126742"> <int key="NSCellFlags">-2076049856</int> @@ -6073,8 +6069,6 @@ </object> </object> <string key="NSFrameSize">{292, 112}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{292, 134}</string> @@ -25613,7 +25607,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>CMTextView</string> + <string>SPTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -26630,7 +26624,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -26996,7 +26990,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -27205,7 +27199,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -27549,43 +27543,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">CMTextView</string> - <string key="superclassName">NSTextView</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>customQueryInstance</string> - <string>scrollView</string> - <string>tableDocumentInstance</string> - <string>tablesListInstance</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>CustomQuery</string> - <string>NSScrollView</string> - <string>TableDocument</string> - <string>TablesList</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/CMTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">CMTextView</string> - <string key="superclassName">NSTextView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">CustomQuery</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> @@ -27745,7 +27702,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>NSMenuItem</string> <string>id</string> <string>id</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>id</string> <string>id</string> </object> @@ -28431,6 +28388,35 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <object class="IBPartialClassDescription"> + <string key="className">SPTextView</string> + <string key="superclassName">NSTextView</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>customQueryInstance</string> + <string>scrollView</string> + <string>tableDocumentInstance</string> + <string>tablesListInstance</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>CustomQuery</string> + <string>NSScrollView</string> + <string>TableDocument</string> + <string>TablesList</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">SPUserManager</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> @@ -30350,7 +30336,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>{10, 10}</string> + <string>{15, 15}</string> <string>{8, 8}</string> <string>{32, 32}</string> <string>{128, 128}</string> diff --git a/Interfaces/English.lproj/DataMigrationDialog.xib b/Interfaces/English.lproj/DataMigrationDialog.xib index d57f084b..7ba026ad 100644 --- a/Interfaces/English.lproj/DataMigrationDialog.xib +++ b/Interfaces/English.lproj/DataMigrationDialog.xib @@ -2,17 +2,16 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10C540</string> - <string key="IBDocument.InterfaceBuilderVersion">740</string> - <string key="IBDocument.AppKitVersion">1038.25</string> - <string key="IBDocument.HIToolboxVersion">458.00</string> + <string key="IBDocument.SystemVersion">10D573</string> + <string key="IBDocument.InterfaceBuilderVersion">762</string> + <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.HIToolboxVersion">460.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">740</string> + <string key="NS.object.0">762</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="162"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -51,7 +50,7 @@ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{522, 348}</string> <object class="NSView" key="NSWindowView" id="78582513"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -65,13 +64,11 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{1, 2.5}, {544, 0}}</string> <reference key="NSSuperview" ref="412235166"/> - <reference key="NSWindow"/> </object> </object> <string key="NSFrame">{{-12, 53}, {546, 2}}</string> <string key="NSBounds">{{0, 1.5}, {546, 0}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -121,7 +118,6 @@ <int key="NSvFlags">269</int> <string key="NSFrame">{{175, 12}, {168, 17}}</string> <reference key="NSSuperview" ref="297364507"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="922239869"> <int key="NSCellFlags">68288064</int> @@ -156,12 +152,10 @@ </object> <string key="NSFrame">{{1, 1}, {522, 39}}</string> <reference key="NSSuperview" ref="617902336"/> - <reference key="NSWindow"/> </object> </object> <string key="NSFrame">{{-1, 308}, {524, 41}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -199,14 +193,12 @@ <int key="NSvFlags">288</int> <string key="NSFrameSize">{522, 126}</string> <reference key="NSSuperview" ref="929465390"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="1025336439"> <reference key="NSNextResponder" ref="622202999"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{522, 17}</string> <reference key="NSSuperview" ref="622202999"/> - <reference key="NSWindow"/> <reference key="NSTableView" ref="678921094"/> </object> <object class="_NSCornerView" key="NSCornerView" id="20192669"> @@ -214,7 +206,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-22, 0}, {12, 17}}</string> <reference key="NSSuperview" ref="495172082"/> - <reference key="NSWindow"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -466,7 +457,6 @@ </object> <string key="NSFrame">{{1, 17}, {522, 126}}</string> <reference key="NSSuperview" ref="495172082"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="678921094"/> <reference key="NSDocView" ref="678921094"/> <object class="NSColor" key="NSBGColor" id="518286732"> @@ -482,7 +472,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{413, 18}, {11, 140}}</string> <reference key="NSSuperview" ref="495172082"/> - <reference key="NSWindow"/> <int key="NSsFlags">256</int> <reference key="NSTarget" ref="495172082"/> <string key="NSAction">_doScroller:</string> @@ -493,7 +482,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {227, 11}}</string> <reference key="NSSuperview" ref="495172082"/> - <reference key="NSWindow"/> <int key="NSsFlags">257</int> <reference key="NSTarget" ref="495172082"/> <string key="NSAction">_doScroller:</string> @@ -509,7 +497,6 @@ </object> <string key="NSFrame">{{1, 0}, {522, 17}}</string> <reference key="NSSuperview" ref="495172082"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1025336439"/> <reference key="NSDocView" ref="1025336439"/> <reference key="NSBGColor" ref="518286732"/> @@ -519,7 +506,6 @@ </object> <string key="NSFrame">{{-1, 129}, {524, 144}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="929465390"/> <int key="NSsFlags">530</int> <reference key="NSVScroller" ref="59350381"/> @@ -534,7 +520,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{343, 12}, {82, 32}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="977848648"> <int key="NSCellFlags">67239424</int> @@ -560,7 +545,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{425, 12}, {83, 32}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="291690242"> @@ -584,7 +568,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{20, 19}, {32, 24}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="87458302"> <int key="NSCellFlags">604110336</int> @@ -609,7 +592,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{51, 19}, {32, 24}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="809975974"> @@ -636,7 +618,6 @@ <int key="NSvFlags">294</int> <string key="NSFrame">{{88, 23}, {155, 14}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="929441265"> <int key="NSCellFlags">67239488</int> @@ -653,7 +634,6 @@ <int key="NSvFlags">267</int> <string key="NSFrame">{{290, 278}, {215, 22}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="107647973"> <int key="NSCellFlags">-2076049856</int> @@ -686,7 +666,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{372, 97}, {133, 22}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="1033308908"> <int key="NSCellFlags">-2076049856</int> @@ -751,7 +730,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{276, 102}, {94, 14}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="869323357"> <int key="NSCellFlags">68288064</int> @@ -776,7 +754,6 @@ </object> <string key="NSFrame">{{5, 280}, {260, 20}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPathCell" key="NSCell" id="183652084"> <int key="NSCellFlags">69336641</int> @@ -826,7 +803,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{17, 100}, {188, 18}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="413696615"> <int key="NSCellFlags">-2080244224</int> @@ -854,7 +830,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{372, 73}, {133, 22}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="940205369"> <int key="NSCellFlags">-2076049856</int> @@ -937,7 +912,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{253, 79}, {117, 14}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="498123343"> <int key="NSCellFlags">68288064</int> @@ -954,7 +928,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{239, 12}, {82, 32}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="538595338"> <int key="NSCellFlags">67239424</int> @@ -975,7 +948,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{11, 56}, {29, 26}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1001034034"> <int key="NSCellFlags">67239424</int> @@ -1002,7 +974,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 8}, {100, 18}}</string> <reference key="NSSuperview" ref="892658687"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="385836359"> <int key="NSCellFlags">67239424</int> @@ -1025,7 +996,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{132, 8}, {80, 18}}</string> <reference key="NSSuperview" ref="892658687"/> - <reference key="NSWindow"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="767775548"> @@ -1047,7 +1017,6 @@ </object> <string key="NSFrame">{{145, 20}, {230, 44}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="219742831"> @@ -1060,7 +1029,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{227, 62}, {134, 18}}</string> <reference key="NSSuperview" ref="219742831"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="843921917"> <int key="NSCellFlags">-2080244224</int> @@ -1116,7 +1084,6 @@ </object> <string key="NSFrameSize">{400, 14}</string> <reference key="NSSuperview" ref="396898918"/> - <reference key="NSWindow"/> <object class="NSTextContainer" key="NSTextContainer" id="510363477"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> @@ -1196,7 +1163,6 @@ </object> <string key="NSFrame">{{1, 1}, {400, 37}}</string> <reference key="NSSuperview" ref="952580067"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="249839159"/> <reference key="NSDocView" ref="249839159"/> <reference key="NSBGColor" ref="746040121"/> @@ -1211,7 +1177,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{386, 1}, {15, 37}}</string> <reference key="NSSuperview" ref="952580067"/> - <reference key="NSWindow"/> <int key="NSsFlags">512</int> <reference key="NSTarget" ref="952580067"/> <string key="NSAction">_doScroller:</string> @@ -1223,7 +1188,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 15}}</string> <reference key="NSSuperview" ref="952580067"/> - <reference key="NSWindow"/> <int key="NSsFlags">513</int> <reference key="NSTarget" ref="952580067"/> <string key="NSAction">_doScroller:</string> @@ -1233,7 +1197,6 @@ </object> <string key="NSFrame">{{20, 20}, {402, 39}}</string> <reference key="NSSuperview" ref="219742831"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="396898918"/> <int key="NSsFlags">530</int> <reference key="NSVScroller" ref="24215372"/> @@ -1245,7 +1208,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{227, 85}, {104, 18}}</string> <reference key="NSSuperview" ref="219742831"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="776859395"> <int key="NSCellFlags">67239424</int> @@ -1268,7 +1230,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 85}, {100, 18}}</string> <reference key="NSSuperview" ref="219742831"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="666818493"> <int key="NSCellFlags">67239424</int> @@ -1291,7 +1252,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 62}, {181, 18}}</string> <reference key="NSSuperview" ref="219742831"/> - <reference key="NSWindow"/> <int key="NSTag">2</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="265447544"> @@ -1315,7 +1275,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{137, 85}, {80, 18}}</string> <reference key="NSSuperview" ref="219742831"/> - <reference key="NSWindow"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="548754049"> @@ -1339,7 +1298,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{354, 85}, {70, 18}}</string> <reference key="NSSuperview" ref="219742831"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="115350738"> <int key="NSCellFlags">67239424</int> @@ -1360,7 +1318,6 @@ </object> <string key="NSFrame">{{39, -57}, {442, 121}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="471578497"> @@ -1373,7 +1330,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{213, 8}, {139, 18}}</string> <reference key="NSSuperview" ref="471578497"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="450486129"> <int key="NSCellFlags">67239424</int> @@ -1396,7 +1352,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 8}, {100, 18}}</string> <reference key="NSSuperview" ref="471578497"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="162288118"> <int key="NSCellFlags">67239424</int> @@ -1419,7 +1374,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{132, 8}, {70, 18}}</string> <reference key="NSSuperview" ref="471578497"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="591185810"> <int key="NSCellFlags">67239424</int> @@ -1440,7 +1394,6 @@ </object> <string key="NSFrame">{{66, 20}, {377, 44}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSButton" id="317672858"> @@ -1448,7 +1401,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{34, 58}, {58, 23}}</string> <reference key="NSSuperview" ref="78582513"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="365850666"> <int key="NSCellFlags">-2080244224</int> @@ -1466,8 +1418,6 @@ </object> </object> <string key="NSFrameSize">{522, 348}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> <string key="NSMinSize">{522, 370}</string> @@ -1485,7 +1435,7 @@ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{311, 186}</string> <object class="NSView" key="NSWindowView" id="803374494"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1803,7 +1753,6 @@ </object> </object> <string key="NSFrameSize">{311, 186}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string> <string key="NSMinSize">{311, 208}</string> @@ -3687,7 +3636,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3756,22 +3705,6 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">CMTextView</string> - <string key="superclassName">NSTextView</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">scrollView</string> - <string key="NS.object.0">NSScrollView</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/CMTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -4000,7 +3933,7 @@ <string>id</string> <string>NSMenuItem</string> <string>id</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>id</string> <string>NSButton</string> <string>id</string> @@ -4016,6 +3949,22 @@ <string key="minorKey">Source/SPFieldMapperController.h</string> </object> </object> + <object class="IBPartialClassDescription"> + <string key="className">SPTextView</string> + <string key="superclassName">NSTextView</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">scrollView</string> + <string key="NS.object.0">NSScrollView</string> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> </object> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -4690,6 +4639,7 @@ </object> </object> <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -4705,5 +4655,28 @@ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSAddTemplate</string> + <string>NSGoLeftTemplate</string> + <string>NSGoRightTemplate</string> + <string>NSMenuCheckmark</string> + <string>NSMenuMixedState</string> + <string>NSRemoveTemplate</string> + <string>NSSwitch</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{8, 8}</string> + <string>{9, 9}</string> + <string>{9, 9}</string> + <string>{9, 8}</string> + <string>{7, 2}</string> + <string>{8, 8}</string> + <string>{15, 15}</string> + </object> + </object> </data> </archive> diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 6b7962a2..7deba083 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -12,7 +12,6 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="81"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -4847,35 +4846,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">CMTextView</string> - <string key="superclassName">NSTextView</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>customQueryInstance</string> - <string>scrollView</string> - <string>tableDocumentInstance</string> - <string>tablesListInstance</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>CustomQuery</string> - <string>NSScrollView</string> - <string>TableDocument</string> - <string>TablesList</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/CMTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">CustomQuery</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> @@ -5035,7 +5005,7 @@ <string>NSMenuItem</string> <string>id</string> <string>id</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>id</string> <string>id</string> </object> @@ -5569,7 +5539,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>NSPopUpButton</string> <string>NSTextField</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>NSTextField</string> <string>NSArrayController</string> <string>NSTableView</string> @@ -5632,6 +5602,35 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">SPTextView</string> + <string key="superclassName">NSTextView</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>customQueryInstance</string> + <string>scrollView</string> + <string>tableDocumentInstance</string> + <string>tablesListInstance</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>CustomQuery</string> + <string>NSScrollView</string> + <string>TableDocument</string> + <string>TablesList</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">SPUserManager</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> diff --git a/Interfaces/English.lproj/QueryFavoriteManager.xib b/Interfaces/English.lproj/QueryFavoriteManager.xib index 60f07b5e..d03c3ed8 100644 --- a/Interfaces/English.lproj/QueryFavoriteManager.xib +++ b/Interfaces/English.lproj/QueryFavoriteManager.xib @@ -2,10 +2,10 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10C540</string> - <string key="IBDocument.InterfaceBuilderVersion">740</string> - <string key="IBDocument.AppKitVersion">1038.25</string> - <string key="IBDocument.HIToolboxVersion">458.00</string> + <string key="IBDocument.SystemVersion">10D573</string> + <string key="IBDocument.InterfaceBuilderVersion">762</string> + <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.HIToolboxVersion">460.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -15,7 +15,7 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>740</string> + <string>762</string> <string>1.2.5</string> </object> </object> @@ -58,7 +58,7 @@ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{529, 371}</string> <object class="NSView" key="NSWindowView" id="1006"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -67,7 +67,6 @@ <int key="NSvFlags">4106</int> <string key="NSFrame">{{0, 358}, {500, 5}}</string> <reference key="NSSuperview" ref="1006"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -117,7 +116,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{-1, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="12172024"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="63587388"> <int key="NSCellFlags">67239424</int> @@ -142,7 +140,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{30, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="12172024"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1023807891"> <int key="NSCellFlags">67239424</int> @@ -167,7 +164,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{61, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="12172024"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="929623756"> <int key="NSCellFlags">71433792</int> @@ -320,7 +316,6 @@ </object> <string key="NSFrameSize">{209, 23}</string> <reference key="NSSuperview" ref="1030932325"/> - <reference key="NSWindow"/> <bool key="BWABBIsResizable">YES</bool> <bool key="BWABBIsAtBottom">YES</bool> <bool key="BWABBHandleIsRightAligned">NO</bool> @@ -341,14 +336,12 @@ <int key="NSvFlags">4370</int> <string key="NSFrameSize">{210, 322}</string> <reference key="NSSuperview" ref="106335880"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="724842455"> <reference key="NSNextResponder" ref="642947098"/> <int key="NSvFlags">4352</int> <string key="NSFrameSize">{210, 17}</string> <reference key="NSSuperview" ref="642947098"/> - <reference key="NSWindow"/> <reference key="NSTableView" ref="522643855"/> </object> <object class="_NSCornerView" key="NSCornerView" id="299150059"> @@ -356,7 +349,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{198, 0}, {12, 17}}</string> <reference key="NSSuperview" ref="205303038"/> - <reference key="NSWindow"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -482,7 +474,6 @@ </object> <string key="NSFrame">{{0, 17}, {210, 322}}</string> <reference key="NSSuperview" ref="205303038"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="522643855"/> <reference key="NSDocView" ref="522643855"/> <reference key="NSBGColor" ref="392588142"/> @@ -493,7 +484,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{198, 17}, {11, 322}}</string> <reference key="NSSuperview" ref="205303038"/> - <reference key="NSWindow"/> <int key="NSsFlags">256</int> <reference key="NSTarget" ref="205303038"/> <string key="NSAction">_doScroller:</string> @@ -504,7 +494,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {311, 15}}</string> <reference key="NSSuperview" ref="205303038"/> - <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="205303038"/> <string key="NSAction">_doScroller:</string> @@ -519,7 +508,6 @@ </object> <string key="NSFrameSize">{210, 17}</string> <reference key="NSSuperview" ref="205303038"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="724842455"/> <reference key="NSDocView" ref="724842455"/> <reference key="NSBGColor" ref="392588142"/> @@ -529,7 +517,6 @@ </object> <string key="NSFrame">{{0, 22}, {210, 339}}</string> <reference key="NSSuperview" ref="1030932325"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="106335880"/> <int key="NSsFlags">528</int> <reference key="NSVScroller" ref="322405876"/> @@ -542,7 +529,6 @@ </object> <string key="NSFrameSize">{209, 361}</string> <reference key="NSSuperview" ref="588484039"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="BWCustomView" id="954707656"> @@ -555,7 +541,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{17, 15}, {25, 25}}</string> <reference key="NSSuperview" ref="954707656"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="917409661"> <int key="NSCellFlags">67239424</int> @@ -576,7 +561,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{46, 15}, {117, 25}}</string> <reference key="NSSuperview" ref="954707656"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="1063983207"> <int key="NSCellFlags">-2076049856</int> @@ -847,7 +831,6 @@ <int key="NSvFlags">290</int> <string key="NSFrame">{{92, 54}, {207, 19}}</string> <reference key="NSSuperview" ref="954707656"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="276546601"> <int key="NSCellFlags">-1804468671</int> @@ -870,7 +853,6 @@ <int key="NSvFlags">288</int> <string key="NSFrame">{{17, 57}, {70, 14}}</string> <reference key="NSSuperview" ref="954707656"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="497354008"> <int key="NSCellFlags">68288064</int> @@ -892,7 +874,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 330}, {45, 14}}</string> <reference key="NSSuperview" ref="954707656"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="448987091"> <int key="NSCellFlags">68288064</int> @@ -909,7 +890,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{56, 328}, {243, 19}}</string> <reference key="NSSuperview" ref="954707656"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="474077606"> <int key="NSCellFlags">-1804468671</int> @@ -961,7 +941,6 @@ </object> <string key="NSFrameSize">{277, 14}</string> <reference key="NSSuperview" ref="221447089"/> - <reference key="NSWindow"/> <object class="NSTextContainer" key="NSTextContainer" id="74289808"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> @@ -1036,7 +1015,6 @@ </object> <string key="NSFrame">{{1, 1}, {277, 236}}</string> <reference key="NSSuperview" ref="407061848"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="556251150"/> <reference key="NSDocView" ref="556251150"/> <reference key="NSBGColor" ref="359131077"/> @@ -1051,7 +1029,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {11, 133}}</string> <reference key="NSSuperview" ref="407061848"/> - <reference key="NSWindow"/> <int key="NSsFlags">256</int> <reference key="NSTarget" ref="407061848"/> <string key="NSAction">_doScroller:</string> @@ -1062,7 +1039,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 18}}</string> <reference key="NSSuperview" ref="407061848"/> - <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="407061848"/> <string key="NSAction">_doScroller:</string> @@ -1072,7 +1048,6 @@ </object> <string key="NSFrame">{{20, 82}, {279, 238}}</string> <reference key="NSSuperview" ref="954707656"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="221447089"/> <int key="NSsFlags">530</int> <reference key="NSVScroller" ref="978638217"/> @@ -1084,7 +1059,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{234, 13}, {70, 28}}</string> <reference key="NSSuperview" ref="954707656"/> - <reference key="NSWindow"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="908635119"> @@ -1111,7 +1085,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{166, 13}, {70, 28}}</string> <reference key="NSSuperview" ref="954707656"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="615814080"> <int key="NSCellFlags">67239424</int> @@ -1131,13 +1104,11 @@ </object> <string key="NSFrame">{{210, 0}, {319, 361}}</string> <reference key="NSSuperview" ref="588484039"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrameSize">{529, 361}</string> <reference key="NSSuperview" ref="1006"/> - <reference key="NSWindow"/> <bool key="NSIsVertical">YES</bool> <int key="NSDividerStyle">2</int> <string key="NSAutosaveName">SPQueryFavoriteSplitView</string> @@ -1203,8 +1174,6 @@ </object> </object> <string key="NSFrameSize">{529, 371}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMinSize">{529, 393}</string> @@ -2390,7 +2359,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2725,22 +2694,6 @@ IG5vdCBiZSB1c2VkIGluc2lkZSBvZiBhIHRhYiBzbmlwcGV0XeKAqA</string> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">CMTextView</string> - <string key="superclassName">NSTextView</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">scrollView</string> - <string key="NS.object.0">NSScrollView</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/CMTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">ImageAndTextCell</string> <string key="superclassName">NSTextFieldCell</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -2973,7 +2926,7 @@ IG5vdCBiZSB1c2VkIGluc2lkZSBvZiBhIHRhYiBzbmlwcGV0XeKAqA</string> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSPopUpButton</string> <string>NSTextField</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>NSTextField</string> <string>NSArrayController</string> <string>NSTableView</string> @@ -2991,6 +2944,22 @@ IG5vdCBiZSB1c2VkIGluc2lkZSBvZiBhIHRhYiBzbmlwcGV0XeKAqA</string> <string key="minorKey">Source/SPTableView.h</string> </object> </object> + <object class="IBPartialClassDescription"> + <string key="className">SPTextView</string> + <string key="superclassName">NSTextView</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">scrollView</string> + <string key="NS.object.0">NSScrollView</string> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> </object> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3052,7 +3021,7 @@ IG5vdCBiZSB1c2VkIGluc2lkZSBvZiBhIHRhYiBzbmlwcGV0XeKAqA</string> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSPopUpButton</string> <string>NSTextField</string> - <string>CMTextView</string> + <string>SPTextView</string> <string>NSTextField</string> <string>NSArrayController</string> <string>NSTableView</string> @@ -3780,6 +3749,7 @@ IG5vdCBiZSB1c2VkIGluc2lkZSBvZiBhIHRhYiBzbmlwcGV0XeKAqA</string> </object> </object> <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -3795,5 +3765,24 @@ IG5vdCBiZSB1c2VkIGluc2lkZSBvZiBhIHRhYiBzbmlwcGV0XeKAqA</string> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSActionTemplate</string> + <string>NSMenuCheckmark</string> + <string>NSMenuMixedState</string> + <string>button_add</string> + <string>button_remove</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{15, 15}</string> + <string>{9, 8}</string> + <string>{7, 2}</string> + <string>{128, 128}</string> + <string>{128, 128}</string> + </object> + </object> </data> </archive> diff --git a/Source/CustomQuery.h b/Source/CustomQuery.h index 829083fe..f4299db0 100644 --- a/Source/CustomQuery.h +++ b/Source/CustomQuery.h @@ -28,7 +28,7 @@ #import <WebKit/WebKit.h> #import "CMCopyTable.h" -#import "CMTextView.h" +#import "SPTextView.h" #import "RegexKitLite.h" #define SP_HELP_TOC_SEARCH_STRING @"contents" @@ -75,7 +75,7 @@ IBOutlet NSMenuItem *copyHistoryMenuItem; IBOutlet NSPopUpButton *encodingPopUp; - IBOutlet CMTextView *textView; + IBOutlet SPTextView *textView; IBOutlet CMCopyTable *customQueryView; IBOutlet NSScrollView *customQueryScrollView; IBOutlet id errorText; diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m index ac9bef86..de2564b1 100644 --- a/Source/SPContentFilterManager.m +++ b/Source/SPContentFilterManager.m @@ -208,7 +208,7 @@ } /** - * This method is only implemented to be compatible with CMTextView. + * This method is only implemented to be compatible with SPTextView. */ - (id)customQueryInstance { diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h index f6187d48..266986f4 100644 --- a/Source/SPFieldMapperController.h +++ b/Source/SPFieldMapperController.h @@ -25,7 +25,7 @@ #import <Cocoa/Cocoa.h> #import <MCPKit/MCPKit.h> -@class CMTextView; +@class SPTextView; @interface SPFieldMapperController : NSWindowController { @@ -64,7 +64,7 @@ IBOutlet id lowPriorityUpdateCheckBox; IBOutlet id highPriorityCheckBox; IBOutlet id skipexistingRowsCheckBox; - IBOutlet CMTextView *onupdateTextView; + IBOutlet SPTextView *onupdateTextView; IBOutlet id advancedButton; diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index 0a51e20f..8ba0ebbb 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -30,7 +30,7 @@ #import "SPStringAdditions.h" #import "SPConstants.h" #import "SPNotLoaded.h" -#import "CMTextView.h" +#import "SPTextView.h" @implementation SPFieldMapperController diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m index 668e01c1..eaa3c43c 100644 --- a/Source/SPNarrowDownCompletion.m +++ b/Source/SPNarrowDownCompletion.m @@ -36,7 +36,7 @@ #import "SPConstants.h" #import "SPQueryController.h" #import "RegexKitLite.h" -#import "CMTextView.h" +#import "SPTextView.h" #import "SPConstants.h" diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h index c3b93ab5..e62244ef 100644 --- a/Source/SPQueryFavoriteManager.h +++ b/Source/SPQueryFavoriteManager.h @@ -25,7 +25,7 @@ #import <Cocoa/Cocoa.h> -@class BWAnchoredButtonBar, CMTextView, TableDocument; +@class BWAnchoredButtonBar, SPTextView, TableDocument; @interface NSObject (SPQueryFavoriteManagerDelegate) @@ -43,7 +43,7 @@ IBOutlet NSTableView *favoritesTableView; IBOutlet NSTextField *favoriteNameTextField; IBOutlet NSTextField *favoriteTabTriggerTextField; - IBOutlet CMTextView *favoriteQueryTextView; + IBOutlet SPTextView *favoriteQueryTextView; IBOutlet NSButton *removeButton; IBOutlet BWAnchoredButtonBar *splitViewButtonBar; diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m index 40648f91..3840bd1e 100644 --- a/Source/SPQueryFavoriteManager.m +++ b/Source/SPQueryFavoriteManager.m @@ -30,7 +30,7 @@ #import "SPConstants.h" #import "SPConnectionController.h" #import "RegexKitLite.h" -#import "CMTextView.h" +#import "SPTextView.h" #define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"[multiple selection]") #define SP_NO_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[no selection]", @"[no selection]") @@ -178,7 +178,7 @@ } /** - * This method is only implemented to be compatible with CMTextView. + * This method is only implemented to be compatible with SPTextView. */ - (id)customQueryInstance { diff --git a/Source/CMTextView.h b/Source/SPTextView.h index 51f2153d..2964845a 100644 --- a/Source/CMTextView.h +++ b/Source/SPTextView.h @@ -1,7 +1,7 @@ // -// $Id$ +// $Id: CMTextView.h 2240 2010-05-23 21:44:59Z rowanb $ // -// CMTextView.h +// SPTextView.h // sequel-pro // // Created by Carsten Blüm. @@ -27,13 +27,12 @@ #import "NoodleLineNumberView.h" #import "CMCopyTable.h" -#import "CMTextView.h" #define SP_TEXT_SIZE_TRIGGER_FOR_PARTLY_PARSING 10000 @class SPNarrowDownCompletion, TableDocument, TablesList, CustomQuery; -@interface CMTextView : NSTextView +@interface SPTextView : NSTextView { IBOutlet TableDocument *tableDocumentInstance; IBOutlet TablesList *tablesListInstance; diff --git a/Source/CMTextView.m b/Source/SPTextView.m index 55c759a0..5a096b93 100644 --- a/Source/CMTextView.m +++ b/Source/SPTextView.m @@ -1,7 +1,7 @@ // // $Id$ // -// CMTextView.m +// SPTextView.m // sequel-pro // // Created by Carsten Blüm. @@ -22,7 +22,7 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "CMTextView.h" +#import "SPTextView.h" #import "CustomQuery.h" #import "TableDocument.h" #import "SPStringAdditions.h" @@ -86,7 +86,7 @@ static inline CGFloat SPRectRight(NSRect rectangle) { return rectangle.origin.x+ static inline CGFloat SPPointDistance(NSPoint a, NSPoint b) { return sqrt( (a.x-b.x)*(a.x-b.x) + (a.y-b.y)*(a.y-b.y) ); } static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NSMakePoint(a.x*(1.-t) + b.x*t, a.y*(1.-t) + b.y*t); } -@implementation CMTextView +@implementation SPTextView @synthesize queryHiliteColor; @synthesize queryEditorBackgroundColor; @@ -802,7 +802,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) /* - * Returns the associated line number for a character position inside of the CMTextView + * Returns the associated line number for a character position inside of the SPTextView */ - (NSUInteger) getLineNumberForCharacterIndex:(NSUInteger)anIndex { @@ -2028,7 +2028,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) return; } - // Check for {SHIFT}TAB to try to insert query favorite via TAB trigger if CMTextView belongs to CustomQuery + // Check for {SHIFT}TAB to try to insert query favorite via TAB trigger if SPTextView belongs to CustomQuery if ([theEvent keyCode] == 48 && [self isEditable] && [[self delegate] isKindOfClass:[CustomQuery class]]){ NSRange targetRange = [self getRangeForCurrentWord]; NSString *tabTrigger = [[self string] substringWithRange:targetRange]; diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 65b9f131..43f14515 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -105,7 +105,7 @@ 17E641750EF01F80001BC333 /* SPKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641740EF01F80001BC333 /* SPKeychain.m */; }; 17E641820EF01FA8001BC333 /* CMCopyTable.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6417D0EF01FA8001BC333 /* CMCopyTable.m */; }; 17E641830EF01FA8001BC333 /* CMImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6417F0EF01FA8001BC333 /* CMImageView.m */; }; - 17E641840EF01FA8001BC333 /* CMTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641810EF01FA8001BC333 /* CMTextView.m */; }; + 17E641840EF01FA8001BC333 /* SPTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641810EF01FA8001BC333 /* SPTextView.m */; }; 17E641C00EF02036001BC333 /* appicon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17E6418C0EF02036001BC333 /* appicon.icns */; }; 17E641C10EF02036001BC333 /* clearconsole.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 17E6418D0EF02036001BC333 /* clearconsole.tiff */; }; 17E641D10EF02036001BC333 /* grabber-horizontal.png in Resources */ = {isa = PBXBuildFile; fileRef = 17E6419D0EF02036001BC333 /* grabber-horizontal.png */; }; @@ -539,8 +539,8 @@ 17E6417D0EF01FA8001BC333 /* CMCopyTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMCopyTable.m; sourceTree = "<group>"; }; 17E6417E0EF01FA8001BC333 /* CMImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMImageView.h; sourceTree = "<group>"; }; 17E6417F0EF01FA8001BC333 /* CMImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMImageView.m; sourceTree = "<group>"; }; - 17E641800EF01FA8001BC333 /* CMTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMTextView.h; sourceTree = "<group>"; }; - 17E641810EF01FA8001BC333 /* CMTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMTextView.m; sourceTree = "<group>"; }; + 17E641800EF01FA8001BC333 /* SPTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTextView.h; sourceTree = "<group>"; }; + 17E641810EF01FA8001BC333 /* SPTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTextView.m; sourceTree = "<group>"; }; 17E6418C0EF02036001BC333 /* appicon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = appicon.icns; sourceTree = "<group>"; }; 17E6418D0EF02036001BC333 /* clearconsole.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = clearconsole.tiff; sourceTree = "<group>"; }; 17E6419D0EF02036001BC333 /* grabber-horizontal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "grabber-horizontal.png"; sourceTree = "<group>"; }; @@ -1402,8 +1402,8 @@ 17E6417D0EF01FA8001BC333 /* CMCopyTable.m */, 17E6417E0EF01FA8001BC333 /* CMImageView.h */, 17E6417F0EF01FA8001BC333 /* CMImageView.m */, - 17E641800EF01FA8001BC333 /* CMTextView.h */, - 17E641810EF01FA8001BC333 /* CMTextView.m */, + 17E641800EF01FA8001BC333 /* SPTextView.h */, + 17E641810EF01FA8001BC333 /* SPTextView.m */, 58C56EF30F438E120035701E /* SPDataCellFormatter.h */, 58C56EF40F438E120035701E /* SPDataCellFormatter.m */, BC1847E80FE6EC8400094BFB /* SPEditSheetTextView.h */, @@ -2041,7 +2041,7 @@ 17E641750EF01F80001BC333 /* SPKeychain.m in Sources */, 17E641820EF01FA8001BC333 /* CMCopyTable.m in Sources */, 17E641830EF01FA8001BC333 /* CMImageView.m in Sources */, - 17E641840EF01FA8001BC333 /* CMTextView.m in Sources */, + 17E641840EF01FA8001BC333 /* SPTextView.m in Sources */, 58FEF16D0F23D66600518E8E /* SPSQLParser.m in Sources */, 1789343C0F30C1DD0097539A /* SPStringAdditions.m in Sources */, 58FEF57E0F3B4E9700518E8E /* SPTableData.m in Sources */, |