aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPDatabaseDocument.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2012-05-02 13:12:38 +0000
committerstuconnolly <stuart02@gmail.com>2012-05-02 13:12:38 +0000
commit5d87f0f50fc90c7ed47ff82b35f07b2749262132 (patch)
tree37ab959b7385c8f5aaf2d1465e1f19fbd47247c7 /Source/SPDatabaseDocument.m
parentdea294a90f9bf6017986f9c950991a7fc7c9645e (diff)
parentfe555b6d511a51f3bdfb5c0a2b00a3206993076b (diff)
downloadsequelpro-5d87f0f50fc90c7ed47ff82b35f07b2749262132.tar.gz
sequelpro-5d87f0f50fc90c7ed47ff82b35f07b2749262132.tar.bz2
sequelpro-5d87f0f50fc90c7ed47ff82b35f07b2749262132.zip
Merge outline view branch into trunk.
Adds support for managing and grouping favorites into folders in the connection view and removes the associated favorites management from the preferences window. NOTE: On first launch your connection favorites will be migrated from Sequel Pro's preference file to a new file in ~/Application Support/Sequel Pro/Data. Your old favorites will remain in the preference file until removed in a future version. Outstanding known issues: - Removing a group node with no child favorites presents a warning about also removing the non-existent favorites. - Starting the application with no favorites, creating a group node then selecting, hides the connection details input. Doesn't support emoty selection. - Setting the name of a connection, adding it to the favorites and then swicthing to a different connection type, screws with the favorite name. - The preservation between launches of whether group nodes are collapsed or not is currently not supported.
Diffstat (limited to 'Source/SPDatabaseDocument.m')
-rw-r--r--Source/SPDatabaseDocument.m12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index a0545fbc..53dfb908 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -34,8 +34,8 @@ enum {
#import "SPDatabaseDocument.h"
#import "SPConnectionController.h"
-
-#import <SPMySQL/SPMySQL.h>
+#import "SPConnectionHandler.h"
+#import "SPConnectionControllerInitializer.h"
#import "SPTablesList.h"
#import "SPTableStructure.h"
@@ -95,6 +95,8 @@ enum {
#import "SPDatabaseRename.h"
#endif
+#import <SPMySQL/SPMySQL.h>
+
// Constants
#ifndef SP_REFACTOR
static NSString *SPCreateSyntx = @"SPCreateSyntax";
@@ -4103,7 +4105,7 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase";
// If the window is being set for the first time - connection controller is visible - update focus
if (!parentWindow && !mySQLConnection) {
#ifndef SP_REFACTOR
- [aWindow makeFirstResponder:[connectionController valueForKey:@"favoritesTable"]];
+ [aWindow makeFirstResponder:(NSResponder *)[connectionController favoritesOutlineView]];
#endif
[connectionController performSelector:@selector(updateFavoriteSelection:) withObject:self afterDelay:0.0];
}
@@ -4390,12 +4392,12 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase";
[self updateWindowTitle:self];
// Deselect all favorites on the connection controller
- [[connectionController valueForKeyPath:@"favoritesTable"] deselectAll:connectionController];
+ [[connectionController favoritesOutlineView] deselectAll:connectionController];
// Suppress the possibility to choose an other connection from the favorites
// if a connection should initialized by SPF file. Otherwise it could happen
// that the SPF file runs out of sync.
- [[connectionController valueForKeyPath:@"favoritesTable"] setEnabled:NO];
+ [[connectionController favoritesOutlineView] setEnabled:NO];
// Ensure the connection controller is set to a blank slate
[connectionController setName:@""];