aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2010-12-04 22:57:26 +0000
committerrowanbeentje <rowan@beent.je>2010-12-04 22:57:26 +0000
commitc84d39d22cdc466b6a3d0c0e71966d074789b090 (patch)
tree5b33d22e0976d7da07c94eecb7a6dd4595c3cbd5
parent7387efe3ddd3ad7440d54ba1ab10e5806da63ba7 (diff)
downloadsequelpro-c84d39d22cdc466b6a3d0c0e71966d074789b090.tar.gz
sequelpro-c84d39d22cdc466b6a3d0c0e71966d074789b090.tar.bz2
sequelpro-c84d39d22cdc466b6a3d0c0e71966d074789b090.zip
- Show and hide the custom query info area based on whether custom query errors occurred, starting off hidden
- Add "errors"/"no errors" prefix to the custom query status area - Add an import cancelled line to the import error list when stopping imports after errors - Fix custom query error highlighting by scrolling to the error - Update localisable strings
-rw-r--r--Interfaces/English.lproj/DBView.xib412
-rw-r--r--Resources/English.lproj/BundleEditor.stringsbin15018 -> 18482 bytes
-rw-r--r--Resources/English.lproj/BundleHTMLOutput.stringsbin0 -> 166 bytes
-rw-r--r--Resources/English.lproj/DBView.stringsbin100418 -> 100620 bytes
-rw-r--r--Resources/English.lproj/Localizable.stringsbin195712 -> 197540 bytes
-rw-r--r--Source/SPCustomQuery.h2
-rw-r--r--Source/SPCustomQuery.m94
-rw-r--r--Source/SPDataImport.m1
8 files changed, 367 insertions, 142 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 73902c1b..1e9085a1 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -23,13 +23,13 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="7691"/>
+ <integer value="7208"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.brandonwalkin.BWToolkit</string>
- <string>com.apple.WebKitIBPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.WebKitIBPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
@@ -222,7 +222,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="1001122760">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<reference key="NSTextColor" ref="454249633"/>
@@ -1065,7 +1065,7 @@
<object class="NSTabViewItem" id="831053945">
<string key="NSIdentifier">source</string>
<object class="NSView" key="NSView" id="461236772">
- <reference key="NSNextResponder" ref="714795046"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2536,7 +2536,6 @@
</object>
</object>
<string key="NSFrame">{{10, 7}, {706, 544}}</string>
- <reference key="NSSuperview" ref="714795046"/>
</object>
<string key="NSLabel">Structure</string>
<reference key="NSColor" ref="62854682"/>
@@ -3317,7 +3316,7 @@
<object class="NSTabViewItem" id="105987292">
<string key="NSIdentifier">customQuery</string>
<object class="NSView" key="NSView" id="746504912">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder" ref="714795046"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3508,7 +3507,30 @@
<object class="NSTextView" id="793890647">
<reference key="NSNextResponder" ref="888807510"/>
<int key="NSvFlags">6418</int>
- <string key="NSFrame">{{0, 2}, {694, 14}}</string>
+ <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="NSFrame">{{0, -8}, {694, 14}}</string>
<reference key="NSSuperview" ref="888807510"/>
<object class="NSTextContainer" key="NSTextContainer" id="845974686">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -3567,7 +3589,7 @@
<nil key="NSDelegate"/>
</object>
</object>
- <string key="NSFrame">{{1, 1}, {694, 148}}</string>
+ <string key="NSFrame">{{1, 1}, {694, 140}}</string>
<reference key="NSSuperview" ref="274248101"/>
<reference key="NSNextKeyView" ref="793890647"/>
<reference key="NSDocView" ref="793890647"/>
@@ -3599,7 +3621,7 @@
<double key="NSPercent">0.94565218687057495</double>
</object>
</object>
- <string key="NSFrameSize">{696, 150}</string>
+ <string key="NSFrameSize">{696, 142}</string>
<reference key="NSSuperview" ref="815597998"/>
<reference key="NSNextKeyView" ref="888807510"/>
<int key="NSsFlags">530</int>
@@ -3608,7 +3630,7 @@
<reference key="NSContentView" ref="888807510"/>
</object>
</object>
- <string key="NSFrameSize">{696, 150}</string>
+ <string key="NSFrameSize">{696, 142}</string>
<reference key="NSSuperview" ref="727658473"/>
<string key="NSClassName">NSView</string>
</object>
@@ -3630,7 +3652,7 @@
<object class="NSTableView" id="7005793">
<reference key="NSNextResponder" ref="719411200"/>
<int key="NSvFlags">4352</int>
- <string key="NSFrameSize">{694, 221}</string>
+ <string key="NSFrameSize">{694, 206}</string>
<reference key="NSSuperview" ref="719411200"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="569161033">
@@ -3692,7 +3714,7 @@
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
- <string key="NSFrame">{{1, 17}, {694, 221}}</string>
+ <string key="NSFrame">{{1, 17}, {694, 206}}</string>
<reference key="NSSuperview" ref="808759882"/>
<reference key="NSNextKeyView" ref="7005793"/>
<reference key="NSDocView" ref="7005793"/>
@@ -3735,7 +3757,7 @@
</object>
<reference ref="348657092"/>
</object>
- <string key="NSFrame">{{0, -1}, {696, 239}}</string>
+ <string key="NSFrame">{{0, -1}, {696, 224}}</string>
<reference key="NSSuperview" ref="539474293"/>
<reference key="NSNextKeyView" ref="719411200"/>
<int key="NSsFlags">562</int>
@@ -3749,7 +3771,7 @@
<object class="NSPopUpButton" id="956647572">
<reference key="NSNextResponder" ref="539474293"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{156, 237}, {98, 22}}</string>
+ <string key="NSFrame">{{156, 222}, {98, 22}}</string>
<reference key="NSSuperview" ref="539474293"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="619849563">
@@ -3862,7 +3884,7 @@
<object class="NSPopUpButton" id="346800534">
<reference key="NSNextResponder" ref="539474293"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{38, 237}, {108, 22}}</string>
+ <string key="NSFrame">{{38, 222}, {108, 22}}</string>
<reference key="NSSuperview" ref="539474293"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="620314745">
@@ -3976,7 +3998,7 @@
<object class="NSPopUpButton" id="544395596">
<reference key="NSNextResponder" ref="539474293"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-10, 236}, {48, 25}}</string>
+ <string key="NSFrame">{{-10, 221}, {48, 25}}</string>
<reference key="NSSuperview" ref="539474293"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="127119628">
@@ -4316,7 +4338,7 @@
<object class="NSButton" id="1067429818">
<reference key="NSNextResponder" ref="539474293"/>
<int key="NSvFlags">265</int>
- <string key="NSFrame">{{563, 239}, {124, 17}}</string>
+ <string key="NSFrame">{{563, 224}, {124, 17}}</string>
<reference key="NSSuperview" ref="539474293"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="230812569">
@@ -4337,7 +4359,7 @@
<object class="NSButton" id="768193117">
<reference key="NSNextResponder" ref="539474293"/>
<int key="NSvFlags">265</int>
- <string key="NSFrame">{{404, 239}, {151, 17}}</string>
+ <string key="NSFrame">{{404, 224}, {151, 17}}</string>
<reference key="NSSuperview" ref="539474293"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="538725211">
@@ -4369,7 +4391,7 @@
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{32, 237}, {664, 23}}</string>
+ <string key="NSFrame">{{32, 222}, {664, 23}}</string>
<reference key="NSSuperview" ref="539474293"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="982720237">
@@ -4384,16 +4406,16 @@
<bool key="NSEditable">YES</bool>
</object>
</object>
- <string key="NSFrame">{{0, 159}, {696, 260}}</string>
+ <string key="NSFrame">{{0, 151}, {696, 245}}</string>
<reference key="NSSuperview" ref="727658473"/>
<string key="NSClassName">NSView</string>
</object>
</object>
- <string key="NSFrameSize">{696, 419}</string>
+ <string key="NSFrameSize">{696, 396}</string>
<reference key="NSSuperview" ref="940311190"/>
</object>
</object>
- <string key="NSFrameSize">{696, 419}</string>
+ <string key="NSFrameSize">{696, 396}</string>
<reference key="NSSuperview" ref="515194087"/>
<string key="NSClassName">NSView</string>
</object>
@@ -4402,10 +4424,183 @@
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSScrollView" id="618407678">
+ <reference key="NSNextResponder" ref="1028777476"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSClipView" id="572051963">
+ <reference key="NSNextResponder" ref="618407678"/>
+ <int key="NSvFlags">2304</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSTextView" id="714539623">
+ <reference key="NSNextResponder" ref="572051963"/>
+ <int key="NSvFlags">2322</int>
+ <string key="NSFrameSize">{672, 13}</string>
+ <reference key="NSSuperview" ref="572051963"/>
+ <object class="NSTextContainer" key="NSTextContainer" id="322143189">
+ <object class="NSLayoutManager" key="NSLayoutManager">
+ <object class="NSTextStorage" key="NSTextStorage">
+ <object class="NSMutableString" key="NSString">
+ <characters key="NS.bytes">No errors</characters>
+ </object>
+ <object class="NSDictionary" key="NSAttributes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSFont</string>
+ <string>NSParagraphStyle</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="790379580"/>
+ <object class="NSParagraphStyle">
+ <int key="NSAlignment">4</int>
+ <object class="NSArray" key="NSTabStops">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSTextTab">
+ <double key="NSLocation">28</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">56</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">84</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">112</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">140</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">168</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">196</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">224</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">252</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">280</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">308</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">336</double>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ <nil key="NSDelegate"/>
+ </object>
+ <object class="NSMutableArray" key="NSTextContainers">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="322143189"/>
+ </object>
+ <int key="NSLMFlags">134</int>
+ <nil key="NSDelegate"/>
+ </object>
+ <reference key="NSTextView" ref="714539623"/>
+ <double key="NSWidth">672</double>
+ <int key="NSTCFlags">1</int>
+ </object>
+ <object class="NSTextViewSharedData" key="NSSharedData">
+ <int key="NSFlags">12005</int>
+ <int key="NSTextCheckingTypes">0</int>
+ <nil key="NSMarkedAttributes"/>
+ <reference key="NSBackgroundColor" ref="449903125"/>
+ <object class="NSDictionary" key="NSSelectedAttributes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSBackgroundColor</string>
+ <string>NSColor</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="905060551"/>
+ <reference ref="63182758"/>
+ </object>
+ </object>
+ <reference key="NSInsertionColor" ref="304829493"/>
+ <object class="NSDictionary" key="NSLinkAttributes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSColor</string>
+ <string>NSCursor</string>
+ <string>NSUnderline</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSColor" id="114422645">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDEAA</bytes>
+ </object>
+ <object class="NSCursor" id="2186">
+ <string key="NSHotSpot">{8, -8}</string>
+ <int key="NSCursorType">13</int>
+ </object>
+ <integer value="1"/>
+ </object>
+ </object>
+ <nil key="NSDefaultParagraphStyle"/>
+ </object>
+ <int key="NSTVFlags">6</int>
+ <string key="NSMaxSize">{672, 1e+07}</string>
+ <string key="NSMinize">{223, 3}</string>
+ <nil key="NSDelegate"/>
+ </object>
+ </object>
+ <string key="NSFrameSize">{672, 66}</string>
+ <reference key="NSSuperview" ref="618407678"/>
+ <reference key="NSNextKeyView" ref="714539623"/>
+ <reference key="NSDocView" ref="714539623"/>
+ <reference key="NSBGColor" ref="449903125"/>
+ <reference key="NSCursor" ref="32917531"/>
+ <int key="NScvFlags">2</int>
+ </object>
+ <object class="NSScroller" id="628306046">
+ <reference key="NSNextResponder" ref="618407678"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{656, 1}, {15, 64}}</string>
+ <reference key="NSSuperview" ref="618407678"/>
+ <reference key="NSTarget" ref="618407678"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSPercent">0.98496240601503759</double>
+ </object>
+ <object class="NSScroller" id="195758564">
+ <reference key="NSNextResponder" ref="618407678"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
+ <reference key="NSSuperview" ref="618407678"/>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="618407678"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.94565218687057495</double>
+ </object>
+ </object>
+ <string key="NSFrame">{{12, 12}, {672, 66}}</string>
+ <reference key="NSSuperview" ref="1028777476"/>
+ <reference key="NSNextKeyView" ref="572051963"/>
+ <int key="NSsFlags">528</int>
+ <reference key="NSVScroller" ref="628306046"/>
+ <reference key="NSHScroller" ref="195758564"/>
+ <reference key="NSContentView" ref="572051963"/>
+ </object>
<object class="NSTextField" id="951184307">
<reference key="NSNextResponder" ref="1028777476"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 63}, {363, 14}}</string>
+ <string key="NSFrame">{{15, 86}, {363, 14}}</string>
<reference key="NSSuperview" ref="1028777476"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="679246699">
@@ -4418,27 +4613,8 @@
<reference key="NSTextColor" ref="454249633"/>
</object>
</object>
- <object class="NSTextField" id="327222625">
- <reference key="NSNextResponder" ref="1028777476"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrame">{{15, 12}, {662, 45}}</string>
- <reference key="NSSuperview" ref="1028777476"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="92523913">
- <int key="NSCellFlags">69336577</int>
- <int key="NSCellFlags2">4329472</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="327222625"/>
- <reference key="NSBackgroundColor" ref="62854682"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- </object>
- </object>
</object>
- <string key="NSFrame">{{0, 420}, {696, 88}}</string>
+ <string key="NSFrame">{{0, 397}, {696, 111}}</string>
<reference key="NSSuperview" ref="515194087"/>
<string key="NSClassName">NSView</string>
</object>
@@ -4495,6 +4671,7 @@
</object>
</object>
<string key="NSFrame">{{10, 7}, {706, 544}}</string>
+ <reference key="NSSuperview" ref="714795046"/>
</object>
<string key="NSLabel">Custom Query</string>
<reference key="NSColor" ref="62854682"/>
@@ -4579,10 +4756,7 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSColor" id="114422645">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDEAA</bytes>
- </object>
+ <reference ref="114422645"/>
<integer value="1"/>
</object>
</object>
@@ -6284,14 +6458,14 @@
<reference key="NSTabView" ref="714795046"/>
</object>
</object>
- <reference key="NSSelectedTabViewItem" ref="831053945"/>
+ <reference key="NSSelectedTabViewItem" ref="105987292"/>
<reference key="NSFont" ref="26"/>
<int key="NSTvFlags">134217731</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="461236772"/>
+ <reference ref="746504912"/>
</object>
</object>
</object>
@@ -7031,7 +7205,7 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="234287744">
<nil key="NSNextResponder"/>
@@ -7185,7 +7359,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSWindowTemplate" id="423199625">
<int key="NSWindowStyleMask">7</int>
@@ -7195,7 +7369,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">Reset Auto Increment</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{255, 95}</string>
<object class="NSView" key="NSWindowView" id="748618982">
<nil key="NSNextResponder"/>
@@ -7358,7 +7532,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
<string key="NSMinSize">{255, 117}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSWindowTemplate" id="787219800">
<int key="NSWindowStyleMask">1</int>
@@ -7368,7 +7542,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">New Relation</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<object class="NSView" key="NSWindowView" id="842408319">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -7969,7 +8143,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSFrameSize">{302, 307}</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSWindowTemplate" id="437271354">
<int key="NSWindowStyleMask">9</int>
@@ -7979,7 +8153,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">New Trigger</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{360, 348}</string>
<object class="NSView" key="NSWindowView" id="729080358">
<nil key="NSNextResponder"/>
@@ -8386,7 +8560,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{360, 370}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSWindowTemplate" id="1066802919">
<int key="NSWindowStyleMask">3</int>
@@ -8398,7 +8572,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 50}</string>
<object class="NSView" key="NSWindowView" id="525490268">
<nil key="NSNextResponder"/>
@@ -8518,7 +8692,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMinSize">{213, 72}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSWindowTemplate" id="553728448">
<int key="NSWindowStyleMask">9</int>
@@ -8530,7 +8704,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="1052076676">
<nil key="NSNextResponder"/>
@@ -8665,7 +8839,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSWindowTemplate" id="828950706">
<int key="NSWindowStyleMask">15</int>
@@ -8677,7 +8851,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{350, 200}</string>
<object class="NSView" key="NSWindowView" id="749598685">
<nil key="NSNextResponder"/>
@@ -8900,7 +9074,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{350, 222}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">SPCreateSyntaxSheet</string>
</object>
<object class="NSWindowTemplate" id="466147946">
@@ -8913,7 +9087,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="860968037">
<nil key="NSNextResponder"/>
@@ -9083,7 +9257,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSWindowTemplate" id="78186995">
<int key="NSWindowStyleMask">31</int>
@@ -9093,7 +9267,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">MySQL Help</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{351, 120}</string>
<object class="NSView" key="NSWindowView" id="539508428">
<nil key="NSNextResponder"/>
@@ -9491,7 +9665,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
<string key="NSMinSize">{351, 136}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">MYSQL_HELP_WINDOW</string>
</object>
<object class="NSWindowTemplate" id="633448481">
@@ -9502,7 +9676,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">Filter</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{380, 170}</string>
<object class="NSView" key="NSWindowView" id="257361103">
<nil key="NSNextResponder"/>
@@ -9880,10 +10054,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="114422645"/>
- <object class="NSCursor" id="2186">
- <string key="NSHotSpot">{8, -8}</string>
- <int key="NSCursorType">13</int>
- </object>
+ <reference ref="2186"/>
<integer value="1"/>
</object>
</object>
@@ -10147,7 +10318,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{380, 192}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">SPTableFilterPanel</string>
</object>
<object class="NSWindowTemplate" id="923391973">
@@ -10647,7 +10818,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string key="NSWindowTitle">Secure Text Input Sheet</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<object class="NSView" key="NSWindowView" id="978976687">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -10751,7 +10922,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string key="NSFrameSize">{338, 150}</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSCustomView" id="884983195">
<nil key="NSNextResponder"/>
@@ -10934,7 +11105,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string key="NSColorName">disabledControlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4zMzMzMzMzNDMzAA</bytes>
+ <bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
</object>
</object>
@@ -15851,14 +16022,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<int key="connectionID">7395</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">errorText</string>
- <reference key="source" ref="601471102"/>
- <reference key="destination" ref="327222625"/>
- </object>
- <int key="connectionID">7432</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">exportCustomQueryResultAsFormat:</string>
<reference key="source" ref="4626"/>
@@ -16378,6 +16541,22 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
</object>
<int key="connectionID">7715</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">errorTextScrollView</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="618407678"/>
+ </object>
+ <int key="connectionID">7725</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">errorText</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="714539623"/>
+ </object>
+ <int key="connectionID">7726</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -21532,8 +21711,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<reference key="object" ref="1028777476"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="327222625"/>
<reference ref="951184307"/>
+ <reference ref="618407678"/>
</object>
<reference key="parent" ref="515194087"/>
</object>
@@ -22091,15 +22270,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<reference key="parent" ref="694090924"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7428</int>
- <reference key="object" ref="327222625"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="92523913"/>
- </object>
- <reference key="parent" ref="1028777476"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">7429</int>
<reference key="object" ref="951184307"/>
<object class="NSMutableArray" key="children">
@@ -22114,11 +22284,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<reference key="parent" ref="951184307"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7431</int>
- <reference key="object" ref="92523913"/>
- <reference key="parent" ref="327222625"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">7438</int>
<reference key="object" ref="986860589"/>
<object class="NSMutableArray" key="children">
@@ -22958,6 +23123,32 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<reference key="object" ref="530698659"/>
<reference key="parent" ref="195537032"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7721</int>
+ <reference key="object" ref="618407678"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="628306046"/>
+ <reference ref="195758564"/>
+ <reference ref="714539623"/>
+ </object>
+ <reference key="parent" ref="1028777476"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7722</int>
+ <reference key="object" ref="628306046"/>
+ <reference key="parent" ref="618407678"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7723</int>
+ <reference key="object" ref="195758564"/>
+ <reference key="parent" ref="618407678"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7724</int>
+ <reference key="object" ref="714539623"/>
+ <reference key="parent" ref="618407678"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -24118,10 +24309,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string>7409.IBPluginDependency</string>
<string>7410.IBPluginDependency</string>
<string>7412.IBPluginDependency</string>
- <string>7428.IBPluginDependency</string>
<string>7429.IBPluginDependency</string>
<string>7430.IBPluginDependency</string>
- <string>7431.IBPluginDependency</string>
<string>7438.IBPluginDependency</string>
<string>7439.IBPluginDependency</string>
<string>7440.IBPluginDependency</string>
@@ -24275,6 +24464,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string>7695.ImportedFromIB2</string>
<string>7696.CustomClassName</string>
<string>7696.IBPluginDependency</string>
+ <string>7721.IBPluginDependency</string>
+ <string>7722.IBPluginDependency</string>
+ <string>7723.IBPluginDependency</string>
+ <string>7724.IBPluginDependency</string>
<string>858.IBPluginDependency</string>
<string>858.ImportedFromIB2</string>
<string>959.IBEditorWindowLastContentRect</string>
@@ -25607,7 +25800,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{76, 64}, {943, 549}}</string>
+ <string>{{58, 273}, {943, 549}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -25875,8 +26068,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<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 +26267,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string>SPTableTextFieldCell</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>
<integer value="1"/>
<string>{{265, 489}, {405, 267}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -26113,7 +26308,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">7720</int>
+ <int key="maxID">7726</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -26673,6 +26868,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string>editorFontMenuItem</string>
<string>encodingPopUp</string>
<string>errorText</string>
+ <string>errorTextScrollView</string>
<string>helpNavigator</string>
<string>helpSearchField</string>
<string>helpSearchFieldCell</string>
@@ -26728,6 +26924,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string>NSMenuItem</string>
<string>NSPopUpButton</string>
<string>id</string>
+ <string>NSScrollView</string>
<string>NSSegmentedControl</string>
<string>NSSearchField</string>
<string>NSSearchFieldCell</string>
@@ -26786,6 +26983,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string>editorFontMenuItem</string>
<string>encodingPopUp</string>
<string>errorText</string>
+ <string>errorTextScrollView</string>
<string>helpNavigator</string>
<string>helpSearchField</string>
<string>helpSearchFieldCell</string>
@@ -26887,6 +27085,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
+ <string key="name">errorTextScrollView</string>
+ <string key="candidateClassName">NSScrollView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">helpNavigator</string>
<string key="candidateClassName">NSSegmentedControl</string>
</object>
diff --git a/Resources/English.lproj/BundleEditor.strings b/Resources/English.lproj/BundleEditor.strings
index 34048acb..70fce557 100644
--- a/Resources/English.lproj/BundleEditor.strings
+++ b/Resources/English.lproj/BundleEditor.strings
Binary files differ
diff --git a/Resources/English.lproj/BundleHTMLOutput.strings b/Resources/English.lproj/BundleHTMLOutput.strings
new file mode 100644
index 00000000..1191d0d2
--- /dev/null
+++ b/Resources/English.lproj/BundleHTMLOutput.strings
Binary files differ
diff --git a/Resources/English.lproj/DBView.strings b/Resources/English.lproj/DBView.strings
index d3b1b5ee..b2b0b4b9 100644
--- a/Resources/English.lproj/DBView.strings
+++ b/Resources/English.lproj/DBView.strings
Binary files differ
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 4fed6b8e..93af30f2 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
Binary files differ
diff --git a/Source/SPCustomQuery.h b/Source/SPCustomQuery.h
index d1147ecb..439ec8e3 100644
--- a/Source/SPCustomQuery.h
+++ b/Source/SPCustomQuery.h
@@ -78,6 +78,7 @@
IBOutlet SPCopyTable *customQueryView;
IBOutlet NSScrollView *customQueryScrollView;
IBOutlet id errorText;
+ IBOutlet NSScrollView *errorTextScrollView;
IBOutlet id affectedRowsText;
IBOutlet id valueSheet;
IBOutlet id valueTextField;
@@ -155,6 +156,7 @@
NSUInteger numberOfQueries;
NSUInteger queryTextViewStartPosition;
+ NSUInteger queryInfoPanePaddingHeight;
NSInteger currentHistoryOffsetIndex;
BOOL historyItemWasJustInserted;
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index 415bf2fa..372fa512 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -118,6 +118,7 @@
[textView setSelectedRange:NSMakeRange(oldThreadedQueryRange.location,0)];
[textView insertText:@""];
[textView setSelectedRange:oldRange];
+ [textView scrollRangeToVisible:oldRange];
}
}
@@ -506,7 +507,7 @@
taskString = NSLocalizedString(@"Running query...", @"Running single query string");
}
[tableDocumentInstance startTaskWithDescription:taskString];
- [errorText setStringValue:taskString];
+ [errorText setString:taskString];
[affectedRowsText setStringValue:@""];
NSValue *encodedCallbackMethod = nil;
@@ -580,7 +581,7 @@
if (i > 0) {
NSString *taskString = [NSString stringWithFormat:NSLocalizedString(@"Running query %ld of %lu...", @"Running multiple queries string"), (long)(i+1), (unsigned long)queryCount];
[[tableDocumentInstance onMainThread] setTaskDescription:taskString];
- [[errorText onMainThread] setStringValue:taskString];
+ [[errorText onMainThread] setString:taskString];
}
NSString *query = [NSArrayObjectAtIndex(queries, i) stringByTrimmingCharactersInSet:whitespaceAndNewlineSet];
@@ -661,7 +662,7 @@
[errors appendFormat:NSLocalizedString(@"[ERROR in query %ld] %@\n", @"error text when multiple custom query failed"),
(long)(i+1),
errorString];
- [[errorText onMainThread] setStringValue:errors];
+ [[errorText onMainThread] setString:errors];
// ask the user to continue after detecting an error
if (![mySQLConnection queryCancelled]) {
@@ -748,45 +749,51 @@
[self performSelectorOnMainThread:@selector(updateStatusInterfaceWithDetails:) withObject:statusDetails waitUntilDone:YES];
// Set up the status string
+ NSString *statusString = nil;
+ NSString *statusErrorString = [errors length]?NSLocalizedString(@"Errors", @"Errors title"):NSLocalizedString(@"No errors", @"No errors title");
if ( [mySQLConnection queryCancelled] ) {
if (totalQueriesRun > 1) {
- [[affectedRowsText onMainThread] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Cancelled in query %ld, after %@", @"text showing multiple queries were cancelled"),
- (long)totalQueriesRun,
- [NSString stringForTimeInterval:executionTime]
- ]];
+ statusString = [NSString stringWithFormat:NSLocalizedString(@"%@; Cancelled in query %ld, after %@", @"text showing multiple queries were cancelled"),
+ statusErrorString,
+ (long)totalQueriesRun,
+ [NSString stringForTimeInterval:executionTime]
+ ];
} else {
- [[affectedRowsText onMainThread] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Cancelled after %@", @"text showing a query was cancelled"),
- [NSString stringForTimeInterval:executionTime]
- ]];
+ statusString = [NSString stringWithFormat:NSLocalizedString(@"%@; Cancelled after %@", @"text showing a query was cancelled"),
+ statusErrorString,
+ [NSString stringForTimeInterval:executionTime]
+ ];
}
} else if ( totalQueriesRun > 1 ) {
if (totalAffectedRows==1) {
- [[affectedRowsText onMainThread] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"1 row affected in total, by %ld queries taking %@", @"text showing one row has been affected by multiple queries"),
- (long)totalQueriesRun,
- [NSString stringForTimeInterval:executionTime]
- ]];
-
+ statusString = [NSString stringWithFormat:NSLocalizedString(@"%@; 1 row affected in total, by %ld queries taking %@", @"text showing one row has been affected by multiple queries"),
+ statusErrorString,
+ (long)totalQueriesRun,
+ [NSString stringForTimeInterval:executionTime]
+ ];
} else {
- [[affectedRowsText onMainThread] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%ld rows affected in total, by %ld queries taking %@", @"text showing how many rows have been affected by multiple queries"),
- (long)totalAffectedRows,
- (long)totalQueriesRun,
- [NSString stringForTimeInterval:executionTime]
- ]];
-
+ statusString = [NSString stringWithFormat:NSLocalizedString(@"%@; %ld rows affected in total, by %ld queries taking %@", @"text showing how many rows have been affected by multiple queries"),
+ statusErrorString,
+ (long)totalAffectedRows,
+ (long)totalQueriesRun,
+ [NSString stringForTimeInterval:executionTime]
+ ];
}
} else {
if (totalAffectedRows==1) {
- [[affectedRowsText onMainThread] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"1 row affected, taking %@", @"text showing one row has been affected by a single query"),
- [NSString stringForTimeInterval:executionTime]
- ]];
+ statusString = [NSString stringWithFormat:NSLocalizedString(@"%@; 1 row affected, taking %@", @"text showing one row has been affected by a single query"),
+ statusErrorString,
+ [NSString stringForTimeInterval:executionTime]
+ ];
} else {
- [[affectedRowsText onMainThread] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%ld rows affected, taking %@", @"text showing how many rows have been affected by a single query"),
- (long)totalAffectedRows,
- [NSString stringForTimeInterval:executionTime]
- ]];
-
+ statusString = [NSString stringWithFormat:NSLocalizedString(@"%@; %ld rows affected, taking %@", @"text showing how many rows have been affected by a single query"),
+ statusErrorString,
+ (long)totalAffectedRows,
+ [NSString stringForTimeInterval:executionTime]
+ ];
}
}
+ [[affectedRowsText onMainThread] setStringValue:statusString];
// Restore automatic query retries
[mySQLConnection setAllowQueryRetries:YES];
@@ -802,7 +809,7 @@
// Perform the Growl notification for query completion
[[SPGrowlController sharedGrowlController] notifyWithTitle:@"Query Finished"
- description:[NSString stringWithFormat:NSLocalizedString(@"%@",@"description for query finished growl notification"), [errorText stringValue]]
+ description:[NSString stringWithFormat:NSLocalizedString(@"%@",@"description for query finished growl notification"), [errorText string]]
document:tableDocumentInstance
notificationName:@"Query Finished"];
@@ -833,7 +840,7 @@
// Query finished Growl notification
[[SPGrowlController sharedGrowlController] notifyWithTitle:@"Query Finished"
- description:[NSString stringWithFormat:NSLocalizedString(@"%@",@"description for query finished growl notification"), [errorText stringValue]]
+ description:[NSString stringWithFormat:NSLocalizedString(@"%@",@"description for query finished growl notification"), [errorText string]]
document:tableDocumentInstance
notificationName:@"Query Finished"];
@@ -1214,8 +1221,10 @@
// If errors occur, display them
if ( [mySQLConnection queryCancelled] || ([errorsString length] && !queryIsTableSorter)) {
+
// set the error text
- [errorText setStringValue:errorsString];
+ [errorText setString:[errorsString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]];
+ [[errorTextScrollView verticalScroller] setFloatValue:1.0];
// try to select the line x of the first error if error message with ID 1064 contains "at line x"
// by capturing the last number of the error string
@@ -1274,10 +1283,19 @@
}
} else if ( [errorsString length] && queryIsTableSorter ) {
- [errorText setStringValue:NSLocalizedString(@"Couldn't sort column.", @"text shown if an error occured while sorting the result table")];
+ [errorText setString:NSLocalizedString(@"Couldn't sort column.", @"text shown if an error occured while sorting the result table")];
NSBeep();
} else {
- [errorText setStringValue:NSLocalizedString(@"There were no errors.", @"text shown when query was successfull")];
+ [errorText setString:NSLocalizedString(@"There were no errors.", @"text shown when query was successfull")];
+ }
+
+ // Show or hide the error area if necessary
+ if ([errorsString length] && [queryInfoPaneSplitView collapsibleSubviewCollapsed]) {
+ [queryInfoButton setState:NSOnState];
+ [self toggleQueryInfoPaneCollapse:queryInfoButton];
+ } else if (![errorsString length] && ![queryInfoPaneSplitView collapsibleSubviewCollapsed]) {
+ [queryInfoButton setState:NSOffState];
+ [self toggleQueryInfoPaneCollapse:queryInfoButton];
}
}
@@ -1884,7 +1902,7 @@
NSString *tableForColumn = [columnDefinition objectForKey:@"org_table"];
if(!tableForColumn || ![tableForColumn length]) {
- [errorText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Couldn't identify field origin unambiguously. The column '%@' contains data from more than one table.", @"Custom Query result editing error - could not identify a corresponding column"), [columnDefinition objectForKey:@"name"]]];
+ [errorText setString:[NSString stringWithFormat:NSLocalizedString(@"Couldn't identify field origin unambiguously. The column '%@' contains data from more than one table.", @"Custom Query result editing error - could not identify a corresponding column"), [columnDefinition objectForKey:@"name"]]];
NSBeep();
return;
}
@@ -3757,7 +3775,9 @@
[prefs addObserver:self forKeyPath:SPGlobalResultTableFont options:NSKeyValueObservingOptionNew context:NULL];
// Collapse the query information pane
- /*if ([queryInfoPaneSplitView collapsibleSubview]) {
+ if ([queryInfoPaneSplitView collapsibleSubview]) {
+ queryInfoPanePaddingHeight = [[queryInfoPaneSplitView collapsibleSubview] frame].size.height - [errorTextScrollView frame].size.height;
+
[queryInfoButton setNextState];
[queryInfoButton setToolTip:NSLocalizedString(@"Show Query Information", @"Show Query Information")];
@@ -3766,7 +3786,7 @@
[[queryInfoPaneSplitView collapsibleSubview] setFrameSize:NSMakeSize([queryInfoPaneSplitView collapsibleSubview].frame.size.width, 0)];
[queryInfoPaneSplitView setCollapsibleSubviewCollapsed:YES];
[[queryInfoPaneSplitView collapsibleSubview] setAutoresizesSubviews:YES];
- }*/
+ }
}
/**
diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m
index 0879228a..0a521cc2 100644
--- a/Source/SPDataImport.m
+++ b/Source/SPDataImport.m
@@ -592,6 +592,7 @@
// Otherwise, stop
default:
+ [errors appendString:NSLocalizedString(@"Import cancelled!\n", @"import cancelled message")];
progressCancelled = YES;
}
}