diff options
| author | sqlprodev <sqlprodev@northofthree.com> | 2011-05-19 22:47:53 +0000 |
|---|---|---|
| committer | sqlprodev <sqlprodev@northofthree.com> | 2011-05-19 22:47:53 +0000 |
| commit | c80db3a0d26b394b9c88fc6ef19a90cda5340440 (patch) | |
| tree | d79af344b053e24393864382958e490f4b844735 /Source/SPDatabaseDocument.h | |
| parent | 838faafed7af37723e8f900a6cba846a29507db2 (diff) | |
| download | sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.gz sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.bz2 sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.zip | |
merging SP_REFACTOR branch with trunk
Diffstat (limited to 'Source/SPDatabaseDocument.h')
| -rw-r--r-- | Source/SPDatabaseDocument.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h index ebdac213..8f67ccc4 100644 --- a/Source/SPDatabaseDocument.h +++ b/Source/SPDatabaseDocument.h @@ -34,7 +34,7 @@ #ifndef SP_REFACTOR /* class forward decls */ SPProcessListController, SPServerVariablesController, SPUserManager, SPWindowController, #endif -SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport; +SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SPCustomQuery; #import "SPConnectionControllerDelegateProtocol.h" @@ -85,7 +85,7 @@ SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport; IBOutlet id databaseCopySheet; IBOutlet id databaseRenameSheet; - IBOutlet id queryProgressBar; + IBOutlet NSProgressIndicator* queryProgressBar; IBOutlet NSBox *taskProgressLayer; IBOutlet id taskProgressIndicator; IBOutlet id taskDescriptionText; @@ -234,8 +234,9 @@ SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport; } #ifdef SP_REFACTOR /* ivars */ -@property (readwrite, assign) id delegate; +@property (assign) id delegate; @property (readonly) NSMutableArray* allDatabases; +@property (assign) NSProgressIndicator* queryProgressBar; #endif #ifndef SP_REFACTOR /* ivars */ @@ -397,7 +398,9 @@ SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport; // Tab methods - (void)makeKeyDocument; - (BOOL)parentTabShouldClose; +#endif - (void)parentTabDidClose; +#ifndef SP_REFACTOR - (void)willResignActiveTabInWindow; - (void)didBecomeActiveTabInWindow; - (void)tabDidBecomeKey; @@ -430,10 +433,11 @@ SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport; - (void)connect; - (NSArray*)allTableNames; - (SPTablesList*)tablesListInstance; -- (SPTableData*)tableDataInstance; - (void)setTableSourceInstance:(SPTableStructure*)source; - (void)setTableContentInstance:(SPTableContent*)content; -- (void)setTableDataInstance:(SPTableData*)data; + +@property (assign) SPTableData* tableDataInstance; +@property (assign) SPCustomQuery* customQueryInstance; #endif @end |