• fixed/improved several things for the SPQueryFavoriteManager:

- allow favorites with the same name (it's the user's responsibility)
- fixed removing of all menu items (beginning from the end)
- "Save Query to Favorites" will save the selected text, or if no selection the CURRENT query, or if no current query can be detected the entire textView string (since the tooltip says '...or save the current query...)
- ensure after editing the favorites ALL changes will be saved first before closing the sheet

1 files changed, 20 insertions, 2 deletions

diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m
index 39cae4e1..6c2c48b0 100644
--- a/Source/SPQueryFavoriteManager.m
+++ b/Source/SPQueryFavoriteManager.m
@@ -38,7 +38,7 @@
 {
 	if ((self = [super initWithWindowNibName:@"QueryFavoriteManager"])) {
 		delegate = managerDelegate;
-		
+
 		prefs = [NSUserDefaults standardUserDefaults];
 		
 		delegateRespondsToFavoriteUpdates = [delegate respondsToSelector:@selector(queryFavoritesHaveBeenUpdated:)];
@@ -105,6 +105,8 @@
 	[favoritesTableView reloadData];
 	[favoritesTableView scrollRowToVisible:[favoritesTableView selectedRow]];
 	
+	[prefs synchronize];
+	
 	// Inform the delegate that the query favorites have been updated
 	if (delegateRespondsToFavoriteUpdates) {
 		[delegate queryFavoritesHaveBeenUpdated:self];
@@ -120,7 +122,12 @@
 		[queryFavoritesController removeObjectAtArrangedObjectIndex:[favoritesTableView selectedRow]];
 		
 		[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];
@@ -196,8 +203,19 @@
  */
 - (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];
+	}
+	
 }
 
 #pragma mark -