From eb0801ac5dc2807169905c1f402215814bcf8dec Mon Sep 17 00:00:00 2001
From: rowanbeentje <rowan@beent.je>
Date: Sun, 28 Apr 2013 21:59:13 +0000
Subject: 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

---
 Interfaces/English.lproj/DBView.xib | 681 ++++++++++++++++--------------------
 1 file changed, 307 insertions(+), 374 deletions(-)

(limited to 'Interfaces')

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">
@@ -15054,22 +14934,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
           </object>
           <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>
@@ -15314,14 +15178,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
           </object>
           <int key="connectionID">7313</int>
         </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>
@@ -15402,14 +15258,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
           </object>
           <int key="connectionID">7324</int>
         </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>
@@ -15450,14 +15298,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
           </object>
           <int key="connectionID">7338</int>
         </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>
@@ -15474,30 +15314,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
           </object>
           <int key="connectionID">7349</int>
         </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>
@@ -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>
@@ -20862,15 +20733,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
             </object>
             <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"/>
@@ -20901,20 +20763,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
             </object>
             <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"/>
@@ -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>
@@ -21053,21 +20898,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
             <reference key="object" ref="11400907"/>
             <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"/>
@@ -21143,11 +20973,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
             <reference key="object" ref="274956371"/>
             <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"/>
@@ -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">
@@ -26358,6 +26239,30 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
             <string key="minorKey">Source/SPWindowAdditions.h</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>
@@ -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>
@@ -26558,6 +26472,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
                 <string key="name">runAllQueries:</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>
@@ -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">
-- 
cgit v1.2.3