From 1d7ed99d602bf9c7aa4ea40a9a2ab6458864e51f Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sun, 22 Jan 2012 12:19:21 +0000 Subject: Bring outlinew view branch up to date with trunk (r3375:3468). --- Source/SPTablesList.h | 58 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 13 deletions(-) (limited to 'Source/SPTablesList.h') diff --git a/Source/SPTablesList.h b/Source/SPTablesList.h index 50a5f4c0..e5e76548 100644 --- a/Source/SPTablesList.h +++ b/Source/SPTablesList.h @@ -26,7 +26,11 @@ #import @class SPHistoryController, SPTableView; -@class SPDatabaseDocument; +@class SPDatabaseDocument, SPDatabaseData, SPTableStructure, SPTableContent; + +#ifdef SP_REFACTOR +@class SQLSidebarViewController; +#endif @interface NSObject (NSSplitView) @@ -38,34 +42,48 @@ @end @interface SPTablesList : NSObject +#ifdef SP_REFACTOR + +#endif { IBOutlet SPDatabaseDocument* tableDocumentInstance; + IBOutlet SPTableStructure* tableSourceInstance; + IBOutlet SPTableContent* tableContentInstance; #ifndef SP_REFACTOR /* ivars */ - IBOutlet id tableSourceInstance; - IBOutlet id tableContentInstance; IBOutlet id customQueryInstance; IBOutlet id tableDumpInstance; IBOutlet id tableDataInstance; IBOutlet id extendedTableInfoInstance; - IBOutlet id databaseDataInstance; +#endif + IBOutlet SPDatabaseData* databaseDataInstance; +#ifndef SP_REFACTOR /* ivars */ IBOutlet id tableInfoInstance; IBOutlet id tableTriggersInstance; IBOutlet SPHistoryController *spHistoryControllerInstance; IBOutlet id copyTableSheet; +#endif IBOutlet SPTableView *tablesListView; +#ifndef SP_REFACTOR /* ivars */ IBOutlet id copyTableButton; IBOutlet id copyTableNameField; IBOutlet id copyTableMessageField; IBOutlet NSButton *copyTableContentSwitch; +#endif IBOutlet id tableSheet; IBOutlet id tableNameField; IBOutlet id tableEncodingButton; IBOutlet id tableTypeButton; IBOutlet id toolbarAddButton; +#ifdef SP_REFACTOR + id toolbarDeleteButton; +#endif +#ifndef SP_REFACTOR IBOutlet id toolbarActionsButton; IBOutlet id toolbarReloadButton; +#endif IBOutlet id addTableButton; +#ifndef SP_REFACTOR IBOutlet id truncateTableButton; IBOutlet NSSplitView *tableListSplitView; IBOutlet NSSplitView *tableListFilterSplitView; @@ -80,6 +98,7 @@ IBOutlet NSMenuItem *openTableInNewTabMenuItem; IBOutlet NSMenuItem *separatorTableMenuItem; IBOutlet NSMenuItem *showCreateSyntaxMenuItem; + IBOutlet NSMenuItem *copyCreateSyntaxMenuItem; IBOutlet NSMenuItem *separatorTableMenuItem2; IBOutlet NSMenuItem *separatorTableMenuItem3; #endif @@ -95,39 +114,38 @@ IBOutlet NSMenuItem *openTableInNewTabContextMenuItem; IBOutlet NSMenuItem *separatorTableContextMenuItem; IBOutlet NSMenuItem *showCreateSyntaxContextMenuItem; + IBOutlet NSMenuItem *copyCreateSyntaxContextMenuItem; IBOutlet NSMenuItem *separatorTableContextMenuItem2; IBOutlet NSMenuItem *separatorTableContextMenuItem3; #endif NSMutableArray *tables; -#ifndef SP_REFACTOR /* ivars */ NSMutableArray *filteredTables; -#endif NSMutableArray *tableTypes; -#ifndef SP_REFACTOR /* ivars */ NSMutableArray *filteredTableTypes; -#endif NSInteger selectedTableType; NSString *selectedTableName; -#ifndef SP_REFACTOR /* ivars */ BOOL isTableListFiltered; BOOL tableListIsSelectable; -#endif BOOL tableListContainsViews; -#ifndef SP_REFACTOR /* ivars */ BOOL alertSheetOpened; +#ifndef SP_REFACTOR /* ivars */ NSFont *smallSystemFont; #endif + +#ifdef SP_REFACTOR + SQLSidebarViewController* sidebarViewController; +#endif } // IBAction methods - (IBAction)updateTables:(id)sender; -#ifndef SP_REFACTOR /* method decls */ - (IBAction)addTable:(id)sender; - (IBAction)closeSheet:(id)sender; - (IBAction)removeTable:(id)sender; +#ifndef SP_REFACTOR /* method decls */ - (IBAction)copyTable:(id)sender; - (IBAction)renameTable:(id)sender; - (IBAction)truncateTable:(id)sender; @@ -168,17 +186,31 @@ - (void) showFilter; - (void) hideFilter; - (void) clearFilter; +#endif - (IBAction) updateFilter:(id)sender; // Task interaction - (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 */ +@property (assign) SPTableStructure* tableSourceInstance; +@property (assign) SPTableContent* tableContentInstance; +@property (assign) id toolbarAddButton; +@property (assign) id toolbarDeleteButton; +@property (assign) id tableSheet; +@property (assign) id tableNameField; +@property (assign) id tableEncodingButton; +@property (assign) id tableTypeButton; +@property (assign) id databaseDataInstance; +@property (assign) id addTableButton; +@property (assign) NSTableView* tablesListView; +@property (assign) SQLSidebarViewController* sidebarViewController; + +- (BOOL)selectionShouldChangeInTableView:(NSTableView *)aTableView; - (void)setDatabaseDocument:(SPDatabaseDocument*)val; #endif @end -- cgit v1.2.3