diff options
| -rw-r--r-- | Interfaces/English.lproj/DBView.xib | 124 | ||||
| -rw-r--r-- | Source/CustomQuery.m | 6 |
2 files changed, 30 insertions, 100 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index f0c6595c..8ea38d71 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -9,8 +9,7 @@ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="3994"/> - <integer value="4811"/> - <integer value="500"/> + <integer value="676"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -439,7 +438,6 @@ </object> </object> </object> - <int key="NSSelectedIndex">1</int> <bool key="NSPullDown">YES</bool> <int key="NSPreferredEdge">1</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -2266,8 +2264,8 @@ <bool key="NS.raise.underflow">YES</bool> <bool key="NS.raise.dividebyzero">YES</bool> </object> - <string key="NS.decimal">,</string> - <string key="NS.thousand">.</string> + <string key="NS.decimal">.</string> + <string key="NS.thousand">,</string> <bool key="NS.hasthousands">NO</bool> <bool key="NS.localized">YES</bool> <bool key="NS.allowsfloats">NO</bool> @@ -2953,7 +2951,10 @@ <reference key="NSControlView" ref="363916571"/> <int key="NSButtonFlags">-2042609409</int> <int key="NSButtonFlags2">35</int> - <reference key="NSNormalImage" ref="95983676"/> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_action</string> + </object> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">400</int> @@ -3153,8 +3154,8 @@ <reference key="NSTarget" ref="984501775"/> </object> </object> + <bool key="NSNoAutoenable">YES</bool> </object> - <int key="NSSelectedIndex">13</int> <bool key="NSPullDown">YES</bool> <int key="NSPreferredEdge">1</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -4415,7 +4416,7 @@ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="653204527"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -4523,7 +4524,6 @@ </object> </object> <string key="NSFrameSize">{262, 127}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> @@ -18355,6 +18355,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>248.ImportedFromIB2</string> <string>249.IBPluginDependency</string> <string>249.ImportedFromIB2</string> + <string>25.IBAttributePlaceholdersKey</string> <string>25.IBPluginDependency</string> <string>25.ImportedFromIB2</string> <string>253.IBPluginDependency</string> @@ -19800,6 +19801,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> + <object class="NSMutableDictionary"> + <string key="NS.key.0">InitialTabViewItem</string> + <object class="IBInitialTabViewItemAttribute" key="NS.object.0"> + <string key="name">InitialTabViewItem</string> + <reference key="object" ref="714795046"/> + <reference key="initialTabViewItem" ref="831053945"/> + </object> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -20164,7 +20173,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{1739, 266}, {200, 32}}</string> + <string>{{1400, 266}, {200, 32}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{628, 654}</string> <string>{{284, 769}, {200, 32}}</string> @@ -20463,7 +20472,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{323, 314}, {175, 73}}</string> + <string>{{323, 258}, {175, 73}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> @@ -20485,8 +20494,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{314, 362}, {944, 550}}</string> - <string>{{314, 362}, {944, 550}}</string> + <string>{{189, 297}, {944, 550}}</string> + <string>{{189, 297}, {944, 550}}</string> <reference ref="9"/> <reference ref="9"/> <string>{{62, 352}, {845, 504}}</string> @@ -20668,7 +20677,7 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{1847, 269}, {236, 254}}</string> + <string>{{523, 431}, {236, 254}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -22104,9 +22113,12 @@ Y2hhbmdlIHRoZSBvcmRlcg</string> <bool key="EncodedWithXMLCoder">YES</bool> <string>addTableButton</string> <string>copyTableContentSwitch</string> + <string>copyTableMessageField</string> <string>copyTableNameField</string> <string>copyTableSheet</string> <string>customQueryInstance</string> + <string>duplicateTableMenuItem</string> + <string>removeTableMenuItem</string> <string>tabView</string> <string>tableContentInstance</string> <string>tableDataInstance</string> @@ -22128,6 +22140,9 @@ Y2hhbmdlIHRoZSBvcmRlcg</string> <string>id</string> <string>id</string> <string>id</string> + <string>NSMenuItem</string> + <string>NSMenuItem</string> + <string>id</string> <string>id</string> <string>id</string> <string>id</string> @@ -22155,87 +22170,6 @@ Y2hhbmdlIHRoZSBvcmRlcg</string> </object> </object> </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">TablesList</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>addTable:</string> - <string>closeCopyTableSheet:</string> - <string>closeTableSheet:</string> - <string>copyTable:</string> - <string>removeTable:</string> - <string>updateTables:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>addTableButton</string> - <string>copyTableContentSwitch</string> - <string>copyTableMessageField</string> - <string>copyTableNameField</string> - <string>copyTableSheet</string> - <string>customQueryInstance</string> - <string>duplicateTableMenuItem</string> - <string>removeTableMenuItem</string> - <string>tabView</string> - <string>tableContentInstance</string> - <string>tableDataInstance</string> - <string>tableDocumentInstance</string> - <string>tableDumpInstance</string> - <string>tableEncodingButton</string> - <string>tableNameField</string> - <string>tableSheet</string> - <string>tableSourceInstance</string> - <string>tableStatusInstance</string> - <string>tableWindow</string> - <string>tablesListView</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBDocumentRelativeSource</string> - <string key="minorKey">../../Source/TablesList.h</string> - </object> - </object> - </object> </object> <int key="IBDocument.localizationMode">0</int> <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m index 95de8d9b..a5c7e8db 100644 --- a/Source/CustomQuery.m +++ b/Source/CustomQuery.m @@ -801,6 +801,7 @@ sets the tableView columns corresponding to the mysql-result // If there is a previous query and the position should be associated with it, do so. if (i && positionAssociatedWithPreviousQuery && [[[queries objectAtIndex:i-1] stringByTrimmingCharactersInSet:newlineSet] length]) { query = [NSString stringWithString:[queries objectAtIndex:i-1]]; + queryStartPosition = lastQueryStartPosition; break; } @@ -915,8 +916,6 @@ sets the connection (received from TableDocument) and makes things that have to } [self setFavorites]; - // To be able to disable runSelectionMenuItem - [[runSelectionMenuItem menu] setAutoenablesItems:NO]; // Disable runSelectionMenuItem in the gear menu [runSelectionMenuItem setEnabled:NO]; @@ -1249,9 +1248,6 @@ traps enter key and // Ensure that the notification is from the custom query text view if ( [aNotification object] != textView ) return; - // To be able to disable runSelectionMenuItem - [[runSelectionMenuItem menu] setAutoenablesItems:NO]; - // If no text is selected, disable the button and action menu. if ( [textView selectedRange].location == NSNotFound ) { [runSelectionButton setEnabled:NO]; |