diff options
| author | stuconnolly <stuart02@gmail.com> | 2012-02-19 16:25:19 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2012-02-19 16:25:19 +0000 |
| commit | 2483cd22f74239d2a06c83f1c5d9a25eaab44a7c (patch) | |
| tree | 2a8a527b3f418c257e65156efb582f818324c812 /Source/SPTableStructure.h | |
| parent | b7bd2ae9a683652920a6c772eadeca2bac1e7b91 (diff) | |
| download | sequelpro-2483cd22f74239d2a06c83f1c5d9a25eaab44a7c.tar.gz sequelpro-2483cd22f74239d2a06c83f1c5d9a25eaab44a7c.tar.bz2 sequelpro-2483cd22f74239d2a06c83f1c5d9a25eaab44a7c.zip | |
Bring outline view branch up to date with trunk (r3471:r3481).
Diffstat (limited to 'Source/SPTableStructure.h')
| -rw-r--r-- | Source/SPTableStructure.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/Source/SPTableStructure.h b/Source/SPTableStructure.h index b69c5a55..63ac74b8 100644 --- a/Source/SPTableStructure.h +++ b/Source/SPTableStructure.h @@ -42,26 +42,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 duplicateFieldButton; 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; @@ -85,6 +91,15 @@ BOOL isEditingRow, isEditingNewRow, isSavingRow, alertSheetOpened; } +#ifdef SP_REFACTOR +@property (assign) SPIndexesController* indexesController; +@property (assign) id indexesTableView; +@property (assign) id addFieldButton; +@property (assign) id duplicateFieldButton; +@property (assign) id removeFieldButton; +@property (assign) id reloadFieldsButton; +#endif + // Table loading - (void)loadTable:(NSString *)aTable; - (IBAction)reloadTable:(id)sender; @@ -94,12 +109,15 @@ - (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; // Edit methods - (IBAction)addField:(id)sender; -- (IBAction)copyField:(id)sender; +- (IBAction)duplicateField:(id)sender; - (IBAction)removeField:(id)sender; - (void)removeFieldSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo; - (IBAction)resetAutoIncrement:(id)sender; |