diff options
| author | sqlprodev <sqlprodev@northofthree.com> | 2011-05-19 22:47:53 +0000 |
|---|---|---|
| committer | sqlprodev <sqlprodev@northofthree.com> | 2011-05-19 22:47:53 +0000 |
| commit | c80db3a0d26b394b9c88fc6ef19a90cda5340440 (patch) | |
| tree | d79af344b053e24393864382958e490f4b844735 /Source/SPTableStructure.h | |
| parent | 838faafed7af37723e8f900a6cba846a29507db2 (diff) | |
| download | sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.gz sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.bz2 sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.zip | |
merging SP_REFACTOR branch with trunk
Diffstat (limited to 'Source/SPTableStructure.h')
| -rw-r--r-- | Source/SPTableStructure.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/Source/SPTableStructure.h b/Source/SPTableStructure.h index 40b665b2..b8657273 100644 --- a/Source/SPTableStructure.h +++ b/Source/SPTableStructure.h @@ -27,7 +27,11 @@ @class SPDatabaseDocument, SPTableFieldValidation, SPTableData, SPDatabaseData, SPTablesList, SPIndexesController, SPTableView; +#ifndef SP_REFACTOR @interface SPTableStructure : NSObject +#else +@interface SPTableStructure : NSObject <NSTableViewDelegate, NSTableViewDataSource> +#endif { IBOutlet SPTablesList* tablesListInstance; IBOutlet SPTableData* tableDataInstance; @@ -39,26 +43,32 @@ IBOutlet SPIndexesController* indexesController; IBOutlet SPDatabaseData* databaseDataInstance; +#ifndef SP_REFACTOR /* ivars */ IBOutlet id keySheet; IBOutlet id resetAutoIncrementSheet; IBOutlet id resetAutoIncrementValue; IBOutlet id resetAutoIncrementLine; - IBOutlet SPTableView *tableSourceView; +#endif + IBOutlet SPTableView* tableSourceView; IBOutlet id addFieldButton; IBOutlet id copyFieldButton; IBOutlet id removeFieldButton; IBOutlet id reloadFieldsButton; +#ifndef SP_REFACTOR /* ivars */ IBOutlet id chooseKeyButton; IBOutlet id structureGrabber; IBOutlet id editTableButton; IBOutlet id addIndexButton; IBOutlet id removeIndexButton; IBOutlet id refreshIndexesButton; - IBOutlet SPTableView *indexesTableView; +#endif + IBOutlet SPTableView* indexesTableView; +#ifndef SP_REFACTOR /* ivars */ IBOutlet NSSplitView *tablesIndexesSplitView; IBOutlet NSButton *indexesShowButton; IBOutlet id viewColumnsMenu; +#endif IBOutlet NSPopUpButtonCell *encodingPopupCell; MCPConnection *mySQLConnection; @@ -82,6 +92,15 @@ BOOL isEditingRow, isEditingNewRow, isSavingRow, alertSheetOpened; } +#ifdef SP_REFACTOR +@property (assign) SPIndexesController* indexesController; +@property (assign) id indexesTableView; +@property (assign) id addFieldButton; +@property (assign) id copyFieldButton; +@property (assign) id removeFieldButton; +@property (assign) id reloadFieldsButton; +#endif + // Table loading - (void)loadTable:(NSString *)aTable; - (IBAction)reloadTable:(id)sender; @@ -91,6 +110,9 @@ - (void)setDatabaseDocument:(SPDatabaseDocument*)doc; - (void)setTableListInstance:(SPTablesList*)list; - (void)setTableDataInstance:(SPTableData*)data; +- (void)setDatabaseDataInstance:(SPDatabaseData*)data; +- (void)setTableSourceView:(SPTableView*)tv; +- (void)setEncodingPopupCell:(NSPopUpButtonCell*)cell; #endif - (void)showErrorSheetWith:(NSDictionary *)errorDictionary; |