aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2013-04-28 21:59:13 +0000
committerrowanbeentje <rowan@beent.je>2013-04-28 21:59:13 +0000
commiteb0801ac5dc2807169905c1f402215814bcf8dec (patch)
treee69c0b444b0936b089ac1e2ec06f08d6513621c9
parente2c43531137cf4d19f6814229dcb85880963d475 (diff)
downloadsequelpro-eb0801ac5dc2807169905c1f402215814bcf8dec.tar.gz
sequelpro-eb0801ac5dc2807169905c1f402215814bcf8dec.tar.bz2
sequelpro-eb0801ac5dc2807169905c1f402215814bcf8dec.zip
Merge further revisions back from trunk to 1.0.x release branch:
- r4062: Fix build warning - r4064: Combine the "Run All" and "Run Current/Previous/Selection" buttons into a single button with dropdown menu with ability to change the default action: Create a new SPComboPopupButton class; this subclasses NSPopupButton to retain the ability to show the popup menu, but only when the right-hand side of the button is pressed, allowing the rest of the button to perform the click action; Combine the previous two "Run" buttons on the Custom Query view into a new SPComboPopupButton; Move the Run menu items from the gear menu into the Run button popup menu so they can be discovered more easily (and the shortcuts seen more easily) ; Add a menu item to switch the button's default action, which also swaps all associated shortcuts; Clean up associated logic. This implements Issue #1569 - r4065: Alter the SPComboPopupButton to ignore clicks started in the left-hand part of the button but ended in the right-hand part of the button; Change the button to use "Run All" instead of "Run All Queries" to avoid localisation issues
Diffstat
-rw-r--r--Interfaces/English.lproj/DBView.xib681
-rw-r--r--Resources/English.lproj/DBView.stringsbin102596 -> 104058 bytes
-rw-r--r--Resources/English.lproj/MainMenu.stringsbin47472 -> 47700 bytes
-rw-r--r--Resources/Plists/PreferenceDefaults.plist2
-rw-r--r--Source/SPComboPopupButton.h52
-rw-r--r--Source/SPComboPopupButton.m312
-rw-r--r--Source/SPConstants.h1
-rw-r--r--Source/SPConstants.m1
-rw-r--r--Source/SPCustomQuery.h24
-rw-r--r--Source/SPCustomQuery.m192
-rw-r--r--Source/SPTableStructure.m1
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj6
12 files changed, 827 insertions, 445 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 9304f088..ae177480 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -22,9 +22,6 @@
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="7210"/>
- <integer value="6991"/>
- <integer value="6766"/>
- <integer value="500"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -96,7 +93,6 @@
<int key="NSvFlags">4362</int>
<string key="NSFrameSize">{218, 38}</string>
<reference key="NSSuperview" ref="494991824"/>
- <reference key="NSNextKeyView" ref="196112633"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@@ -204,7 +200,6 @@
</object>
<string key="NSFrame">{{1, 1}, {218, 38}}</string>
<reference key="NSSuperview" ref="607475905"/>
- <reference key="NSNextKeyView" ref="970881282"/>
<reference key="NSDocView" ref="970881282"/>
<object class="NSColor" key="NSBGColor" id="1024678221">
<int key="NSColorSpace">6</int>
@@ -219,7 +214,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 8}}</string>
<reference key="NSSuperview" ref="607475905"/>
- <reference key="NSNextKeyView" ref="142487484"/>
<reference key="NSTarget" ref="607475905"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.42105263471603394</double>
@@ -229,7 +223,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {223, 15}}</string>
<reference key="NSSuperview" ref="607475905"/>
- <reference key="NSNextKeyView" ref="494991824"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="607475905"/>
<string key="NSAction">_doScroller:</string>
@@ -238,7 +231,6 @@
</object>
<string key="NSFrame">{{-1, -13}, {220, 40}}</string>
<reference key="NSSuperview" ref="801427893"/>
- <reference key="NSNextKeyView" ref="494991824"/>
<int key="NSsFlags">133122</int>
<reference key="NSVScroller" ref="196112633"/>
<reference key="NSHScroller" ref="142487484"/>
@@ -250,7 +242,6 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{5, 2}, {204, 19}}</string>
<reference key="NSSuperview" ref="801427893"/>
- <reference key="NSNextKeyView" ref="1017775084"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="134854992">
<int key="NSCellFlags">342884416</int>
@@ -319,7 +310,6 @@
</object>
<string key="NSFrameSize">{214, 24}</string>
<reference key="NSSuperview" ref="213762440"/>
- <reference key="NSNextKeyView" ref="607475905"/>
</object>
<object class="NSView" id="1017775084">
<reference key="NSNextResponder" ref="213762440"/>
@@ -341,7 +331,6 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{214, 334}</string>
<reference key="NSSuperview" ref="73685676"/>
- <reference key="NSNextKeyView" ref="656188692"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@@ -406,7 +395,6 @@
</object>
<string key="NSFrameSize">{214, 334}</string>
<reference key="NSSuperview" ref="233472824"/>
- <reference key="NSNextKeyView" ref="251040077"/>
<reference key="NSDocView" ref="251040077"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -416,7 +404,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{197, 0}, {15, 292}}</string>
<reference key="NSSuperview" ref="233472824"/>
- <reference key="NSNextKeyView" ref="192579410"/>
<reference key="NSTarget" ref="233472824"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">0.096045196056365967</double>
@@ -427,7 +414,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {141, 11}}</string>
<reference key="NSSuperview" ref="233472824"/>
- <reference key="NSNextKeyView" ref="73685676"/>
<int key="NSsFlags">257</int>
<reference key="NSTarget" ref="233472824"/>
<string key="NSAction">_doScroller:</string>
@@ -436,7 +422,6 @@
</object>
<string key="NSFrameSize">{214, 334}</string>
<reference key="NSSuperview" ref="1017775084"/>
- <reference key="NSNextKeyView" ref="73685676"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="693168867"/>
<reference key="NSHScroller" ref="656188692"/>
@@ -446,18 +431,15 @@
</object>
<string key="NSFrame">{{0, 25}, {214, 334}}</string>
<reference key="NSSuperview" ref="213762440"/>
- <reference key="NSNextKeyView" ref="233472824"/>
</object>
</object>
<string key="NSFrameSize">{214, 359}</string>
<reference key="NSSuperview" ref="131633443"/>
- <reference key="NSNextKeyView" ref="801427893"/>
<int key="NSDividerStyle">2</int>
</object>
</object>
<string key="NSFrameSize">{214, 359}</string>
<reference key="NSSuperview" ref="298095498"/>
- <reference key="NSNextKeyView" ref="213762440"/>
</object>
<object class="NSView" id="192579410">
<reference key="NSNextResponder" ref="298095498"/>
@@ -479,7 +461,6 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{216, 166}</string>
<reference key="NSSuperview" ref="242523705"/>
- <reference key="NSNextKeyView" ref="313695606"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@@ -544,7 +525,6 @@
</object>
<string key="NSFrameSize">{216, 166}</string>
<reference key="NSSuperview" ref="561874764"/>
- <reference key="NSNextKeyView" ref="794785393"/>
<reference key="NSDocView" ref="794785393"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">6</int>
@@ -554,7 +534,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 20}}</string>
<reference key="NSSuperview" ref="561874764"/>
- <reference key="NSNextKeyView" ref="464071814"/>
<reference key="NSTarget" ref="561874764"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.99315071105957031</double>
@@ -564,7 +543,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {141, 11}}</string>
<reference key="NSSuperview" ref="561874764"/>
- <reference key="NSNextKeyView" ref="242523705"/>
<int key="NSsFlags">257</int>
<reference key="NSTarget" ref="561874764"/>
<string key="NSAction">_doScroller:</string>
@@ -573,7 +551,6 @@
</object>
<string key="NSFrame">{{-1, 0}, {216, 166}}</string>
<reference key="NSSuperview" ref="192579410"/>
- <reference key="NSNextKeyView" ref="242523705"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="313695606"/>
<reference key="NSHScroller" ref="464071814"/>
@@ -595,7 +572,6 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{214, 166}</string>
<reference key="NSSuperview" ref="685057119"/>
- <reference key="NSNextKeyView" ref="245346414"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@@ -660,7 +636,6 @@
</object>
<string key="NSFrameSize">{214, 166}</string>
<reference key="NSSuperview" ref="298226231"/>
- <reference key="NSNextKeyView" ref="347093764"/>
<reference key="NSDocView" ref="347093764"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">6</int>
@@ -670,7 +645,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 20}}</string>
<reference key="NSSuperview" ref="298226231"/>
- <reference key="NSNextKeyView" ref="353686052"/>
<reference key="NSTarget" ref="298226231"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">0.48965516686439514</double>
@@ -681,7 +655,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {141, 11}}</string>
<reference key="NSSuperview" ref="298226231"/>
- <reference key="NSNextKeyView" ref="685057119"/>
<int key="NSsFlags">257</int>
<reference key="NSTarget" ref="298226231"/>
<string key="NSAction">_doScroller:</string>
@@ -690,7 +663,6 @@
</object>
<string key="NSFrameSize">{214, 166}</string>
<reference key="NSSuperview" ref="192579410"/>
- <reference key="NSNextKeyView" ref="685057119"/>
<int key="NSsFlags">133632</int>
<reference key="NSVScroller" ref="245346414"/>
<reference key="NSHScroller" ref="353686052"/>
@@ -700,12 +672,10 @@
</object>
<string key="NSFrame">{{0, 360}, {214, 166}}</string>
<reference key="NSSuperview" ref="298095498"/>
- <reference key="NSNextKeyView" ref="561874764"/>
</object>
</object>
<string key="NSFrame">{{0, 23}, {214, 526}}</string>
<reference key="NSSuperview" ref="1053680279"/>
- <reference key="NSNextKeyView" ref="131633443"/>
<int key="NSDividerStyle">2</int>
</object>
<object class="NSImageView" id="561922715">
@@ -725,7 +695,6 @@
</object>
<string key="NSFrameSize">{214, 23}</string>
<reference key="NSSuperview" ref="1053680279"/>
- <reference key="NSNextKeyView" ref="947510561"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="1048280771">
<int key="NSCellFlags">134217728</int>
@@ -758,7 +727,6 @@
</object>
<string key="NSFrame">{{199, 0}, {15, 23}}</string>
<reference key="NSSuperview" ref="1053680279"/>
- <reference key="NSNextKeyView" ref="882258892"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="6140012">
<int key="NSCellFlags">134217728</int>
@@ -779,7 +747,6 @@
<int key="NSvFlags">260</int>
<string key="NSFrame">{{-1, -1}, {32, 25}}</string>
<reference key="NSSuperview" ref="1053680279"/>
- <reference key="NSNextKeyView" ref="298095498"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="963962550">
<int key="NSCellFlags">67108864</int>
@@ -804,7 +771,6 @@
<int key="NSvFlags">260</int>
<string key="NSFrame">{{92, -1}, {32, 25}}</string>
<reference key="NSSuperview" ref="1053680279"/>
- <reference key="NSNextKeyView" ref="648857411"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="121579282">
<int key="NSCellFlags">67108864</int>
@@ -833,7 +799,6 @@
<int key="NSvFlags">260</int>
<string key="NSFrame">{{30, -1}, {36, 25}}</string>
<reference key="NSSuperview" ref="1053680279"/>
- <reference key="NSNextKeyView" ref="890671991"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="443520294">
<int key="NSCellFlags">71433792</int>
@@ -1054,7 +1019,6 @@
<int key="NSvFlags">260</int>
<string key="NSFrame">{{61, -0.5}, {32, 25}}</string>
<reference key="NSSuperview" ref="1053680279"/>
- <reference key="NSNextKeyView" ref="618427141"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="739503272">
<int key="NSCellFlags">67108864</int>
@@ -1077,7 +1041,6 @@
</object>
<string key="NSFrameSize">{214, 549}</string>
<reference key="NSSuperview" ref="162770193"/>
- <reference key="NSNextKeyView" ref="1055568837"/>
</object>
<object class="NSView" id="882258892">
<reference key="NSNextResponder" ref="162770193"/>
@@ -3301,7 +3264,6 @@
</object>
<string key="NSFrame">{{6, 10}, {695, 23}}</string>
<reference key="NSSuperview" ref="746504912"/>
- <reference key="NSNextKeyView" ref="252335193"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="924326939">
<int key="NSCellFlags">134217728</int>
@@ -3319,7 +3281,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{36, 9}, {36, 25}}</string>
<reference key="NSSuperview" ref="746504912"/>
- <reference key="NSNextKeyView" ref="690847485"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="274650945">
<int key="NSCellFlags">71433792</int>
@@ -3403,7 +3364,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{6, 9}, {32, 25}}</string>
<reference key="NSSuperview" ref="746504912"/>
- <reference key="NSNextKeyView" ref="1051716983"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="874101645">
<int key="NSCellFlags">67108864</int>
@@ -3426,7 +3386,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{67, 9}, {32, 25}}</string>
<reference key="NSSuperview" ref="746504912"/>
- <reference key="NSNextKeyView" ref="461846195"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="55083641">
<int key="NSCellFlags">67108864</int>
@@ -3580,7 +3539,6 @@
</object>
<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"/>
@@ -3615,7 +3573,6 @@
</object>
<string key="NSFrame">{{0, 0.5}, {695, 143}}</string>
<reference key="NSSuperview" ref="815597998"/>
- <reference key="NSNextKeyView" ref="665594557"/>
<string key="NSReuseIdentifierKey">_NS:1494</string>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="691452503"/>
@@ -3625,7 +3582,6 @@
</object>
<string key="NSFrameSize">{695, 143}</string>
<reference key="NSSuperview" ref="727658473"/>
- <reference key="NSNextKeyView"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="539474293">
@@ -3648,14 +3604,12 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{693, 197}</string>
<reference key="NSSuperview" ref="719411200"/>
- <reference key="NSNextKeyView" ref="893759750"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="569161033">
<reference key="NSNextResponder" ref="893759750"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{693, 17}</string>
<reference key="NSSuperview" ref="893759750"/>
- <reference key="NSNextKeyView" ref="445978979"/>
<reference key="NSTableView" ref="7005793"/>
</object>
<object class="_NSCornerView" key="NSCornerView">
@@ -3712,7 +3666,6 @@
</object>
<string key="NSFrame">{{1.5, 17}, {693, 197}}</string>
<reference key="NSSuperview" ref="808759882"/>
- <reference key="NSNextKeyView" ref="7005793"/>
<reference key="NSDocView" ref="7005793"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -3722,7 +3675,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{680, 17}, {15, 199}}</string>
<reference key="NSSuperview" ref="808759882"/>
- <reference key="NSNextKeyView" ref="1028777476"/>
<reference key="NSTarget" ref="808759882"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.98507463932037354</double>
@@ -3732,7 +3684,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 207}, {688, 15}}</string>
<reference key="NSSuperview" ref="808759882"/>
- <reference key="NSNextKeyView" ref="719411200"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="808759882"/>
<string key="NSAction">_doScroller:</string>
@@ -3747,7 +3698,6 @@
</object>
<string key="NSFrame">{{1.5, 0}, {693, 17}}</string>
<reference key="NSSuperview" ref="808759882"/>
- <reference key="NSNextKeyView" ref="569161033"/>
<reference key="NSDocView" ref="569161033"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -3755,7 +3705,6 @@
</object>
<string key="NSFrame">{{0, -1}, {695, 215}}</string>
<reference key="NSSuperview" ref="539474293"/>
- <reference key="NSNextKeyView" ref="719411200"/>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="472788253"/>
<reference key="NSHScroller" ref="445978979"/>
@@ -3768,7 +3717,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{156, 214}, {98, 22}}</string>
<reference key="NSSuperview" ref="539474293"/>
- <reference key="NSNextKeyView" ref="1067429818"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="619849563">
<int key="NSCellFlags">-2076049856</int>
@@ -3882,7 +3830,6 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{38, 214}, {108, 22}}</string>
<reference key="NSSuperview" ref="539474293"/>
- <reference key="NSNextKeyView" ref="956647572"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="620314745">
<int key="NSCellFlags">-2076049856</int>
@@ -3997,7 +3944,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{-11, 213}, {48, 25}}</string>
<reference key="NSSuperview" ref="539474293"/>
- <reference key="NSNextKeyView" ref="131271512"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="127119628">
<int key="NSCellFlags">-2076049856</int>
@@ -4027,43 +3973,6 @@
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="40537642"/>
- <object class="NSMenuItem" id="339454293">
- <reference key="NSMenu" ref="771730213"/>
- <bool key="NSIsDisabled">YES</bool>
- <string key="NSTitle">Run Current Query</string>
- <string key="NSKeyEquiv">r</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="192906517"/>
- <reference key="NSMixedImage" ref="990233977"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">2</int>
- <reference key="NSTarget" ref="127119628"/>
- </object>
- <object class="NSMenuItem" id="851449724">
- <reference key="NSMenu" ref="771730213"/>
- <string key="NSTitle">Run All Queries</string>
- <string key="NSKeyEquiv">r</string>
- <int key="NSKeyEquivModMask">1572864</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="192906517"/>
- <reference key="NSMixedImage" ref="990233977"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">1</int>
- <reference key="NSTarget" ref="127119628"/>
- </object>
- <object class="NSMenuItem" id="299769724">
- <reference key="NSMenu" ref="771730213"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="192906517"/>
- <reference key="NSMixedImage" ref="990233977"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="127119628"/>
- </object>
<object class="NSMenuItem" id="11400907">
<reference key="NSMenu" ref="771730213"/>
<string key="NSTitle">Previous Query from History</string>
@@ -4323,54 +4232,106 @@
</object>
<bool key="NSNoAutoenable">YES</bool>
</object>
- <int key="NSSelectedIndex">18</int>
+ <int key="NSSelectedIndex">1</int>
<bool key="NSPullDown">YES</bool>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
</object>
</object>
- <object class="NSButton" id="1067429818">
- <reference key="NSNextResponder" ref="539474293"/>
- <int key="NSvFlags">265</int>
- <string key="NSFrame">{{386.5, 216}, {124, 17}}</string>
- <reference key="NSSuperview" ref="539474293"/>
- <reference key="NSNextKeyView" ref="768193117"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="230812569">
- <int key="NSCellFlags">-2080374784</int>
- <int key="NSCellFlags2">134348800</int>
- <string key="NSContents">Run All</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="1067429818"/>
- <int key="NSButtonFlags">-2034876416</int>
- <int key="NSButtonFlags2">402653220</int>
- <reference key="NSAlternateImage" ref="26"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent">r</string>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="768193117">
+ <object class="NSPopUpButton" id="866600258">
<reference key="NSNextResponder" ref="539474293"/>
<int key="NSvFlags">265</int>
- <string key="NSFrame">{{519, 216}, {168, 17}}</string>
+ <string key="NSFrame">{{507.5, 214}, {180, 22}}</string>
<reference key="NSSuperview" ref="539474293"/>
- <reference key="NSNextKeyView" ref="808759882"/>
+ <string key="NSReuseIdentifierKey">_NS:791</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="538725211">
- <int key="NSCellFlags">603979776</int>
- <int key="NSCellFlags2">134348800</int>
- <string key="NSContents">Run Current</string>
+ <object class="NSPopUpButtonCell" key="NSCell" id="532678104">
+ <int key="NSCellFlags">-2076049856</int>
+ <int key="NSCellFlags2">134350848</int>
<reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="768193117"/>
- <int key="NSButtonFlags">-2038284288</int>
+ <string key="NSCellIdentifier">_NS:791</string>
+ <reference key="NSControlView" ref="866600258"/>
+ <int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">164</int>
<string key="NSAlternateContents"/>
- <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ <object class="NSMenuItem" key="NSMenuItem" id="565650995">
+ <reference key="NSMenu" ref="628982892"/>
+ <bool key="NSIsHidden">YES</bool>
+ <string key="NSTitle">Run Current</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="192906517"/>
+ <reference key="NSMixedImage" ref="990233977"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="532678104"/>
+ </object>
+ <bool key="NSMenuItemRespectAlignment">YES</bool>
+ <object class="NSMenu" key="NSMenu" id="628982892">
+ <string key="NSTitle">OtherViews</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="565650995"/>
+ <object class="NSMenuItem" id="474806576">
+ <reference key="NSMenu" ref="628982892"/>
+ <string key="NSTitle">Run Current Query</string>
+ <string key="NSKeyEquiv">r</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="192906517"/>
+ <reference key="NSMixedImage" ref="990233977"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">2</int>
+ <reference key="NSTarget" ref="532678104"/>
+ </object>
+ <object class="NSMenuItem" id="320607900">
+ <reference key="NSMenu" ref="628982892"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="192906517"/>
+ <reference key="NSMixedImage" ref="990233977"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="532678104"/>
+ </object>
+ <object class="NSMenuItem" id="421066916">
+ <reference key="NSMenu" ref="628982892"/>
+ <string key="NSTitle">Run All Queries</string>
+ <string key="NSKeyEquiv">r</string>
+ <int key="NSKeyEquivModMask">1572864</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="192906517"/>
+ <reference key="NSMixedImage" ref="990233977"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">1</int>
+ <reference key="NSTarget" ref="532678104"/>
+ </object>
+ <object class="NSMenuItem" id="830358003">
+ <reference key="NSMenu" ref="628982892"/>
+ <string key="NSTitle">Switch Default</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="192906517"/>
+ <reference key="NSMixedImage" ref="990233977"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="532678104"/>
+ </object>
+ </object>
+ <reference key="NSMenuFont" ref="244931163"/>
+ </object>
+ <int key="NSSelectedIndex">4</int>
+ <bool key="NSPullDown">YES</bool>
+ <int key="NSPreferredEdge">1</int>
+ <bool key="NSUsesItemFromMenu">YES</bool>
+ <bool key="NSAltersState">YES</bool>
+ <int key="NSArrowPosition">2</int>
</object>
</object>
<object class="NSImageView" id="131271512">
@@ -4388,9 +4349,8 @@
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{26, 214}, {669, 23}}</string>
+ <string key="NSFrame">{{26.5, 214}, {669, 23}}</string>
<reference key="NSSuperview" ref="539474293"/>
- <reference key="NSNextKeyView" ref="346800534"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="982720237">
<int key="NSCellFlags">134217728</int>
@@ -4406,18 +4366,15 @@
</object>
<string key="NSFrame">{{0, 152}, {695, 237}}</string>
<reference key="NSSuperview" ref="727658473"/>
- <reference key="NSNextKeyView" ref="544395596"/>
<string key="NSClassName">NSView</string>
</object>
</object>
<string key="NSFrameSize">{695, 389}</string>
<reference key="NSSuperview" ref="940311190"/>
- <reference key="NSNextKeyView" ref="815597998"/>
</object>
</object>
<string key="NSFrameSize">{695, 391}</string>
<reference key="NSSuperview" ref="515194087"/>
- <reference key="NSNextKeyView" ref="727658473"/>
</object>
<object class="NSView" id="1028777476">
<reference key="NSNextResponder" ref="515194087"/>
@@ -4439,7 +4396,6 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{671, 72}</string>
<reference key="NSSuperview" ref="572051963"/>
- <reference key="NSNextKeyView" ref="195758564"/>
<object class="NSTextContainer" key="NSTextContainer" id="322143189">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -4558,7 +4514,6 @@
</object>
<string key="NSFrame">{{0.5, 0}, {671, 72}}</string>
<reference key="NSSuperview" ref="618407678"/>
- <reference key="NSNextKeyView" ref="714539623"/>
<reference key="NSDocView" ref="714539623"/>
<reference key="NSBGColor" ref="449903125"/>
<object class="NSCursor" key="NSCursor" id="32917531">
@@ -4724,7 +4679,6 @@ wGw</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{656, 1}, {15, 64}}</string>
<reference key="NSSuperview" ref="618407678"/>
- <reference key="NSNextKeyView" ref="492918519"/>
<reference key="NSTarget" ref="618407678"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.98496240377426147</double>
@@ -4734,7 +4688,6 @@ wGw</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="618407678"/>
- <reference key="NSNextKeyView" ref="572051963"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="618407678"/>
<string key="NSAction">_doScroller:</string>
@@ -4744,7 +4697,6 @@ wGw</bytes>
</object>
<string key="NSFrame">{{12, 12}, {671, 72}}</string>
<reference key="NSSuperview" ref="1028777476"/>
- <reference key="NSNextKeyView" ref="572051963"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="628306046"/>
<reference key="NSHScroller" ref="195758564"/>
@@ -4755,7 +4707,6 @@ wGw</bytes>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 91}, {363, 14}}</string>
<reference key="NSSuperview" ref="1028777476"/>
- <reference key="NSNextKeyView" ref="618407678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="679246699">
<int key="NSCellFlags">68157504</int>
@@ -4770,12 +4721,10 @@ wGw</bytes>
</object>
<string key="NSFrame">{{0, 392}, {695, 117}}</string>
<reference key="NSSuperview" ref="515194087"/>
- <reference key="NSNextKeyView" ref="951184307"/>
</object>
</object>
<string key="NSFrame">{{6, 33}, {695, 509}}</string>
<reference key="NSSuperview" ref="746504912"/>
- <reference key="NSNextKeyView" ref="940311190"/>
<int key="NSDividerStyle">2</int>
</object>
<object class="NSTextField" id="461846195">
@@ -4797,7 +4746,6 @@ wGw</bytes>
</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>
<reference key="NSColor" ref="62854682"/>
@@ -6594,12 +6542,10 @@ wGw</bytes>
</object>
<string key="NSFrame">{{215, 0}, {728, 549}}</string>
<reference key="NSSuperview" ref="162770193"/>
- <reference key="NSNextKeyView" ref="714795046"/>
</object>
</object>
<string key="NSFrameSize">{943, 549}</string>
<reference key="NSSuperview" ref="632807581"/>
- <reference key="NSNextKeyView" ref="1053680279"/>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
<string key="NSAutosaveName">DBViewSplitter</string>
@@ -6607,7 +6553,6 @@ wGw</bytes>
</object>
<string key="NSFrameSize">{943, 549}</string>
<reference key="NSSuperview"/>
- <reference key="NSNextKeyView" ref="162770193"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSWindowTemplate" id="554105051">
@@ -6960,7 +6905,7 @@ wGw</bytes>
<string key="NSWindowContentMaxSize">{650, 112}</string>
<string key="NSWindowContentMinSize">{292, 112}</string>
<object class="NSView" key="NSWindowView" id="1034135752">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7043,7 +6988,6 @@ wGw</bytes>
</object>
</object>
<string key="NSFrameSize">{314, 112}</string>
- <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMinSize">{292, 134}</string>
@@ -7269,7 +7213,7 @@ wGw</bytes>
<string key="NSWindowContentMaxSize">{600, 127}</string>
<string key="NSWindowContentMinSize">{260, 127}</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>
@@ -7373,7 +7317,6 @@ wGw</bytes>
</object>
</object>
<string key="NSFrameSize">{260, 127}</string>
- <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMinSize">{260, 149}</string>
@@ -8440,7 +8383,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSWindowContentMinSize">{360, 348}</string>
<object class="NSView" key="NSWindowView" id="729080358">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8717,29 +8660,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<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>
- <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">{318, 168}</string>
<reference key="NSSuperview" ref="1014021706"/>
<string key="NSReuseIdentifierKey">_NS:1498</string>
@@ -8807,7 +8727,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 1}, {318, 168}}</string>
<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"/>
@@ -8839,7 +8758,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{20, 45}, {320, 170}}</string>
<reference key="NSSuperview" ref="729080358"/>
- <reference key="NSNextKeyView" ref="1014021706"/>
<string key="NSReuseIdentifierKey">_NS:1494</string>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="164784175"/>
@@ -8848,7 +8766,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<string key="NSFrameSize">{360, 348}</string>
- <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMinSize">{360, 370}</string>
@@ -9072,6 +8989,7 @@ 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"/>
@@ -9101,6 +9019,7 @@ 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"/>
@@ -9313,6 +9232,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 1}, {411, 264}}</string>
<reference key="NSSuperview" ref="272021798"/>
+ <reference key="NSNextKeyView" ref="277018534"/>
<string key="NSReuseIdentifierKey">_NS:1496</string>
<reference key="NSDocView" ref="277018534"/>
<reference key="NSBGColor" ref="449903125"/>
@@ -9344,6 +9264,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{-1, 42}, {413, 266}}</string>
<reference key="NSSuperview" ref="749598685"/>
+ <reference key="NSNextKeyView" ref="648530676"/>
<string key="NSReuseIdentifierKey">_NS:1494</string>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="240381411"/>
@@ -9394,7 +9315,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">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -9403,7 +9324,6 @@ 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>
@@ -9430,7 +9350,6 @@ 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">
@@ -9482,7 +9401,6 @@ 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"/>
@@ -9494,7 +9412,6 @@ 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>
@@ -9505,7 +9422,6 @@ 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>
@@ -9515,7 +9431,6 @@ 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"/>
@@ -9527,7 +9442,6 @@ 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>
@@ -9549,7 +9463,6 @@ 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>
@@ -9568,8 +9481,6 @@ 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>
@@ -9999,7 +9910,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">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -10028,14 +9939,12 @@ 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">
@@ -10094,7 +10003,6 @@ 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"/>
@@ -10105,7 +10013,6 @@ 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>
@@ -10116,7 +10023,6 @@ 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>
@@ -10131,7 +10037,6 @@ 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"/>
@@ -10140,7 +10045,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</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"/>
@@ -10152,7 +10056,6 @@ 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">
@@ -10175,7 +10078,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{510, 91}</string>
<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">
@@ -10241,7 +10143,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<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"/>
@@ -10254,7 +10155,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">-2147483392</int>
<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>
@@ -10266,7 +10166,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">-2147483392</int>
<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="443961873"/>
@@ -10277,7 +10176,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{20, 20.5}, {512, 93}}</string>
<reference key="NSSuperview" ref="545289941"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="504446282"/>
<string key="NSReuseIdentifierKey">_NS:1494</string>
<int key="NSsFlags">133682</int>
@@ -10290,7 +10188,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<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>
@@ -10307,7 +10204,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<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>
@@ -10332,7 +10228,6 @@ 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>
@@ -10357,7 +10252,6 @@ 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>
@@ -10374,7 +10268,6 @@ 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>
@@ -10397,7 +10290,6 @@ 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>
@@ -10420,7 +10312,6 @@ 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>
@@ -10441,13 +10332,11 @@ 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">
@@ -10455,7 +10344,6 @@ 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>
@@ -10477,7 +10365,6 @@ 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>
@@ -10499,7 +10386,6 @@ 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>
@@ -10518,8 +10404,6 @@ 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>
@@ -11491,10 +11375,6 @@ 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">
@@ -15055,22 +14935,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="connectionID">7096</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">performClick:</string>
- <reference key="source" ref="1067429818"/>
- <reference key="destination" ref="851449724"/>
- </object>
- <int key="connectionID">7284</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">performClick:</string>
- <reference key="source" ref="768193117"/>
- <reference key="destination" ref="339454293"/>
- </object>
- <int key="connectionID">7286</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: values.QueryHistoryReplacesContent</string>
<reference key="source" ref="187254930"/>
@@ -15316,14 +15180,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">runSelectedQueries:</string>
- <reference key="source" ref="601471102"/>
- <reference key="destination" ref="768193117"/>
- </object>
- <int key="connectionID">7314</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">gearMenuItemSelected:</string>
<reference key="source" ref="601471102"/>
<reference key="destination" ref="390532841"/>
@@ -15404,14 +15260,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">runAllQueries:</string>
- <reference key="source" ref="601471102"/>
- <reference key="destination" ref="1067429818"/>
- </object>
- <int key="connectionID">7325</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">chooseQueryHistory:</string>
<reference key="source" ref="601471102"/>
<reference key="destination" ref="956647572"/>
@@ -15452,14 +15300,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">runAllButton</string>
- <reference key="source" ref="601471102"/>
- <reference key="destination" ref="1067429818"/>
- </object>
- <int key="connectionID">7342</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"/>
@@ -15476,30 +15316,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">runAllMenuItem</string>
- <reference key="source" ref="601471102"/>
- <reference key="destination" ref="851449724"/>
- </object>
- <int key="connectionID">7350</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">runSelectionMenuItem</string>
- <reference key="source" ref="601471102"/>
- <reference key="destination" ref="339454293"/>
- </object>
- <int key="connectionID">7351</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">runSelectionButton</string>
- <reference key="source" ref="601471102"/>
- <reference key="destination" ref="768193117"/>
- </object>
- <int key="connectionID">7352</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">queryFavoritesButton</string>
<reference key="source" ref="601471102"/>
<reference key="destination" ref="346800534"/>
@@ -16710,6 +16526,62 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<int key="connectionID">8228</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">runPrimaryQueryAction:</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="866600258"/>
+ </object>
+ <int key="connectionID">8237</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">runPrimaryActionButton</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="866600258"/>
+ </object>
+ <int key="connectionID">8238</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">runPrimaryQueryAction:</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="474806576"/>
+ </object>
+ <int key="connectionID">8239</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">runPrimaryActionMenuItem</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="474806576"/>
+ </object>
+ <int key="connectionID">8240</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">runSecondaryQueryAction:</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="421066916"/>
+ </object>
+ <int key="connectionID">8241</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">runSecondaryActionMenuItem</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="421066916"/>
+ </object>
+ <int key="connectionID">8242</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">switchDefaultQueryAction:</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="830358003"/>
+ </object>
+ <int key="connectionID">8243</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -20836,11 +20708,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="956647572"/>
<reference ref="346800534"/>
- <reference ref="1067429818"/>
<reference ref="544395596"/>
<reference ref="131271512"/>
<reference ref="808759882"/>
- <reference ref="768193117"/>
+ <reference ref="866600258"/>
</object>
<reference key="parent" ref="727658473"/>
</object>
@@ -20863,15 +20734,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="parent" ref="539474293"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7220</int>
- <reference key="object" ref="1067429818"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="230812569"/>
- </object>
- <reference key="parent" ref="539474293"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">7221</int>
<reference key="object" ref="544395596"/>
<object class="NSMutableArray" key="children">
@@ -20902,20 +20764,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="parent" ref="539474293"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7219</int>
- <reference key="object" ref="768193117"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="538725211"/>
- </object>
- <reference key="parent" ref="539474293"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7261</int>
- <reference key="object" ref="538725211"/>
- <reference key="parent" ref="768193117"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">7224</int>
<reference key="object" ref="7005793"/>
<object class="NSMutableArray" key="children">
@@ -20983,8 +20831,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference ref="137574969"/>
<reference ref="390532841"/>
<reference ref="11400907"/>
- <reference ref="299769724"/>
- <reference ref="851449724"/>
<reference ref="40537642"/>
<reference ref="1019660857"/>
<reference ref="218034896"/>
@@ -20994,7 +20840,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference ref="187254930"/>
<reference ref="955447048"/>
<reference ref="738645357"/>
- <reference ref="339454293"/>
</object>
<reference key="parent" ref="127119628"/>
</object>
@@ -21054,21 +20899,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="parent" ref="771730213"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7244</int>
- <reference key="object" ref="299769724"/>
- <reference key="parent" ref="771730213"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7245</int>
- <reference key="object" ref="339454293"/>
- <reference key="parent" ref="771730213"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7246</int>
- <reference key="object" ref="851449724"/>
- <reference key="parent" ref="771730213"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">7247</int>
<reference key="object" ref="40537642"/>
<reference key="parent" ref="771730213"/>
@@ -21144,11 +20974,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="parent" ref="213180477"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7260</int>
- <reference key="object" ref="230812569"/>
- <reference key="parent" ref="1067429818"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">7262</int>
<reference key="object" ref="620314745"/>
<object class="NSMutableArray" key="children">
@@ -23399,6 +23224,62 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="object" ref="87307329"/>
<reference key="parent" ref="4997736"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8229</int>
+ <reference key="object" ref="866600258"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="532678104"/>
+ </object>
+ <reference key="parent" ref="539474293"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8230</int>
+ <reference key="object" ref="532678104"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="628982892"/>
+ </object>
+ <reference key="parent" ref="866600258"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8231</int>
+ <reference key="object" ref="628982892"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="320607900"/>
+ <reference ref="421066916"/>
+ <reference ref="474806576"/>
+ <reference ref="830358003"/>
+ <reference ref="565650995"/>
+ </object>
+ <reference key="parent" ref="532678104"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8232</int>
+ <reference key="object" ref="320607900"/>
+ <reference key="parent" ref="628982892"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8233</int>
+ <reference key="object" ref="421066916"/>
+ <reference key="parent" ref="628982892"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8234</int>
+ <reference key="object" ref="474806576"/>
+ <reference key="parent" ref="628982892"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8235</int>
+ <reference key="object" ref="830358003"/>
+ <reference key="parent" ref="628982892"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8236</int>
+ <reference key="object" ref="565650995"/>
+ <reference key="parent" ref="628982892"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -24187,12 +24068,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>7217.IBPluginDependency</string>
<string>7218.IBAttributePlaceholdersKey</string>
<string>7218.IBPluginDependency</string>
- <string>7219.IBAttributePlaceholdersKey</string>
- <string>7219.IBPluginDependency</string>
- <string>7220.IBAttributePlaceholdersKey</string>
- <string>7220.IBPluginDependency</string>
<string>7221.IBPluginDependency</string>
<string>7222.IBPluginDependency</string>
+ <string>7222.IBViewBoundsToFrameTransform</string>
<string>7223.IBPluginDependency</string>
<string>7224.CustomClassName</string>
<string>7224.IBPluginDependency</string>
@@ -24206,6 +24084,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>7229.IBPluginDependency</string>
<string>7230.IBPluginDependency</string>
<string>7231.IBPluginDependency</string>
+ <string>7232.IBEditorWindowLastContentRect</string>
<string>7232.IBPluginDependency</string>
<string>7233.IBPluginDependency</string>
<string>7234.IBPluginDependency</string>
@@ -24220,9 +24099,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>7242.IBPluginDependency</string>
<string>7243.IBAttributePlaceholdersKey</string>
<string>7243.IBPluginDependency</string>
- <string>7244.IBPluginDependency</string>
- <string>7245.IBPluginDependency</string>
- <string>7246.IBPluginDependency</string>
<string>7247.IBPluginDependency</string>
<string>7248.IBPluginDependency</string>
<string>7249.IBPluginDependency</string>
@@ -24236,8 +24112,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>7257.IBPluginDependency</string>
<string>7258.IBPluginDependency</string>
<string>7259.IBPluginDependency</string>
- <string>7260.IBPluginDependency</string>
- <string>7261.IBPluginDependency</string>
<string>7262.IBPluginDependency</string>
<string>7263.IBPluginDependency</string>
<string>7264.IBPluginDependency</string>
@@ -24498,6 +24372,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>8217.IBPluginDependency</string>
<string>8218.CustomClassName</string>
<string>8218.IBPluginDependency</string>
+ <string>8229.CustomClassName</string>
+ <string>8229.IBPluginDependency</string>
+ <string>8229.IBViewBoundsToFrameTransform</string>
+ <string>8230.CustomClassName</string>
+ <string>8230.IBPluginDependency</string>
+ <string>8231.IBEditorWindowLastContentRect</string>
+ <string>8231.IBPluginDependency</string>
+ <string>8232.IBPluginDependency</string>
+ <string>8233.IBPluginDependency</string>
+ <string>8234.IBPluginDependency</string>
+ <string>8235.IBPluginDependency</string>
+ <string>8236.IBPluginDependency</string>
<string>858.IBPluginDependency</string>
<string>959.IBEditorWindowLastContentRect</string>
<string>959.IBPluginDependency</string>
@@ -25536,7 +25422,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{112, 296}, {943, 549}}</string>
+ <string>{{123, 307}, {943, 549}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -25580,26 +25466,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSMutableDictionary">
- <string key="NS.key.0">ToolTip</string>
- <object class="IBToolTipAttribute" key="NS.object.0">
- <string key="name">ToolTip</string>
- <reference key="object" ref="768193117"/>
- <string key="toolTip">Run the query that the text cursor is currently within, or the active selection (⌘R, Enter or fn-Return)</string>
- </object>
- </object>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSMutableDictionary">
- <string key="NS.key.0">ToolTip</string>
- <object class="IBToolTipAttribute" key="NS.object.0">
- <string key="name">ToolTip</string>
- <reference key="object" ref="1067429818"/>
- <string key="toolTip">Run all queries in the editor (⌥⌘R)</string>
- </object>
- </object>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AUHQAABDVgAAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>SPCopyTable</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -25613,6 +25484,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{325, 369}, {256, 330}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -25657,11 +25529,6 @@ 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>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>
<object class="IBToolTipAttribute" key="NS.object.0">
@@ -26076,6 +25943,20 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>SPTextView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>SPComboPopupButton</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDjIAAw2oAAA</bytes>
+ </object>
+ <string>SPComboPopupButtonCell</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{844, 616}, {180, 81}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{35, 544}, {405, 267}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -26105,7 +25986,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">8228</int>
+ <int key="maxID">8243</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -26359,6 +26240,30 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPComboPopupButton</string>
+ <string key="superclassName">NSPopUpButton</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">actionTarget</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">actionTarget</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">actionTarget</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="605229256">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPComboPopupButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPComboPopupButtonCell</string>
+ <string key="superclassName">NSPopUpButtonCell</string>
+ <reference key="sourceIdentifier" ref="605229256"/>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">SPCopyTable</string>
<string key="superclassName">SPTableView</string>
<object class="NSMutableDictionary" key="actions">
@@ -26432,12 +26337,15 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>helpSelectHelpTargetWeb:</string>
<string>helpTargetDispatcher:</string>
<string>runAllQueries:</string>
+ <string>runPrimaryQueryAction:</string>
+ <string>runSecondaryQueryAction:</string>
<string>runSelectedQueries:</string>
<string>saveQueryHistory:</string>
<string>showAutoHelpForCurrentWord:</string>
<string>showCompletionList:</string>
<string>showHelpForCurrentWord:</string>
<string>showHelpForSearchString:</string>
+ <string>switchDefaultQueryAction:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -26463,6 +26371,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -26485,12 +26396,15 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>helpSelectHelpTargetWeb:</string>
<string>helpTargetDispatcher:</string>
<string>runAllQueries:</string>
+ <string>runPrimaryQueryAction:</string>
+ <string>runSecondaryQueryAction:</string>
<string>runSelectedQueries:</string>
<string>saveQueryHistory:</string>
<string>showAutoHelpForCurrentWord:</string>
<string>showCompletionList:</string>
<string>showHelpForCurrentWord:</string>
<string>showHelpForSearchString:</string>
+ <string>switchDefaultQueryAction:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -26559,6 +26473,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">runPrimaryQueryAction:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">runSecondaryQueryAction:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">runSelectedQueries:</string>
<string key="candidateClassName">id</string>
</object>
@@ -26582,6 +26504,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="name">showHelpForSearchString:</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBActionInfo">
+ <string key="name">switchDefaultQueryAction:</string>
+ <string key="candidateClassName">id</string>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -26628,9 +26554,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>queryInfoButton</string>
<string>queryInfoPaneSplitView</string>
<string>runAllButton</string>
- <string>runAllMenuItem</string>
- <string>runSelectionButton</string>
- <string>runSelectionMenuItem</string>
+ <string>runPrimaryActionButton</string>
+ <string>runPrimaryActionButtonAsSelection</string>
+ <string>runPrimaryActionMenuItem</string>
+ <string>runSecondaryActionMenuItem</string>
<string>saveHistoryMenuItem</string>
<string>saveQueryFavoriteButton</string>
<string>saveQueryFavoriteGlobal</string>
@@ -26684,10 +26611,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>NSButton</string>
<string>SPSplitView</string>
<string>id</string>
- <string>NSMenuItem</string>
+ <string>id</string>
<string>id</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
+ <string>NSMenuItem</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSMenuItem</string>
@@ -26743,9 +26671,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>queryInfoButton</string>
<string>queryInfoPaneSplitView</string>
<string>runAllButton</string>
- <string>runAllMenuItem</string>
- <string>runSelectionButton</string>
- <string>runSelectionMenuItem</string>
+ <string>runPrimaryActionButton</string>
+ <string>runPrimaryActionButtonAsSelection</string>
+ <string>runPrimaryActionMenuItem</string>
+ <string>runSecondaryActionMenuItem</string>
<string>saveHistoryMenuItem</string>
<string>saveQueryFavoriteButton</string>
<string>saveQueryFavoriteGlobal</string>
@@ -26920,15 +26849,19 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
- <string key="name">runAllMenuItem</string>
- <string key="candidateClassName">NSMenuItem</string>
+ <string key="name">runPrimaryActionButton</string>
+ <string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
- <string key="name">runSelectionButton</string>
+ <string key="name">runPrimaryActionButtonAsSelection</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
- <string key="name">runSelectionMenuItem</string>
+ <string key="name">runPrimaryActionMenuItem</string>
+ <string key="candidateClassName">NSMenuItem</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">runSecondaryActionMenuItem</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
diff --git a/Resources/English.lproj/DBView.strings b/Resources/English.lproj/DBView.strings
index 1bc35872..46f49499 100644
--- a/Resources/English.lproj/DBView.strings
+++ b/Resources/English.lproj/DBView.strings
Binary files differ
diff --git a/Resources/English.lproj/MainMenu.strings b/Resources/English.lproj/MainMenu.strings
index b7022582..2b7a388f 100644
--- a/Resources/English.lproj/MainMenu.strings
+++ b/Resources/English.lproj/MainMenu.strings
Binary files differ
diff --git a/Resources/Plists/PreferenceDefaults.plist b/Resources/Plists/PreferenceDefaults.plist
index c77ec08e..3fb262e4 100644
--- a/Resources/Plists/PreferenceDefaults.plist
+++ b/Resources/Plists/PreferenceDefaults.plist
@@ -157,6 +157,8 @@
<false/>
<key>QueryHistoryReplacesContent</key>
<false/>
+ <key>QueryPrimaryControlRunsAll</key>
+ <false/>
<key>QuickLookTypes</key>
<array/>
<key>ReloadAfterAddingRow</key>
diff --git a/Source/SPComboPopupButton.h b/Source/SPComboPopupButton.h
new file mode 100644
index 00000000..f6514e05
--- /dev/null
+++ b/Source/SPComboPopupButton.h
@@ -0,0 +1,52 @@
+//
+// $Id$
+//
+// SPComboPopupButton.h
+// sequel-pro
+//
+// Created by Rowan Beentje (rowan.beent.je) on March 22, 2013
+// Copyright (c) 2013 Rowan Beentje. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// More info at <http://code.google.com/p/sequel-pro/>
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface SPComboPopupButton : NSPopUpButton {
+ BOOL menuIsOpen;
+ BOOL shouldDrawNonHighlightState;
+ NSUInteger lineOffset;
+
+ SEL actionSelector;
+ id actionTarget;
+}
+
+@property(readonly, assign) BOOL shouldDrawNonHighlightState;
+@property(readonly, assign) NSUInteger lineOffset;
+
+@end
+
+@interface SPComboPopupButtonCell : NSPopUpButtonCell
+
+@end
diff --git a/Source/SPComboPopupButton.m b/Source/SPComboPopupButton.m
new file mode 100644
index 00000000..9ee71084
--- /dev/null
+++ b/Source/SPComboPopupButton.m
@@ -0,0 +1,312 @@
+//
+// $Id$
+//
+// SPComboPopupButton.m
+// sequel-pro
+//
+// Created by Rowan Beentje (rowan.beent.je) on March 22, 2013
+// Copyright (c) 2013 Rowan Beentje. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// More info at <http://code.google.com/p/sequel-pro/>
+
+#import "SPComboPopupButton.h"
+
+#define kSPComboPopupButtonLineOffsetMini 13;
+#define kSPComboPopupButtonLineOffsetSmall 15;
+#define kSPComboPopupButtonLineOffsetRegular 17;
+
+@interface SPComboPopupButton (PrivateAPI)
+
+- (void)_initCustomData;
+
+@end
+
+@implementation SPComboPopupButton
+
+@synthesize shouldDrawNonHighlightState;
+@synthesize lineOffset;
+
+#pragma mark -
+#pragma mark Setup
+
+- (id)initWithCoder:(NSCoder *)decoder
+{
+ if ((self = [super initWithCoder:decoder])) {
+ [self _initCustomData];
+ }
+ return self;
+}
+
+- (id)initWithFrame:(NSRect)frameRect pullsDown:(BOOL)flag
+{
+ if ((self = [super initWithFrame:frameRect pullsDown:flag])) {
+ [self _initCustomData];
+ }
+ return self;
+}
+
+/**
+ * Default to the overridden class. Note that this won't apply to instanced
+ * created in a xib, where the cell class should be selected appropriately.
+ */
++ (Class)cellClass
+{
+ return [SPComboPopupButtonCell class];
+}
+
+#pragma mark -
+#pragma mark Drawing
+
+/**
+ * Draw the control, largely leveraging NSPopupButton drawing but with tweaks
+ * to draw a separator line and different highlights if the dropdown area is
+ * selected.
+ */
+- (void)drawRect:(NSRect)dirtyRect
+{
+ NSRect boundsRect = [self bounds];
+ CGFloat boundingLinePosition = boundsRect.origin.x + boundsRect.size.width - lineOffset - 0.5;
+ CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+ CGFloat heightIndent = ([self isFlipped] ? 4.f : -4.f);
+
+ // Allow the NSPopupButton to draw the majority of the button, with one exception:
+ // if the menu is open, only draw part of the rectangle highlighted.
+ if (menuIsOpen) {
+
+ // Draw the unhighlighted button state in the left-hand part of the button
+ NSRect partialDirtyRect = NSIntersectionRect(dirtyRect, NSMakeRect(boundsRect.origin.x, boundsRect.origin.y, boundingLinePosition - boundsRect.origin.x, boundsRect.size.height));
+ if (!NSIsEmptyRect(partialDirtyRect)) {
+ CGContextSaveGState(context);
+ CGContextClipToRect(context, NSRectToCGRect(partialDirtyRect));
+ shouldDrawNonHighlightState = YES;
+ [super drawRect:partialDirtyRect];
+ shouldDrawNonHighlightState = NO;
+ CGContextRestoreGState(context);
+ }
+
+ // Draw the right-hand side of the button as normal
+ partialDirtyRect = NSIntersectionRect(dirtyRect, NSMakeRect(boundingLinePosition - 0.5, boundsRect.origin.y, boundsRect.origin.x + boundsRect.size.width + 0.5 - boundingLinePosition, boundsRect.size.height));
+ if (!NSIsEmptyRect(partialDirtyRect)) {
+ CGContextSaveGState(context);
+ CGContextClipToRect(context, NSRectToCGRect(partialDirtyRect));
+ [super drawRect:dirtyRect];
+ CGContextRestoreGState(context);
+ }
+ } else {
+ [super drawRect:dirtyRect];
+ }
+
+ // Draw the divider line for the two parts of the button
+ NSColor *lineBaseColor = [[NSColor lightGrayColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
+ CGFloat lineColorParts[[lineBaseColor numberOfComponents]];
+ CGColorSpaceRef rgbSpace = CGColorSpaceCreateDeviceRGB();
+ [lineBaseColor getComponents:(CGFloat *)&lineColorParts];
+ CGColorRef lineColor = CGColorCreate(rgbSpace, lineColorParts);
+ CGColorRef lineEdgeColor = CGColorCreateCopyWithAlpha(lineColor, 0.1);
+ CGColorRef gradientColors[] = { lineEdgeColor, lineColor, lineColor, lineEdgeColor };
+ CFArrayRef colorArray = CFArrayCreate(NULL, (const void **)gradientColors, 4, &kCFTypeArrayCallBacks);
+ CGFloat gradientPositions[] = { 0.05, 0.25, 0.75, 0.95 };
+ CGGradientRef lineGradient = CGGradientCreateWithColors(rgbSpace, colorArray, gradientPositions);
+
+ CGContextSaveGState(context);
+ CGContextSetStrokeColor(context, lineColorParts);
+ CGContextAddRect(context, CGRectMake(boundingLinePosition - 0.5, boundsRect.origin.y + heightIndent, 1.f, boundsRect.size.height - abs(2 * heightIndent)));
+ CGContextClip(context);
+ CGContextDrawLinearGradient(context, lineGradient, CGPointMake(boundingLinePosition - 0.5, boundsRect.origin.y + heightIndent), CGPointMake(boundingLinePosition - 0.5, boundsRect.origin.y + boundsRect.size.height - abs(heightIndent)), 0);
+ CGContextRestoreGState(context);
+
+ CGGradientRelease(lineGradient);
+ CFRelease(colorArray);
+ CGColorRelease(lineEdgeColor);
+ CGColorRelease(lineColor);
+ CGColorSpaceRelease(rgbSpace);
+}
+
+#pragma mark -
+#pragma mark Click action overrides
+
+- (void)performClick:(id)sender
+{
+ if (actionSelector && actionTarget) {
+ [self sendAction:actionSelector to:actionTarget];
+ }
+}
+
+- (id)target
+{
+ return actionTarget;
+}
+
+- (void)setTarget:(id)anObject
+{
+ actionTarget = anObject;
+}
+
+- (SEL)action
+{
+ return actionSelector;
+}
+
+- (void)setAction:(SEL)aSelector
+{
+ actionSelector = aSelector;
+}
+
+#pragma mark -
+#pragma mark Menu delegate implementation
+
+- (void)menuWillOpen:(NSMenu *)menu
+{
+ menuIsOpen = YES;
+}
+
+- (void)menuDidClose:(NSMenu *)menu
+{
+ menuIsOpen = NO;
+}
+
+@end
+
+#pragma mark -
+
+@implementation SPComboPopupButton (PrivateAPI)
+
+- (void)_initCustomData
+{
+
+ // Set the line position based on the initial control size
+ switch ([[self cell] controlSize]) {
+ case NSMiniControlSize:
+ lineOffset = kSPComboPopupButtonLineOffsetMini;
+ break;
+ case NSSmallControlSize:
+ lineOffset = kSPComboPopupButtonLineOffsetSmall;
+ break;
+ default:
+ lineOffset = kSPComboPopupButtonLineOffsetRegular;
+ break;
+ }
+
+ // Track when the menu is open via delegate methods
+ menuIsOpen = NO;
+ [[[self cell] menu] setDelegate:self];
+
+ // Move any xib-specified action and target for use as the button target
+ actionSelector = [super action];
+ [super setAction:NULL];
+ actionTarget = [super target];
+ [super setTarget:nil];
+}
+
+@end
+
+#pragma mark -
+
+@interface SPComboPopupButtonCell (PrivateAPI)
+
+- (void)_initCustomData;
+
+@end
+
+@implementation SPComboPopupButtonCell
+
+/**
+ * Indent the title slightly to take account of the additional divider
+ */
+- (NSRect)drawTitle:(NSAttributedString *)title withFrame:(NSRect)frame inView:(NSView *)controlView
+{
+ frame.size.width -= 1;
+ return [super drawTitle:title withFrame:frame inView:controlView];
+}
+
+/**
+ * Allow the button to overwrite the draw status as required
+ */
+- (BOOL)isHighlighted
+{
+ if ([(SPComboPopupButton *)[self controlView] shouldDrawNonHighlightState]) {
+ return NO;
+ }
+ return [super isHighlighted];
+}
+
+#pragma mark -
+#pragma mark Custom interaction handling
+
+- (BOOL)trackMouse:(NSEvent *)theEvent inRect:(NSRect)cellFrame ofView:(NSView *)controlView untilMouseUp:(BOOL)untilMouseUp
+{
+ NSPoint thePoint;
+ NSRect activeRect;
+ CGFloat heightIndent = ([controlView isFlipped] ? 2.f : -2.f);
+ BOOL mouseInButton = YES;
+ BOOL trackAsPerMenuButton = NO;
+
+ // If the event isn't a mouse button event, allow the NSPopUpButtonCell to handle it
+ if ([theEvent type] != NSLeftMouseDown) {
+ trackAsPerMenuButton = YES;
+ }
+
+ // If the view doesn't support line position checks, pass on the event
+ else if (![controlView respondsToSelector:@selector(lineOffset)]) {
+ trackAsPerMenuButton = YES;
+ }
+
+ // If the click is to the right of the line, show the menu
+ else if ([controlView convertPoint:theEvent.locationInWindow fromView:nil].x + [(SPComboPopupButton *)controlView lineOffset] >= [controlView frame].size.width) {
+ trackAsPerMenuButton = YES;
+ }
+
+ if (trackAsPerMenuButton) {
+ return [super trackMouse:theEvent inRect:cellFrame ofView:controlView untilMouseUp:untilMouseUp];
+ }
+
+
+ // Custom tracking to be performed - indent the vertical button area slightly
+ activeRect = NSMakeRect(cellFrame.origin.x, cellFrame.origin.y + heightIndent, cellFrame.size.width - [(SPComboPopupButton *)controlView lineOffset] + 1, cellFrame.size.height - fabsf(2 * heightIndent));
+
+ // Continue tracking the mouse while it's down, updating the state as it enters and leaves the cell,
+ // until it is released; if still within the cell, perform a click.
+ while ([theEvent type] != NSLeftMouseUp) {
+ thePoint = [controlView convertPoint:[theEvent locationInWindow] fromView:nil];
+
+ if (NSMouseInRect(thePoint, activeRect, [controlView isFlipped]) != mouseInButton) {
+ mouseInButton = !mouseInButton;
+ [self setHighlighted:mouseInButton];
+ }
+
+ theEvent = [[controlView window] nextEventMatchingMask:(NSLeftMouseUpMask | NSLeftMouseDraggedMask)];
+ }
+
+ // If the mouse is still inside the button area, perform a click action and restore state
+ if (mouseInButton) {
+ if ([controlView respondsToSelector:@selector(performClick:)]) {
+ [(NSControl *)controlView performClick:self];
+ }
+ [self setHighlighted:NO];
+ }
+
+ return YES;
+}
+
+@end
diff --git a/Source/SPConstants.h b/Source/SPConstants.h
index c321d1fa..b353b2dc 100644
--- a/Source/SPConstants.h
+++ b/Source/SPConstants.h
@@ -406,6 +406,7 @@ extern NSString *SPQueryFavorites;
extern NSString *SPQueryFavoriteReplacesContent;
extern NSString *SPQueryHistory;
extern NSString *SPQueryHistoryReplacesContent;
+extern NSString *SPQueryPrimaryControlRunsAll;
extern NSString *SPQuickLookTypes;
extern NSString *SPTableChangedNotification;
extern NSString *SPTableInfoChangedNotification;
diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index 74468d5a..3204b8b8 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -212,6 +212,7 @@ NSString *SPQueryFavorites = @"queryFavorites";
NSString *SPQueryFavoriteReplacesContent = @"QueryFavoriteReplacesContent";
NSString *SPQueryHistory = @"queryHistory";
NSString *SPQueryHistoryReplacesContent = @"QueryHistoryReplacesContent";
+NSString *SPQueryPrimaryControlRunsAll = @"QueryPrimaryControlRunsAll";
NSString *SPQuickLookTypes = @"QuickLookTypes";
NSString *SPTableChangedNotification = @"SPTableSelectionChanged";
NSString *SPTableInfoChangedNotification = @"SPTableInformationChanged";
diff --git a/Source/SPCustomQuery.h b/Source/SPCustomQuery.h
index 982b2059..ffca796b 100644
--- a/Source/SPCustomQuery.h
+++ b/Source/SPCustomQuery.h
@@ -95,11 +95,16 @@
IBOutlet id affectedRowsText;
IBOutlet id valueSheet;
IBOutlet id valueTextField;
- IBOutlet id runSelectionButton;
+
+ // Hooks for old layouts using just the Run All button
IBOutlet id runAllButton;
- IBOutlet NSMenuItem *runSelectionMenuItem;
- IBOutlet NSMenuItem *runAllMenuItem;
+ // Hooks for layouts using the new single button with interchangeable actions
+ IBOutlet id runPrimaryActionButton;
+ IBOutlet id runPrimaryActionButtonAsSelection;
+ IBOutlet NSMenuItem *runPrimaryActionMenuItem;
+ IBOutlet NSMenuItem *runSecondaryActionMenuItem;
+
IBOutlet NSMenuItem *shiftLeftMenuItem;
IBOutlet NSMenuItem *shiftRightMenuItem;
IBOutlet NSMenuItem *completionListMenuItem;
@@ -136,8 +141,8 @@
NSString *usedQuery;
NSRange currentQueryRange;
NSArray *currentQueryRanges;
+ BOOL currentQueryBeforeCaret;
- BOOL selectionButtonCanBeEnabled;
NSString *mySQLversion;
NSTableColumn *sortColumn;
@@ -191,13 +196,16 @@
@property (assign) SPTablesList* tablesListInstance;
@property (assign) SPTextView *textView;
@property (assign) SPCopyTable *customQueryView;
-@property (assign) NSButton* runAllButton;
@property (assign) id affectedRowsText;
#endif
-@property(assign) BOOL textViewWasChanged;
+@property (assign) NSButton* runAllButton;
+@property (assign) BOOL textViewWasChanged;
// IBAction methods
+- (IBAction)runPrimaryQueryAction:(id)sender;
+- (IBAction)runSecondaryQueryAction:(id)sender;
+- (IBAction)switchDefaultQueryAction:(id)sender;
- (IBAction)runAllQueries:(id)sender;
- (IBAction)runSelectedQueries:(id)sender;
- (IBAction)chooseQueryFavorite:(id)sender;
@@ -230,6 +238,10 @@
- (NSRange)queryTextRangeForQuery:(NSInteger)anIndex startPosition:(NSUInteger)position;
- (void)updateStatusInterfaceWithDetails:(NSDictionary *)errorDetails;
+// Interface setup
+- (void)updateQueryInteractionInterface;
+- (void)updateContextualRunInterface;
+
// Query load actions
- (void)initQueryLoadTimer;
- (void)clearQueryLoadTimer;
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index 38224eec..b5a99a37 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -58,6 +58,7 @@
#import "SPTextView.h"
#import "RegexKitLite.h"
#import "SPThreadAdditions.h"
+#import "SPConstants.h"
#ifndef SP_REFACTOR /* headers */
#import "SPAppController.h"
#import "SPBundleHTMLOutputController.h"
@@ -79,16 +80,50 @@
#ifdef SP_REFACTOR
@synthesize textView;
@synthesize customQueryView;
-@synthesize runAllButton;
@synthesize tableDocumentInstance;
@synthesize tablesListInstance;
@synthesize affectedRowsText;
#endif
+@synthesize runAllButton;
@synthesize textViewWasChanged;
#pragma mark IBAction methods
+/**
+ * Run the primary query task, as per the user preference
+ */
+- (IBAction)runPrimaryQueryAction:(id)sender
+{
+ if ([prefs boolForKey:SPQueryPrimaryControlRunsAll]) {
+ [self runAllQueries:sender];
+ } else {
+ [self runSelectedQueries:sender];
+ }
+}
+
+/**
+ * Run the secondary query task, as per the user preference
+ */
+- (IBAction)runSecondaryQueryAction:(id)sender
+{
+ if ([prefs boolForKey:SPQueryPrimaryControlRunsAll]) {
+ [self runSelectedQueries:sender];
+ } else {
+ [self runAllQueries:sender];
+ }
+}
+
+/**
+ * Swap the primary and secondary query run actions
+ */
+- (IBAction)switchDefaultQueryAction:(id)sender
+{
+ BOOL newValue = ![prefs boolForKey:SPQueryPrimaryControlRunsAll];
+ [prefs setBool:newValue forKey:SPQueryPrimaryControlRunsAll];
+ [self updateQueryInteractionInterface];
+}
+
/*
* Split all the queries in the text view, split them into individual queries,
* and run sequentially.
@@ -1355,6 +1390,67 @@
}
#pragma mark -
+#pragma mark Interface setup
+
+/**
+ * Update the Run Selection/Query/All button and menu item state according
+ * to the user preferences.
+ */
+- (void)updateQueryInteractionInterface
+{
+
+ // By default, the interface uses Run Query/Run Selection as the primary interface,
+ // but the user can switch this.
+ BOOL primaryActionIsRunAll = [prefs boolForKey:SPQueryPrimaryControlRunsAll];
+
+ // Update the links as appropriate
+ if (primaryActionIsRunAll) {
+ runPrimaryActionButtonAsSelection = nil;
+ [runPrimaryActionButton setTitle:NSLocalizedString(@"Run All", @"run all button")];
+ [runPrimaryActionMenuItem setTitle:NSLocalizedString(@"Run All Queries", @"Run All menu item title")];
+ } else {
+ runPrimaryActionButtonAsSelection = runPrimaryActionButton;
+ [runSecondaryActionMenuItem setTitle:NSLocalizedString(@"Run All Queries", @"Run All menu item title")];
+ }
+
+ // Update the Run Current/Previous/Selection menu item (and button if appropriate)
+ [self updateContextualRunInterface];
+}
+
+/**
+ * Update the selection-sensitive "Run Current" / "Run Previous" / "Run Selection"
+ * button and menu items based on the current interface state
+ */
+- (void)updateContextualRunInterface
+{
+ NSMenuItem *runSelectionMenuItem;
+
+ // Determine the menu item to change
+ if (runPrimaryActionButtonAsSelection) {
+ runSelectionMenuItem = runPrimaryActionMenuItem;
+ } else {
+ runSelectionMenuItem = runSecondaryActionMenuItem;
+ }
+
+ // If the current selection is a single caret position, update the button based on
+ // whether the caret is inside a valid query.
+ if (![textView selectedRange].length) {
+ if (currentQueryBeforeCaret) {
+ [runPrimaryActionButtonAsSelection setTitle:NSLocalizedString(@"Run Previous", @"Title of button to run query just before text caret in custom query view")];
+ [runSelectionMenuItem setTitle:NSLocalizedString(@"Run Previous Query", @"Title of action menu item to run query just before text caret in custom query view")];
+ } else {
+ [runPrimaryActionButtonAsSelection setTitle:NSLocalizedString(@"Run Current", @"Title of button to run current query in custom query view")];
+ [runSelectionMenuItem setTitle:NSLocalizedString(@"Run Current Query", @"Title of action menu item to run current query in custom query view")];
+ }
+
+ // Otherwise, reflect the active selection
+ } else {
+ [runPrimaryActionButtonAsSelection setTitle:NSLocalizedString(@"Run Selection", @"Title of button to run selected text in custom query view")];
+ [runSelectionMenuItem setTitle:NSLocalizedString(@"Run Selected Text", @"Title of action menu item to run selected text in custom query view")];
+ }
+}
+
+#pragma mark -
#pragma mark Table load actions
/**
@@ -1520,9 +1616,6 @@
// Populate query favorites
[self queryFavoritesHaveBeenUpdated:nil];
#endif
-
- // Disable runSelectionMenuItem in the gear menu
- [runSelectionMenuItem setEnabled:NO];
}
/**
@@ -2594,7 +2687,7 @@
if (aTextView == textView) {
if ([aTextView methodForSelector:aSelector] == [aTextView methodForSelector:@selector(insertNewline:)] &&
[[[NSApp currentEvent] characters] isEqualToString:@"\003"]) {
- [self runAllQueries:self];
+ [self runPrimaryQueryAction:self];
return YES;
}
@@ -2637,69 +2730,37 @@
// Ensure that the notification is from the custom query text view
if ( [aNotification object] != textView ) return;
- BOOL isLookBehind = YES;
NSRange currentSelection = [textView selectedRange];
NSUInteger caretPosition = currentSelection.location;
- NSRange qRange = [self queryRangeAtPosition:caretPosition lookBehind:&isLookBehind];
+ // Detect the current query range, allowing the search to occur if the caret is after
+ // a semicolon
+ currentQueryBeforeCaret = YES;
+ currentQueryRange = [self queryRangeAtPosition:caretPosition lookBehind:&currentQueryBeforeCaret];
- if(qRange.length)
- currentQueryRange = qRange;
- else
- currentQueryRange = NSMakeRange(0, 0);
-
- [textView setQueryRange:qRange];
+ [textView setQueryRange:currentQueryRange];
[textView setNeedsDisplayInRect:[textView bounds]];
- // disable "Comment Current Query" menu item if no current query is selectable
- [commentCurrentQueryMenuItem setEnabled:(currentQueryRange.length) ? YES : NO];
-
- // If no text is selected, disable the button and action menu.
- if ( caretPosition == NSNotFound ) {
- selectionButtonCanBeEnabled = NO;
- [runSelectionButton setEnabled:NO];
- [runSelectionMenuItem setEnabled:NO];
- return;
+ // If a query range is selected, update the current query range and menu actions
+ if (currentQueryRange.length) {
+ [commentCurrentQueryMenuItem setEnabled:YES];
+ } else {
+ currentQueryRange = NSMakeRange(0, 0);
+ [commentCurrentQueryMenuItem setEnabled:NO];
}
- // If the current selection is a single caret position, update the button based on
- // whether the caret is inside a valid query.
- if (!currentSelection.length) {
- [runSelectionButton setTitle:NSLocalizedString(@"Run Current", @"Title of button to run current query in custom query view")];
- [runSelectionMenuItem setTitle:NSLocalizedString(@"Run Current Query", @"Title of action menu item to run current query in custom query view")];
-
- // If a valid query is present at the cursor position, enable the button
- if (qRange.length) {
- if (isLookBehind) {
- [runSelectionButton setTitle:NSLocalizedString(@"Run Previous", @"Title of button to run query just before text caret in custom query view")];
- [runSelectionMenuItem setTitle:NSLocalizedString(@"Run Previous Query", @"Title of action menu item to run query just before text caret in custom query view")];
- }
- selectionButtonCanBeEnabled = YES;
- if (![tableDocumentInstance isWorking]) {
- [runSelectionButton setEnabled:YES];
- [runSelectionMenuItem setEnabled:YES];
- }
- } else {
- selectionButtonCanBeEnabled = NO;
- [runSelectionButton setEnabled:NO];
- [runSelectionMenuItem setEnabled:NO];
- }
- [commentLineOrSelectionMenuItem setTitle:NSLocalizedString(@"Comment Line", @"Title of action menu item to comment line")];
-
- // For selection ranges, enable the button.
- } else {
- selectionButtonCanBeEnabled = YES;
- [runSelectionButton setTitle:NSLocalizedString(@"Run Selection", @"Title of button to run selected text in custom query view")];
- [runSelectionMenuItem setTitle:NSLocalizedString(@"Run Selected Text", @"Title of action menu item to run selected text in custom query view")];
+ // Vary the comment/line selection menu item according to whether a section is present
+ if (currentSelection.length) {
[commentLineOrSelectionMenuItem setTitle:NSLocalizedString(@"Comment Selection", @"Title of action menu item to comment selection")];
- if (![tableDocumentInstance isWorking]) {
- [runSelectionButton setEnabled:YES];
- [runSelectionMenuItem setEnabled:YES];
- }
+ } else {
+ [commentLineOrSelectionMenuItem setTitle:NSLocalizedString(@"Comment Line", @"Title of action menu item to comment line")];
}
- if(!historyItemWasJustInserted)
+ if (!historyItemWasJustInserted)
currentHistoryOffsetIndex = -1;
+
+ // Update the text of the contextual run current/previous/selection button and menu item
+ [self updateContextualRunInterface];
}
#pragma mark -
@@ -3391,10 +3452,10 @@
#endif
tableRowsSelectable = NO;
- [runSelectionButton setEnabled:NO];
- [runSelectionMenuItem setEnabled:NO];
[runAllButton setEnabled:NO];
- [runAllMenuItem setEnabled:NO];
+ [runPrimaryActionButton setEnabled:NO];
+ [runPrimaryActionMenuItem setEnabled:NO];
+ [runSecondaryActionMenuItem setEnabled:NO];
}
/**
@@ -3410,13 +3471,11 @@
return;
#endif
- if (selectionButtonCanBeEnabled) {
- [runSelectionButton setEnabled:YES];
- [runSelectionMenuItem setEnabled:YES];
- }
tableRowsSelectable = YES;
[runAllButton setEnabled:YES];
- [runAllMenuItem setEnabled:YES];
+ [runPrimaryActionButton setEnabled:YES];
+ [runPrimaryActionMenuItem setEnabled:YES];
+ [runSecondaryActionMenuItem setEnabled:YES];
}
#pragma mark -
@@ -3656,7 +3715,6 @@
sortField = nil;
isDesc = NO;
sortColumn = nil;
- selectionButtonCanBeEnabled = NO;
isFieldEditable = NO;
cqColumnDefinition = nil;
favoritesManager = nil;
@@ -3692,6 +3750,9 @@
currentHistoryOffsetIndex = -1;
historyItemWasJustInserted = NO;
+ currentQueryRange = NSMakeRange(0, 0);
+ currentQueryBeforeCaret = NO;
+ runPrimaryActionButtonAsSelection = nil;
queryLoadTimer = nil;
@@ -3866,6 +3927,7 @@
{
[customQueryView setFieldEditorSelectedRange:NSMakeRange(0,0)];
+ [self updateQueryInteractionInterface];
// Set pre-defined menu tags
[queryFavoritesSaveAsMenuItem setTag:SP_SAVE_SELECTION_FAVORTITE_MENUITEM_TAG];
diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m
index 11d6aeac..fcbc7d13 100644
--- a/Source/SPTableStructure.m
+++ b/Source/SPTableStructure.m
@@ -46,6 +46,7 @@
#import "SPTableFieldValidation.h"
#import "SPTableStructureLoading.h"
#import "SPThreadAdditions.h"
+#import "SPServerSupport.h"
#import <SPMySQL/SPMySQL.h>
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index d0d6884e..68dd9c63 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -330,6 +330,7 @@
58CDB3410FCE141900F8ACA3 /* SequelProTunnelAssistant.m in Sources */ = {isa = PBXBuildFile; fileRef = 58CDB3310FCE139C00F8ACA3 /* SequelProTunnelAssistant.m */; };
58CDB3420FCE142500F8ACA3 /* SPKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641740EF01F80001BC333 /* SPKeychain.m */; };
58D29FE016E96306002EB401 /* SPUserManagerDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 58D29FDF16E96306002EB401 /* SPUserManagerDataSource.m */; };
+ 58D2A6A716FBDEFF002EB401 /* SPComboPopupButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 58D2A6A616FBDEFF002EB401 /* SPComboPopupButton.m */; };
58D2E229101222670063EF1D /* SPTextAndLinkCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 58D2E227101222670063EF1D /* SPTextAndLinkCell.m */; };
58D2E22E101222870063EF1D /* link-arrow-clicked.png in Resources */ = {isa = PBXBuildFile; fileRef = 58D2E22B101222870063EF1D /* link-arrow-clicked.png */; };
58D2E22F101222870063EF1D /* link-arrow-highlighted-clicked.png in Resources */ = {isa = PBXBuildFile; fileRef = 58D2E22C101222870063EF1D /* link-arrow-highlighted-clicked.png */; };
@@ -1078,6 +1079,8 @@
58CDB3360FCE13C900F8ACA3 /* SequelProTunnelAssistant */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SequelProTunnelAssistant; sourceTree = BUILT_PRODUCTS_DIR; };
58D29FDE16E96306002EB401 /* SPUserManagerDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUserManagerDataSource.h; sourceTree = "<group>"; };
58D29FDF16E96306002EB401 /* SPUserManagerDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUserManagerDataSource.m; sourceTree = "<group>"; };
+ 58D2A6A516FBDEFF002EB401 /* SPComboPopupButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPComboPopupButton.h; sourceTree = "<group>"; };
+ 58D2A6A616FBDEFF002EB401 /* SPComboPopupButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPComboPopupButton.m; sourceTree = "<group>"; };
58D2E227101222670063EF1D /* SPTextAndLinkCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTextAndLinkCell.m; sourceTree = "<group>"; };
58D2E228101222670063EF1D /* SPTextAndLinkCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTextAndLinkCell.h; sourceTree = "<group>"; };
58D2E22B101222870063EF1D /* link-arrow-clicked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "link-arrow-clicked.png"; sourceTree = "<group>"; };
@@ -2229,6 +2232,8 @@
children = (
17FDB04A1280778B00DBBBC2 /* SPFontPreviewTextField.h */,
17FDB04B1280778B00DBBBC2 /* SPFontPreviewTextField.m */,
+ 58D2A6A516FBDEFF002EB401 /* SPComboPopupButton.h */,
+ 58D2A6A616FBDEFF002EB401 /* SPComboPopupButton.m */,
);
name = Controls;
sourceTree = "<group>";
@@ -3225,6 +3230,7 @@
171B374115DA654300EBC7AB /* SPTableContentFilter.m in Sources */,
5843E247162B555B00EAA6D1 /* SPThreadAdditions.m in Sources */,
58D29FE016E96306002EB401 /* SPUserManagerDataSource.m in Sources */,
+ 58D2A6A716FBDEFF002EB401 /* SPComboPopupButton.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:23:02 +0000