aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/Preferences.xib335
-rw-r--r--Resources/PreferenceDefaults.plist8
-rw-r--r--Source/CustomQuery.m3
-rw-r--r--Source/TableDocument.h9
-rw-r--r--Source/TableDocument.m25
-rw-r--r--Source/TableDump.m23
6 files changed, 207 insertions, 196 deletions
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib
index 058441b0..e0fa3133 100644
--- a/Interfaces/English.lproj/Preferences.xib
+++ b/Interfaces/English.lproj/Preferences.xib
@@ -2,13 +2,12 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9L30</string>
+ <string key="IBDocument.SystemVersion">9L31a</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="512"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -686,8 +685,8 @@
<bool key="NS.raise.underflow">YES</bool>
<bool key="NS.raise.dividebyzero">YES</bool>
</object>
- <string key="NS.decimal">,</string>
- <string key="NS.thousand">.</string>
+ <string key="NS.decimal">.</string>
+ <string key="NS.thousand">,</string>
<bool key="NS.hasthousands">NO</bool>
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">NO</bool>
@@ -733,6 +732,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{152, 181}, {123, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="7693853">
<int key="NSCellFlags">67239424</int>
@@ -755,6 +755,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{28, 220}, {120, 17}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="524603578">
<int key="NSCellFlags">67239488</int>
@@ -771,6 +772,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{374, 67}, {38, 17}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="596167553">
<int key="NSCellFlags">67239488</int>
@@ -787,6 +789,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{152, 221}, {106, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="29938940">
<int key="NSCellFlags">-2080244224</int>
@@ -809,6 +812,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{152, 66}, {115, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="920748663">
<int key="NSCellFlags">67239424</int>
@@ -831,6 +835,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{152, 201}, {105, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="516443326">
<int key="NSCellFlags">-2080244224</int>
@@ -853,6 +858,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{353, 61}, {19, 27}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="1061407286">
<int key="NSCellFlags">917024</int>
@@ -871,6 +877,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{273, 64}, {75, 22}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="585678618">
<int key="NSCellFlags">-1804468672</int>
@@ -921,8 +928,8 @@
<bool key="NS.raise.underflow">YES</bool>
<bool key="NS.raise.dividebyzero">YES</bool>
</object>
- <string key="NS.decimal">,</string>
- <string key="NS.thousand">.</string>
+ <string key="NS.decimal">.</string>
+ <string key="NS.thousand">,</string>
<bool key="NS.hasthousands">NO</bool>
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">NO</bool>
@@ -939,6 +946,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 22}, {131, 17}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="609090823">
<int key="NSCellFlags">68288064</int>
@@ -955,6 +963,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{154, 20}, {75, 22}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="82744709">
<int key="NSCellFlags">-1804468671</int>
@@ -973,6 +982,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{152, 141}, {297, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="441275">
<int key="NSCellFlags">67239424</int>
@@ -995,6 +1005,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{152, 121}, {225, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="561991963">
<int key="NSCellFlags">67239424</int>
@@ -1017,6 +1028,7 @@
<int key="NSvFlags">12</int>
<string key="NSFrame">{{154, 167}, {326, 5}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -1039,6 +1051,7 @@
<int key="NSvFlags">12</int>
<string key="NSFrame">{{154, 92}, {326, 5}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -1061,6 +1074,7 @@
<int key="NSvFlags">12</int>
<string key="NSFrame">{{154, 53}, {326, 5}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -1083,6 +1097,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{152, 101}, {206, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="542131730">
<int key="NSCellFlags">-2080244224</int>
@@ -1103,6 +1118,7 @@
</object>
<string key="NSFrameSize">{500, 259}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="593732956">
@@ -2169,15 +2185,16 @@
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="1041614321">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButton" id="624078196">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 81}, {187, 18}}</string>
+ <string key="NSFrame">{{152, 173}, {187, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1060471631">
<int key="NSCellFlags">67239424</int>
@@ -2198,8 +2215,9 @@
<object class="NSBox" id="122803528">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 44}, {334, 5}}</string>
+ <string key="NSFrame">{{154, 136}, {334, 5}}</string>
<reference key="NSSuperview" ref="1041614321"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -2220,8 +2238,9 @@
<object class="NSButton" id="385216684">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 58}, {261, 18}}</string>
+ <string key="NSFrame">{{152, 150}, {261, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="695439962">
<int key="NSCellFlags">67239424</int>
@@ -2242,13 +2261,14 @@
<object class="NSButton" id="894039889">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 18}, {207, 18}}</string>
+ <string key="NSFrame">{{152, 110}, {207, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="641765383">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Enable logging for all queries</string>
+ <string key="NSContents">Enable logging for queries</string>
<reference key="NSSupport" ref="320262838"/>
<reference key="NSControlView" ref="894039889"/>
<int key="NSButtonFlags">1211912703</int>
@@ -2263,9 +2283,10 @@
</object>
<object class="NSButton" id="638138321">
<reference key="NSNextResponder" ref="1041614321"/>
- <int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{180, -5}, {77, 18}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{180, 87}, {77, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="135236421">
<int key="NSCellFlags">67239424</int>
@@ -2285,9 +2306,10 @@
</object>
<object class="NSButton" id="967639780">
<reference key="NSNextResponder" ref="1041614321"/>
- <int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{180, -28}, {123, 18}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{180, 41}, {123, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="510254021">
<int key="NSCellFlags">67239424</int>
@@ -2307,9 +2329,10 @@
</object>
<object class="NSButton" id="705623520">
<reference key="NSNextResponder" ref="1041614321"/>
- <int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{180, -51}, {154, 18}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{180, 64}, {154, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="29352039">
<int key="NSCellFlags">67239424</int>
@@ -2329,9 +2352,10 @@
</object>
<object class="NSButton" id="184242117">
<reference key="NSNextResponder" ref="1041614321"/>
- <int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{180, -74}, {63, 18}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{180, 18}, {63, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="545580787">
<int key="NSCellFlags">67239424</int>
@@ -2350,7 +2374,9 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{500, 117}</string>
+ <string key="NSFrameSize">{500, 209}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="369742224">
@@ -2677,8 +2703,8 @@ AQAAAAA</bytes>
<bool key="NS.raise.underflow">YES</bool>
<bool key="NS.raise.dividebyzero">YES</bool>
</object>
- <string key="NS.decimal">,</string>
- <string key="NS.thousand">.</string>
+ <string key="NS.decimal">.</string>
+ <string key="NS.thousand">,</string>
<bool key="NS.hasthousands">NO</bool>
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">YES</bool>
@@ -3443,6 +3469,13 @@ AQAAAAA</bytes>
<string key="NSClassName">NSView</string>
</object>
<object class="NSUserDefaultsController" id="151174232">
+ <object class="NSMutableArray" key="NSDeclaredKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>ConsoleEnableInterfaceLogging</string>
+ <string>ConsoleEnableImportExportLogging</string>
+ <string>ConsoleEnableCustomQueryLogging</string>
+ <string>ConsoleEnableErrorLogging</string>
+ </object>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSArrayController" id="937123943">
@@ -4718,70 +4751,6 @@ AQAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">value: values.EnableInterfaceLogging</string>
- <reference key="source" ref="638138321"/>
- <reference key="destination" ref="151174232"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="638138321"/>
- <reference key="NSDestination" ref="151174232"/>
- <string key="NSLabel">value: values.EnableInterfaceLogging</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">values.EnableInterfaceLogging</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">1162</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: values.EnableImportExportLogging</string>
- <reference key="source" ref="967639780"/>
- <reference key="destination" ref="151174232"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="967639780"/>
- <reference key="NSDestination" ref="151174232"/>
- <string key="NSLabel">value: values.EnableImportExportLogging</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">values.EnableImportExportLogging</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">1163</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: values.EnableCustomQueryLogging</string>
- <reference key="source" ref="705623520"/>
- <reference key="destination" ref="151174232"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="705623520"/>
- <reference key="NSDestination" ref="151174232"/>
- <string key="NSLabel">value: values.EnableCustomQueryLogging</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">values.EnableCustomQueryLogging</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">1164</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: values.EnableErrorLogging</string>
- <reference key="source" ref="184242117"/>
- <reference key="destination" ref="151174232"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="184242117"/>
- <reference key="NSDestination" ref="151174232"/>
- <string key="NSLabel">value: values.EnableErrorLogging</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">values.EnableErrorLogging</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">1165</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
<string key="label">selectedIndex: selection.type</string>
<reference key="source" ref="961025550"/>
<reference key="destination" ref="937123943"/>
@@ -5496,6 +5465,70 @@ AQAAAAA</bytes>
</object>
<int key="connectionID">1378</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.ConsoleEnableInterfaceLogging</string>
+ <reference key="source" ref="638138321"/>
+ <reference key="destination" ref="151174232"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="638138321"/>
+ <reference key="NSDestination" ref="151174232"/>
+ <string key="NSLabel">value: values.ConsoleEnableInterfaceLogging</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.ConsoleEnableInterfaceLogging</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">1379</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.ConsoleEnableImportExportLogging</string>
+ <reference key="source" ref="967639780"/>
+ <reference key="destination" ref="151174232"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="967639780"/>
+ <reference key="NSDestination" ref="151174232"/>
+ <string key="NSLabel">value: values.ConsoleEnableImportExportLogging</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.ConsoleEnableImportExportLogging</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">1380</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.ConsoleEnableCustomQueryLogging</string>
+ <reference key="source" ref="705623520"/>
+ <reference key="destination" ref="151174232"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="705623520"/>
+ <reference key="NSDestination" ref="151174232"/>
+ <string key="NSLabel">value: values.ConsoleEnableCustomQueryLogging</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.ConsoleEnableCustomQueryLogging</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">1381</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.ConsoleEnableErrorLogging</string>
+ <reference key="source" ref="184242117"/>
+ <reference key="destination" ref="151174232"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="184242117"/>
+ <reference key="NSDestination" ref="151174232"/>
+ <string key="NSLabel">value: values.ConsoleEnableErrorLogging</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.ConsoleEnableErrorLogging</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">1382</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -8584,7 +8617,7 @@ AQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{447, 564}, {500, 117}}</string>
+ <string>{{388, 472}, {500, 209}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8757,7 +8790,7 @@ AQAAAAA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1378</int>
+ <int key="maxID">1382</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -8792,122 +8825,34 @@ AQAAAAA</bytes>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">toggleCollapse:</string>
- <string key="NS.object.0">id</string>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/TablesList.h</string>
+ <string key="minorKey">Source/SPExporter.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
+ <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/SPWindowAdditions.h</string>
+ <string key="minorKey">Source/SPQueryFavoriteManager.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">SPPreferenceController</string>
- <string key="superclassName">NSWindowController</string>
+ <string key="className">NSObject</string>
<object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>addFavorite:</string>
- <string>changeFont:</string>
- <string>displayAutoUpdatePreferences:</string>
- <string>displayEditorPreferences:</string>
- <string>displayFavoritePreferences:</string>
- <string>displayGeneralPreferences:</string>
- <string>displayNetworkPreferences:</string>
- <string>displayNotificationPreferences:</string>
- <string>displayTablePreferences:</string>
- <string>duplicateFavorite:</string>
- <string>favoriteTypeDidChange:</string>
- <string>removeFavorite:</string>
- <string>saveFavorite:</string>
- <string>setDefaultColors:</string>
- <string>showCustomQueryFontPanel:</string>
- <string>updateDefaultFavorite:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>autoUpdateView</string>
- <string>defaultFavoritePopup</string>
- <string>editorFontName</string>
- <string>editorView</string>
- <string>favoritesController</string>
- <string>favoritesTabView</string>
- <string>favoritesTableView</string>
- <string>favoritesView</string>
- <string>generalView</string>
- <string>networkView</string>
- <string>notificationsView</string>
- <string>preferencesWindow</string>
- <string>socketPasswordField</string>
- <string>sshPasswordField</string>
- <string>sshSQLPasswordField</string>
- <string>standardPasswordField</string>
- <string>tablesView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSView</string>
- <string>NSPopUpButton</string>
- <string>NSTextField</string>
- <string>NSView</string>
- <string>NSArrayController</string>
- <string>NSTabView</string>
- <string>NSTableView</string>
- <string>NSView</string>
- <string>NSView</string>
- <string>NSView</string>
- <string>NSView</string>
- <string>NSWindow</string>
- <string>NSSecureTextField</string>
- <string>NSSecureTextField</string>
- <string>NSSecureTextField</string>
- <string>NSSecureTextField</string>
- <string>NSView</string>
- </object>
+ <string key="NS.key.0">toggleCollapse:</string>
+ <string key="NS.object.0">id</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/SPPreferenceController.h</string>
+ <string key="minorKey">Source/TablesList.h</string>
</object>
</object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
- <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="211715013">
- <string key="majorKey">IBDocumentRelativeSource</string>
- <string key="minorKey">../../Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h</string>
+ <string key="className">NSWindow</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPWindowAdditions.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -8964,7 +8909,6 @@ AQAAAAA</bytes>
<string>editorView</string>
<string>favoriteHostTextField</string>
<string>favoriteHostTextFieldSSH</string>
- <string>favoriteHostTextFieldSocket</string>
<string>favoriteNameTextField</string>
<string>favoriteUserTextField</string>
<string>favoriteUserTextFieldSSH</string>
@@ -8995,7 +8939,6 @@ AQAAAAA</bytes>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSTextField</string>
- <string>NSTextField</string>
<string>NSArrayController</string>
<string>NSTabView</string>
<string>NSTableView</string>
@@ -9012,8 +8955,18 @@ AQAAAAA</bytes>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPPreferenceController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="211715013">
<string key="majorKey">IBDocumentRelativeSource</string>
- <string key="minorKey">../../Source/SPPreferenceController.h</string>
+ <string key="minorKey">../../Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
diff --git a/Resources/PreferenceDefaults.plist b/Resources/PreferenceDefaults.plist
index bf58e7ec..4f127c88 100644
--- a/Resources/PreferenceDefaults.plist
+++ b/Resources/PreferenceDefaults.plist
@@ -88,6 +88,14 @@
<false/>
<key>ConsoleEnableLogging</key>
<true/>
+ <key>ConsoleEnableInterfaceLogging</key>
+ <true/>
+ <key>ConsoleEnableCustomQueryLogging</key>
+ <true/>
+ <key>ConsoleEnableImportExportLogging</key>
+ <false/>
+ <key>ConsoleEnableErrorLogging</key>
+ <true/>
<key>ConsoleShowTimestamps</key>
<true/>
<key>ConsoleShowSelectsAndShows</key>
diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m
index 17ca6d35..dcb42c26 100644
--- a/Source/CustomQuery.m
+++ b/Source/CustomQuery.m
@@ -340,6 +340,7 @@
// BOOL queriesSeparatedByDelimiter = NO;
NSCharacterSet *whitespaceAndNewlineSet = [NSCharacterSet whitespaceAndNewlineCharacterSet];
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_CUSTOMQUERY];
// Notify listeners that a query has started
[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:self];
@@ -573,6 +574,8 @@
// Restore automatic query retries
[mySQLConnection setAllowQueryRetries:YES];
+
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
// If no results were returned, redraw the empty table and post notifications before returning.
if ( ![fullResult count] ) {
diff --git a/Source/TableDocument.h b/Source/TableDocument.h
index 3c890a40..0ad2638f 100644
--- a/Source/TableDocument.h
+++ b/Source/TableDocument.h
@@ -32,6 +32,13 @@
@class SPConnectionController, SPUserManager;
+enum sp_current_query_mode
+{
+ SP_QUERYMODE_INTERFACE = 0,
+ SP_QUERYMODE_CUSTOMQUERY = 1,
+ SP_QUERYMODE_IMPORTEXPORT = 2
+};
+
/**
* The TableDocument class controls the primary database view window.
*/
@@ -124,6 +131,7 @@
BOOL _shouldOpenConnectionAutomatically;
BOOL _isConnected;
BOOL _mainNibLoaded;
+ int _queryMode;
NSToolbar *mainToolbar;
NSToolbarItem *chooseDatabaseToolbarItem;
@@ -180,6 +188,7 @@
- (IBAction)checksumTable:(id)sender;
// Other methods
+- (void) setQueryMode:(int)theQueryMode;
- (NSString *)host;
- (IBAction)closeSheet:(id)sender;
- (IBAction)closeErrorConnectionSheet:(id)sender;
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index ece7d376..84aad499 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -71,6 +71,7 @@
_mainNibLoaded = NO;
_encoding = [[NSString alloc] initWithString:@"utf8"];
_isConnected = NO;
+ _queryMode = SP_QUERYMODE_INTERFACE;
chooseDatabaseButton = nil;
chooseDatabaseToolbarItem = nil;
connectionController = nil;
@@ -1051,6 +1052,14 @@
[[SPQueryConsole sharedQueryConsole] clearConsole:sender];
}
+/**
+ * Set a query mode, used to control logging dependant on preferences
+ */
+- (void) setQueryMode:(int)theQueryMode
+{
+ _queryMode = theQueryMode;
+}
+
#pragma mark -
#pragma mark Encoding Methods
@@ -2802,9 +2811,15 @@
* Invoked when the framework is about to perform a query.
*/
- (void)willQueryString:(NSString *)query connection:(id)connection
-{
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"ConsoleEnableLogging"]) {
- [[SPQueryConsole sharedQueryConsole] showMessageInConsole:query];
+{
+ NSLog(@"Mode is %i, bool is %@", _queryMode, [prefs boolForKey:@"ConsoleEnableImportExportLogging"]?@"on":@"off");
+ if ([prefs boolForKey:@"ConsoleEnableLogging"]) {
+ if ((_queryMode == SP_QUERYMODE_INTERFACE && [prefs boolForKey:@"ConsoleEnableInterfaceLogging"])
+ || (_queryMode == SP_QUERYMODE_CUSTOMQUERY && [prefs boolForKey:@"ConsoleEnableCustomQueryLogging"])
+ || (_queryMode == SP_QUERYMODE_IMPORTEXPORT && [prefs boolForKey:@"ConsoleEnableImportExportLogging"]))
+ {
+ [[SPQueryConsole sharedQueryConsole] showMessageInConsole:query];
+ }
}
}
@@ -2813,7 +2828,9 @@
*/
- (void)queryGaveError:(NSString *)error connection:(id)connection
{
- [[SPQueryConsole sharedQueryConsole] showErrorInConsole:error];
+ if ([prefs boolForKey:@"ConsoleEnableLogging"] && [prefs boolForKey:@"ConsoleEnableErrorLogging"]) {
+ [[SPQueryConsole sharedQueryConsole] showErrorInConsole:error];
+ }
}
/**
diff --git a/Source/TableDump.m b/Source/TableDump.m
index a41b61df..a9b1be37 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -462,6 +462,8 @@
[NSApp beginSheet:singleProgressSheet modalForWindow:tableWindow modalDelegate:self didEndSelector:nil contextInfo:nil];
[singleProgressSheet makeKeyWindow];
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_IMPORTEXPORT];
+
// Read in the file in a loop
sqlParser = [[SPSQLParser alloc] init];
sqlDataBuffer = [[NSMutableData alloc] init];
@@ -480,6 +482,7 @@
[sqlParser release];
[sqlDataBuffer release];
[importPool drain];
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
return;
}
@@ -526,6 +529,7 @@
[sqlParser release];
[sqlDataBuffer release];
[importPool drain];
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
return;
}
}
@@ -601,6 +605,7 @@
[sqlParser release];
[sqlDataBuffer release];
[importPool drain];
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
// Close progress sheet
[NSApp endSheet:singleProgressSheet];
@@ -657,6 +662,8 @@
didEndSelector:nil
contextInfo:nil];
[singleProgressSheet makeKeyWindow];
+
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_IMPORTEXPORT];
// Read the file with the current connection encoding.
dumpFile = [NSString stringWithContentsOfFile:filename
@@ -673,6 +680,7 @@
nil, nil, nil,
[errorStr localizedDescription]
);
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
return;
}
@@ -705,12 +713,14 @@
NSLocalizedString(@"Could not parse file as CSV", @"Error when we can't parse/split file as CSV")
);
[importArray release], importArray = nil;
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
return;
}
if (progressCancelled) {
progressCancelled = NO;
[importArray release], importArray = nil;
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
return;
}
MCPResult *theResult;
@@ -745,6 +755,7 @@
NSLocalizedString(@"The CSV was read as containing more than 512 columns, more than the maximum columns permitted for speed reasons by Sequel Pro.\n\nThis usually happens due to errors reading the CSV; please double-check the CSV to be imported and the line endings and escape characters at the bottom of the CSV selection dialog.", @"Error when CSV appears to have too many columns to import, probably due to line ending mismatch")
);
[importArray release], importArray = nil;
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
return;
}
@@ -870,6 +881,8 @@
//free arrays
if (fieldMappingArray) [fieldMappingArray release], fieldMappingArray = nil;
[importArray release], importArray = nil;
+
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
// Import finished Growl notification
[[SPGrowlController sharedGrowlController] notifyWithTitle:@"Import Finished"
@@ -999,7 +1012,9 @@
[NSApp beginSheet:singleProgressSheet
modalForWindow:tableWindow modalDelegate:self
didEndSelector:nil contextInfo:nil];
-
+
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_IMPORTEXPORT];
+
// Copy over the selected table names into a table in preparation for iteration
for ( i = 0 ; i < [tables count] ; i++ ) {
if ( [NSArrayObjectAtIndex(NSArrayObjectAtIndex(tables, i), 0) boolValue] ) {
@@ -1292,6 +1307,8 @@
[errorsSheet orderOut:nil];
}
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
+
[sqlString release];
return TRUE;
}
@@ -2067,6 +2084,8 @@
[singleProgressText displayIfNeeded];
[singleProgressBar setDoubleValue:0];
[singleProgressBar displayIfNeeded];
+
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_IMPORTEXPORT];
// Open the progress sheet
[NSApp beginSheet:singleProgressSheet
@@ -2223,6 +2242,8 @@
[NSApp endSheet:errorsSheet];
[errorsSheet orderOut:nil];
}
+
+ [tableDocumentInstance setQueryMode:SP_QUERYMODE_INTERFACE];
return TRUE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-01 07:39:14 +0000