Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
merge SPConnectionController (part of #2789)
  • Loading branch information
dmoagx committed Jan 20, 2018
1 parent b7830d6 commit d0bf2ec
Show file tree
Hide file tree
Showing 14 changed files with 1,649 additions and 2,064 deletions.
28 changes: 26 additions & 2 deletions Source/SPConnectionController.h
@@ -1,5 +1,5 @@
//
// SPConnectionHandler.h
// SPConnectionController.h
// sequel-pro
//
// Created by Stuart Connolly (stuconnolly.com) on November 15, 2010.
Expand Down Expand Up @@ -30,6 +30,7 @@

#import "SPConnectionControllerDelegateProtocol.h"
#import "SPFavoritesExportProtocol.h"
#import "SPFavoritesImportProtocol.h"

#import <SPMySQL/SPMySQL.h>

Expand All @@ -48,7 +49,7 @@
#endif
;

@interface SPConnectionController : NSViewController <SPMySQLConnectionDelegate, NSOpenSavePanelDelegate, SPFavoritesExportProtocol, NSSplitViewDelegate>
@interface SPConnectionController : NSViewController <SPMySQLConnectionDelegate, NSOpenSavePanelDelegate, SPFavoritesImportProtocol, SPFavoritesExportProtocol, NSSplitViewDelegate>
{
id <SPConnectionControllerDelegateProtocol, NSObject> delegate;

Expand Down Expand Up @@ -266,4 +267,27 @@
- (SPFavoritesOutlineView *)favoritesOutlineView;

#endif

#pragma mark - SPConnectionHandler

- (void)initiateMySQLConnection;
- (void)initiateMySQLConnectionInBackground;
- (void)initiateSSHTunnelConnection;

- (void)mySQLConnectionEstablished;
- (void)sshTunnelCallback:(SPSSHTunnel *)theTunnel;

- (void)addConnectionToDocument;

- (void)failConnectionWithTitle:(NSString *)theTitle errorMessage:(NSString *)theErrorMessage detail:(NSString *)errorDetail rawErrorText:(NSString *)rawErrorText;

#pragma mark - SPConnectionControllerInitializer

- (id)initWithDocument:(SPDatabaseDocument *)document;

- (void)loadNib;
- (void)registerForNotifications;
- (void)setUpFavoritesOutlineView;
- (void)setUpSelectedConnectionFavorite;

@end

0 comments on commit d0bf2ec

Please sign in to comment.