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/SPConnectionController.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/SPConnectionController.h')
| -rw-r--r-- | Source/SPConnectionController.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index 2fcede2f..dccbf9a6 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -26,9 +26,6 @@ #import "SPConnectionControllerDelegateProtocol.h" #import <SPMySQL/SPMySQLConnectionDelegate.h> -#ifndef SP_REFACTOR /* headers */ -#endif - @class SPDatabaseDocument, SPFavoritesController, SPSSHTunnel, @@ -64,17 +61,15 @@ SPKeychain *keychain; NSView *databaseConnectionSuperview; NSSplitView *databaseConnectionView; - NSOpenPanel *keySelectionPanel; #endif + NSOpenPanel *keySelectionPanel; NSUserDefaults *prefs; -#ifndef SP_REFACTOR /* ivars */ BOOL cancellingConnection; BOOL isConnecting; // Standard details NSInteger previousType; -#endif NSInteger type; NSString *name; NSString *host; @@ -103,7 +98,6 @@ NSString *connectionKeychainID; NSString *connectionKeychainItemName; -#ifndef SP_REFACTOR /* ivars */ NSString *connectionKeychainItemAccount; NSString *connectionSSHKeychainItemName; NSString *connectionSSHKeychainItemAccount; @@ -114,7 +108,9 @@ IBOutlet NSSplitView *connectionSplitView; IBOutlet NSScrollView *connectionDetailsScrollView; IBOutlet NSTextField *connectionInstructionsTextField; +#ifndef SP_REFACTOR IBOutlet BWAnchoredButtonBar *connectionSplitViewButtonBar; +#endif IBOutlet SPFavoritesOutlineView *favoritesOutlineView; IBOutlet NSWindow *errorDetailWindow; @@ -161,7 +157,6 @@ BOOL isEditing; BOOL reverseFavoritesSort; -#endif BOOL initComplete; BOOL mySQLConnectionCancelled; BOOL favoriteNameFieldWasTouched; @@ -199,21 +194,22 @@ @property (readwrite, assign) NSInteger sshKeyLocationEnabled; @property (readwrite, retain) NSString *sshKeyLocation; @property (readwrite, retain) NSString *sshPort; -#ifndef SP_REFACTOR /* ivars */ - @property (readwrite, retain) NSString *connectionKeychainItemName; @property (readwrite, retain) NSString *connectionKeychainItemAccount; @property (readwrite, retain) NSString *connectionSSHKeychainItemName; @property (readwrite, retain) NSString *connectionSSHKeychainItemAccount; + +#ifdef SP_REFACTOR +@property (readwrite, assign) SPDatabaseDocument *dbDocument; #endif @property (readonly, assign) BOOL isConnecting; // Connection processes - (IBAction)initiateConnection:(id)sender; -#ifndef SP_REFACTOR /* method decls */ - (IBAction)cancelMySQLConnection:(id)sender; +#ifndef SP_REFACTOR // Interface interaction - (IBAction)nodeDoubleClicked:(id)sender; - (IBAction)chooseKeyLocation:(id)sender; |