From c80db3a0d26b394b9c88fc6ef19a90cda5340440 Mon Sep 17 00:00:00 2001
From: sqlprodev <sqlprodev@northofthree.com>
Date: Thu, 19 May 2011 22:47:53 +0000
Subject: merging SP_REFACTOR branch with trunk

---
 Source/SPIndexesController.h | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'Source/SPIndexesController.h')

diff --git a/Source/SPIndexesController.h b/Source/SPIndexesController.h
index 65cbb207..6b755bcc 100644
--- a/Source/SPIndexesController.h
+++ b/Source/SPIndexesController.h
@@ -23,9 +23,17 @@
 //
 //  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, MCPConnection, BWAnchoredButtonBar, SPTableView;
+#else
+@class SPDatabaseDocument, SPTablesList, SPTableData, SPTableStructure, MCPConnection, SPTableView;
+#endif
 
+#ifndef SP_REFACTOR
 @interface SPIndexesController : NSWindowController 
+#else
+@interface SPIndexesController : NSWindowController <NSTableViewDelegate, NSTableViewDataSource>
+#endif
 {
 	// Controllers
 	IBOutlet SPDatabaseDocument *dbDocument;
@@ -49,6 +57,7 @@
 	IBOutlet NSButton *addIndexedColumnButton;
 	IBOutlet NSButton *removeIndexedColumnButton;
 	IBOutlet NSButton *confirmAddIndexButton;
+#ifndef SP_REFACTOR
 	IBOutlet BWAnchoredButtonBar *anchoredButtonBar;
 	
 	// Advanced options view
@@ -57,6 +66,7 @@
 	IBOutlet NSButton *indexAdvancedOptionsViewLabelButton;
 	IBOutlet NSPopUpButton *indexStorageTypePopUpButton;
 	IBOutlet NSTextField *indexKeyBlockSizeTextField;
+#endif
 		
 	NSString *table;
 	
@@ -68,13 +78,24 @@
 	
 	MCPConnection *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
  */
-- 
cgit v1.2.3