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, 19 insertions, 3 deletions

diff --git a/Source/SPFavoritesController.h b/Source/SPFavoritesController.h
index 1b9f0aca..e15ab385 100644
--- a/Source/SPFavoritesController.h
+++ b/Source/SPFavoritesController.h
@@ -25,6 +25,8 @@
 
 #import "SPSingleton.h"
 
+@class SPTreeNode;
+
 /**
  * @class SPFavoritesController SPFavoritesController.h
  *
@@ -35,17 +37,31 @@
  */
 @interface SPFavoritesController : SPSingleton 
 {
-	NSMutableDictionary *favorites;
+	SPTreeNode *favoritesTree;
+	NSMutableDictionary *favoritesData;
+	
+	pthread_mutex_t writeLock;
+	pthread_mutex_t favoritesLock;
 }
 
 /**
- * @property favorites Favorites data dictionary
+ * @property favoritesTree The current favorites tree
+ */
+@property (readonly) SPTreeNode *favoritesTree;
+
+/**
+ * @property favoritesData Favorites data dictionary
  */
-@property (readonly) NSMutableDictionary *favorites;
+@property (readonly) NSMutableDictionary *favoritesData;
 
 + (SPFavoritesController *)sharedFavoritesController;
 
 - (void)saveFavorites;
 - (void)reloadFavoritesWithSave:(BOOL)save;
 
+- (SPTreeNode *)addGroupNodeWithName:(NSString *)name asChildOfNode:(SPTreeNode *)parent;
+- (SPTreeNode *)addFavoriteNodeWithData:(NSMutableDictionary *)data asChildOfNode:(SPTreeNode *)parent;
+
+- (void)removeFavoriteNode:(SPTreeNode *)node;
+
 @end