aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/ContentPaginationView.xib201
-rw-r--r--Interfaces/English.lproj/DBView.xib253
-rw-r--r--Source/CMCopyTable.m8
-rw-r--r--Source/SPContentFilterManager.m2
-rw-r--r--Source/SPExportController.m2
-rw-r--r--Source/SPHistoryController.h4
-rw-r--r--Source/SPHistoryController.m2
-rw-r--r--Source/SPPrintController.m2
-rw-r--r--Source/SPTableContent.h (renamed from Source/TableContent.h)2
-rw-r--r--Source/SPTableContent.m (renamed from Source/TableContent.m)4
-rw-r--r--Source/SPTablesList.m2
-rw-r--r--Source/TableDocument.m2
-rw-r--r--Source/TableDump.m2
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj12
14 files changed, 257 insertions, 241 deletions
diff --git a/Interfaces/English.lproj/ContentPaginationView.xib b/Interfaces/English.lproj/ContentPaginationView.xib
index 2a311b24..3fbab6c4 100644
--- a/Interfaces/English.lproj/ContentPaginationView.xib
+++ b/Interfaces/English.lproj/ContentPaginationView.xib
@@ -2,17 +2,16 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.SystemVersion">10D573</string>
+ <string key="IBDocument.InterfaceBuilderVersion">762</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">460.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">740</string>
+ <string key="NS.object.0">762</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -30,7 +29,7 @@
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1001">
- <string key="NSClassName">TableContent</string>
+ <string key="NSClassName">SPTableContent</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
@@ -39,7 +38,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="1005">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">289</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -201,7 +200,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="187149193">
@@ -396,11 +395,11 @@
<bool key="NSTransparent">NO</bool>
<object class="NSColor" key="NSBorderColor2">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjIAA</bytes>
+ <bytes key="NSWhite">MCAwLjIwMDAwMDAwMwA</bytes>
</object>
<object class="NSColor" key="NSFillColor2">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC45NDc1ODA2NDUyAA</bytes>
+ <bytes key="NSWhite">MC45NDc1ODA2MzU1AA</bytes>
</object>
</object>
<object class="NSCustomView" id="298938363">
@@ -412,7 +411,6 @@
</object>
</object>
<string key="NSFrameSize">{278, 135}</string>
- <reference key="NSSuperview"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSClassName">NSView</string>
</object>
@@ -1088,92 +1086,7 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">SPTableInfo</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>infoTable</string>
- <string>tableDataInstance</string>
- <string>tableDocumentInstance</string>
- <string>tableList</string>
- <string>tableListInstance</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>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/SPTableInfo.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">SPTableView</string>
- <string key="superclassName">NSTableView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/SPTableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">SPUserManager</string>
- <string key="superclassName">NSWindowController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>addHost:</string>
- <string>addUser:</string>
- <string>checkAllPrivileges:</string>
- <string>doApply:</string>
- <string>doCancel:</string>
- <string>removeHost:</string>
- <string>removeUser:</string>
- <string>uncheckAllPrivileges:</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>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>outlineView</string>
- <string>privsSupportedByServer</string>
- <string>tabView</string>
- <string>treeController</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSOutlineView</string>
- <string>NSMutableDictionary</string>
- <string>NSTabView</string>
- <string>NSTreeController</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/SPUserManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">TableContent</string>
+ <string key="className">SPTableContent</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1274,8 +1187,93 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPTableInfo</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>infoTable</string>
+ <string>tableDataInstance</string>
+ <string>tableDocumentInstance</string>
+ <string>tableList</string>
+ <string>tableListInstance</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>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/TableContent.h</string>
+ <string key="minorKey">Source/SPTableInfo.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPTableView</string>
+ <string key="superclassName">NSTableView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPTableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPUserManager</string>
+ <string key="superclassName">NSWindowController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addHost:</string>
+ <string>addUser:</string>
+ <string>checkAllPrivileges:</string>
+ <string>doApply:</string>
+ <string>doCancel:</string>
+ <string>removeHost:</string>
+ <string>removeUser:</string>
+ <string>uncheckAllPrivileges:</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>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>outlineView</string>
+ <string>privsSupportedByServer</string>
+ <string>tabView</string>
+ <string>treeController</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSOutlineView</string>
+ <string>NSMutableDictionary</string>
+ <string>NSTabView</string>
+ <string>NSTreeController</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPUserManager.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -2229,6 +2227,7 @@
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
@@ -2240,5 +2239,9 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">NSSwitch</string>
+ <string key="NS.object.0">{15, 15}</string>
+ </object>
</data>
</archive>
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index a26eaa57..12f21205 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -12111,7 +12111,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSClassName">CustomQuery</string>
</object>
<object class="NSCustomObject" id="392169872">
- <string key="NSClassName">TableContent</string>
+ <string key="NSClassName">SPTableContent</string>
</object>
<object class="NSCustomObject" id="225526897">
<string key="NSClassName">TableDump</string>
@@ -27773,21 +27773,21 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/CMImageView.h</string>
+ <string key="minorKey">Source/SPConnectionController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/SPConnectionController.h</string>
+ <string key="minorKey">Source/SPContentFilterManager.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/SPContentFilterManager.h</string>
+ <string key="minorKey">Source/SPImageView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -27817,9 +27817,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NS.key.0">toggleCollapse:</string>
<string key="NS.object.0">id</string>
</object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="471028953">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/TablesList.h</string>
+ <string key="minorKey">Source/SPTablesList.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -28182,6 +28182,112 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPTableContent</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addRow:</string>
+ <string>copyRow:</string>
+ <string>filterTable:</string>
+ <string>navigatePaginationFromButton:</string>
+ <string>reloadTable:</string>
+ <string>removeRow:</string>
+ <string>setCompareTypes:</string>
+ <string>toggleFilterField:</string>
+ <string>togglePagination:</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>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addButton</string>
+ <string>argumentField</string>
+ <string>betweenTextField</string>
+ <string>compareField</string>
+ <string>contentFilterManager</string>
+ <string>contentViewPane</string>
+ <string>copyButton</string>
+ <string>countText</string>
+ <string>fieldField</string>
+ <string>filterButton</string>
+ <string>firstBetweenField</string>
+ <string>limitRowsButton</string>
+ <string>limitRowsField</string>
+ <string>limitRowsStepper</string>
+ <string>multipleLineEditingButton</string>
+ <string>paginationButton</string>
+ <string>paginationNextButton</string>
+ <string>paginationPageField</string>
+ <string>paginationPageStepper</string>
+ <string>paginationPreviousButton</string>
+ <string>paginationView</string>
+ <string>reloadButton</string>
+ <string>removeButton</string>
+ <string>secondBetweenField</string>
+ <string>spHistoryControllerInstance</string>
+ <string>tableContentView</string>
+ <string>tableDataInstance</string>
+ <string>tableDocumentInstance</string>
+ <string>tableInfoInstance</string>
+ <string>tableSourceInstance</string>
+ <string>tablesListInstance</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>NSView</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSPopUpButton</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSButton</string>
+ <string>NSButton</string>
+ <string>NSTextField</string>
+ <string>NSStepper</string>
+ <string>NSButton</string>
+ <string>NSView</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>SPHistoryController</string>
+ <string>CMCopyTable</string>
+ <string>id</string>
+ <string>id</string>
+ <string>SPTableInfo</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPTableContent.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">SPTableData</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="outlets">
@@ -28395,6 +28501,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPTableStructure.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPTableStructure</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
@@ -28610,6 +28724,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>id</string>
</object>
</object>
+ <reference key="sourceIdentifier" ref="471028953"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPTablesList</string>
+ <string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -28640,6 +28759,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPTextView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPTextView</string>
+ <string key="superclassName">NSTextView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
@@ -28721,120 +28848,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">TableContent</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>addRow:</string>
- <string>copyRow:</string>
- <string>filterTable:</string>
- <string>navigatePaginationFromButton:</string>
- <string>reloadTable:</string>
- <string>removeRow:</string>
- <string>setCompareTypes:</string>
- <string>toggleFilterField:</string>
- <string>togglePagination:</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>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>addButton</string>
- <string>argumentField</string>
- <string>betweenTextField</string>
- <string>compareField</string>
- <string>contentFilterManager</string>
- <string>contentViewPane</string>
- <string>copyButton</string>
- <string>countText</string>
- <string>fieldField</string>
- <string>filterButton</string>
- <string>firstBetweenField</string>
- <string>limitRowsButton</string>
- <string>limitRowsField</string>
- <string>limitRowsStepper</string>
- <string>multipleLineEditingButton</string>
- <string>paginationButton</string>
- <string>paginationNextButton</string>
- <string>paginationPageField</string>
- <string>paginationPageStepper</string>
- <string>paginationPreviousButton</string>
- <string>paginationView</string>
- <string>reloadButton</string>
- <string>removeButton</string>
- <string>secondBetweenField</string>
- <string>spHistoryControllerInstance</string>
- <string>tableContentView</string>
- <string>tableDataInstance</string>
- <string>tableDocumentInstance</string>
- <string>tableInfoInstance</string>
- <string>tableSourceInstance</string>
- <string>tablesListInstance</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>NSView</string>
- <string>id</string>
- <string>id</string>
- <string>NSPopUpButton</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSTextField</string>
- <string>NSStepper</string>
- <string>NSButton</string>
- <string>NSView</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>SPHistoryController</string>
- <string>CMCopyTable</string>
- <string>id</string>
- <string>id</string>
- <string>SPTableInfo</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/TableContent.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">TableContent</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">TableDocument</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
diff --git a/Source/CMCopyTable.m b/Source/CMCopyTable.m
index cba561aa..d449190a 100644
--- a/Source/CMCopyTable.m
+++ b/Source/CMCopyTable.m
@@ -27,7 +27,7 @@
#import "CMCopyTable.h"
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
-#import "TableContent.h"
+#import "SPTableContent.h"
#import "SPTableTriggers.h"
#import "SPTableRelations.h"
#import "CustomQuery.h"
@@ -254,10 +254,10 @@ NSInteger MENU_EDIT_COPY_AS_SQL = 2003;
cellData = SPDataStorageObjectAtRowAndColumn(tableStorage, rowIndex, columnMappings[c]);
// If the data is not loaded, attempt to fetch the value
- if ([cellData isSPNotLoaded] && [[self delegate] isKindOfClass:[TableContent class]]) {
+ if ([cellData isSPNotLoaded] && [[self delegate] isKindOfClass:[SPTableContent class]]) {
// Abort if no table name given, not table content, or if there are no indices on this table
- if (!selectedTable || ![[self delegate] isKindOfClass:[TableContent class]] || ![[tableInstance argumentForRow:rowIndex] length]) {
+ if (!selectedTable || ![[self delegate] isKindOfClass:[SPTableContent class]] || ![[tableInstance argumentForRow:rowIndex] length]) {
NSBeep();
free(columnMappings);
free(columnTypes);
@@ -451,7 +451,7 @@ NSInteger MENU_EDIT_COPY_AS_SQL = 2003;
{
// RETURN or ENTER invoke editing mode for selected row
// by calling tableView:shouldEditTableColumn: to validate
- if([[[[self delegate] class] description] isEqualToString:@"TableContent"]) {
+ if([[[[self delegate] class] description] isEqualToString:@"SPTableContent"]) {
id tableContentView = [[self delegate] valueForKeyPath:@"tableContentView"];
if([tableContentView numberOfSelectedRows] == 1 && ([theEvent keyCode] == 36 || [theEvent keyCode] == 76)) {
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
index de2564b1..1edb8416 100644
--- a/Source/SPContentFilterManager.m
+++ b/Source/SPContentFilterManager.m
@@ -27,7 +27,7 @@
#import "ImageAndTextCell.h"
#import "RegexKitLite.h"
#import "SPQueryController.h"
-#import "TableContent.h"
+#import "SPTableContent.h"
#import "SPConstants.h"
#import "SPConnectionController.h"
diff --git a/Source/SPExportController.m b/Source/SPExportController.m
index 0cf756ef..fc858312 100644
--- a/Source/SPExportController.m
+++ b/Source/SPExportController.m
@@ -29,7 +29,7 @@
#import "SPExportInitializer.h"
#import "SPTablesList.h"
#import "SPTableData.h"
-#import "TableContent.h"
+#import "SPTableContent.h"
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
#import "SPConstants.h"
diff --git a/Source/SPHistoryController.h b/Source/SPHistoryController.h
index fc36f1bf..5dcd6962 100644
--- a/Source/SPHistoryController.h
+++ b/Source/SPHistoryController.h
@@ -24,14 +24,14 @@
#import <Cocoa/Cocoa.h>
-@class TableDocument, TableContent, SPTablesList;
+@class TableDocument, SPTableContent, SPTablesList;
@interface SPHistoryController : NSObject
{
IBOutlet TableDocument *theDocument;
IBOutlet NSSegmentedControl *historyControl;
- TableContent *tableContentInstance;
+ SPTableContent *tableContentInstance;
SPTablesList *tablesListInstance;
NSMutableArray *history;
NSMutableDictionary *tableContentStates;
diff --git a/Source/SPHistoryController.m b/Source/SPHistoryController.m
index 40f99a8a..c6ae150c 100644
--- a/Source/SPHistoryController.m
+++ b/Source/SPHistoryController.m
@@ -23,7 +23,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "TableDocument.h"
-#import "TableContent.h"
+#import "SPTableContent.h"
#import "SPTablesList.h"
#import "SPConstants.h"
#import "SPHistoryController.h"
diff --git a/Source/SPPrintController.m b/Source/SPPrintController.m
index 020e3ca0..f01d0ac6 100644
--- a/Source/SPPrintController.m
+++ b/Source/SPPrintController.m
@@ -24,7 +24,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPPrintController.h"
-#import "TableContent.h"
+#import "SPTableContent.h"
#import "SPTableStructure.h"
#import "CustomQuery.h"
#import "SPConstants.h"
diff --git a/Source/TableContent.h b/Source/SPTableContent.h
index 35bd6c31..27903634 100644
--- a/Source/TableContent.h
+++ b/Source/SPTableContent.h
@@ -30,7 +30,7 @@
@class CMCopyTable, SPTextAndLinkCell, SPHistoryController, SPTableInfo, SPDataStorage;
-@interface TableContent : NSObject
+@interface SPTableContent : NSObject
{
IBOutlet id tableDocumentInstance;
IBOutlet id tablesListInstance;
diff --git a/Source/TableContent.m b/Source/SPTableContent.m
index ce24134b..a040fb1c 100644
--- a/Source/TableContent.m
+++ b/Source/SPTableContent.m
@@ -25,7 +25,7 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import "TableContent.h"
+#import "SPTableContent.h"
#import "TableDocument.h"
#import "SPTableStructure.h"
#import "SPTableInfo.h"
@@ -52,7 +52,7 @@
#import "SPMainThreadTrampoline.h"
#import "SPHistoryController.h"
-@implementation TableContent
+@implementation SPTableContent
/**
* Standard init method. Initialize various ivars.
diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m
index 28885938..69fda60d 100644
--- a/Source/SPTablesList.m
+++ b/Source/SPTablesList.m
@@ -26,7 +26,7 @@
#import "SPTablesList.h"
#import "TableDocument.h"
#import "SPTableStructure.h"
-#import "TableContent.h"
+#import "SPTableContent.h"
#import "SPTableData.h"
#import "SPTableInfo.h"
#import "TableDump.h"
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index b327dd7d..c418e95b 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -28,7 +28,7 @@
#import "TableDocument.h"
#import "SPTablesList.h"
#import "SPTableStructure.h"
-#import "TableContent.h"
+#import "SPTableContent.h"
#import "CustomQuery.h"
#import "TableDump.h"
#import "ImageAndTextCell.h"
diff --git a/Source/TableDump.m b/Source/TableDump.m
index 6f2d77bc..f5025509 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -27,7 +27,7 @@
#import "TableDocument.h"
#import "SPTablesList.h"
#import "SPTableStructure.h"
-#import "TableContent.h"
+#import "SPTableContent.h"
#import "CustomQuery.h"
#import "SPGrowlController.h"
#import "SPSQLParser.h"
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 1e93cb14..2741a94e 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -95,7 +95,7 @@
17E641560EF01EF6001BC333 /* CustomQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641490EF01EF6001BC333 /* CustomQuery.m */; };
17E641570EF01EF6001BC333 /* SPAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414B0EF01EF6001BC333 /* SPAppController.m */; };
17E641580EF01EF6001BC333 /* SPGrowlController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414D0EF01EF6001BC333 /* SPGrowlController.m */; };
- 17E641590EF01EF6001BC333 /* TableContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414F0EF01EF6001BC333 /* TableContent.m */; };
+ 17E641590EF01EF6001BC333 /* SPTableContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414F0EF01EF6001BC333 /* SPTableContent.m */; };
17E6415A0EF01EF6001BC333 /* TableDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641510EF01EF6001BC333 /* TableDocument.m */; };
17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641530EF01EF6001BC333 /* TableDump.m */; };
17E6415C0EF01EF6001BC333 /* SPTableStructure.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641550EF01EF6001BC333 /* SPTableStructure.m */; };
@@ -519,8 +519,8 @@
17E6414B0EF01EF6001BC333 /* SPAppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPAppController.m; sourceTree = "<group>"; };
17E6414C0EF01EF6001BC333 /* SPGrowlController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPGrowlController.h; sourceTree = "<group>"; };
17E6414D0EF01EF6001BC333 /* SPGrowlController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPGrowlController.m; sourceTree = "<group>"; };
- 17E6414E0EF01EF6001BC333 /* TableContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableContent.h; sourceTree = "<group>"; };
- 17E6414F0EF01EF6001BC333 /* TableContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableContent.m; sourceTree = "<group>"; };
+ 17E6414E0EF01EF6001BC333 /* SPTableContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableContent.h; sourceTree = "<group>"; };
+ 17E6414F0EF01EF6001BC333 /* SPTableContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableContent.m; sourceTree = "<group>"; };
17E641500EF01EF6001BC333 /* TableDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableDocument.h; sourceTree = "<group>"; };
17E641510EF01EF6001BC333 /* TableDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableDocument.m; sourceTree = "<group>"; };
17E641520EF01EF6001BC333 /* TableDump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableDump.h; sourceTree = "<group>"; };
@@ -1011,8 +1011,8 @@
387BBBA70FBCB6CB00B31746 /* SPTableRelations.m */,
29FA88211114619E00D1AF3D /* SPTableTriggers.h */,
29FA88221114619E00D1AF3D /* SPTableTriggers.m */,
- 17E6414E0EF01EF6001BC333 /* TableContent.h */,
- 17E6414F0EF01EF6001BC333 /* TableContent.m */,
+ 17E6414E0EF01EF6001BC333 /* SPTableContent.h */,
+ 17E6414F0EF01EF6001BC333 /* SPTableContent.m */,
17E641500EF01EF6001BC333 /* TableDocument.h */,
17E641510EF01EF6001BC333 /* TableDocument.m */,
17E641520EF01EF6001BC333 /* TableDump.h */,
@@ -2031,7 +2031,7 @@
17E641560EF01EF6001BC333 /* CustomQuery.m in Sources */,
17E641570EF01EF6001BC333 /* SPAppController.m in Sources */,
17E641580EF01EF6001BC333 /* SPGrowlController.m in Sources */,
- 17E641590EF01EF6001BC333 /* TableContent.m in Sources */,
+ 17E641590EF01EF6001BC333 /* SPTableContent.m in Sources */,
17E6415A0EF01EF6001BC333 /* TableDocument.m in Sources */,
17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */,
17E6415C0EF01EF6001BC333 /* SPTableStructure.m in Sources */,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 07:45:55 +0000