aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPTablesList.h
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2011-04-22 17:44:57 +0000
committerstuconnolly <stuart02@gmail.com>2011-04-22 17:44:57 +0000
commit4611475c5b255eed9202474dd3bdee147e932946 (patch)
tree39bdc50e046f802265950c6e2607ca9ebda453be /Source/SPTablesList.h
parent3ed8b33deeadcc98185911f41bc6bcb4e53b4719 (diff)
downloadsequelpro-4611475c5b255eed9202474dd3bdee147e932946.tar.gz
sequelpro-4611475c5b255eed9202474dd3bdee147e932946.tar.bz2
sequelpro-4611475c5b255eed9202474dd3bdee147e932946.zip
Bring outline view branch up to date with trunk (r3234:3277).
Diffstat (limited to 'Source/SPTablesList.h')
-rw-r--r--Source/SPTablesList.h43
1 files changed, 29 insertions, 14 deletions
diff --git a/Source/SPTablesList.h b/Source/SPTablesList.h
index d4623f40..914295a5 100644
--- a/Source/SPTablesList.h
+++ b/Source/SPTablesList.h
@@ -25,7 +25,8 @@
#import <MCPKit/MCPKit.h>
-@class SPHistoryController;
+@class SPHistoryController, SPTableView;
+@class SPDatabaseDocument;
@interface NSObject (NSSplitView)
@@ -38,7 +39,8 @@
@interface SPTablesList : NSObject
{
- IBOutlet id tableDocumentInstance;
+ SPDatabaseDocument* tableDocumentInstance;
+#ifndef SP_REFACTOR /* ivars */
IBOutlet id tableSourceInstance;
IBOutlet id tableContentInstance;
IBOutlet id customQueryInstance;
@@ -51,7 +53,7 @@
IBOutlet SPHistoryController *spHistoryControllerInstance;
IBOutlet id copyTableSheet;
- IBOutlet id tablesListView;
+ IBOutlet SPTableView *tablesListView;
IBOutlet id copyTableButton;
IBOutlet id copyTableNameField;
IBOutlet id copyTableMessageField;
@@ -79,9 +81,11 @@
IBOutlet NSMenuItem *separatorTableMenuItem;
IBOutlet NSMenuItem *showCreateSyntaxMenuItem;
IBOutlet NSMenuItem *separatorTableMenuItem2;
+#endif
MCPConnection *mySQLConnection;
+#ifndef SP_REFACTOR /* ivars */
// Table list context menu items
IBOutlet NSMenuItem *removeTableContextMenuItem;
IBOutlet NSMenuItem *duplicateTableContextMenuItem;
@@ -91,25 +95,34 @@
IBOutlet NSMenuItem *separatorTableContextMenuItem;
IBOutlet NSMenuItem *showCreateSyntaxContextMenuItem;
IBOutlet NSMenuItem *separatorTableContextMenuItem2;
+#endif
NSMutableArray *tables;
+#ifndef SP_REFACTOR /* ivars */
NSMutableArray *filteredTables;
+#endif
NSMutableArray *tableTypes;
+#ifndef SP_REFACTOR /* ivars */
NSMutableArray *filteredTableTypes;
- SPTableType selectedTableType;
+#endif
+ NSInteger selectedTableType;
NSString *selectedTableName;
+#ifndef SP_REFACTOR /* ivars */
BOOL isTableListFiltered;
BOOL tableListIsSelectable;
+#endif
BOOL tableListContainsViews;
-
+#ifndef SP_REFACTOR /* ivars */
BOOL alertSheetOpened;
NSFont *smallSystemFont;
-
+#endif
}
// IBAction methods
- (IBAction)updateTables:(id)sender;
+
+#ifndef SP_REFACTOR /* method decls */
- (IBAction)addTable:(id)sender;
- (IBAction)closeSheet:(id)sender;
- (IBAction)removeTable:(id)sender;
@@ -118,13 +131,11 @@
- (IBAction)truncateTable:(id)sender;
- (IBAction)openTableInNewTab:(id)sender;
- (IBAction)togglePaneCollapse:(id)sender;
-
-// Alert sheet callbacks
-- (void)sheetDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo;
-
+#endif
// Additional methods
- (void)setConnection:(MCPConnection *)theConnection;
- (void)setSelectionState:(NSDictionary *)selectionDetails;
+#ifndef SP_REFACTOR /* method decls */
- (void)selectTableAtIndex:(NSNumber *)row;
- (void)makeTableListFilterHaveFocus;
@@ -132,6 +143,7 @@
- (NSArray *)selectedTableNames;
- (NSArray *)selectedTableItems;
- (NSArray *)selectedTableTypes;
+#endif
- (NSString *)tableName;
- (SPTableType)tableType;
- (NSArray *)tables;
@@ -147,12 +159,9 @@
// Setters
- (BOOL)selectItemWithName:(NSString *)theName;
+#ifndef SP_REFACTOR /* method decls */
- (BOOL)selectItemsWithNames:(NSArray *)theNames;
-// Data validation
-- (BOOL)isTableNameValid:(NSString *)tableName forType:(SPTableType)tableType;
-- (BOOL)isTableNameValid:(NSString *)tableName forType:(SPTableType)tableType ignoringSelectedTable:(BOOL)ignoreSelectedTable;
-
// Table list filter interaction
- (void) showFilter;
- (void) hideFilter;
@@ -163,5 +172,11 @@
- (void) startDocumentTaskForTab:(NSNotification *)aNotification;
- (void) endDocumentTaskForTab:(NSNotification *)aNotification;
- (void) setTableListSelectability:(BOOL)isSelectable;
+#endif
+- (BOOL)isTableNameValid:(NSString *)tableName forType:(SPTableType)tableType;
+- (BOOL)isTableNameValid:(NSString *)tableName forType:(SPTableType)tableType ignoringSelectedTable:(BOOL)ignoreSelectedTable;
+#ifdef SP_REFACTOR /* method decls */
+- (void)setDatabaseDocument:(SPDatabaseDocument*)val;
+#endif
@end