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.

1 files changed, 0 insertions, 31 deletions

diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index 0d6d46aa..01d39e25 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -42,7 +42,6 @@
 
 @synthesize generalPreferencePane;
 @synthesize tablesPreferencePane;
-@synthesize favoritesPreferencePane;
 @synthesize notificationsPreferencePane;
 @synthesize editorPreferencePane;
 @synthesize autoUpdatePreferencePane;
@@ -78,7 +77,6 @@
 					   generalPreferencePane,
 					   tablesPreferencePane,
 					   notificationsPreferencePane,
-					   favoritesPreferencePane,
 					   editorPreferencePane,
 					   autoUpdatePreferencePane,
 					   networkPreferencePane,
@@ -128,27 +126,6 @@
 	[self _resizeWindowForContentView:[tablesPreferencePane preferencePaneView]];
 }
 
-/** 
- * Displays the favorite preferences pane.
- */
-- (IBAction)displayFavoritePreferences:(id)sender
-{
-	// To make the Favorites pane resizable give the window a minimum size and display the resize indicator. 
-	// Notice that we still make all other panes non-resizable by removing the dsiplay of the indicator and
-	// resetting the minimum size to zero.
-	[[self window] setMinSize:NSMakeSize(500, 381)];
-	[[self window] setShowsResizeIndicator:[favoritesPreferencePane preferencePaneAllowsResizing]];
-	
-	[toolbar setSelectedItemIdentifier:[favoritesPreferencePane preferencePaneIdentifier]];
-	
-	[self _resizeWindowForContentView:[favoritesPreferencePane preferencePaneView]];
-	
-	// Set the default favorite popup back to preference
-	if ([sender isKindOfClass:[NSMenuItem class]]) {
-		[generalPreferencePane updateDefaultFavoritePopupSelection];
-	}
-}
-
 /**
  * Displays the editor preferences pane.
  */
@@ -226,14 +203,6 @@
 	[tablesItem setTarget:self];
 	[tablesItem setAction:@selector(displayTablePreferences:)];
 
-	// Favorite preferences
-	favoritesItem = [[NSToolbarItem alloc] initWithItemIdentifier:[favoritesPreferencePane preferencePaneIdentifier]];
-
-	[favoritesItem setLabel:[favoritesPreferencePane preferencePaneName]];
-	[favoritesItem setImage:[favoritesPreferencePane preferencePaneIcon]];
-	[favoritesItem setTarget:self];
-	[favoritesItem setAction:@selector(displayFavoritePreferences:)];
-
 	// Notification preferences
 	notificationsItem = [[NSToolbarItem alloc] initWithItemIdentifier:[notificationsPreferencePane preferencePaneIdentifier]];