• query favorite manager

- first step to allow to manage global favs (stored in the prefs) and connection-based (not yet implemented - will be stored in ApplicationSupport/SequelPro)
- fav table is now a grouped table à la Table List
- second column in fav table will be used soon ;)
- now the sheet has two buttons "Save" and "Cancel" in order to be able to dismiss changes
- enabled table view inline editing of query names

3 files changed, 413 insertions, 75 deletions

diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m
index dcb42c26..2088642f 100644
--- a/Source/CustomQuery.m
+++ b/Source/CustomQuery.m
@@ -171,6 +171,12 @@
 			  contextInfo:@"addAllToNewQueryFavorite"];
 	}
 	else if ([queryFavoritesButton indexOfSelectedItem] == 3) {
+
+		// init query favorites controller
+		[prefs synchronize];
+		if(favoritesManager) [favoritesManager release];
+		favoritesManager = [[SPQueryFavoriteManager alloc] initWithDelegate:self];
+
 		// Open query favorite manager
 		[NSApp beginSheet:[favoritesManager window] 
 		   modalForWindow:tableWindow 
@@ -187,7 +193,9 @@
 		if(replaceContent)
 			[textView setSelectedRange:NSMakeRange(0,[[textView string] length])];
 
-		[textView insertText:[[[prefs objectForKey:@"queryFavorites"] objectAtIndex:([queryFavoritesButton indexOfSelectedItem] - 6)] objectForKey:@"query"]];
+		// [textView insertText:[[[prefs objectForKey:@"queryFavorites"] objectAtIndex:([queryFavoritesButton indexOfSelectedItem] - 6)] objectForKey:@"query"]];
+		// The actual query strings have been already stored as tooltip
+		[textView insertText:[[queryFavoritesButton selectedItem] toolTip]];
 	}
 }
 
@@ -196,9 +204,12 @@
  */
 - (IBAction)chooseQueryHistory:(id)sender
 {
+
+	[prefs synchronize];
+
 	// Choose history item
 	if ([queryHistoryButton indexOfSelectedItem] > 1) {
-;
+
 		BOOL replaceContent = [prefs boolForKey:@"QueryHistoryReplacesContent"];
 
 		if([[NSApp currentEvent] modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask))
@@ -233,6 +244,7 @@
 
 		// [queryHistoryButton addItemWithTitle:NSLocalizedString(@"Query History…",@"Title of query history popup button")];
 		[prefs setObject:[NSArray array] forKey:@"queryHistory"];
+		[prefs synchronize];
 	}
 
 	// "Shift Right" menu item - indent the selection with an additional tab.
@@ -2389,8 +2401,20 @@
  */
 - (void)queryFavoritesHaveBeenUpdated:(id)manager
 {
-	// NSInteger i;
-	NSMutableArray *favorites = ([favoritesManager queryFavorites]) ? [favoritesManager queryFavorites] : [prefs objectForKey:@"queryFavorites"];
+
+	NSMutableArray *favorites = [[NSMutableArray alloc] init];
+
+	// Invoked after adding a favorite from inside CustomQuery
+	if(manager == nil) {
+		[favorites addObjectsFromArray:[prefs objectForKey:@"queryFavorites"]];
+	}
+	// Invoked by the query favorite manager
+	else if(manager == favoritesManager){
+		// Update global query favorites
+		[favorites addObjectsFromArray:[favoritesManager globalQueryFavorites]];
+		[prefs setObject:favorites forKey:@"queryFavorites"];
+		[prefs synchronize];
+	}
 
 	// Remove all favorites beginning from the end
 	while([queryFavoritesButton numberOfItems] > 6)
@@ -2400,13 +2424,19 @@
 	NSMenu *menu = [queryFavoritesButton menu];
 	int i = 6;
 	for (NSDictionary *favorite in favorites) {
-		NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:[favorite objectForKey:@"name"] action:NULL keyEquivalent:@""];
+		NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithString:[favorite objectForKey:@"name"]] action:NULL keyEquivalent:@""];
 		[item setTag:i++];
-		[item setToolTip:[favorite objectForKey:@"query"]];
+		[item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]];
 		[menu addItem:item];
 		[item release];
 	}
+
+	[favorites release];
+
+	[prefs synchronize];
 	
+	[queryFavoritesSearchField setStringValue:@""];
+
 }
 
 #pragma mark -
@@ -2459,7 +2489,9 @@
 				queryToBeAddded = [textView string];
 			}
 			
-			[favorites addObject:[NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:[queryFavoriteNameTextField stringValue], queryToBeAddded, nil] forKeys:[NSArray arrayWithObjects:@"name", @"query", nil]]];
+			[favorites addObject:[NSDictionary dictionaryWithObjects:
+				[NSArray arrayWithObjects:[queryFavoriteNameTextField stringValue], queryToBeAddded, nil] 
+						forKeys:[NSArray arrayWithObjects:@"name", @"query", nil]]];
 			
 			[prefs setObject:favorites forKey:@"queryFavorites"];
 			[prefs synchronize];
@@ -2527,9 +2559,6 @@
 		// init tableView's data source
 		fullResult = [[NSMutableArray alloc] init];
 		
-		// init query favorites controller
-		favoritesManager = [[SPQueryFavoriteManager alloc] initWithDelegate:self];
-		
 		prefs = [NSUserDefaults standardUserDefaults];
 	}
 
diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h
index c7ce22e0..820f2a1a 100644
--- a/Source/SPQueryFavoriteManager.h
+++ b/Source/SPQueryFavoriteManager.h
@@ -25,6 +25,14 @@
 
 #import <Cocoa/Cocoa.h>
 
+enum sp_favorite_types
+{
+	SP_FAVORITETYPE_HEADER     = 0,
+	SP_FAVORITETYPE_GLOBAL     = 1,
+	SP_FAVORITETYPE_CONNECTION = 2,
+};
+
+
 @interface NSObject (SPQueryFavoriteManagerDelegate)
 
 - (void)queryFavoritesHaveBeenUpdated:(id)manager;
@@ -43,13 +51,21 @@
 	IBOutlet NSTableView *favoritesTableView;
 	IBOutlet NSTextField *favoriteNameTextField;
 	IBOutlet NSTextView  *favoriteQueryTextView;
-	IBOutlet NSArrayController *queryFavoritesController;
+	IBOutlet id removeButton;
+
+	NSMutableArray *favorites;
+	NSMutableArray *favoriteProperties;
+	
+	NSMutableString *pendingQueryString;
+	
+	NSUInteger selectedRowBeforeChangingSelection;
 }
 
 - (id)initWithDelegate:(id)managerDelegate;
 
 // Accessors
-- (NSMutableArray *)queryFavorites;
+- (NSMutableArray *)globalQueryFavorites;
+- (NSMutableArray *)connectionQueryFavorites;
 - (id)customQueryInstance;
 
 // IBAction methods
diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m
index df5b802a..e49dbb13 100644
--- a/Source/SPQueryFavoriteManager.m
+++ b/Source/SPQueryFavoriteManager.m
@@ -24,13 +24,21 @@
 //  More info at <http://code.google.com/p/sequel-pro/>
 
 #import "SPQueryFavoriteManager.h"
+#import "ImageAndTextCell.h"
 #import "SPEncodingPopupAccessory.h"
 
 #define DEFAULT_QUERY_FAVORITE_FILE_EXTENSION @"sql"
 #define DEFAULT_SEQUELPRO_FILE_EXTENSION @"spf"
 
+#define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"[multiple selection]")
+#define SP_NO_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[no selection]", @"[no selection]")
+
 #define QUERY_FAVORITES_PB_DRAG_TYPE @"SequelProQueryFavoritesPasteboard"
 
+@interface SPQueryFavoriteManager (Private)
+- (void)_writePendingQueryString;
+@end
+
 @implementation SPQueryFavoriteManager
 
 /**
@@ -42,6 +50,11 @@
 		delegate = managerDelegate;
 
 		prefs = [NSUserDefaults standardUserDefaults];
+
+		favoriteProperties = [[NSMutableArray alloc] init];
+		favorites = [[NSMutableArray alloc] init];
+		selectedRowBeforeChangingSelection = 0;
+		pendingQueryString = [[NSMutableString alloc] init];
 		
 		delegateRespondsToFavoriteUpdates = [delegate respondsToSelector:@selector(queryFavoritesHaveBeenUpdated:)];
 	}
@@ -49,11 +62,20 @@
 	return self;
 }
 
+- (void)dealloc
+{
+	[favoriteProperties release];
+	[favorites release];
+	[pendingQueryString release];
+	[super dealloc];
+}
+
 /**
  * Upon awakening bind the query text view's background colour.
  */
 - (void)awakeFromNib
 {
+
 	[favoriteQueryTextView setAllowsDocumentBackgroundColorChange:YES];
 	
 	NSMutableDictionary *bindingOptions = [NSMutableDictionary dictionary];
@@ -64,23 +86,64 @@
 					   toObject:[NSUserDefaultsController sharedUserDefaultsController]
 					withKeyPath:@"values.CustomQueryEditorBackgroundColor"
 						options:bindingOptions];
-	
+
+
+	[favorites addObject:[NSDictionary dictionaryWithObjectsAndKeys:@"GLOBAL", @"name", nil]];
+	[favoriteProperties addObject:[NSNumber numberWithInt:SP_FAVORITETYPE_HEADER]];
+
+	// Build data source for global queryFavorites (as mutable copy! otherwise each
+	// change will be stored in the prefs at once)
+	if([prefs objectForKey:@"queryFavorites"]) {
+		for(id fav in [prefs objectForKey:@"queryFavorites"]) {
+			[favorites addObject:[fav mutableCopy]];
+			[favoriteProperties addObject:[NSNumber numberWithInt:SP_FAVORITETYPE_GLOBAL]];
+		}
+	}
+	[favoritesTableView reloadData];
+
+	// Set Remove button state
+	[removeButton setEnabled:([favorites count] > 1)];
+
 	// Select the first query
-	[queryFavoritesController setSelectionIndex:0];
-	
+	[favoritesTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:1] byExtendingSelection:NO];
+
 	// Register drag types
-	[favoritesTableView registerForDraggedTypes:[NSArray arrayWithObject:QUERY_FAVORITES_PB_DRAG_TYPE]];	
+	[favoritesTableView registerForDraggedTypes:[NSArray arrayWithObject:QUERY_FAVORITES_PB_DRAG_TYPE]];
 }
 
 #pragma mark -
 #pragma mark Accessor methods
 
 /**
- * Returns the query favorites array.
+ * Returns the global query favorites array.
  */
-- (NSMutableArray *)queryFavorites
+- (NSMutableArray *)globalQueryFavorites
 {
-	return [queryFavoritesController arrangedObjects];
+	NSMutableArray *globals = [NSMutableArray array];
+	
+	NSUInteger i;
+	
+	for(i=1; i<[favorites count]; i++)
+		if([[favoriteProperties objectAtIndex:i] intValue] == SP_FAVORITETYPE_GLOBAL)
+			[globals addObject:[favorites objectAtIndex:i]];
+
+	return globals;
+}
+
+/**
+ * Returns the global query favorites array.
+ */
+- (NSMutableArray *)connectionQueryFavorites
+{
+	NSMutableArray *conns = [NSMutableArray array];
+	
+	NSUInteger i;
+	
+	for(i=1; i<[favorites count]; i++)
+		if([[favoriteProperties objectAtIndex:i] intValue] == SP_FAVORITETYPE_CONNECTION)
+			[conns addObject:[favorites objectAtIndex:i]];
+
+	return conns;
 }
 
 /**
@@ -99,20 +162,24 @@
  */
 - (IBAction)addQueryFavorite:(id)sender
 {
+
+	[self _writePendingQueryString];
 	NSMutableDictionary *favorite = [NSMutableDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"New Favorite", @"", nil] forKeys:[NSArray arrayWithObjects:@"name", @"query", nil]];
 	
-	[queryFavoritesController addObject:favorite];
-	[queryFavoritesController setSelectionIndex:([[queryFavoritesController arrangedObjects] count] - 1)];
-	
+	[favorites addObject:favorite];
+	[favoriteProperties addObject:[NSNumber numberWithInt:SP_FAVORITETYPE_GLOBAL]];
 	[favoritesTableView reloadData];
-	[favoritesTableView scrollRowToVisible:[favoritesTableView selectedRow]];
+
+	[favoritesTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:([favorites count] - 1)] byExtendingSelection:NO];
 	
-	[prefs synchronize];
+	[favoritesTableView scrollRowToVisible:[favoritesTableView selectedRow]];
+
+	selectedRowBeforeChangingSelection = [favorites count] - 1;
+
+	[removeButton setEnabled:([favorites count] > 1)];
 	
-	// Inform the delegate that the query favorites have been updated
-	if (delegateRespondsToFavoriteUpdates) {
-		[delegate queryFavoritesHaveBeenUpdated:self];
-	}
+	[[self window] makeFirstResponder:favoriteNameTextField];
+
 }
 
 /**
@@ -167,16 +234,21 @@
 	if ([favoritesTableView numberOfSelectedRows] == 1) { 
 		NSMutableDictionary *favorite = [NSMutableDictionary dictionaryWithObjects:[NSArray arrayWithObjects:[[favoriteNameTextField stringValue] stringByAppendingFormat:@" Copy"], [favoriteQueryTextView string], nil] forKeys:[NSArray arrayWithObjects:@"name", @"query", nil]];
 		
-		[queryFavoritesController addObject:favorite];
-		[queryFavoritesController setSelectionIndex:([[queryFavoritesController arrangedObjects] count] - 1)];
+		[self _writePendingQueryString];
+		
+		[favorites addObject:favorite];
+		[favoriteProperties addObject:[NSNumber numberWithInt:SP_FAVORITETYPE_GLOBAL]];
 		
 		[favoritesTableView reloadData];
+
+		// Update selection
+		[favoritesTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:([favorites count] - 1)] byExtendingSelection:NO];
+		selectedRowBeforeChangingSelection = [favorites count] - 1;
+		
 		[favoritesTableView scrollRowToVisible:[favoritesTableView selectedRow]];
 		
-		// Inform the delegate that the query favorites have been updated
-		if (delegateRespondsToFavoriteUpdates) {
-			[delegate queryFavoritesHaveBeenUpdated:self];
-		}
+		[[self window] makeFirstResponder:favoriteNameTextField];
+
 	}
 }
 
@@ -231,16 +303,23 @@
 - (IBAction)closeQueryManagerSheet:(id)sender
 {
 
-	// Ensure taht last changes will be written to prefs
-	[[self window] makeFirstResponder:favoritesTableView];
-	[prefs synchronize];
-	
 	[NSApp endSheet:[self window] returnCode:0];
 	[[self window] orderOut:self];
-	
-	// Inform the delegate that the query favorites have been updated
-	if (delegateRespondsToFavoriteUpdates) {
-		[delegate queryFavoritesHaveBeenUpdated:self];
+
+	// Save button was pressed
+	if([sender tag]) {
+		// Ensure that last changes will be written to prefs
+		// if only one favorite is selected; otherwise unstable state
+		if ([favoritesTableView numberOfSelectedRows] == 1) {
+			[self _writePendingQueryString];
+			[[self window] makeFirstResponder:favoritesTableView];
+			[favoritesTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRowBeforeChangingSelection] byExtendingSelection:NO];
+		}
+
+		// Inform the delegate that the query favorites have been updated
+		if (delegateRespondsToFavoriteUpdates)
+			[delegate queryFavoritesHaveBeenUpdated:self];
+
 	}
 	
 }
@@ -270,17 +349,191 @@
 /**
  * Returns the number of query favorites.
  */
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
 {
-	return [[queryFavoritesController arrangedObjects] count];
+	return [favorites count];
 }
 
 /**
  * Returns the value for the requested table column and row index.
  */
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
 {
-	return [[[queryFavoritesController arrangedObjects] objectAtIndex:rowIndex] objectForKey:[aTableColumn identifier]];
+	if(![[favorites objectAtIndex:rowIndex] objectForKey:[aTableColumn identifier]]) return @"";
+
+	return [[favorites objectAtIndex:rowIndex] objectForKey:[aTableColumn identifier]];
+}
+
+/*
+ * Save favorite names if inline edited (suppress empty names)
+ */
+- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+
+	if([[aTableColumn identifier] isEqualToString:@"name"] && [anObject length]) {
+		[[favorites objectAtIndex:rowIndex] setObject:[anObject description] forKey:@"name"];
+		[[favorites objectAtIndex:rowIndex] setObject:[favoriteQueryTextView string] forKey:@"query"];
+		[favoriteNameTextField setStringValue:[anObject description]];
+	}
+
+	[favoritesTableView reloadData];
+}
+
+/*
+ * Before selecting an other favorite save pending query string changes
+ * and make sure that no group table item can be selected
+ */
+- (BOOL)tableView:(NSTableView *)aTableView shouldSelectRow:(NSInteger)rowIndex
+{
+	[pendingQueryString setString:[favoriteQueryTextView string]];
+	[self _writePendingQueryString];
+	return ([[favoriteProperties objectAtIndex:rowIndex] intValue] == SP_FAVORITETYPE_HEADER) ? NO : YES;
+}
+
+/*
+ * Update name and query view and control several table selection modi
+ */
+- (void)tableViewSelectionDidChange:(NSNotification *)aNotification
+{
+
+	// store the last selected favorite for writing the pending query string
+	// - for a single favorite selection
+	if([favoritesTableView numberOfSelectedRows] == 1)
+		selectedRowBeforeChangingSelection = [favoritesTableView selectedRow];
+	// - for multiple favorite selection
+	if([favoritesTableView numberOfSelectedRows] > 1) {
+
+		// Save query string directly
+		if(selectedRowBeforeChangingSelection > 0 && selectedRowBeforeChangingSelection < [favorites count])
+		[[favorites objectAtIndex:selectedRowBeforeChangingSelection] setObject:[favoriteQueryTextView string] forKey:@"query"];
+
+		// Update name text field
+		[[favoriteNameTextField cell] setPlaceholderString:SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING];
+		[favoriteNameTextField setStringValue:@""];
+		[favoriteNameTextField setEditable:NO];
+		[favoriteNameTextField setSelectable:NO];
+		
+		// This is an "hack"; if one set it to @"" it could happen that
+		// the wrong pending query string will be saved
+		[favoriteQueryTextView setTextColor:[NSColor clearColor]];
+		[favoriteQueryTextView setEditable:NO];
+		[favoriteQueryTextView setSelectable:NO];
+		
+		return;
+
+	} else {
+		[favoriteNameTextField setEditable:YES];
+		[favoriteNameTextField setSelectable:YES];
+		[favoriteQueryTextView setSelectable:YES];
+		[favoriteQueryTextView setEditable:YES];
+	}
+
+
+	// only the "GLOBAL" header is in the table 
+	if([favorites count] < 2) {
+		[self _writePendingQueryString];
+		[[self window] makeFirstResponder:favoritesTableView];
+		[[favoriteNameTextField cell] setPlaceholderString:SP_NO_SELECTION_PLACEHOLDER_STRING];
+		[favoriteNameTextField setStringValue:@""];
+		[favoriteQueryTextView setString:@""];
+		[pendingQueryString setString:@""];
+		selectedRowBeforeChangingSelection = -1;
+		return;
+	}
+
+	// Update name and query field contents
+	NSUInteger row = (NSUInteger)[[aNotification object] selectedRow];
+
+	// This is needed if one deletes the last table item
+	if(row > [favorites count] - 1) row = [favorites count] - 1;
+	if(row < 1) row = 1;
+
+	[favoriteNameTextField setStringValue:[[favorites objectAtIndex:row] objectForKey:@"name"]];
+	[favoriteQueryTextView setString:[[favorites objectAtIndex:row] objectForKey:@"query"]];
+
+}
+
+/*
+ * Set indention levels for headers and favorites
+ * (maybe in the future use an image for headers for expanding and collapsing)
+ */
+- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+	if([[favoriteProperties objectAtIndex:rowIndex] intValue] == SP_FAVORITETYPE_HEADER && [[aTableColumn identifier] isEqualToString:@"name"]) {
+		// if([[[favoriteProperties objectAtIndex:rowIndex] objectForKey:@"isGroup"] isEqualToString:@"1"])
+		// 	[(ImageAndTextCell*)aCell setImage:[NSImage imageNamed:@"NSRightFacingTriangleTemplate"]];
+		// else
+		// 	[(ImageAndTextCell*)aCell setImage:[NSImage imageNamed:@"NSLeftFacingTriangleTemplate"]];
+		[(ImageAndTextCell*)aCell setIndentationLevel:0];
+	}
+	else if([[favoriteProperties objectAtIndex:rowIndex] intValue] != SP_FAVORITETYPE_HEADER && [[aTableColumn identifier] isEqualToString:@"name"]) {
+		// [(ImageAndTextCell*)aCell setImage:[NSImage imageNamed:@"dummy-small"]];
+		[(ImageAndTextCell*)aCell setIndentationLevel:1];
+	}
+}
+
+/*
+ * A row of an header return is slighlty larger
+ */
+- (CGFloat)tableView:(NSTableView *)aTableView heightOfRow:(NSInteger)rowIndex
+{
+	return ([[favoriteProperties objectAtIndex:rowIndex] intValue] == SP_FAVORITETYPE_HEADER) ? 20 : 18;
+}
+
+/*
+ * Only favorite name can be edited inline
+ */
+- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+	return ([[favoriteProperties objectAtIndex:rowIndex] intValue] == SP_FAVORITETYPE_HEADER) ? NO : YES;
+}
+
+/*
+ * favoriteProperties holds the data if a table row is a group header or not
+ */
+- (BOOL)tableView:(NSTableView *)aTableView isGroupRow:(NSInteger)rowIndex
+{
+	return ([[favoriteProperties objectAtIndex:rowIndex] intValue] == SP_FAVORITETYPE_HEADER) ? YES : NO;
+}
+
+/*
+ * Changes in the name text field will be saved in data source directly
+ * to update the table view accordingly
+ */
+- (void)controlTextDidChange:(NSNotification *)notification
+{
+
+	// Do nothing if no favorite is selected
+	if([favoritesTableView selectedRow] < 1) return;
+
+	id object = [notification object];
+
+	if(object == favoriteNameTextField) {
+		[[favorites objectAtIndex:[favoritesTableView selectedRow]] setObject:[favoriteNameTextField stringValue] forKey:@"name"];
+		[favoritesTableView reloadData];
+	}
+
+}
+
+/*
+ * Changes in the query text view will be cached as pending query string which will update
+ * the data source before selecting an other favorite or before an other event.
+ * If multiple rows are selected update name field.
+ */
+- (void)textViewDidChangeSelection:(NSNotification *)notification
+{
+	id object = [notification object];
+
+	if(object == favoriteQueryTextView) {
+		if(![favoriteQueryTextView isEditable]) return;
+		[pendingQueryString setString:[NSString stringWithString:[favoriteQueryTextView string]]];
+		if([favoritesTableView numberOfSelectedRows] > 1) {
+			[[favoriteNameTextField cell] setPlaceholderString:SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING];
+			[favoriteNameTextField setStringValue:@""];
+			selectedRowBeforeChangingSelection = -1;
+			return;
+		}
+	}
 }
 
 #pragma mark -
@@ -291,6 +544,10 @@
  */
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 {
+
+	// Disable all if only GLOBAL is in the table
+	if([favorites count] < 2) return NO;
+
 	SEL action = [menuItem action];
 	
 	if ( (action == @selector(copyQueryFavorite:))	|| 
@@ -304,7 +561,7 @@
 		return ([favoritesTableView numberOfSelectedRows] > 0);
 	}
 	else if (action == @selector(removeAllQueryFavorites:)) {
-		return ([[queryFavoritesController arrangedObjects] count] > 0);
+		return ([favorites count] > 0);
 	}
 	
 	return YES;
@@ -319,15 +576,25 @@
 - (BOOL)tableView:(NSTableView *)tableView writeRows:(NSArray *)rows toPasteboard:(NSPasteboard *)pboard
 {	
 	if ([rows count] == 1) {
+	
 		NSArray *pboardTypes = [NSArray arrayWithObject:QUERY_FAVORITES_PB_DRAG_TYPE];
 		NSInteger originalRow = [[rows objectAtIndex:0] intValue];
-		
+	
 		[pboard declareTypes:pboardTypes owner:nil];
 		[pboard setString:[[NSNumber numberWithInt:originalRow] stringValue] forType:QUERY_FAVORITES_PB_DRAG_TYPE];
-		
+	
+		// Save query string before dragging
+		// and suppress the writing of pending query string changes
+		[[favorites objectAtIndex:selectedRowBeforeChangingSelection] setObject:[favoriteQueryTextView string] forKey:@"query"];
+		selectedRowBeforeChangingSelection = -1;
 		return YES;
+	} else {
+		[favoritesTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRowBeforeChangingSelection] byExtendingSelection:NO];
+		[[favoriteNameTextField cell] setPlaceholderString:SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING];
+		[favoriteNameTextField setStringValue:@""];
+		[favoriteQueryTextView setTextColor:[NSColor clearColor]];
 	} 
-		
+	
 	return NO;
 }
 
@@ -342,7 +609,7 @@
 		if (([pboardTypes containsObject:QUERY_FAVORITES_PB_DRAG_TYPE]) && (operation == NSTableViewDropAbove)) {
 			NSInteger originalRow = [[[info draggingPasteboard] stringForType:QUERY_FAVORITES_PB_DRAG_TYPE] intValue];
 			
-			if ((row != originalRow) && (row != (originalRow + 1))) {
+			if ((row != originalRow) && (row != (originalRow + 1)) && (row > 0)) {
 				return NSDragOperationMove;
 			}
 		}
@@ -354,6 +621,7 @@
 /**
  * Return whether or not to accept the drop of the supplied rows.
  */
+
 - (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation
 {	
 	NSInteger originalRow = [[[info draggingPasteboard] stringForType:QUERY_FAVORITES_PB_DRAG_TYPE] intValue];
@@ -361,10 +629,10 @@
 	
 	if (destinationRow > originalRow) destinationRow--;
 	
-	NSMutableDictionary *draggedRow = [NSMutableDictionary dictionaryWithDictionary:[[queryFavoritesController arrangedObjects] objectAtIndex:originalRow]];
+	NSMutableDictionary *draggedRow = [NSMutableDictionary dictionaryWithDictionary:[favorites objectAtIndex:originalRow]];
 	
-	[queryFavoritesController removeObjectAtArrangedObjectIndex:originalRow];
-	[queryFavoritesController insertObject:draggedRow atArrangedObjectIndex:destinationRow];
+	[favorites removeObjectAtIndex:originalRow];
+	[favorites insertObject:draggedRow atIndex:destinationRow];
 	
 	[favoritesTableView reloadData];
 	[favoritesTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:destinationRow] byExtendingSelection:NO];
@@ -380,34 +648,48 @@
  */
 - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(NSString *)contextInfo
 {
-	if ([contextInfo isEqualToString:@"removeAllFavorites"]) {
-		if (returnCode == NSAlertAlternateReturn) {
-			[queryFavoritesController removeObjects:[queryFavoritesController arrangedObjects]];
-		}
-	}
+	// Is disabled - do we need that?
+	// if ([contextInfo isEqualToString:@"removeAllFavorites"]) {
+	// 	if (returnCode == NSAlertAlternateReturn) {
+	// 		[favorites removeObjects:[queryFavoritesController arrangedObjects]];
+	// 	}
+	// }
 	if([contextInfo isEqualToString:@"removeSelectedFavorites"]) {
 		if (returnCode == NSAlertAlternateReturn) {
 			NSIndexSet *indexes = [favoritesTableView selectedRowIndexes];
 
 			// get last index
 			NSUInteger currentIndex = [indexes lastIndex];
+			NSUInteger idx = currentIndex;
+
+			// Prevend to write pending changes
+			selectedRowBeforeChangingSelection = -1;
+			[pendingQueryString setString:@""];
 
 			while (currentIndex != NSNotFound) {
-				[queryFavoritesController removeObjectAtArrangedObjectIndex:currentIndex];
+				[favorites removeObjectAtIndex:currentIndex];
+				[favoriteProperties removeObjectAtIndex:currentIndex];
 				// get next index (beginning from the end)
 				currentIndex = [indexes indexLessThanIndex:currentIndex];
+				[favoritesTableView reloadData];
 			}
 
-			[favoritesTableView reloadData];
-
-			[prefs synchronize];
-
 			// Set focus to favorite list to avoid an unstable state
 			[[self window] makeFirstResponder:favoritesTableView];
 
-			// Inform the delegate that the query favorites have been updated
-			if (delegateRespondsToFavoriteUpdates)
-				[delegate queryFavoritesHaveBeenUpdated:self];
+			// Try to reselect a favorite
+			[favoritesTableView selectRowIndexes:[NSIndexSet indexSet] byExtendingSelection:NO];
+			if(idx > [favorites count]-1)
+				idx = [favorites count]-1;
+			if(idx != 0)
+				[favoritesTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:idx] byExtendingSelection:NO];
+
+			if(idx > 1) {
+				[favoriteNameTextField setStringValue:[[favorites objectAtIndex:idx] objectForKey:@"name"]];
+				[favoriteQueryTextView setString:[[favorites objectAtIndex:idx] objectForKey:@"query"]];
+			}
+
+			[removeButton setEnabled:([favorites count] > 1)];
 		}
 	}
 }
@@ -443,15 +725,12 @@
 
 			NSIndexSet *indexes = [favoritesTableView selectedRowIndexes];
 
-			// get last index
-			NSUInteger currentIndex = [indexes lastIndex];
+			// Get selected items and preserve the order
+			NSUInteger i;
+			for (i=1; i<[favorites count]; i++)
+				if([indexes containsIndex:i])
+					[favoriteData addObject:[favorites objectAtIndex:i]];
 
-			while (currentIndex != NSNotFound) {
-				[favoriteData addObject:[[self queryFavorites] objectAtIndex:currentIndex]];
-				
-				// get next index (beginning from the end)
-				currentIndex = [indexes indexLessThanIndex:currentIndex];
-			}
 			[data setObject:favoriteData forKey:@"queryFavorites"];
 			[spfdata setObject:data forKey:@"data"];
 			
@@ -480,4 +759,18 @@
 	}
 }
 
+/*
+ * Before an other favorite will be chosen or an other event will unfocus the 
+ * query text view store the query into the data source
+ */
+- (void)_writePendingQueryString
+{
+	if(selectedRowBeforeChangingSelection > 0 && selectedRowBeforeChangingSelection < [favorites count] ) {
+		[[favorites objectAtIndex:selectedRowBeforeChangingSelection] setObject:[NSString stringWithString:pendingQueryString] forKey:@"query"];
+	} else if(selectedRowBeforeChangingSelection = 0) {
+		[[favorites objectAtIndex:[favoritesTableView selectedRow]] setObject:[NSString stringWithString:pendingQueryString] forKey:@"query"];
+	}
+	[pendingQueryString setString:@""];
+}
+
 @end