diff options
| author | sqlprodev <sqlprodev@northofthree.com> | 2012-07-05 17:57:24 +0000 |
|---|---|---|
| committer | sqlprodev <sqlprodev@northofthree.com> | 2012-07-05 17:57:24 +0000 |
| commit | d8a3650b1106fa8a4563e032e7ad66ca076da01b (patch) | |
| tree | c0c2463557610a3abfa6372df698dd6fdbe05875 /Source/SPDatabaseDocument.h | |
| parent | f834f466cb51061f40199cf63d8e1cf47b1b1794 (diff) | |
| download | sequelpro-d8a3650b1106fa8a4563e032e7ad66ca076da01b.tar.gz sequelpro-d8a3650b1106fa8a4563e032e7ad66ca076da01b.tar.bz2 sequelpro-d8a3650b1106fa8a4563e032e7ad66ca076da01b.zip | |
Merged SP r3710 with Coda
Diffstat (limited to 'Source/SPDatabaseDocument.h')
| -rw-r--r-- | Source/SPDatabaseDocument.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h index 9c7111ad..12f00863 100644 --- a/Source/SPDatabaseDocument.h +++ b/Source/SPDatabaseDocument.h @@ -37,12 +37,16 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS #import "SPConnectionControllerDelegateProtocol.h" +#ifdef SP_REFACTOR /* patch */ +#import <SPMySQL/SPMySQLConnectionDelegate.h> +#endif + /** * The SPDatabaseDocument class controls the primary database view window. */ @interface SPDatabaseDocument : NSObject <SPConnectionControllerDelegateProtocol #ifdef SP_REFACTOR /* patch */ - , NSTextFieldDelegate + , SPMySQLConnectionDelegate, NSTextFieldDelegate #endif > { @@ -89,27 +93,32 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS IBOutlet id databaseRenameSheet; IBOutlet NSProgressIndicator* queryProgressBar; +#ifndef SP_REFACTOR IBOutlet NSBox *taskProgressLayer; IBOutlet id taskProgressIndicator; IBOutlet id taskDescriptionText; IBOutlet NSButton *taskCancelButton; IBOutlet id favoritesButton; +#endif IBOutlet id databaseNameField; IBOutlet id databaseEncodingButton; IBOutlet id addDatabaseButton; +#ifndef SP_REFACTOR IBOutlet id databaseCopyNameField; IBOutlet NSButton *copyDatabaseDataButton; IBOutlet id copyDatabaseMessageField; IBOutlet id copyDatabaseButton; +#endif IBOutlet id databaseRenameNameField; IBOutlet id renameDatabaseMessageField; IBOutlet id renameDatabaseButton; IBOutlet id chooseDatabaseButton; +#ifndef SP_REFACTOR IBOutlet id historyControl; IBOutlet NSTabView *tableTabView; @@ -120,6 +129,7 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS IBOutlet id sidebarGrabber; IBOutlet NSPopUpButton *encodingPopUp; +#endif IBOutlet NSTextView *customQueryTextView; @@ -130,6 +140,7 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS IBOutlet NSWindow *createTableSyntaxWindow; IBOutlet NSWindow *connectionErrorDialog; +#ifndef SP_REFACTOR IBOutlet id saveConnectionAccessory; IBOutlet NSButton *saveConnectionIncludeData; IBOutlet NSButton *saveConnectionIncludeQuery; @@ -144,6 +155,7 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS IBOutlet id inputTextWindowMessage; IBOutlet id inputTextWindowSecureTextField; NSInteger passwordSheetReturnCode; +#endif // Master connection SPMySQLConnection *mySQLConnection; @@ -186,6 +198,7 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS BOOL _workingTimeout; +#ifndef SP_REFACTOR NSWindow *taskProgressWindow; BOOL taskDisplayIsIndeterminate; CGFloat taskProgressValue; @@ -200,7 +213,6 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS NSToolbar *mainToolbar; NSToolbarItem *chooseDatabaseToolbarItem; -#ifndef SP_REFACTOR /* ivars */ WebView *printWebView; #endif |