aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-05-27 20:08:13 +0000
committerstuconnolly <stuart02@gmail.com>2010-05-27 20:08:13 +0000
commitd62541cf4992bd6b4e1d0f3bee58e8a6367c5e48 (patch)
tree9b86bea52408640f3cb43bb6487b8184b985c177
parent20e2a56789fee97b67c41e3d16b5752dbe9f495b (diff)
downloadsequelpro-d62541cf4992bd6b4e1d0f3bee58e8a6367c5e48.tar.gz
sequelpro-d62541cf4992bd6b4e1d0f3bee58e8a6367c5e48.tar.bz2
sequelpro-d62541cf4992bd6b4e1d0f3bee58e8a6367c5e48.zip
Rename TablesList to SPTablesList.
-rw-r--r--Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m2
-rw-r--r--Interfaces/English.lproj/DBView.xib277
-rw-r--r--Interfaces/English.lproj/MainMenu.xib265
-rw-r--r--Source/CustomQuery.m2
-rw-r--r--Source/SPExportController.m2
-rw-r--r--Source/SPExportInitializer.m2
-rw-r--r--Source/SPExtendedTableInfo.h4
-rw-r--r--Source/SPExtendedTableInfo.m2
-rw-r--r--Source/SPFieldMapperController.m2
-rw-r--r--Source/SPHistoryController.h4
-rw-r--r--Source/SPHistoryController.m2
-rw-r--r--Source/SPNavigatorController.m2
-rw-r--r--Source/SPSQLExporter.m2
-rw-r--r--Source/SPTableData.m2
-rw-r--r--Source/SPTableInfo.m2
-rw-r--r--Source/SPTableRelations.m2
-rw-r--r--Source/SPTableTriggers.m2
-rw-r--r--Source/SPTableView.m4
-rw-r--r--Source/SPTablesList.h (renamed from Source/TablesList.h)4
-rw-r--r--Source/SPTablesList.m (renamed from Source/TablesList.m)10
-rw-r--r--Source/SPTextView.h4
-rw-r--r--Source/SPTextView.m4
-rw-r--r--Source/TableContent.m2
-rw-r--r--Source/TableDocument.m6
-rw-r--r--Source/TableDump.m4
-rw-r--r--Source/TableSource.m4
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj12
27 files changed, 314 insertions, 316 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
index f56e4750..eca76dcb 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
@@ -2035,7 +2035,7 @@ void performThreadedKeepAlive(void *ptr)
return;
}
- // Retrieve the tables and views for this database from tablesList (TODO: split out of MCPKit)
+ // Retrieve the tables and views for this database from SPTablesList (TODO: split out of MCPKit)
NSMutableArray *tablesAndViews = [NSMutableArray array];
for (id aTable in [[[self delegate] valueForKeyPath:@"tablesListInstance"] allTableNames]) {
NSDictionary *aTableDict = [NSDictionary dictionaryWithObjectsAndKeys:
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 0416cbc0..18f8e6a2 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -12117,7 +12117,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSClassName">TableDump</string>
</object>
<object class="NSCustomObject" id="438574515">
- <string key="NSClassName">TablesList</string>
+ <string key="NSClassName">SPTablesList</string>
</object>
<object class="NSCustomObject" id="103234030">
<string key="NSClassName">TableSource</string>
@@ -27817,7 +27817,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NS.key.0">toggleCollapse:</string>
<string key="NS.object.0">id</string>
</object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="197237725">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Source/TablesList.h</string>
</object>
@@ -28148,7 +28148,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>id</string>
<string>NSPopUpButton</string>
<string>NSTextField</string>
- <string>TablesList</string>
+ <string>SPTablesList</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -28388,6 +28388,138 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPTablesList</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>addTable:</string>
+ <string>closeSheet:</string>
+ <string>copyTable:</string>
+ <string>removeTable:</string>
+ <string>renameTable:</string>
+ <string>togglePaneCollapse:</string>
+ <string>truncateTable:</string>
+ <string>updateFilter:</string>
+ <string>updateTables:</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>addTableButton</string>
+ <string>copyTableButton</string>
+ <string>copyTableContentSwitch</string>
+ <string>copyTableMessageField</string>
+ <string>copyTableNameField</string>
+ <string>copyTableSheet</string>
+ <string>customQueryInstance</string>
+ <string>databaseDataInstance</string>
+ <string>duplicateTableContextMenuItem</string>
+ <string>duplicateTableMenuItem</string>
+ <string>extendedTableInfoInstance</string>
+ <string>listFilterField</string>
+ <string>removeTableContextMenuItem</string>
+ <string>removeTableMenuItem</string>
+ <string>renameTableContextMenuItem</string>
+ <string>renameTableMenuItem</string>
+ <string>separatorTableContextMenuItem</string>
+ <string>separatorTableContextMenuItem2</string>
+ <string>separatorTableMenuItem</string>
+ <string>separatorTableMenuItem2</string>
+ <string>showCreateSyntaxContextMenuItem</string>
+ <string>showCreateSyntaxMenuItem</string>
+ <string>spHistoryControllerInstance</string>
+ <string>tabView</string>
+ <string>tableContentInstance</string>
+ <string>tableDataInstance</string>
+ <string>tableDocumentInstance</string>
+ <string>tableDumpInstance</string>
+ <string>tableEncodingButton</string>
+ <string>tableInfoCollapseButton</string>
+ <string>tableInfoInstance</string>
+ <string>tableListFilterSplitView</string>
+ <string>tableListSplitView</string>
+ <string>tableNameField</string>
+ <string>tableSheet</string>
+ <string>tableSourceInstance</string>
+ <string>tableTriggersInstance</string>
+ <string>tableTypeButton</string>
+ <string>tablesListView</string>
+ <string>toolbarActionsButton</string>
+ <string>toolbarAddButton</string>
+ <string>toolbarReloadButton</string>
+ <string>truncateTableButton</string>
+ <string>truncateTableContextButton</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>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>id</string>
+ <string>NSSearchField</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>SPHistoryController</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSButton</string>
+ <string>id</string>
+ <string>NSSplitView</string>
+ <string>NSSplitView</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="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">SPTextView</string>
<string key="superclassName">NSTextView</string>
<object class="NSMutableDictionary" key="actions">
@@ -28408,7 +28540,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>CustomQuery</string>
<string>NSScrollView</string>
<string>TableDocument</string>
- <string>TablesList</string>
+ <string>SPTablesList</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -29156,143 +29288,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="minorKey"/>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">TablesList</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>addTable:</string>
- <string>closeSheet:</string>
- <string>copyTable:</string>
- <string>removeTable:</string>
- <string>renameTable:</string>
- <string>togglePaneCollapse:</string>
- <string>truncateTable:</string>
- <string>updateFilter:</string>
- <string>updateTables:</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>addTableButton</string>
- <string>copyTableButton</string>
- <string>copyTableContentSwitch</string>
- <string>copyTableMessageField</string>
- <string>copyTableNameField</string>
- <string>copyTableSheet</string>
- <string>customQueryInstance</string>
- <string>databaseDataInstance</string>
- <string>duplicateTableContextMenuItem</string>
- <string>duplicateTableMenuItem</string>
- <string>extendedTableInfoInstance</string>
- <string>listFilterField</string>
- <string>removeTableContextMenuItem</string>
- <string>removeTableMenuItem</string>
- <string>renameTableContextMenuItem</string>
- <string>renameTableMenuItem</string>
- <string>separatorTableContextMenuItem</string>
- <string>separatorTableContextMenuItem2</string>
- <string>separatorTableMenuItem</string>
- <string>separatorTableMenuItem2</string>
- <string>showCreateSyntaxContextMenuItem</string>
- <string>showCreateSyntaxMenuItem</string>
- <string>spHistoryControllerInstance</string>
- <string>tabView</string>
- <string>tableContentInstance</string>
- <string>tableDataInstance</string>
- <string>tableDocumentInstance</string>
- <string>tableDumpInstance</string>
- <string>tableEncodingButton</string>
- <string>tableInfoCollapseButton</string>
- <string>tableInfoInstance</string>
- <string>tableListFilterSplitView</string>
- <string>tableListSplitView</string>
- <string>tableNameField</string>
- <string>tableSheet</string>
- <string>tableSourceInstance</string>
- <string>tableTriggersInstance</string>
- <string>tableTypeButton</string>
- <string>tablesListView</string>
- <string>toolbarActionsButton</string>
- <string>toolbarAddButton</string>
- <string>toolbarReloadButton</string>
- <string>truncateTableButton</string>
- <string>truncateTableContextButton</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>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>id</string>
- <string>NSSearchField</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>SPHistoryController</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>NSButton</string>
- <string>id</string>
- <string>NSSplitView</string>
- <string>NSSplitView</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>
- <reference key="sourceIdentifier" ref="197237725"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">TablesList</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 7deba083..2f0c82fc 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -5163,7 +5163,7 @@
<string key="NS.key.0">toggleCollapse:</string>
<string key="NS.object.0">id</string>
</object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="97037241">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Source/TablesList.h</string>
</object>
@@ -5602,6 +5602,138 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPTablesList</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>addTable:</string>
+ <string>closeSheet:</string>
+ <string>copyTable:</string>
+ <string>removeTable:</string>
+ <string>renameTable:</string>
+ <string>togglePaneCollapse:</string>
+ <string>truncateTable:</string>
+ <string>updateFilter:</string>
+ <string>updateTables:</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>addTableButton</string>
+ <string>copyTableButton</string>
+ <string>copyTableContentSwitch</string>
+ <string>copyTableMessageField</string>
+ <string>copyTableNameField</string>
+ <string>copyTableSheet</string>
+ <string>customQueryInstance</string>
+ <string>databaseDataInstance</string>
+ <string>duplicateTableContextMenuItem</string>
+ <string>duplicateTableMenuItem</string>
+ <string>extendedTableInfoInstance</string>
+ <string>listFilterField</string>
+ <string>removeTableContextMenuItem</string>
+ <string>removeTableMenuItem</string>
+ <string>renameTableContextMenuItem</string>
+ <string>renameTableMenuItem</string>
+ <string>separatorTableContextMenuItem</string>
+ <string>separatorTableContextMenuItem2</string>
+ <string>separatorTableMenuItem</string>
+ <string>separatorTableMenuItem2</string>
+ <string>showCreateSyntaxContextMenuItem</string>
+ <string>showCreateSyntaxMenuItem</string>
+ <string>spHistoryControllerInstance</string>
+ <string>tabView</string>
+ <string>tableContentInstance</string>
+ <string>tableDataInstance</string>
+ <string>tableDocumentInstance</string>
+ <string>tableDumpInstance</string>
+ <string>tableEncodingButton</string>
+ <string>tableInfoCollapseButton</string>
+ <string>tableInfoInstance</string>
+ <string>tableListFilterSplitView</string>
+ <string>tableListSplitView</string>
+ <string>tableNameField</string>
+ <string>tableSheet</string>
+ <string>tableSourceInstance</string>
+ <string>tableTriggersInstance</string>
+ <string>tableTypeButton</string>
+ <string>tablesListView</string>
+ <string>toolbarActionsButton</string>
+ <string>toolbarAddButton</string>
+ <string>toolbarReloadButton</string>
+ <string>truncateTableButton</string>
+ <string>truncateTableContextButton</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>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>id</string>
+ <string>NSSearchField</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>SPHistoryController</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSButton</string>
+ <string>id</string>
+ <string>NSSplitView</string>
+ <string>NSSplitView</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="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">SPTextView</string>
<string key="superclassName">NSTextView</string>
<object class="NSMutableDictionary" key="actions">
@@ -5622,7 +5754,7 @@
<string>CustomQuery</string>
<string>NSScrollView</string>
<string>TableDocument</string>
- <string>TablesList</string>
+ <string>SPTablesList</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -6020,135 +6152,6 @@
<string key="minorKey">Source/TableDocument.h</string>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">TablesList</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>addTable:</string>
- <string>closeSheet:</string>
- <string>copyTable:</string>
- <string>removeTable:</string>
- <string>renameTable:</string>
- <string>togglePaneCollapse:</string>
- <string>truncateTable:</string>
- <string>updateFilter:</string>
- <string>updateTables:</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>addTableButton</string>
- <string>copyTableButton</string>
- <string>copyTableContentSwitch</string>
- <string>copyTableMessageField</string>
- <string>copyTableNameField</string>
- <string>copyTableSheet</string>
- <string>customQueryInstance</string>
- <string>databaseDataInstance</string>
- <string>duplicateTableContextMenuItem</string>
- <string>duplicateTableMenuItem</string>
- <string>extendedTableInfoInstance</string>
- <string>listFilterField</string>
- <string>removeTableContextMenuItem</string>
- <string>removeTableMenuItem</string>
- <string>renameTableContextMenuItem</string>
- <string>renameTableMenuItem</string>
- <string>separatorTableContextMenuItem</string>
- <string>separatorTableContextMenuItem2</string>
- <string>separatorTableMenuItem</string>
- <string>separatorTableMenuItem2</string>
- <string>showCreateSyntaxContextMenuItem</string>
- <string>showCreateSyntaxMenuItem</string>
- <string>spHistoryControllerInstance</string>
- <string>tabView</string>
- <string>tableContentInstance</string>
- <string>tableDataInstance</string>
- <string>tableDocumentInstance</string>
- <string>tableDumpInstance</string>
- <string>tableEncodingButton</string>
- <string>tableInfoCollapseButton</string>
- <string>tableInfoInstance</string>
- <string>tableListFilterSplitView</string>
- <string>tableListSplitView</string>
- <string>tableNameField</string>
- <string>tableSheet</string>
- <string>tableSourceInstance</string>
- <string>tableTriggersInstance</string>
- <string>tableTypeButton</string>
- <string>tablesListView</string>
- <string>toolbarActionsButton</string>
- <string>toolbarAddButton</string>
- <string>toolbarReloadButton</string>
- <string>truncateTableButton</string>
- <string>truncateTableContextButton</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>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>id</string>
- <string>NSSearchField</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>NSMenuItem</string>
- <string>SPHistoryController</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>NSButton</string>
- <string>id</string>
- <string>NSSplitView</string>
- <string>NSSplitView</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>
- <reference key="sourceIdentifier" ref="97037241"/>
- </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
<bool key="EncodedWithXMLCoder">YES</bool>
diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m
index 6020a255..0e13d344 100644
--- a/Source/CustomQuery.m
+++ b/Source/CustomQuery.m
@@ -32,7 +32,7 @@
#import "SPDataAdditions.h"
#import "SPDataCellFormatter.h"
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "RegexKitLite.h"
#import "SPFieldEditorController.h"
#import "SPTextAndLinkCell.h"
diff --git a/Source/SPExportController.m b/Source/SPExportController.m
index d87ccf7e..0cf756ef 100644
--- a/Source/SPExportController.m
+++ b/Source/SPExportController.m
@@ -27,7 +27,7 @@
#import "SPExportController.h"
#import "SPExportInitializer.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPTableData.h"
#import "TableContent.h"
#import "SPArrayAdditions.h"
diff --git a/Source/SPExportInitializer.m b/Source/SPExportInitializer.m
index 46eaf2b6..7b82de87 100644
--- a/Source/SPExportInitializer.m
+++ b/Source/SPExportInitializer.m
@@ -29,7 +29,7 @@
#import "SPStringAdditions.h"
#import "SPTableData.h"
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPGrowlController.h"
#import "SPMainThreadTrampoline.h"
#import "TableDocument.h"
diff --git a/Source/SPExtendedTableInfo.h b/Source/SPExtendedTableInfo.h
index aef1a6c4..9a067b0c 100644
--- a/Source/SPExtendedTableInfo.h
+++ b/Source/SPExtendedTableInfo.h
@@ -26,12 +26,12 @@
#import <Cocoa/Cocoa.h>
#import <MCPKit/MCPKit.h>
-@class SPTableData, SPDatabaseData, TablesList;
+@class SPTableData, SPDatabaseData, SPTablesList;
@interface SPExtendedTableInfo : NSObject
{
IBOutlet id tableDocumentInstance;
- IBOutlet TablesList *tablesListInstance;
+ IBOutlet SPTablesList *tablesListInstance;
IBOutlet SPTableData *tableDataInstance;
IBOutlet SPDatabaseData *databaseDataInstance;
IBOutlet id tableSourceInstance;
diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m
index f48ce2ca..3770ecd6 100644
--- a/Source/SPExtendedTableInfo.m
+++ b/Source/SPExtendedTableInfo.m
@@ -30,7 +30,7 @@
#import "SPStringAdditions.h"
#import "SPConstants.h"
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPAlertSheets.h"
#import "TableSource.h"
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index 8ba0ebbb..0c54df10 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -25,7 +25,7 @@
#import "SPFieldMapperController.h"
#import "SPTableData.h"
#import "TableDump.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
#import "SPConstants.h"
diff --git a/Source/SPHistoryController.h b/Source/SPHistoryController.h
index b0f3e082..fc36f1bf 100644
--- a/Source/SPHistoryController.h
+++ b/Source/SPHistoryController.h
@@ -24,7 +24,7 @@
#import <Cocoa/Cocoa.h>
-@class TableDocument, TableContent, TablesList;
+@class TableDocument, TableContent, SPTablesList;
@interface SPHistoryController : NSObject
{
@@ -32,7 +32,7 @@
IBOutlet NSSegmentedControl *historyControl;
TableContent *tableContentInstance;
- TablesList *tablesListInstance;
+ SPTablesList *tablesListInstance;
NSMutableArray *history;
NSMutableDictionary *tableContentStates;
NSUInteger historyPosition;
diff --git a/Source/SPHistoryController.m b/Source/SPHistoryController.m
index b8128a0f..40f99a8a 100644
--- a/Source/SPHistoryController.m
+++ b/Source/SPHistoryController.m
@@ -24,7 +24,7 @@
#import "TableDocument.h"
#import "TableContent.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPConstants.h"
#import "SPHistoryController.h"
#import "SPStringAdditions.h"
diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m
index 7e2ae14d..738430d4 100644
--- a/Source/SPNavigatorController.m
+++ b/Source/SPNavigatorController.m
@@ -28,7 +28,7 @@
#import "SPConstants.h"
#import "ImageAndTextCell.h"
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPArrayAdditions.h"
#import "SPLogger.h"
#import "SPTooltip.h"
diff --git a/Source/SPSQLExporter.m b/Source/SPSQLExporter.m
index 99e42515..4591325a 100644
--- a/Source/SPSQLExporter.m
+++ b/Source/SPSQLExporter.m
@@ -26,7 +26,7 @@
#import <MCPKit/MCPKit.h>
#import "SPSQLExporter.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPConstants.h"
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
diff --git a/Source/SPTableData.m b/Source/SPTableData.m
index 117f1a05..05908853 100644
--- a/Source/SPTableData.m
+++ b/Source/SPTableData.m
@@ -26,7 +26,7 @@
#import "SPTableData.h"
#import "SPSQLParser.h"
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPStringAdditions.h"
#import "SPArrayAdditions.h"
#import "SPConstants.h"
diff --git a/Source/SPTableInfo.m b/Source/SPTableInfo.m
index eb8c0b55..99197a86 100644
--- a/Source/SPTableInfo.m
+++ b/Source/SPTableInfo.m
@@ -25,7 +25,7 @@
#import "SPTableInfo.h"
#import "ImageAndTextCell.h"
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPTableData.h"
#import "SPConstants.h"
#import "SPStringAdditions.h"
diff --git a/Source/SPTableRelations.m b/Source/SPTableRelations.m
index e37d453d..ce31daee 100644
--- a/Source/SPTableRelations.m
+++ b/Source/SPTableRelations.m
@@ -25,7 +25,7 @@
#import "SPTableRelations.h"
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPTableData.h"
#import "SPStringAdditions.h"
#import "SPConstants.h"
diff --git a/Source/SPTableTriggers.m b/Source/SPTableTriggers.m
index e3cdda63..89aa5634 100644
--- a/Source/SPTableTriggers.m
+++ b/Source/SPTableTriggers.m
@@ -25,7 +25,7 @@
#import "SPTableTriggers.h"
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPTableData.h"
#import "SPStringAdditions.h"
#import "SPConstants.h"
diff --git a/Source/SPTableView.m b/Source/SPTableView.m
index 58e2206e..a1e44fb6 100644
--- a/Source/SPTableView.m
+++ b/Source/SPTableView.m
@@ -59,8 +59,8 @@
NSInteger row = [self rowAtPoint:[self convertPoint:[event locationInWindow] fromView:nil]];
if(row >= 0 && row < [self numberOfRows]) {
- // Check for TablesList if right-click on header, then suppress context menu
- if([[[[self delegate] class] description] isEqualToString:@"TablesList"]) {
+ // Check for SPTablesList if right-click on header, then suppress context menu
+ if([[[[self delegate] class] description] isEqualToString:@"SPTablesList"]) {
if([NSArrayObjectAtIndex([[self delegate] valueForKeyPath:@"tableTypes"], row) integerValue] == -1)
return nil;
}
diff --git a/Source/TablesList.h b/Source/SPTablesList.h
index 6a313d44..d85235ab 100644
--- a/Source/TablesList.h
+++ b/Source/SPTablesList.h
@@ -1,7 +1,7 @@
//
// $Id$
//
-// TablesList.h
+// SPTablesList.h
// sequel-pro
//
// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002.
@@ -37,7 +37,7 @@
@end
-@interface TablesList : NSObject
+@interface SPTablesList : NSObject
{
IBOutlet id tableDocumentInstance;
IBOutlet id tableSourceInstance;
diff --git a/Source/TablesList.m b/Source/SPTablesList.m
index be617aa2..5bab7b65 100644
--- a/Source/TablesList.m
+++ b/Source/SPTablesList.m
@@ -1,7 +1,7 @@
//
// $Id$
//
-// TablesList.m
+// SPTablesList.m
// sequel-pro
//
// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002.
@@ -23,7 +23,7 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "TableDocument.h"
#import "TableSource.h"
#import "TableContent.h"
@@ -43,7 +43,7 @@
#import "SPMainThreadTrampoline.h"
#import "SPHistoryController.h"
-@interface TablesList (PrivateAPI)
+@interface SPTablesList (PrivateAPI)
- (void)removeTable;
- (void)truncateTable;
@@ -55,7 +55,7 @@
@end
-@implementation TablesList
+@implementation SPTablesList
#pragma mark -
#pragma mark IBAction methods
@@ -1879,7 +1879,7 @@
@end
-@implementation TablesList (PrivateAPI)
+@implementation SPTablesList (PrivateAPI)
/**
* Removes the selected object (table, view, procedure, function, etc.) from the database and tableView.
diff --git a/Source/SPTextView.h b/Source/SPTextView.h
index f89bbc06..f58304b9 100644
--- a/Source/SPTextView.h
+++ b/Source/SPTextView.h
@@ -30,12 +30,12 @@
#define SP_TEXT_SIZE_TRIGGER_FOR_PARTLY_PARSING 10000
-@class SPNarrowDownCompletion, TableDocument, TablesList, CustomQuery;
+@class SPNarrowDownCompletion, TableDocument, SPTablesList, CustomQuery;
@interface SPTextView : NSTextView
{
IBOutlet TableDocument *tableDocumentInstance;
- IBOutlet TablesList *tablesListInstance;
+ IBOutlet SPTablesList *tablesListInstance;
IBOutlet CustomQuery *customQueryInstance;
BOOL autoindentEnabled;
diff --git a/Source/SPTextView.m b/Source/SPTextView.m
index 5a096b93..cf468cc7 100644
--- a/Source/SPTextView.m
+++ b/Source/SPTextView.m
@@ -32,7 +32,7 @@
#import "SPConstants.h"
#import "SPQueryController.h"
#import "SPTooltip.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPNavigatorController.h"
#import "SPAlertSheets.h"
@@ -303,7 +303,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
if(!isDictMode && [mySQLConnection isConnected])
{
- // Add structural db/table/field data to completions list or fallback to gathering TablesList data
+ // Add structural db/table/field data to completions list or fallback to gathering SPTablesList data
NSString* connectionID;
if(tableDocumentInstance)
diff --git a/Source/TableContent.m b/Source/TableContent.m
index dee9e430..2aa20c07 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -29,7 +29,7 @@
#import "TableDocument.h"
#import "TableSource.h"
#import "SPTableInfo.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPImageView.h"
#import "CMCopyTable.h"
#import "SPDataCellFormatter.h"
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index ce87a1ef..deabdc2f 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -26,7 +26,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "TableSource.h"
#import "TableContent.h"
#import "CustomQuery.h"
@@ -2544,7 +2544,7 @@
}
/**
- * Returns the currently selected table (passing the request to TablesList)
+ * Returns the currently selected table (passing the request to SPTablesList)
*/
- (NSString *)table
{
@@ -4458,7 +4458,7 @@
[[tablesListInstance onMainThread] setTableListSelectability:NO];
}
- // Set the connection of TablesList and TablesDump to reload tables in db
+ // Set the connection of SPTablesList and TablesDump to reload tables in db
[tablesListInstance setConnection:mySQLConnection];
[tableDumpInstance setConnection:mySQLConnection];
diff --git a/Source/TableDump.m b/Source/TableDump.m
index 3527ed35..5725f0a5 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -25,7 +25,7 @@
#import "TableDump.h"
#import "TableDocument.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "TableSource.h"
#import "TableContent.h"
#import "CustomQuery.h"
@@ -50,7 +50,7 @@
/**
* Update the table lists with the list of tables, retrieved from the
- * tablesList. If the user has pressed the reload button, trigger a reload
+ * SPTablesList. If the user has pressed the reload button, trigger a reload
* from the server; otherwise used the cached lists.
* Retrieve only tables for all modes except SQL.
*/
diff --git a/Source/TableSource.m b/Source/TableSource.m
index 1ae93a00..bc61b86d 100644
--- a/Source/TableSource.m
+++ b/Source/TableSource.m
@@ -26,7 +26,7 @@
#import "TableSource.h"
#import "TableDocument.h"
#import "SPTableInfo.h"
-#import "TablesList.h"
+#import "SPTablesList.h"
#import "SPTableData.h"
#import "SPSQLParser.h"
#import "SPStringAdditions.h"
@@ -664,7 +664,7 @@ closes the keySheet
NSString *selTable = nil;
- // if selectedTable is nil try to get the name from tablesList
+ // if selectedTable is nil try to get the name from SPTablesList
if(selectedTable == nil || ![selectedTable length])
selTable = [tablesListInstance tableName];
else
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 24a2a732..00a57940 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -100,7 +100,7 @@
17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641530EF01EF6001BC333 /* TableDump.m */; };
17E6415C0EF01EF6001BC333 /* TableSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641550EF01EF6001BC333 /* TableSource.m */; };
17E641640EF01F15001BC333 /* SPTableInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6415F0EF01F15001BC333 /* SPTableInfo.m */; };
- 17E641650EF01F15001BC333 /* TablesList.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641610EF01F15001BC333 /* TablesList.m */; };
+ 17E641650EF01F15001BC333 /* SPTablesList.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641610EF01F15001BC333 /* SPTablesList.m */; };
17E6416C0EF01F37001BC333 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641690EF01F37001BC333 /* ImageAndTextCell.m */; };
17E641750EF01F80001BC333 /* SPKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641740EF01F80001BC333 /* SPKeychain.m */; };
17E641820EF01FA8001BC333 /* CMCopyTable.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6417D0EF01FA8001BC333 /* CMCopyTable.m */; };
@@ -529,8 +529,8 @@
17E641550EF01EF6001BC333 /* TableSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableSource.m; sourceTree = "<group>"; };
17E6415E0EF01F15001BC333 /* SPTableInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableInfo.h; sourceTree = "<group>"; };
17E6415F0EF01F15001BC333 /* SPTableInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableInfo.m; sourceTree = "<group>"; };
- 17E641600EF01F15001BC333 /* TablesList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TablesList.h; sourceTree = "<group>"; };
- 17E641610EF01F15001BC333 /* TablesList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TablesList.m; sourceTree = "<group>"; };
+ 17E641600EF01F15001BC333 /* SPTablesList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTablesList.h; sourceTree = "<group>"; };
+ 17E641610EF01F15001BC333 /* SPTablesList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTablesList.m; sourceTree = "<group>"; };
17E641680EF01F37001BC333 /* ImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageAndTextCell.h; sourceTree = "<group>"; };
17E641690EF01F37001BC333 /* ImageAndTextCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageAndTextCell.m; sourceTree = "<group>"; };
17E641730EF01F80001BC333 /* SPKeychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPKeychain.h; sourceTree = "<group>"; };
@@ -1045,8 +1045,8 @@
17E6415F0EF01F15001BC333 /* SPTableInfo.m */,
4D90B798101E0CDF00D116A1 /* SPUserManager.h */,
4D90B799101E0CDF00D116A1 /* SPUserManager.m */,
- 17E641600EF01F15001BC333 /* TablesList.h */,
- 17E641610EF01F15001BC333 /* TablesList.m */,
+ 17E641600EF01F15001BC333 /* SPTablesList.h */,
+ 17E641610EF01F15001BC333 /* SPTablesList.m */,
BCE0025B11173D2A009DA533 /* SPFieldMapperController.h */,
BCE0025C11173D2A009DA533 /* SPFieldMapperController.m */,
BC27779E11514B940034DF6A /* SPNavigatorController.h */,
@@ -2036,7 +2036,7 @@
17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */,
17E6415C0EF01EF6001BC333 /* TableSource.m in Sources */,
17E641640EF01F15001BC333 /* SPTableInfo.m in Sources */,
- 17E641650EF01F15001BC333 /* TablesList.m in Sources */,
+ 17E641650EF01F15001BC333 /* SPTablesList.m in Sources */,
17E6416C0EF01F37001BC333 /* ImageAndTextCell.m in Sources */,
17E641750EF01F80001BC333 /* SPKeychain.m in Sources */,
17E641820EF01FA8001BC333 /* CMCopyTable.m in Sources */,