aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Interfaces/English.lproj/DBView.xib202
-rw-r--r--Source/SPExtendedTableInfo.m2
-rw-r--r--Source/SPPrintController.m2
-rw-r--r--Source/SPTableStructure.h (renamed from Source/TableSource.h)4
-rw-r--r--Source/SPTableStructure.m (renamed from Source/TableSource.m)10
-rw-r--r--Source/SPTablesList.m2
-rw-r--r--Source/TableContent.m2
-rw-r--r--Source/TableDocument.m2
-rw-r--r--Source/TableDump.m2
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj12
10 files changed, 116 insertions, 124 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 18f8e6a2..a26eaa57 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -12120,7 +12120,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSClassName">SPTablesList</string>
</object>
<object class="NSCustomObject" id="103234030">
- <string key="NSClassName">TableSource</string>
+ <string key="NSClassName">SPTableStructure</string>
</object>
<object class="NSCustomObject" id="936957743">
<string key="NSClassName">SPExtendedTableInfo</string>
@@ -28304,6 +28304,102 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPTableStructure</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>addField:</string>
+ <string>chooseIndexType:</string>
+ <string>closeKeySheet:</string>
+ <string>closeSheet:</string>
+ <string>copyField:</string>
+ <string>openIndexSheet:</string>
+ <string>reloadTable:</string>
+ <string>removeField:</string>
+ <string>removeIndex:</string>
+ <string>resetAutoIncrement:</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>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addFieldButton</string>
+ <string>addIndexButton</string>
+ <string>chooseKeyButton</string>
+ <string>copyFieldButton</string>
+ <string>editTableButton</string>
+ <string>extendedTableInfoInstance</string>
+ <string>indexNameField</string>
+ <string>indexSheet</string>
+ <string>indexTypeField</string>
+ <string>indexView</string>
+ <string>indexedColumnsField</string>
+ <string>keySheet</string>
+ <string>reloadFieldsButton</string>
+ <string>reloadIndexesButton</string>
+ <string>removeFieldButton</string>
+ <string>removeIndexButton</string>
+ <string>resetAutoIncrementLine</string>
+ <string>resetAutoIncrementSheet</string>
+ <string>resetAutoIncrementValue</string>
+ <string>structureGrabber</string>
+ <string>tableDataInstance</string>
+ <string>tableDocumentInstance</string>
+ <string>tableInfoInstance</string>
+ <string>tableSourceView</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>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>
+ <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">SPTableTextFieldCell</string>
<string key="superclassName">ImageAndTextCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -29184,110 +29280,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="minorKey"/>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">TableSource</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>addField:</string>
- <string>chooseIndexType:</string>
- <string>closeKeySheet:</string>
- <string>closeSheet:</string>
- <string>copyField:</string>
- <string>openIndexSheet:</string>
- <string>reloadTable:</string>
- <string>removeField:</string>
- <string>removeIndex:</string>
- <string>resetAutoIncrement:</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>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>addFieldButton</string>
- <string>addIndexButton</string>
- <string>chooseKeyButton</string>
- <string>copyFieldButton</string>
- <string>editTableButton</string>
- <string>extendedTableInfoInstance</string>
- <string>indexNameField</string>
- <string>indexSheet</string>
- <string>indexTypeField</string>
- <string>indexView</string>
- <string>indexedColumnsField</string>
- <string>keySheet</string>
- <string>reloadFieldsButton</string>
- <string>reloadIndexesButton</string>
- <string>removeFieldButton</string>
- <string>removeIndexButton</string>
- <string>resetAutoIncrementLine</string>
- <string>resetAutoIncrementSheet</string>
- <string>resetAutoIncrementValue</string>
- <string>structureGrabber</string>
- <string>tableDataInstance</string>
- <string>tableDocumentInstance</string>
- <string>tableInfoInstance</string>
- <string>tableSourceView</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>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>
- <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/TableSource.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">TableSource</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/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m
index 3770ecd6..56f7a76c 100644
--- a/Source/SPExtendedTableInfo.m
+++ b/Source/SPExtendedTableInfo.m
@@ -32,7 +32,7 @@
#import "TableDocument.h"
#import "SPTablesList.h"
#import "SPAlertSheets.h"
-#import "TableSource.h"
+#import "SPTableStructure.h"
@interface SPExtendedTableInfo (PrivateAPI)
diff --git a/Source/SPPrintController.m b/Source/SPPrintController.m
index b8f323c4..020e3ca0 100644
--- a/Source/SPPrintController.m
+++ b/Source/SPPrintController.m
@@ -25,7 +25,7 @@
#import "SPPrintController.h"
#import "TableContent.h"
-#import "TableSource.h"
+#import "SPTableStructure.h"
#import "CustomQuery.h"
#import "SPConstants.h"
#import "SPTableRelations.h"
diff --git a/Source/TableSource.h b/Source/SPTableStructure.h
index 0278f282..f43a5257 100644
--- a/Source/TableSource.h
+++ b/Source/SPTableStructure.h
@@ -1,7 +1,7 @@
//
// $Id$
//
-// TableSource.h
+// SPTableStructure.h
// sequel-pro
//
// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002.
@@ -26,7 +26,7 @@
#import <Cocoa/Cocoa.h>
#import <MCPKit/MCPKit.h>
-@interface TableSource : NSObject
+@interface SPTableStructure : NSObject
{
IBOutlet id tablesListInstance;
IBOutlet id tableDataInstance;
diff --git a/Source/TableSource.m b/Source/SPTableStructure.m
index bc61b86d..2bef1a12 100644
--- a/Source/TableSource.m
+++ b/Source/SPTableStructure.m
@@ -1,7 +1,7 @@
//
// $Id$
//
-// TableSource.m
+// SPTableStructure.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 "TableSource.h"
+#import "SPTableStructure.h"
#import "TableDocument.h"
#import "SPTableInfo.h"
#import "SPTablesList.h"
@@ -35,7 +35,7 @@
#import "SPAlertSheets.h"
#import "SPMainThreadTrampoline.h"
-@interface TableSource (PrivateAPI)
+@interface SPTableStructure (PrivateAPI)
- (void)_addIndex;
- (void)_removeFieldAndForeignKey:(NSNumber *)removeForeignKey;
@@ -43,7 +43,7 @@
@end
-@implementation TableSource
+@implementation SPTableStructure
/**
* Loads aTable, put it in an array, update the tableViewColumns and reload the tableView
@@ -1735,7 +1735,7 @@ would result in a position change.
@end
-@implementation TableSource (PrivateAPI)
+@implementation SPTableStructure (PrivateAPI)
/**
* Adds an index to the current table.
diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m
index 5bab7b65..28885938 100644
--- a/Source/SPTablesList.m
+++ b/Source/SPTablesList.m
@@ -25,7 +25,7 @@
#import "SPTablesList.h"
#import "TableDocument.h"
-#import "TableSource.h"
+#import "SPTableStructure.h"
#import "TableContent.h"
#import "SPTableData.h"
#import "SPTableInfo.h"
diff --git a/Source/TableContent.m b/Source/TableContent.m
index 2aa20c07..ce24134b 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -27,7 +27,7 @@
#import "TableContent.h"
#import "TableDocument.h"
-#import "TableSource.h"
+#import "SPTableStructure.h"
#import "SPTableInfo.h"
#import "SPTablesList.h"
#import "SPImageView.h"
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index deabdc2f..b327dd7d 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -27,7 +27,7 @@
#import "TableDocument.h"
#import "SPTablesList.h"
-#import "TableSource.h"
+#import "SPTableStructure.h"
#import "TableContent.h"
#import "CustomQuery.h"
#import "TableDump.h"
diff --git a/Source/TableDump.m b/Source/TableDump.m
index 5725f0a5..6f2d77bc 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -26,7 +26,7 @@
#import "TableDump.h"
#import "TableDocument.h"
#import "SPTablesList.h"
-#import "TableSource.h"
+#import "SPTableStructure.h"
#import "TableContent.h"
#import "CustomQuery.h"
#import "SPGrowlController.h"
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 00a57940..1e93cb14 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -98,7 +98,7 @@
17E641590EF01EF6001BC333 /* TableContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414F0EF01EF6001BC333 /* TableContent.m */; };
17E6415A0EF01EF6001BC333 /* TableDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641510EF01EF6001BC333 /* TableDocument.m */; };
17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641530EF01EF6001BC333 /* TableDump.m */; };
- 17E6415C0EF01EF6001BC333 /* TableSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641550EF01EF6001BC333 /* TableSource.m */; };
+ 17E6415C0EF01EF6001BC333 /* SPTableStructure.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641550EF01EF6001BC333 /* SPTableStructure.m */; };
17E641640EF01F15001BC333 /* SPTableInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6415F0EF01F15001BC333 /* SPTableInfo.m */; };
17E641650EF01F15001BC333 /* SPTablesList.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641610EF01F15001BC333 /* SPTablesList.m */; };
17E6416C0EF01F37001BC333 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641690EF01F37001BC333 /* ImageAndTextCell.m */; };
@@ -525,8 +525,8 @@
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>"; };
17E641530EF01EF6001BC333 /* TableDump.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableDump.m; sourceTree = "<group>"; };
- 17E641540EF01EF6001BC333 /* TableSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableSource.h; sourceTree = "<group>"; };
- 17E641550EF01EF6001BC333 /* TableSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableSource.m; sourceTree = "<group>"; };
+ 17E641540EF01EF6001BC333 /* SPTableStructure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableStructure.h; sourceTree = "<group>"; };
+ 17E641550EF01EF6001BC333 /* SPTableStructure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableStructure.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 /* SPTablesList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTablesList.h; sourceTree = "<group>"; };
@@ -1017,8 +1017,8 @@
17E641510EF01EF6001BC333 /* TableDocument.m */,
17E641520EF01EF6001BC333 /* TableDump.h */,
17E641530EF01EF6001BC333 /* TableDump.m */,
- 17E641540EF01EF6001BC333 /* TableSource.h */,
- 17E641550EF01EF6001BC333 /* TableSource.m */,
+ 17E641540EF01EF6001BC333 /* SPTableStructure.h */,
+ 17E641550EF01EF6001BC333 /* SPTableStructure.m */,
1792C28910AE1C7200ABE758 /* Controller Categories */,
);
name = "Main View Controllers";
@@ -2034,7 +2034,7 @@
17E641590EF01EF6001BC333 /* TableContent.m in Sources */,
17E6415A0EF01EF6001BC333 /* TableDocument.m in Sources */,
17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */,
- 17E6415C0EF01EF6001BC333 /* TableSource.m in Sources */,
+ 17E6415C0EF01EF6001BC333 /* SPTableStructure.m in Sources */,
17E641640EF01F15001BC333 /* SPTableInfo.m in Sources */,
17E641650EF01F15001BC333 /* SPTablesList.m in Sources */,
17E6416C0EF01F37001BC333 /* ImageAndTextCell.m in Sources */,