Merge a number of revisions from trunk back to the 1.0.x release branch:

 - r4021: Add a check for SPNotLoaded values when automatically generating new tables when importing CSVs, fixing Issue #1621 (SPNotLoaded values are generated when rows shorter than the header row are seen)
 - r4022: Fix crashes when importing favorites on the connection view, addressing Issue #1556; Select and scroll to newly created favorites after import
 - r4023: Default to disabling SSH multiplexing to avoid connection issues as per Issue #1457; leave multiplexing code present, but behind a preference.  Run `defaults write com.sequelpro.SequelPro SSHMultiplexingEnabled -boolean YES` to re-enable
 - r4024: Fix handling of double-dash style comments within field names, addressing Issue #1554
 - r4025: When favorites in the connection view gave no password, no longer set the focus to the password field as soon as they're selected; instead, make the password field the next responder for tab keys.  This addresses Issue #1555
 - r4028: Fix escaping of backlsashes in non-LIKE clauses, addressing string matching with the = and RegExp operators - addresses Issue #1563
 - r4029: Fix handling of primary keys listing multiple fields of which an early field has a specified length, addressing Issue #1641
 - r4030: Alter the database creation sheet to correctly use the selected new database encoding; Clean up the database creation logic and remove redundant selection logic; Correctly reset and detect the database encoding when creating and switching databases
 - r4031: Fix blurry text in a number of text views in 1.0.x (Possibly caused by IB mangling; recreated new text views with the same settings to address).  This fixes Issue #1560
 - r4032: Detect deleted or non-writable folders for export targets and give appropriate errors (particularly for saved paths), addressing Issue #1566
 - r4033: Add support for export path tokens containing non-alphanumeric characters, automatically grouping and tokenising as required for both dragged and typed tokens.  This addresses Issue #1567

1 files changed, 21 insertions, 0 deletions

diff --git a/Source/SPFavoritesOutlineView.m b/Source/SPFavoritesOutlineView.m
index 3688f769..812451f8 100644
--- a/Source/SPFavoritesOutlineView.m
+++ b/Source/SPFavoritesOutlineView.m
@@ -37,6 +37,8 @@ static NSUInteger SPFavoritesOutlineViewUnindent = 14;
 
 @implementation SPFavoritesOutlineView
 
+@synthesize justGainedFocus;
+
 - (void) awakeFromNib
 {
 	systemVersion = 0;
@@ -45,9 +47,19 @@ static NSUInteger SPFavoritesOutlineViewUnindent = 14;
 
 - (BOOL)acceptsFirstResponder
 {
+	if ([[self window] firstResponder] != self) {
+		[self setJustGainedFocus:YES];
+	}
+
 	return YES;
 }
 
+- (BOOL)resignFirstResponder
+{
+	[self setJustGainedFocus:NO];
+	return [super resignFirstResponder];;
+}
+
 /**
  * Right-click at row will select that row before ordering out the contextual menu
  * if not more than one row is selected.
@@ -76,6 +88,15 @@ static NSUInteger SPFavoritesOutlineViewUnindent = 14;
 		[[self delegate] performSelector:[self doubleAction]];
 		
 		return;
+
+	// If the Tab key is used, change focus rather than entering edit mode.
+	} else if ([[event characters] length] && [[event characters] characterAtIndex:0] == NSTabCharacter) {
+		if (([event modifierFlags] & NSShiftKeyMask) != NSShiftKeyMask) {
+			[[self window] selectKeyViewFollowingView:self];
+		} else {
+			[[self window] selectKeyViewPrecedingView:self];
+		}
+		return;
 	}
 	
 	[super keyDown:event];