aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPConnectionController.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-12-28 19:52:54 +0000
committerstuconnolly <stuart02@gmail.com>2010-12-28 19:52:54 +0000
commit37ef1ea26b8bd0e209f30474a53b9605ba8acfe6 (patch)
tree0432f1a449d64801f8d97dfda5faa48f8440b99f /Source/SPConnectionController.m
parente8bcfe72b6b59c8b881feff7ffdc8d719a82ff8c (diff)
parent16341191bcc112fcf18ddaed2d4755b11479ba45 (diff)
downloadsequelpro-37ef1ea26b8bd0e209f30474a53b9605ba8acfe6.tar.gz
sequelpro-37ef1ea26b8bd0e209f30474a53b9605ba8acfe6.tar.bz2
sequelpro-37ef1ea26b8bd0e209f30474a53b9605ba8acfe6.zip
Bring fravorites outline view branch up to date with trunk (r3036:3058).
Diffstat (limited to 'Source/SPConnectionController.m')
-rw-r--r--Source/SPConnectionController.m7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index 4bafafbf..2bad361f 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -133,8 +133,8 @@ static const NSString *SPExportFavoritesFilename = @"SequelProFavorites.plist";
[databaseConnectionView setHidden:YES];
[connectionView setFrame:[databaseConnectionView frame]];
[databaseConnectionSuperview addSubview:connectionView];
- [connectionSplitView setPosition:[[dbDocument valueForKey:@"dbTablesTableView"] frame].size.width-6 ofDividerAtIndex:0];
- [connectionSplitViewButtonBar setSplitViewDelegate:self];
+ [connectionSplitView setPosition:[[dbDocument valueForKey:@"dbTablesTableView"] frame].size.width ofDividerAtIndex:0];
+ [connectionSplitView setDelegate:self];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollViewFrameChanged:) name:NSViewFrameDidChangeNotification object:nil];
@@ -278,6 +278,9 @@ static const NSString *SPExportFavoritesFilename = @"SequelProFavorites.plist";
isConnecting = YES;
cancellingConnection = NO;
+ // Disable the favorites outline view to prevent further connections attempts
+ [favoritesOutlineView setEnabled:NO];
+
[addToFavoritesButton setHidden:YES];
[addToFavoritesButton display];
[helpButton setHidden:YES];