aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/Console.xib501
-rw-r--r--Resources/Images/button_clear.tiffbin0 -> 6822 bytes
-rw-r--r--Source/SPQueryConsole.h1
-rw-r--r--Source/SPQueryConsole.m9
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj4
5 files changed, 334 insertions, 181 deletions
diff --git a/Interfaces/English.lproj/Console.xib b/Interfaces/English.lproj/Console.xib
index fd45b0eb..21f91519 100644
--- a/Interfaces/English.lproj/Console.xib
+++ b/Interfaces/English.lproj/Console.xib
@@ -8,8 +8,7 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="7"/>
- <integer value="49"/>
+ <integer value="4"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -50,10 +49,42 @@
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSImageView" id="919154377">
+ <reference key="NSNextResponder" ref="215475093"/>
+ <int key="NSvFlags">290</int>
+ <object class="NSMutableSet" key="NSDragTypes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="set.sortedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Apple PDF pasteboard type</string>
+ <string>Apple PICT pasteboard type</string>
+ <string>Apple PNG pasteboard type</string>
+ <string>NSFilenamesPboardType</string>
+ <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+ <string>NeXT TIFF v4.0 pasteboard type</string>
+ </object>
+ </object>
+ <string key="NSFrame">{{62, 0}, {513, 23}}</string>
+ <reference key="NSSuperview" ref="215475093"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSImageCell" key="NSCell" id="127533557">
+ <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags2">33554432</int>
+ <object class="NSCustomResource" key="NSContents">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">button_bar_spacer</string>
+ </object>
+ <int key="NSAlign">0</int>
+ <int key="NSScale">1</int>
+ <int key="NSStyle">0</int>
+ <bool key="NSAnimates">YES</bool>
+ </object>
+ <bool key="NSEditable">YES</bool>
+ </object>
<object class="NSButton" id="591384017">
<reference key="NSNextResponder" ref="215475093"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{353, 5}, {118, 28}}</string>
+ <string key="NSFrame">{{447, 2}, {118, 17}}</string>
<reference key="NSSuperview" ref="215475093"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="95087038">
@@ -67,27 +98,7 @@
</object>
<reference key="NSControlView" ref="591384017"/>
<int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="255852348">
- <reference key="NSNextResponder" ref="215475093"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{469, 5}, {101, 28}}</string>
- <reference key="NSSuperview" ref="215475093"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="507600749">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134348800</int>
- <string key="NSContents">Clear</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="255852348"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
+ <int key="NSButtonFlags2">164</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
@@ -97,7 +108,7 @@
<object class="NSSearchField" id="139811820">
<reference key="NSNextResponder" ref="215475093"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{10, 174}, {555, 19}}</string>
+ <string key="NSFrame">{{10, 174}, {531, 19}}</string>
<reference key="NSSuperview" ref="215475093"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="220914667">
@@ -185,7 +196,7 @@
<object class="NSTableView" id="243353733">
<reference key="NSNextResponder" ref="264199078"/>
<int key="NSvFlags">256</int>
- <string key="NSFrameSize">{553, 124}</string>
+ <string key="NSFrameSize">{575, 142}</string>
<reference key="NSSuperview" ref="264199078"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -237,7 +248,7 @@
</object>
<object class="NSTableColumn" id="781897583">
<string key="NSIdentifier">message</string>
- <double key="NSWidth">4.020000e+02</double>
+ <double key="NSWidth">4.240000e+02</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -287,7 +298,7 @@
<bool key="NSAllowsTypeSelect">YES</bool>
</object>
</object>
- <string key="NSFrame">{{1, 1}, {553, 124}}</string>
+ <string key="NSFrame">{{1, 1}, {575, 142}}</string>
<reference key="NSSuperview" ref="865703622"/>
<reference key="NSNextKeyView" ref="243353733"/>
<reference key="NSDocView" ref="243353733"/>
@@ -314,7 +325,7 @@
<double key="NSPercent">5.714286e-01</double>
</object>
</object>
- <string key="NSFrame">{{10, 40}, {555, 126}}</string>
+ <string key="NSFrame">{{-1, 22}, {577, 144}}</string>
<reference key="NSSuperview" ref="215475093"/>
<reference key="NSNextKeyView" ref="264199078"/>
<int key="NSsFlags">530</int>
@@ -323,65 +334,122 @@
<reference key="NSContentView" ref="264199078"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBcAAAQXAAAA</bytes>
</object>
- <object class="NSButton" id="1024597879">
+ <object class="NSProgressIndicator" id="223792049">
+ <reference key="NSNextResponder" ref="215475093"/>
+ <int key="NSvFlags">-2147482335</int>
+ <object class="NSPSMatrix" key="NSDrawMatrix"/>
+ <string key="NSFrame">{{549, 175}, {16, 16}}</string>
+ <reference key="NSSuperview" ref="215475093"/>
+ <int key="NSpiFlags">20746</int>
+ <double key="NSMinValue">1.600000e+01</double>
+ <double key="NSMaxValue">1.000000e+02</double>
+ </object>
+ <object class="NSButton" id="688790145">
<reference key="NSNextResponder" ref="215475093"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{7, 11}, {120, 18}}</string>
+ <string key="NSFrame">{{30, -1}, {32, 25}}</string>
<reference key="NSSuperview" ref="215475093"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="980749044">
+ <object class="NSButtonCell" key="NSCell" id="939936412">
<int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">131072</int>
- <string key="NSContents">Show time stamps</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="1024597879"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
- <object class="NSCustomResource" key="NSNormalImage" id="539077046">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSSwitch</string>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Clear</string>
+ <object class="NSFont" key="NSSupport" id="1012436895">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">1.300000e+01</double>
+ <int key="NSfFlags">1044</int>
</object>
- <object class="NSButtonImageSource" key="NSAlternateImage" id="850144303">
- <string key="NSImageName">NSSwitch</string>
+ <reference key="NSControlView" ref="688790145"/>
+ <int key="NSButtonFlags">-2042347265</int>
+ <int key="NSButtonFlags2">163</int>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">button_clear</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
</object>
</object>
- <object class="NSButton" id="270576501">
+ <object class="NSPopUpButton" id="544468485">
<reference key="NSNextResponder" ref="215475093"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{130, 11}, {192, 18}}</string>
+ <string key="NSFrame">{{-11, 0}, {46, 25}}</string>
<reference key="NSSuperview" ref="215475093"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="922531493">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">131072</int>
- <string key="NSContents">Show SELECT/SHOW statements</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="270576501"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
- <reference key="NSNormalImage" ref="539077046"/>
- <reference key="NSAlternateImage" ref="850144303"/>
+ <object class="NSPopUpButtonCell" key="NSCell" id="146997448">
+ <int key="NSCellFlags">-2076049856</int>
+ <int key="NSCellFlags2">134219776</int>
+ <reference key="NSSupport" ref="1012436895"/>
+ <reference key="NSControlView" ref="544468485"/>
+ <int key="NSButtonFlags">-2042609409</int>
+ <int key="NSButtonFlags2">35</int>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">button_action</string>
+ </object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ <object class="NSMenuItem" key="NSMenuItem" id="97098983">
+ <reference key="NSMenu" ref="636769899"/>
+ <bool key="NSIsHidden">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <object class="NSCustomResource" key="NSImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">button_action</string>
+ </object>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="146997448"/>
+ </object>
+ <bool key="NSMenuItemRespectAlignment">YES</bool>
+ <object class="NSMenu" key="NSMenu" id="636769899">
+ <string key="NSTitle">OtherViews</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="97098983"/>
+ <object class="NSMenuItem" id="77378686">
+ <reference key="NSMenu" ref="636769899"/>
+ <string key="NSTitle">Show time stamps</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <int key="NSState">1</int>
+ <object class="NSCustomResource" key="NSOnImage" id="896081251">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="235191893">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="146997448"/>
+ </object>
+ <object class="NSMenuItem" id="435045502">
+ <reference key="NSMenu" ref="636769899"/>
+ <string key="NSTitle">Show SELECT/SHOW statements</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <int key="NSState">1</int>
+ <reference key="NSOnImage" ref="896081251"/>
+ <reference key="NSMixedImage" ref="235191893"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="146997448"/>
+ </object>
+ </object>
+ </object>
+ <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="NSProgressIndicator" id="223792049">
- <reference key="NSNextResponder" ref="215475093"/>
- <int key="NSvFlags">-2147482335</int>
- <object class="NSPSMatrix" key="NSDrawMatrix"/>
- <string key="NSFrame">{{334, 13}, {16, 16}}</string>
- <reference key="NSSuperview" ref="215475093"/>
- <int key="NSpiFlags">20746</int>
- <double key="NSMinValue">1.600000e+01</double>
- <double key="NSMaxValue">1.000000e+02</double>
- </object>
</object>
<string key="NSFrameSize">{575, 203}</string>
<reference key="NSSuperview"/>
@@ -392,7 +460,7 @@
<string key="NSFrameAutosaveName">QueryConsole</string>
</object>
<object class="NSCustomView" id="841319465">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -406,16 +474,17 @@
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Include time stamps</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">1.300000e+01</double>
- <int key="NSfFlags">1044</int>
- </object>
+ <reference key="NSSupport" ref="1012436895"/>
<reference key="NSControlView" ref="296628662"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">130</int>
- <reference key="NSNormalImage" ref="539077046"/>
- <reference key="NSAlternateImage" ref="850144303"/>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSSwitch</string>
+ </object>
+ <object class="NSButtonImageSource" key="NSAlternateImage">
+ <string key="NSImageName">NSSwitch</string>
+ </object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
@@ -424,7 +493,6 @@
</object>
</object>
<string key="NSFrameSize">{170, 30}</string>
- <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSMenu" id="1011399888">
@@ -436,14 +504,8 @@
<string key="NSTitle">Copy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
- <object class="NSCustomResource" key="NSOnImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
+ <reference key="NSOnImage" ref="896081251"/>
+ <reference key="NSMixedImage" ref="235191893"/>
</object>
</object>
</object>
@@ -461,14 +523,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">clearConsoleButton</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="255852348"/>
- </object>
- <int key="connectionID">24</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">saveConsoleButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="591384017"/>
@@ -493,14 +547,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">clearConsole:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="255852348"/>
- </object>
- <int key="connectionID">53</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">saveConsoleAs:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="591384017"/>
@@ -508,22 +554,6 @@
<int key="connectionID">54</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">toggleShowTimeStamps:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="1024597879"/>
- </object>
- <int key="connectionID">56</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">toggleShowSelectShowStatements:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="270576501"/>
- </object>
- <int key="connectionID">57</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">consoleTableView</string>
<reference key="source" ref="1001"/>
@@ -587,6 +617,54 @@
</object>
<int key="connectionID">70</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">clearConsole:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="688790145"/>
+ </object>
+ <int key="connectionID">75</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">clearConsoleButton</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="688790145"/>
+ </object>
+ <int key="connectionID">76</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">toggleShowTimeStamps:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="77378686"/>
+ </object>
+ <int key="connectionID">84</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">toggleShowSelectShowStatements:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="435045502"/>
+ </object>
+ <int key="connectionID">85</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">showTimeStampsMenuItem</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="77378686"/>
+ </object>
+ <int key="connectionID">86</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">showSelectShowStatementsMenuItem</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="435045502"/>
+ </object>
+ <int key="connectionID">87</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -632,35 +710,17 @@
<reference key="object" ref="215475093"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="270576501"/>
- <reference ref="1024597879"/>
<reference ref="865703622"/>
<reference ref="139811820"/>
- <reference ref="591384017"/>
- <reference ref="255852348"/>
+ <reference ref="919154377"/>
+ <reference ref="688790145"/>
<reference ref="223792049"/>
+ <reference ref="591384017"/>
+ <reference ref="544468485"/>
</object>
<reference key="parent" ref="209913341"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="270576501"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="922531493"/>
- </object>
- <reference key="parent" ref="215475093"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6</int>
- <reference key="object" ref="1024597879"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="980749044"/>
- </object>
- <reference key="parent" ref="215475093"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">7</int>
<reference key="object" ref="865703622"/>
<object class="NSMutableArray" key="children">
@@ -690,20 +750,6 @@
<reference key="parent" ref="215475093"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="255852348"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="507600749"/>
- </object>
- <reference key="parent" ref="215475093"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="507600749"/>
- <reference key="parent" ref="255852348"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="95087038"/>
<reference key="parent" ref="591384017"/>
@@ -762,16 +808,6 @@
<reference key="parent" ref="781897583"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">21</int>
- <reference key="object" ref="980749044"/>
- <reference key="parent" ref="1024597879"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">22</int>
- <reference key="object" ref="922531493"/>
- <reference key="parent" ref="270576501"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">49</int>
<reference key="object" ref="841319465"/>
<object class="NSMutableArray" key="children">
@@ -814,6 +850,78 @@
<reference key="object" ref="833308614"/>
<reference key="parent" ref="1011399888"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">71</int>
+ <reference key="object" ref="919154377"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="127533557"/>
+ </object>
+ <reference key="parent" ref="215475093"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">72</int>
+ <reference key="object" ref="127533557"/>
+ <reference key="parent" ref="919154377"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">73</int>
+ <reference key="object" ref="688790145"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="939936412"/>
+ </object>
+ <reference key="parent" ref="215475093"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">74</int>
+ <reference key="object" ref="939936412"/>
+ <reference key="parent" ref="688790145"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">77</int>
+ <reference key="object" ref="544468485"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="146997448"/>
+ </object>
+ <reference key="parent" ref="215475093"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">78</int>
+ <reference key="object" ref="146997448"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="636769899"/>
+ </object>
+ <reference key="parent" ref="544468485"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">79</int>
+ <reference key="object" ref="636769899"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="77378686"/>
+ <reference ref="435045502"/>
+ <reference ref="97098983"/>
+ </object>
+ <reference key="parent" ref="146997448"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">80</int>
+ <reference key="object" ref="77378686"/>
+ <reference key="parent" ref="636769899"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">82</int>
+ <reference key="object" ref="435045502"/>
+ <reference key="parent" ref="636769899"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">83</int>
+ <reference key="object" ref="97098983"/>
+ <reference key="parent" ref="636769899"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -823,8 +931,6 @@
<string>-1.IBPluginDependency</string>
<string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
- <string>10.IBPluginDependency</string>
- <string>11.IBPluginDependency</string>
<string>12.IBPluginDependency</string>
<string>13.IBPluginDependency</string>
<string>14.IBPluginDependency</string>
@@ -834,8 +940,6 @@
<string>18.IBPluginDependency</string>
<string>19.IBPluginDependency</string>
<string>20.IBPluginDependency</string>
- <string>21.IBPluginDependency</string>
- <string>22.IBPluginDependency</string>
<string>3.IBEditorWindowLastContentRect</string>
<string>3.IBWindowTemplateEditedContentRect</string>
<string>3.NSWindowTemplate.visibleAtLaunch</string>
@@ -844,16 +948,26 @@
<string>4.IBPluginDependency</string>
<string>49.IBEditorWindowLastContentRect</string>
<string>49.IBPluginDependency</string>
- <string>5.IBPluginDependency</string>
<string>50.IBPluginDependency</string>
<string>51.IBPluginDependency</string>
- <string>6.IBPluginDependency</string>
<string>62.IBPluginDependency</string>
<string>64.IBEditorWindowLastContentRect</string>
<string>64.IBPluginDependency</string>
<string>65.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
+ <string>73.IBAttributePlaceholdersKey</string>
+ <string>73.IBPluginDependency</string>
+ <string>74.IBPluginDependency</string>
+ <string>77.IBPluginDependency</string>
+ <string>78.IBPluginDependency</string>
+ <string>79.IBEditorWindowLastContentRect</string>
+ <string>79.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
+ <string>80.IBAttributePlaceholdersKey</string>
+ <string>80.IBPluginDependency</string>
+ <string>82.IBAttributePlaceholdersKey</string>
+ <string>82.IBPluginDependency</string>
+ <string>83.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -870,26 +984,53 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{270, 824}, {575, 203}}</string>
+ <string>{{270, 824}, {575, 203}}</string>
+ <boolean value="NO"/>
+ <boolean value="YES"/>
+ <string>{575, 130}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{570, 855}, {170, 30}}</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>{{777, 303}, {90, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{642, 458}, {575, 203}}</string>
- <string>{{642, 458}, {575, 203}}</string>
- <boolean value="NO"/>
- <boolean value="YES"/>
- <string>{575, 130}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{611, 287}, {170, 30}}</string>
<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="688790145"/>
+ <string key="toolTip">Clear Console</string>
+ </object>
+ </object>
<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>{{248, 786}, {286, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{777, 303}, {90, 23}}</string>
<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="77378686"/>
+ <string key="toolTip">Duplicate the selected table</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="435045502"/>
+ <string key="toolTip">Remove the selected table(s)</string>
+ </object>
+ </object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -915,7 +1056,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">70</int>
+ <int key="maxID">87</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -974,6 +1115,8 @@
<string>progressIndicator</string>
<string>saveConsoleButton</string>
<string>saveLogView</string>
+ <string>showSelectShowStatementsMenuItem</string>
+ <string>showTimeStampsMenuItem</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -984,6 +1127,8 @@
<string>NSProgressIndicator</string>
<string>NSButton</string>
<string>NSView</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Resources/Images/button_clear.tiff b/Resources/Images/button_clear.tiff
new file mode 100644
index 00000000..9589c170
--- /dev/null
+++ b/Resources/Images/button_clear.tiff
Binary files differ
diff --git a/Source/SPQueryConsole.h b/Source/SPQueryConsole.h
index cbe89662..8b1d912d 100644
--- a/Source/SPQueryConsole.h
+++ b/Source/SPQueryConsole.h
@@ -29,6 +29,7 @@
IBOutlet NSSearchField *consoleSearchField;
IBOutlet NSProgressIndicator *progressIndicator;
IBOutlet NSButton *includeTimeStampsButton, *saveConsoleButton, *clearConsoleButton;
+ IBOutlet NSMenuItem *showTimeStampsMenuItem, *showSelectShowStatementsMenuItem;
NSFont *consoleFont;
NSMutableArray *messagesFullSet, *messagesFilteredSet, *messagesVisibleSet;
diff --git a/Source/SPQueryConsole.m b/Source/SPQueryConsole.m
index 7106f49a..43177ae1 100644
--- a/Source/SPQueryConsole.m
+++ b/Source/SPQueryConsole.m
@@ -200,7 +200,8 @@ static SPQueryConsole *sharedQueryConsole = nil;
*/
- (IBAction)toggleShowTimeStamps:(id)sender
{
- [[consoleTableView tableColumnWithIdentifier:TABLEVIEW_DATE_COLUMN_IDENTIFIER] setHidden:(![sender intValue])];
+ [[consoleTableView tableColumnWithIdentifier:TABLEVIEW_DATE_COLUMN_IDENTIFIER] setHidden:([sender state])];
+ [showTimeStampsMenuItem setState:![sender state]];
}
/**
@@ -208,9 +209,11 @@ static SPQueryConsole *sharedQueryConsole = nil;
*/
- (IBAction)toggleShowSelectShowStatements:(id)sender
{
+ showSelectStatementsAreDisabled = [sender state];
+
// Store the state of the toggle for later quick reference
- showSelectStatementsAreDisabled = ![sender intValue];
-
+ [showSelectShowStatementsMenuItem setState:!showSelectStatementsAreDisabled];
+
[self _updateFilterState];
}
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 7c17bdc3..3fbf2b8c 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -85,6 +85,7 @@
B52460D80F8EF92300171639 /* SPTextViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B52460D60F8EF92300171639 /* SPTextViewAdditions.m */; };
B52460DB0F8EF93B00171639 /* Console.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52460D90F8EF93B00171639 /* Console.xib */; };
B52461030F8EF9F500171639 /* ConnectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52461010F8EF9F500171639 /* ConnectionView.xib */; };
+ B53857340F9CC3B600EB2354 /* button_clear.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B53857330F9CC3B600EB2354 /* button_clear.tiff */; };
B57747D20F7A891A003B34F9 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = B57747D00F7A891A003B34F9 /* Preferences.xib */; };
B57747D40F7A8974003B34F9 /* SPPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = B57747D30F7A8974003B34F9 /* SPPreferenceController.m */; };
B57747D90F7A8990003B34F9 /* SPWindowAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B57747D80F7A8990003B34F9 /* SPWindowAdditions.m */; };
@@ -283,6 +284,7 @@
B52460D60F8EF92300171639 /* SPTextViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTextViewAdditions.m; sourceTree = "<group>"; };
B52460DA0F8EF93B00171639 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Console.xib; sourceTree = "<group>"; };
B52461020F8EF9F500171639 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ConnectionView.xib; sourceTree = "<group>"; };
+ B53857330F9CC3B600EB2354 /* button_clear.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = button_clear.tiff; sourceTree = "<group>"; };
B57747D10F7A891A003B34F9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preferences.xib; sourceTree = "<group>"; };
B57747D30F7A8974003B34F9 /* SPPreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPPreferenceController.m; sourceTree = "<group>"; };
B57747D50F7A8978003B34F9 /* SPPreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPPreferenceController.h; sourceTree = "<group>"; };
@@ -573,6 +575,7 @@
B58A32400F6509D60003C243 /* button_bar_spacer.tiff */,
B58A32410F6509D60003C243 /* button_duplicate.tiff */,
B508B5D90F9837A200E03A69 /* button_edit.tiff */,
+ B53857330F9CC3B600EB2354 /* button_clear.tiff */,
B5A601E20F74DE7F00EE5FBA /* button_edit_mode.tiff */,
58CB20EC0F79A75D005EA204 /* button_edit_mode_selected.tiff */,
B58A32420F6509D60003C243 /* button_info_pane_hide.tiff */,
@@ -821,6 +824,7 @@
B52461030F8EF9F500171639 /* ConnectionView.xib in Resources */,
296DC8D20F90950C002A3258 /* sequel-pro-print-template.html in Resources */,
B508B5DA0F9837A200E03A69 /* button_edit.tiff in Resources */,
+ B53857340F9CC3B600EB2354 /* button_clear.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 15:39:33 +0000