- Add a further UI hint in the form of a accessory view to the SSH key location dialogs

(Note: r2615 and this commit both shamelessly stole the UI concept from Transmit 4; thanks to Panic for the inspiration!)

8 files changed, 233 insertions, 78 deletions

diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib
index eeac316b..9b41e63b 100644
--- a/Interfaces/English.lproj/ConnectionView.xib
+++ b/Interfaces/English.lproj/ConnectionView.xib
@@ -22,6 +22,7 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="5166"/>
+			<integer value="5576"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -247,7 +248,7 @@
 												<object class="BWAnchoredPopUpButtonCell" key="NSCell" id="270183415">
 													<int key="NSCellFlags">-2076049856</int>
 													<int key="NSCellFlags2">134350848</int>
-													<object class="NSFont" key="NSSupport">
+													<object class="NSFont" key="NSSupport" id="615206062">
 														<string key="NSName">LucidaGrande</string>
 														<double key="NSSize">13</double>
 														<int key="NSfFlags">16</int>
@@ -1238,34 +1239,34 @@
 																								<int key="NSPeriodicInterval">75</int>
 																							</object>
 																						</object>
-																						<object class="NSTextField" id="797420065">
+																						<object class="NSTextField" id="369644980">
 																							<reference key="NSNextResponder" ref="326102394"/>
 																							<int key="NSvFlags">268</int>
 																							<string key="NSFrame">{{7, 49}, {98, 17}}</string>
 																							<reference key="NSSuperview" ref="326102394"/>
 																							<bool key="NSEnabled">YES</bool>
-																							<object class="NSTextFieldCell" key="NSCell" id="1004204108">
+																							<object class="NSTextFieldCell" key="NSCell" id="977486746">
 																								<int key="NSCellFlags">68288064</int>
 																								<int key="NSCellFlags2">71304192</int>
 																								<string key="NSContents">SSH Key:</string>
 																								<reference key="NSSupport" ref="807120225"/>
-																								<reference key="NSControlView" ref="797420065"/>
+																								<reference key="NSControlView" ref="369644980"/>
 																								<reference key="NSBackgroundColor" ref="644242225"/>
 																								<reference key="NSTextColor" ref="434026568"/>
 																							</object>
 																						</object>
-																						<object class="NSTextField" id="357022441">
+																						<object class="NSTextField" id="964932186">
 																							<reference key="NSNextResponder" ref="326102394"/>
 																							<int key="NSvFlags">268</int>
 																							<string key="NSFrame">{{110, 47}, {198, 22}}</string>
 																							<reference key="NSSuperview" ref="326102394"/>
 																							<bool key="NSEnabled">YES</bool>
-																							<object class="NSTextFieldCell" key="NSCell" id="31454463">
+																							<object class="NSTextFieldCell" key="NSCell" id="418433681">
 																								<int key="NSCellFlags">-2076049856</int>
 																								<int key="NSCellFlags2">272631296</int>
 																								<string key="NSContents"/>
 																								<reference key="NSSupport" ref="807120225"/>
-																								<reference key="NSControlView" ref="357022441"/>
+																								<reference key="NSControlView" ref="964932186"/>
 																								<bool key="NSDrawsBackground">YES</bool>
 																								<reference key="NSBackgroundColor" ref="211632616"/>
 																								<object class="NSColor" key="NSTextColor">
@@ -1768,6 +1769,32 @@
 					</object>
 				</object>
 			</object>
+			<object class="NSCustomView" id="914547374">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSTextField" id="557801217">
+						<reference key="NSNextResponder" ref="914547374"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{2, 10}, {575, 34}}</string>
+						<reference key="NSSuperview" ref="914547374"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="583482404">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">138674176</int>
+							<string key="NSContents">Choose a custom SSH key file to use with this connection. Note that standard locations like ~/.ssh are checked automatically, as are any files in your SSH configuration.</string>
+							<reference key="NSSupport" ref="615206062"/>
+							<reference key="NSControlView" ref="557801217"/>
+							<reference key="NSBackgroundColor" ref="644242225"/>
+							<reference key="NSTextColor" ref="434026568"/>
+						</object>
+					</object>
+				</object>
+				<string key="NSFrameSize">{579, 51}</string>
+				<reference key="NSSuperview"/>
+				<string key="NSClassName">NSView</string>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -2928,10 +2955,10 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">hidden: sshKeyLocationEnabled</string>
-						<reference key="source" ref="797420065"/>
+						<reference key="source" ref="369644980"/>
 						<reference key="destination" ref="545410097"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="797420065"/>
+							<reference key="NSSource" ref="369644980"/>
 							<reference key="NSDestination" ref="545410097"/>
 							<string key="NSLabel">hidden: sshKeyLocationEnabled</string>
 							<string key="NSBinding">hidden</string>
@@ -2963,10 +2990,10 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">hidden: sshKeyLocationEnabled</string>
-						<reference key="source" ref="357022441"/>
+						<reference key="source" ref="964932186"/>
 						<reference key="destination" ref="545410097"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="357022441"/>
+							<reference key="NSSource" ref="964932186"/>
 							<reference key="NSDestination" ref="545410097"/>
 							<string key="NSLabel">hidden: sshKeyLocationEnabled</string>
 							<string key="NSBinding">hidden</string>
@@ -2998,10 +3025,10 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: sshKeyLocation</string>
-						<reference key="source" ref="357022441"/>
+						<reference key="source" ref="964932186"/>
 						<reference key="destination" ref="545410097"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="357022441"/>
+							<reference key="NSSource" ref="964932186"/>
 							<reference key="NSDestination" ref="545410097"/>
 							<string key="NSLabel">value: sshKeyLocation</string>
 							<string key="NSBinding">value</string>
@@ -3018,10 +3045,10 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">toolTip: sshKeyLocation</string>
-						<reference key="source" ref="357022441"/>
+						<reference key="source" ref="964932186"/>
 						<reference key="destination" ref="545410097"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="357022441"/>
+							<reference key="NSSource" ref="964932186"/>
 							<reference key="NSDestination" ref="545410097"/>
 							<string key="NSLabel">toolTip: sshKeyLocation</string>
 							<string key="NSBinding">toolTip</string>
@@ -3031,6 +3058,14 @@
 					</object>
 					<int key="connectionID">5570</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sshKeyLocationHelp</string>
+						<reference key="source" ref="545410097"/>
+						<reference key="destination" ref="914547374"/>
+					</object>
+					<int key="connectionID">5579</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -3392,8 +3427,8 @@
 						<reference key="object" ref="326102394"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="797420065"/>
-							<reference ref="357022441"/>
+							<reference ref="369644980"/>
+							<reference ref="964932186"/>
 							<reference ref="183948302"/>
 							<reference ref="1030226140"/>
 							<reference ref="615962367"/>
@@ -3420,31 +3455,31 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5525</int>
-						<reference key="object" ref="797420065"/>
+						<reference key="object" ref="369644980"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1004204108"/>
+							<reference ref="977486746"/>
 						</object>
 						<reference key="parent" ref="326102394"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5526</int>
-						<reference key="object" ref="1004204108"/>
-						<reference key="parent" ref="797420065"/>
+						<reference key="object" ref="977486746"/>
+						<reference key="parent" ref="369644980"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5523</int>
-						<reference key="object" ref="357022441"/>
+						<reference key="object" ref="964932186"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="31454463"/>
+							<reference ref="418433681"/>
 						</object>
 						<reference key="parent" ref="326102394"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5524</int>
-						<reference key="object" ref="31454463"/>
-						<reference key="parent" ref="357022441"/>
+						<reference key="object" ref="418433681"/>
+						<reference key="parent" ref="964932186"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5492</int>
@@ -4183,6 +4218,30 @@
 						<reference key="object" ref="757039715"/>
 						<reference key="parent" ref="990947983"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5576</int>
+						<reference key="object" ref="914547374"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="557801217"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">SSH Key Selection Help</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5577</int>
+						<reference key="object" ref="557801217"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="583482404"/>
+						</object>
+						<reference key="parent" ref="914547374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5578</int>
+						<reference key="object" ref="583482404"/>
+						<reference key="parent" ref="557801217"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -4382,6 +4441,10 @@
 					<string>5524.IBPluginDependency</string>
 					<string>5525.IBPluginDependency</string>
 					<string>5526.IBPluginDependency</string>
+					<string>5576.IBEditorWindowLastContentRect</string>
+					<string>5576.IBPluginDependency</string>
+					<string>5577.IBPluginDependency</string>
+					<string>5578.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4759,6 +4822,10 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{245, 466}, {579, 51}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -4777,7 +4844,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">5575</int>
+			<int key="maxID">5579</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5113,6 +5180,7 @@
 							<string>socketConnectionFormContainer</string>
 							<string>socketPasswordField</string>
 							<string>sshConnectionFormContainer</string>
+							<string>sshKeyLocationHelp</string>
 							<string>sshPasswordField</string>
 							<string>sshSQLHostField</string>
 							<string>sshSSHKeyButton</string>
@@ -5140,6 +5208,7 @@
 							<string>NSView</string>
 							<string>NSSecureTextField</string>
 							<string>NSView</string>
+							<string>NSView</string>
 							<string>NSSecureTextField</string>
 							<string>NSTextField</string>
 							<string>NSButton</string>
@@ -5170,6 +5239,7 @@
 							<string>socketConnectionFormContainer</string>
 							<string>socketPasswordField</string>
 							<string>sshConnectionFormContainer</string>
+							<string>sshKeyLocationHelp</string>
 							<string>sshPasswordField</string>
 							<string>sshSQLHostField</string>
 							<string>sshSSHKeyButton</string>
@@ -5249,6 +5319,10 @@
 								<string key="candidateClassName">NSView</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">sshKeyLocationHelp</string>
+								<string key="candidateClassName">NSView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">sshPasswordField</string>
 								<string key="candidateClassName">NSSecureTextField</string>
 							</object>
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib
index 449711bf..559b2fbc 100644
--- a/Interfaces/English.lproj/Preferences.xib
+++ b/Interfaces/English.lproj/Preferences.xib
@@ -21,8 +21,8 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1717"/>
 			<integer value="1176"/>
+			<integer value="1717"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2218,18 +2218,18 @@
 													<int key="NSvFlags">256</int>
 													<object class="NSMutableArray" key="NSSubviews">
 														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSTextField" id="723511019">
+														<object class="NSTextField" id="1069594382">
 															<reference key="NSNextResponder" ref="404987940"/>
 															<int key="NSvFlags">266</int>
 															<string key="NSFrame">{{119, 33}, {159, 19}}</string>
 															<reference key="NSSuperview" ref="404987940"/>
 															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="449219317">
+															<object class="NSTextFieldCell" key="NSCell" id="816035036">
 																<int key="NSCellFlags">-2073952703</int>
 																<int key="NSCellFlags2">4326912</int>
 																<string key="NSContents"/>
 																<reference key="NSSupport" ref="26"/>
-																<reference key="NSControlView" ref="723511019"/>
+																<reference key="NSControlView" ref="1069594382"/>
 																<bool key="NSDrawsBackground">YES</bool>
 																<reference key="NSBackgroundColor" ref="1001357688"/>
 																<object class="NSColor" key="NSTextColor">
@@ -2238,34 +2238,34 @@
 																</object>
 															</object>
 														</object>
-														<object class="NSTextField" id="586801007">
+														<object class="NSTextField" id="31233169">
 															<reference key="NSNextResponder" ref="404987940"/>
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{5, 35}, {109, 14}}</string>
 															<reference key="NSSuperview" ref="404987940"/>
 															<bool key="NSEnabled">YES</bool>
-															<object class="NSTextFieldCell" key="NSCell" id="104958740">
+															<object class="NSTextFieldCell" key="NSCell" id="141835735">
 																<int key="NSCellFlags">68288064</int>
 																<int key="NSCellFlags2">71304192</int>
 																<string key="NSContents">SSH Key:</string>
 																<reference key="NSSupport" ref="26"/>
-																<reference key="NSControlView" ref="586801007"/>
+																<reference key="NSControlView" ref="31233169"/>
 																<reference key="NSBackgroundColor" ref="700609571"/>
 																<reference key="NSTextColor" ref="1035618107"/>
 															</object>
 														</object>
-														<object class="NSButton" id="339449226">
+														<object class="NSButton" id="440294697">
 															<reference key="NSNextResponder" ref="404987940"/>
 															<int key="NSvFlags">265</int>
 															<string key="NSFrame">{{277, 32}, {25, 21}}</string>
 															<reference key="NSSuperview" ref="404987940"/>
 															<bool key="NSEnabled">YES</bool>
-															<object class="NSButtonCell" key="NSCell" id="447774753">
+															<object class="NSButtonCell" key="NSCell" id="735666174">
 																<int key="NSCellFlags">67239424</int>
 																<int key="NSCellFlags2">134348800</int>
 																<string key="NSContents"/>
 																<reference key="NSSupport" ref="26"/>
-																<reference key="NSControlView" ref="339449226"/>
+																<reference key="NSControlView" ref="440294697"/>
 																<int key="NSButtonFlags">-926138113</int>
 																<int key="NSButtonFlags2">162</int>
 																<object class="NSCustomResource" key="NSNormalImage">
@@ -4656,6 +4656,31 @@ AQAAAAA</bytes>
 				<string key="NSMinSize">{264, 296}</string>
 				<string key="NSMaxSize">{264, 296}</string>
 			</object>
+			<object class="NSCustomView" id="301032184">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSTextField" id="200831972">
+						<reference key="NSNextResponder" ref="301032184"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{2, 10}, {575, 34}}</string>
+						<reference key="NSSuperview" ref="301032184"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="219723569">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">138674176</int>
+							<string key="NSContents">Choose a custom SSH key file to use with this connection. Note that standard locations like ~/.ssh are checked automatically, as are any files in your SSH configuration.</string>
+							<reference key="NSSupport" ref="718282869"/>
+							<reference key="NSControlView" ref="200831972"/>
+							<reference key="NSBackgroundColor" ref="700609571"/>
+							<reference key="NSTextColor" ref="1035618107"/>
+						</object>
+					</object>
+				</object>
+				<string key="NSFrameSize">{579, 51}</string>
+				<string key="NSClassName">NSView</string>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -7110,10 +7135,10 @@ AQAAAAA</bytes>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: selection.sshKeyLocationEnabled</string>
-						<reference key="source" ref="339449226"/>
+						<reference key="source" ref="440294697"/>
 						<reference key="destination" ref="937123943"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="339449226"/>
+							<reference key="NSSource" ref="440294697"/>
 							<reference key="NSDestination" ref="937123943"/>
 							<string key="NSLabel">value: selection.sshKeyLocationEnabled</string>
 							<string key="NSBinding">value</string>
@@ -7192,10 +7217,10 @@ AQAAAAA</bytes>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">hidden: selection.sshKeyLocationEnabled</string>
-						<reference key="source" ref="586801007"/>
+						<reference key="source" ref="31233169"/>
 						<reference key="destination" ref="937123943"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="586801007"/>
+							<reference key="NSSource" ref="31233169"/>
 							<reference key="NSDestination" ref="937123943"/>
 							<string key="NSLabel">hidden: selection.sshKeyLocationEnabled</string>
 							<string key="NSBinding">hidden</string>
@@ -7227,7 +7252,7 @@ AQAAAAA</bytes>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
-						<reference key="source" ref="723511019"/>
+						<reference key="source" ref="1069594382"/>
 						<reference key="destination" ref="1001"/>
 					</object>
 					<int key="connectionID">1862</int>
@@ -7235,10 +7260,10 @@ AQAAAAA</bytes>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">hidden: selection.sshKeyLocationEnabled</string>
-						<reference key="source" ref="723511019"/>
+						<reference key="source" ref="1069594382"/>
 						<reference key="destination" ref="937123943"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="723511019"/>
+							<reference key="NSSource" ref="1069594382"/>
 							<reference key="NSDestination" ref="937123943"/>
 							<string key="NSLabel">hidden: selection.sshKeyLocationEnabled</string>
 							<string key="NSBinding">hidden</string>
@@ -7270,10 +7295,10 @@ AQAAAAA</bytes>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: selection.sshKeyLocation</string>
-						<reference key="source" ref="723511019"/>
+						<reference key="source" ref="1069594382"/>
 						<reference key="destination" ref="937123943"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="723511019"/>
+							<reference key="NSSource" ref="1069594382"/>
 							<reference key="NSDestination" ref="937123943"/>
 							<string key="NSLabel">value: selection.sshKeyLocation</string>
 							<string key="NSBinding">value</string>
@@ -7286,10 +7311,10 @@ AQAAAAA</bytes>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">toolTip: selection.sshKeyLocation</string>
-						<reference key="source" ref="723511019"/>
+						<reference key="source" ref="1069594382"/>
 						<reference key="destination" ref="937123943"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="723511019"/>
+							<reference key="NSSource" ref="1069594382"/>
 							<reference key="NSDestination" ref="937123943"/>
 							<string key="NSLabel">toolTip: selection.sshKeyLocation</string>
 							<string key="NSBinding">toolTip</string>
@@ -7303,10 +7328,18 @@ AQAAAAA</bytes>
 					<object class="IBActionConnection" key="connection">
 						<string key="label">chooseSSHKey:</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="339449226"/>
+						<reference key="destination" ref="440294697"/>
 					</object>
 					<int key="connectionID">1872</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sshKeyLocationHelp</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="301032184"/>
+					</object>
+					<int key="connectionID">1876</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -8651,9 +8684,9 @@ AQAAAAA</bytes>
 							<reference ref="578376935"/>
 							<reference ref="623079900"/>
 							<reference ref="981807110"/>
-							<reference ref="339449226"/>
-							<reference ref="586801007"/>
-							<reference ref="723511019"/>
+							<reference ref="440294697"/>
+							<reference ref="31233169"/>
+							<reference ref="1069594382"/>
 						</object>
 						<reference key="parent" ref="682271284"/>
 					</object>
@@ -10243,45 +10276,69 @@ AQAAAAA</bytes>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1835</int>
-						<reference key="object" ref="339449226"/>
+						<reference key="object" ref="440294697"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="447774753"/>
+							<reference ref="735666174"/>
 						</object>
 						<reference key="parent" ref="404987940"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1836</int>
-						<reference key="object" ref="447774753"/>
-						<reference key="parent" ref="339449226"/>
+						<reference key="object" ref="735666174"/>
+						<reference key="parent" ref="440294697"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1851</int>
-						<reference key="object" ref="586801007"/>
+						<reference key="object" ref="31233169"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="104958740"/>
+							<reference ref="141835735"/>
 						</object>
 						<reference key="parent" ref="404987940"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1852</int>
-						<reference key="object" ref="104958740"/>
-						<reference key="parent" ref="586801007"/>
+						<reference key="object" ref="141835735"/>
+						<reference key="parent" ref="31233169"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1859</int>
-						<reference key="object" ref="723511019"/>
+						<reference key="object" ref="1069594382"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="449219317"/>
+							<reference ref="816035036"/>
 						</object>
 						<reference key="parent" ref="404987940"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1860</int>
-						<reference key="object" ref="449219317"/>
-						<reference key="parent" ref="723511019"/>
+						<reference key="object" ref="816035036"/>
+						<reference key="parent" ref="1069594382"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1873</int>
+						<reference key="object" ref="301032184"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="200831972"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">SSH Key Selection Help</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1874</int>
+						<reference key="object" ref="200831972"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="219723569"/>
+						</object>
+						<reference key="parent" ref="301032184"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1875</int>
+						<reference key="object" ref="219723569"/>
+						<reference key="parent" ref="200831972"/>
 					</object>
 				</object>
 			</object>
@@ -10616,6 +10673,10 @@ AQAAAAA</bytes>
 					<string>1859.IBPluginDependency</string>
 					<string>1859.ImportedFromIB2</string>
 					<string>1860.IBPluginDependency</string>
+					<string>1873.IBEditorWindowLastContentRect</string>
+					<string>1873.IBPluginDependency</string>
+					<string>1874.IBPluginDependency</string>
+					<string>1875.IBPluginDependency</string>
 					<string>2.IBPluginDependency</string>
 					<string>24.IBPluginDependency</string>
 					<string>24.ImportedFromIB2</string>
@@ -11269,6 +11330,10 @@ AQAAAAA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{245, 466}, {579, 51}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
@@ -11602,7 +11667,7 @@ AQAAAAA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1872</int>
+			<int key="maxID">1876</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -11973,6 +12038,7 @@ AQAAAAA</bytes>
 							<string>saveThemeMenuItem</string>
 							<string>socketPasswordField</string>
 							<string>splitViewButtonBar</string>
+							<string>sshKeyLocationHelp</string>
 							<string>sshPasswordField</string>
 							<string>sshSQLPasswordField</string>
 							<string>standardPasswordField</string>
@@ -12017,6 +12083,7 @@ AQAAAAA</bytes>
 							<string>NSMenuItem</string>
 							<string>NSSecureTextField</string>
 							<string>BWAnchoredButtonBar</string>
+							<string>NSView</string>
 							<string>NSSecureTextField</string>
 							<string>NSSecureTextField</string>
 							<string>NSSecureTextField</string>
@@ -12064,6 +12131,7 @@ AQAAAAA</bytes>
 							<string>saveThemeMenuItem</string>
 							<string>socketPasswordField</string>
 							<string>splitViewButtonBar</string>
+							<string>sshKeyLocationHelp</string>
 							<string>sshPasswordField</string>
 							<string>sshSQLPasswordField</string>
 							<string>standardPasswordField</string>
@@ -12211,6 +12279,10 @@ AQAAAAA</bytes>
 								<string key="candidateClassName">BWAnchoredButtonBar</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">sshKeyLocationHelp</string>
+								<string key="candidateClassName">NSView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">sshPasswordField</string>
 								<string key="candidateClassName">NSSecureTextField</string>
 							</object>
diff --git a/Resources/English.lproj/ConnectionView.strings b/Resources/English.lproj/ConnectionView.strings
index 55c903c5..95354610 100644
--- a/Resources/English.lproj/ConnectionView.strings
+++ b/Resources/English.lproj/ConnectionView.strings
diff --git a/Resources/English.lproj/Preferences.strings b/Resources/English.lproj/Preferences.strings
index ef3dbb53..422ecee6 100644
--- a/Resources/English.lproj/Preferences.strings
+++ b/Resources/English.lproj/Preferences.strings
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index 67bdb77b..0a1f8cce 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -104,6 +104,7 @@
 	IBOutlet NSView *standardConnectionFormContainer;
 	IBOutlet NSView *socketConnectionFormContainer;
 	IBOutlet NSView *sshConnectionFormContainer;
+	IBOutlet NSView *sshKeyLocationHelp;
 
 	IBOutlet NSTextField *standardSQLHostField;
 	IBOutlet NSTextField *sshSQLHostField;
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index 7937ef99..a0ee7786 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -496,13 +496,16 @@
 		filePath = [sshKeyLocation lastPathComponent];
 		directoryPath = [sshKeyLocation stringByDeletingLastPathComponent];
 	}
-	[[NSOpenPanel openPanel] beginSheetForDirectory:directoryPath
-											   file:filePath
-											  types:[NSArray arrayWithObjects:@"pem", @"", nil]
-									 modalForWindow:[tableDocument parentWindow]
-									  modalDelegate:self
-									 didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:)
-										contextInfo:nil];
+
+	NSOpenPanel *openPanel = [NSOpenPanel openPanel];
+	[openPanel setAccessoryView:sshKeyLocationHelp];
+	[openPanel beginSheetForDirectory:directoryPath
+								 file:filePath
+								types:[NSArray arrayWithObjects:@"pem", @"", nil]
+					   modalForWindow:[tableDocument parentWindow]
+						modalDelegate:self
+					   didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:)
+						  contextInfo:nil];
 }
 
 /**
diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h
index 1683db65..7d8e0375 100644
--- a/Source/SPPreferenceController.h
+++ b/Source/SPPreferenceController.h
@@ -58,6 +58,7 @@
 	IBOutlet NSTextField *favoriteUserTextFieldSSH;
 	IBOutlet NSTextField *favoriteHostTextFieldSSH;
 	IBOutlet NSMenuItem *favoritesSortByMenuItem;
+	IBOutlet NSView *sshKeyLocationHelp;
 
 	IBOutlet NSWindow *enterNameWindow;
 	IBOutlet NSTextField *enterNameLabel;
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index 42503649..c1f3877a 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -704,13 +704,17 @@
 		filePath = [[favoritesController valueForKeyPath:@"selection.sshKeyLocation"] lastPathComponent];
 		directoryPath = [[favoritesController valueForKeyPath:@"selection.sshKeyLocation"] stringByDeletingLastPathComponent];
 	}
-	[[NSOpenPanel openPanel] beginSheetForDirectory:directoryPath
-											   file:filePath
-											  types:[NSArray arrayWithObjects:@"pem", @"", nil]
-									 modalForWindow:preferencesWindow
-									  modalDelegate:self
-									 didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:)
-										contextInfo:nil];
+
+
+	NSOpenPanel *openPanel = [NSOpenPanel openPanel];
+	[openPanel setAccessoryView:sshKeyLocationHelp];
+	[openPanel beginSheetForDirectory:directoryPath
+								 file:filePath
+								types:[NSArray arrayWithObjects:@"pem", @"", nil]
+					   modalForWindow:preferencesWindow
+						modalDelegate:self
+					   didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:)
+						  contextInfo:nil];
 }
 
 /**