• Favorite Preferences - Favorite name issues fixed:

- Trap and control the 'name' field of the new added favorite. If the user pressed 'Add Favorite' the 'name' field is set to "New Favorite". If the user do not change the 'name' field or the user deletes the field content it will be set to user@host automatically. This also fixes the issue for empty names.
- focus is set to 'Host' field after "Add Favorite"
- focus is set to 'Name' field after "Duplicate Favorite"

2 files changed, 83 insertions, 0 deletions

diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h
index f5035787..515221e9 100644
--- a/Source/SPPreferenceController.h
+++ b/Source/SPPreferenceController.h
@@ -49,6 +49,12 @@
 	IBOutlet NSSecureTextField *socketPasswordField;
 	IBOutlet NSSecureTextField *sshSQLPasswordField;
 	IBOutlet NSSecureTextField *sshPasswordField;
+	IBOutlet NSTextField *favoriteNameTextField;
+	IBOutlet NSTextField *favoriteUserTextField;
+	IBOutlet NSTextField *favoriteHostTextField;
+	IBOutlet NSTextField *favoriteUserTextFieldSocket;
+	IBOutlet NSTextField *favoriteUserTextFieldSSH;
+	IBOutlet NSTextField *favoriteHostTextFieldSSH;
 
 	KeyChain *keychain;
 	NSDictionary *currentFavorite;
@@ -67,6 +73,9 @@
 	NSToolbarItem *shortcutItem;
 
 	NSUserDefaults *prefs;
+	
+	BOOL favoriteNameFieldWasTouched;
+	int favoriteType;
 }
 
 - (void)applyRevisionChanges;
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index bf5d9389..79be5318 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -64,6 +64,8 @@
 
 		currentFavorite = nil;
 		keychain = nil;
+		favoriteNameFieldWasTouched = YES;
+		favoriteType = 0;
 	}
 
 	return self;
@@ -285,6 +287,10 @@
 	[favoritesTableView reloadData];
 	[favoritesTableView scrollRowToVisible:[favoritesTableView selectedRow]];
 	[self updateDefaultFavoritePopup];
+	
+	favoriteNameFieldWasTouched = NO;
+	
+	[[self window] makeFirstResponder:favoriteHostTextField];
 }
 
 // -------------------------------------------------------------------------------
@@ -367,6 +373,8 @@
 		[favoritesTableView reloadData];
 		[favoritesTableView scrollRowToVisible:[favoritesTableView selectedRow]];
 		[self updateDefaultFavoritePopup];
+
+		[[self window] makeFirstResponder:favoriteNameTextField];
 	}
 }
 
@@ -625,6 +633,8 @@
 	NSString *keychainSSHName = [keychain nameForSSHForFavoriteName:[currentFavorite objectForKey:@"name"] id:[currentFavorite objectForKey:@"id"]];
 	NSString *keychainSSHAccount = [keychain accountForSSHUser:[currentFavorite objectForKey:@"sshUser"] sshHost:[currentFavorite objectForKey:@"sshHost"]];
 	[sshPasswordField setStringValue:[keychain getPasswordForName:keychainSSHName account:keychainSSHAccount]];
+	
+	favoriteNameFieldWasTouched = YES;
 }
 
 #pragma mark -
@@ -725,6 +735,58 @@
 }
 
 // -------------------------------------------------------------------------------
+// controlTextDidChange:
+// Trap and control the 'name' field of the selected favorite. If the user pressed
+// 'Add Favorite' the 'name' field is set to "New Favorite". If the user do not
+// change the 'name' field or delete that field it will be set to user@host automatically.
+// -------------------------------------------------------------------------------
+- (void)controlTextDidChange:(NSNotification *)aNotification
+{
+
+	id field = [aNotification object];
+	BOOL nameFieldIsEmpty = (
+		[[favoritesController valueForKeyPath:@"selection.name"] isEqualToString:@""] 
+		|| [[favoriteNameTextField stringValue] isEqualToString:@""]);
+
+	switch(favoriteType) {
+		case 0:
+		if(nameFieldIsEmpty || (!favoriteNameFieldWasTouched && (field == favoriteUserTextField || field == favoriteHostTextField))) {
+			[favoriteNameTextField setStringValue:[NSString stringWithFormat:@"%@@%@", [favoriteUserTextField stringValue], [favoriteHostTextField stringValue]]];
+			[favoritesController setValue:[favoriteNameTextField stringValue] forKeyPath:@"selection.name"];
+			[prefs synchronize];
+			// if name field is empty enable user@host update
+			if(nameFieldIsEmpty) favoriteNameFieldWasTouched = NO;
+		}
+		break;
+		case 1:
+		if(nameFieldIsEmpty || (!favoriteNameFieldWasTouched && field == favoriteUserTextFieldSocket)) {
+			[favoriteNameTextField setStringValue:[NSString stringWithFormat:@"%@@%@", [favoriteUserTextFieldSocket stringValue], [favoritesController valueForKeyPath:@"selection.host"]]];
+			[favoritesController setValue:[favoriteNameTextField stringValue] forKeyPath:@"selection.name"];
+			[prefs synchronize];
+			// if name field is empty enable user@host update
+			if(nameFieldIsEmpty) favoriteNameFieldWasTouched = NO;
+		}
+		break;
+		case 2:
+		if(nameFieldIsEmpty || (!favoriteNameFieldWasTouched && (field == favoriteUserTextFieldSSH || field == favoriteHostTextFieldSSH))) {
+			[favoriteNameTextField setStringValue:[NSString stringWithFormat:@"%@@%@", [favoriteUserTextFieldSSH stringValue], [favoriteHostTextFieldSSH stringValue]]];
+			[favoritesController setValue:[favoriteNameTextField stringValue] forKeyPath:@"selection.name"];
+			[prefs synchronize];
+			// if name field is empty enable user@host update
+			if(nameFieldIsEmpty) favoriteNameFieldWasTouched = NO;
+		}
+		break;
+		default:
+		break;
+	}
+	
+		
+	if(field == favoriteNameTextField) {
+		favoriteNameFieldWasTouched = YES;
+	}
+
+}
+// -------------------------------------------------------------------------------
 // favoriteTypeDidChange:
 // Update the favorite host when the type changes.
 // -------------------------------------------------------------------------------
@@ -736,6 +798,17 @@
 		[favoritesController setValue:@"" forKeyPath:@"selection.host"];
 	}
 
+	favoriteType = [sender indexOfSelectedItem];
+	
+	// Update the name for a new added favorite if not touched by the user
+	if(!favoriteNameFieldWasTouched) {
+		[favoriteNameTextField setStringValue:[NSString stringWithFormat:@"%@@%@", 
+			([favoritesController valueForKeyPath:@"selection.user"]) ? [favoritesController valueForKeyPath:@"selection.user"] : @"", 
+			([favoritesController valueForKeyPath:@"selection.host"]) ? [favoritesController valueForKeyPath:@"selection.host"] : @""]];
+		[favoritesController setValue:[favoriteNameTextField stringValue] forKeyPath:@"selection.name"];
+	}
+	
+
 	// Request a password refresh to keep keychain references in synch with the favorites
 	[self updateFavoritePasswordsFromField:nil];
 }
@@ -833,6 +906,7 @@
 // -------------------------------------------------------------------------------
 - (void)windowWillClose:(NSNotification *)notification
 {
+
 	// Mark the currently selected field in the window as having finished editing, to trigger saves.
 	if ([preferencesWindow firstResponder])
 		[preferencesWindow endEditingFor:[preferencesWindow firstResponder]];