Skip to content

Commit d0bf2ec

Browse files
committed
merge SPConnectionController (part of #2789)
1 parent b7830d6 commit d0bf2ec

14 files changed

+1649
-2064
lines changed

Source/SPConnectionController.h

+26-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// SPConnectionHandler.h
2+
// SPConnectionController.h
33
// sequel-pro
44
//
55
// Created by Stuart Connolly (stuconnolly.com) on November 15, 2010.
@@ -30,6 +30,7 @@
3030

3131
#import "SPConnectionControllerDelegateProtocol.h"
3232
#import "SPFavoritesExportProtocol.h"
33+
#import "SPFavoritesImportProtocol.h"
3334

3435
#import <SPMySQL/SPMySQL.h>
3536

@@ -48,7 +49,7 @@
4849
#endif
4950
;
5051

51-
@interface SPConnectionController : NSViewController <SPMySQLConnectionDelegate, NSOpenSavePanelDelegate, SPFavoritesExportProtocol, NSSplitViewDelegate>
52+
@interface SPConnectionController : NSViewController <SPMySQLConnectionDelegate, NSOpenSavePanelDelegate, SPFavoritesImportProtocol, SPFavoritesExportProtocol, NSSplitViewDelegate>
5253
{
5354
id <SPConnectionControllerDelegateProtocol, NSObject> delegate;
5455

@@ -266,4 +267,27 @@
266267
- (SPFavoritesOutlineView *)favoritesOutlineView;
267268

268269
#endif
270+
271+
#pragma mark - SPConnectionHandler
272+
273+
- (void)initiateMySQLConnection;
274+
- (void)initiateMySQLConnectionInBackground;
275+
- (void)initiateSSHTunnelConnection;
276+
277+
- (void)mySQLConnectionEstablished;
278+
- (void)sshTunnelCallback:(SPSSHTunnel *)theTunnel;
279+
280+
- (void)addConnectionToDocument;
281+
282+
- (void)failConnectionWithTitle:(NSString *)theTitle errorMessage:(NSString *)theErrorMessage detail:(NSString *)errorDetail rawErrorText:(NSString *)rawErrorText;
283+
284+
#pragma mark - SPConnectionControllerInitializer
285+
286+
- (id)initWithDocument:(SPDatabaseDocument *)document;
287+
288+
- (void)loadNib;
289+
- (void)registerForNotifications;
290+
- (void)setUpFavoritesOutlineView;
291+
- (void)setUpSelectedConnectionFavorite;
292+
269293
@end

0 commit comments

Comments
 (0)