From 2a6c654d165c207281d10295ebcc40b3cae864ea Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sun, 19 Dec 2010 22:58:58 +0000 Subject: - Fix duplicate/parallel connection attempts when double-clicking on the selected favourite in the connection outline view; this addresses Issue #924. - Correctly restore the interface after an SSH connection attempt fails - Prevent SSH connections from being started twice, eg via return key followed by a double click --- Source/SPConnectionController.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/SPConnectionController.m') diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index aaff9687..4e8338aa 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -248,6 +248,9 @@ isConnecting = YES; cancellingConnection = NO; + // Disable the favorites outline view to prevent further connections attempts + [favoritesTable setEnabled:NO]; + [addToFavoritesButton setHidden:YES]; [addToFavoritesButton display]; [helpButton setHidden:YES]; @@ -387,6 +390,7 @@ if (newState == PROXY_STATE_IDLE) { [tableDocument setTitlebarStatus:NSLocalizedString(@"SSH Disconnected", @"SSH disconnected titlebar marker")]; [self failConnectionWithTitle:NSLocalizedString(@"SSH connection failed!", @"SSH connection failed title") errorMessage:[theTunnel lastError] detail:[sshTunnel debugMessages]]; + [self _restoreConnectionInterface]; } else if (newState == PROXY_STATE_CONNECTED) { [tableDocument setTitlebarStatus:NSLocalizedString(@"SSH Connected", @"SSH connected titlebar marker")]; [self initiateMySQLConnection]; @@ -400,9 +404,6 @@ */ - (void)initiateMySQLConnection { - // Disable the favorites table view to prevent further connections attempts - [favoritesTable setEnabled:NO]; - if (sshTunnel) [progressIndicatorText setStringValue:NSLocalizedString(@"MySQL connecting...", @"MySQL connecting very short status message")]; else -- cgit v1.2.3 From b3b8f0ff04486a982175f70ba72a623a5fff9ad7 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Mon, 20 Dec 2010 02:01:49 +0000 Subject: Address Issue #857: - Replace master connection and database view split views with full BWSplitViews so controls appear in Interface Builder; use those settings to apply which panes resize, and any max/min constraints - Remove split view delegate code which is no longer necessary after these changes - Fix a bug marking the master database view split view thumb as applying to all DatabaseDocument splits views, fixing cursor issues - Update Connection Controller/BWToolkit split view delegate setup to fix resizing issues --- Source/SPConnectionController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/SPConnectionController.m') diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 4e8338aa..e22719de 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -113,7 +113,7 @@ [connectionView setFrame:[databaseConnectionView frame]]; [databaseConnectionSuperview addSubview:connectionView]; [connectionSplitView setPosition:[[tableDocument valueForKey:@"dbTablesTableView"] frame].size.width-6 ofDividerAtIndex:0]; - [connectionSplitViewButtonBar setSplitViewDelegate:self]; + [connectionSplitView setDelegate:self]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollViewFrameChanged:) name:NSViewFrameDidChangeNotification object:nil]; // Set up a keychain instance and preferences reference, and create the initial favorites list -- cgit v1.2.3 From 412b09885523847f4f9b0eb8bf898dcf72688952 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Tue, 21 Dec 2010 01:40:09 +0000 Subject: - Fix split view overlap on the custom query view cuasing lines on scrolling/resize; this addresses Issue #929 - Fix split view overlap on the tables list/info pane causing lines on scrolling/resize; this addresses Issue #740 - Add custom resize behaviour for the table content splitview, addressing Issue #543 - Make button bars at the bottom of the window a consistent height - Fix bug with new splitview setup causing tables pane to become narrower with each launch --- Source/SPConnectionController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/SPConnectionController.m') diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index e22719de..a4adcf92 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -112,7 +112,7 @@ [databaseConnectionView setHidden:YES]; [connectionView setFrame:[databaseConnectionView frame]]; [databaseConnectionSuperview addSubview:connectionView]; - [connectionSplitView setPosition:[[tableDocument valueForKey:@"dbTablesTableView"] frame].size.width-6 ofDividerAtIndex:0]; + [connectionSplitView setPosition:[[tableDocument valueForKey:@"dbTablesTableView"] frame].size.width ofDividerAtIndex:0]; [connectionSplitView setDelegate:self]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollViewFrameChanged:) name:NSViewFrameDidChangeNotification object:nil]; -- cgit v1.2.3