diff options
| author | stuconnolly <stuart02@gmail.com> | 2012-03-18 20:05:36 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2012-03-18 20:05:36 +0000 |
| commit | 524e8c356b4074f5be5933b0551374a130a8f6d1 (patch) | |
| tree | 0dab40735f2d9484930050cd08376cbf15e4ea55 /Source/SPIndexesController.h | |
| parent | be3263f8158cb6f3dfa1005f49beefa7e494b852 (diff) | |
| download | sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.tar.gz sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.tar.bz2 sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.zip | |
Bring outline view branch up to date with trunk (r3471:r3517).
Diffstat (limited to 'Source/SPIndexesController.h')
| -rw-r--r-- | Source/SPIndexesController.h | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/Source/SPIndexesController.h b/Source/SPIndexesController.h index bbe34f28..e014a4a7 100644 --- a/Source/SPIndexesController.h +++ b/Source/SPIndexesController.h @@ -23,9 +23,16 @@ // // More info at <http://code.google.com/p/sequel-pro/> -@class SPDatabaseDocument, SPTablesList, SPTableData, SPTableStructure, SPTableView, MCPConnection, BWAnchoredButtonBar; +#ifndef SP_REFACTOR +@class SPDatabaseDocument, SPTablesList, SPTableData, SPTableStructure, SPMySQLConnection, BWAnchoredButtonBar, SPTableView; +#else +@class SPDatabaseDocument, SPTablesList, SPTableData, SPTableStructure, SPMySQLConnection, SPTableView; +#endif @interface SPIndexesController : NSWindowController +#ifdef SP_REFACTOR +<NSTableViewDelegate, NSTableViewDataSource> +#endif { // Controllers IBOutlet SPDatabaseDocument *dbDocument; @@ -49,6 +56,7 @@ IBOutlet NSButton *addIndexedColumnButton; IBOutlet NSButton *removeIndexedColumnButton; IBOutlet NSButton *confirmAddIndexButton; +#ifndef SP_REFACTOR IBOutlet BWAnchoredButtonBar *anchoredButtonBar; // Advanced options view @@ -57,6 +65,7 @@ IBOutlet NSButton *indexAdvancedOptionsViewLabelButton; IBOutlet NSPopUpButton *indexStorageTypePopUpButton; IBOutlet NSTextField *indexKeyBlockSizeTextField; +#endif BOOL _mainNibLoaded; NSString *table; @@ -68,15 +77,26 @@ NSUserDefaults *prefs; #endif - MCPConnection *connection; + SPMySQLConnection *connection; +#ifndef SP_REFACTOR /* ivars */ BOOL showAdvancedView; NSInteger heightOffset; NSUInteger windowMinWidth; NSUInteger windowMinHeigth; +#endif } +#ifdef SP_REFACTOR +@property (assign) SPTableView* indexesTableView; +@property (assign) SPTableStructure* tableStructure; +@property (assign) NSButton* addIndexButton; +@property (assign) NSButton* removeIndexButton; + +- (void)setDatabaseDocument:(SPDatabaseDocument*)db; +#endif + /** * @property table The table currently being viewed */ @@ -85,7 +105,7 @@ /** * @property connection The MySQL connection to use */ -@property (readwrite, assign) MCPConnection *connection; +@property (readwrite, assign) SPMySQLConnection *connection; - (IBAction)addIndex:(id)sender; - (IBAction)removeIndex:(id)sender; |