diff options
author | sqlprodev <sqlprodev@northofthree.com> | 2011-08-02 00:23:17 +0000 |
---|---|---|
committer | sqlprodev <sqlprodev@northofthree.com> | 2011-08-02 00:23:17 +0000 |
commit | 566f784ae03776dd3f5cfda20a357240d2e73a77 (patch) | |
tree | cf156cbd06ec8b60da628a53d15955d9527feba6 /Source/SPDatabaseDocument.h | |
parent | 34dc6a658202bd624971c81633ea484e3f4f1e74 (diff) | |
download | sequelpro-566f784ae03776dd3f5cfda20a357240d2e73a77.tar.gz sequelpro-566f784ae03776dd3f5cfda20a357240d2e73a77.tar.bz2 sequelpro-566f784ae03776dd3f5cfda20a357240d2e73a77.zip |
merged latest SP_REFACTOR changes
Diffstat (limited to 'Source/SPDatabaseDocument.h')
-rw-r--r-- | Source/SPDatabaseDocument.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h index 8f67ccc4..f7474943 100644 --- a/Source/SPDatabaseDocument.h +++ b/Source/SPDatabaseDocument.h @@ -34,14 +34,18 @@ #ifndef SP_REFACTOR /* class forward decls */ SPProcessListController, SPServerVariablesController, SPUserManager, SPWindowController, #endif -SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SPCustomQuery; +SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SPCustomQuery; #import "SPConnectionControllerDelegateProtocol.h" /** * The SPDatabaseDocument class controls the primary database view window. */ -@interface SPDatabaseDocument : NSObject <SPConnectionControllerDelegateProtocol> +@interface SPDatabaseDocument : NSObject <SPConnectionControllerDelegateProtocol +#ifdef SP_REFACTOR /* patch */ + , NSTextFieldDelegate +#endif +> { #ifdef SP_REFACTOR /* patch */ id delegate; @@ -237,6 +241,7 @@ SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SP @property (assign) id delegate; @property (readonly) NSMutableArray* allDatabases; @property (assign) NSProgressIndicator* queryProgressBar; +@property (assign) NSWindow* databaseSheet; #endif #ifndef SP_REFACTOR /* ivars */ @@ -251,8 +256,10 @@ SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SP #ifndef SP_REFACTOR /* method decls */ - (BOOL)isUntitled; +#endif - (BOOL)couldCommitCurrentViewActions; +#ifndef SP_REFACTOR /* method decls */ - (void)initQueryEditorWithString:(NSString *)query; // Connection callback and methods @@ -267,12 +274,14 @@ SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SP - (IBAction)chooseDatabase:(id)sender; #endif - (void)selectDatabase:(NSString *)aDatabase item:(NSString *)anItem; -#ifndef SP_REFACTOR /* method decls */ - (IBAction)addDatabase:(id)sender; - (IBAction)removeDatabase:(id)sender; +#ifndef SP_REFACTOR /* method decls */ - (IBAction)refreshTables:(id)sender; - (IBAction)copyDatabase:(id)sender; +#endif - (IBAction)renameDatabase:(id)sender; +#ifndef SP_REFACTOR /* method decls */ - (IBAction)showMySQLHelp:(id)sender; - (IBAction)showServerVariables:(id)sender; - (IBAction)showServerProcesses:(id)sender; @@ -436,8 +445,17 @@ SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SP - (void)setTableSourceInstance:(SPTableStructure*)source; - (void)setTableContentInstance:(SPTableContent*)content; +@property (assign) SPDatabaseData* databaseDataInstance; @property (assign) SPTableData* tableDataInstance; @property (assign) SPCustomQuery* customQueryInstance; +@property (assign) id databaseNameField; +@property (assign) id databaseEncodingButton; +@property (assign) id addDatabaseButton; + +@property (assign) id databaseRenameNameField; +@property (assign) id renameDatabaseButton; +@property (assign) id databaseRenameSheet; + #endif @end |