- Add support for SSH identity files (public keys) in custom locations

 - Update localisable strings
 - Fix initial window position

1 files changed, 491 insertions, 142 deletions

diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib
index 89382d47..eeac316b 100644
--- a/Interfaces/English.lproj/ConnectionView.xib
+++ b/Interfaces/English.lproj/ConnectionView.xib
@@ -21,12 +21,12 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="4888"/>
+			<integer value="5166"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.brandonwalkin.BWToolkit</string>
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string>com.brandonwalkin.BWToolkit</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -359,7 +359,6 @@
 															</object>
 														</object>
 													</object>
-													<int key="NSSelectedIndex">1</int>
 													<bool key="NSPullDown">YES</bool>
 													<int key="NSPreferredEdge">1</int>
 													<bool key="NSUsesItemFromMenu">YES</bool>
@@ -407,7 +406,7 @@
 												<string key="NSColorName">controlColor</string>
 												<object class="NSColor" key="NSColor" id="355746054">
 													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+													<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 												</object>
 											</object>
 											<reference key="NSTextColor" ref="434026568"/>
@@ -1117,7 +1116,7 @@
 																						<object class="NSTextField" id="21480939">
 																							<reference key="NSNextResponder" ref="326102394"/>
 																							<int key="NSvFlags">268</int>
-																							<string key="NSFrame">{{110, 47}, {226, 22}}</string>
+																							<string key="NSFrame">{{110, 47}, {198, 22}}</string>
 																							<reference key="NSSuperview" ref="326102394"/>
 																							<bool key="NSEnabled">YES</bool>
 																							<object class="NSTextFieldCell" key="NSCell" id="944931136">
@@ -1125,7 +1124,6 @@
 																								<int key="NSCellFlags2">272630784</int>
 																								<string key="NSContents"/>
 																								<reference key="NSSupport" ref="807120225"/>
-																								<string key="NSPlaceholderString">optional if public key is available</string>
 																								<reference key="NSControlView" ref="21480939"/>
 																								<bool key="NSDrawsBackground">YES</bool>
 																								<reference key="NSBackgroundColor" ref="211632616"/>
@@ -1216,6 +1214,66 @@
 																								<reference key="NSTextColor" ref="434026568"/>
 																							</object>
 																						</object>
+																						<object class="NSButton" id="183948302">
+																							<reference key="NSNextResponder" ref="326102394"/>
+																							<int key="NSvFlags">268</int>
+																							<string key="NSFrame">{{307, 46}, {29, 24}}</string>
+																							<reference key="NSSuperview" ref="326102394"/>
+																							<bool key="NSEnabled">YES</bool>
+																							<object class="NSButtonCell" key="NSCell" id="510891456">
+																								<int key="NSCellFlags">67239424</int>
+																								<int key="NSCellFlags2">134217728</int>
+																								<string key="NSContents"/>
+																								<reference key="NSSupport" ref="807120225"/>
+																								<reference key="NSControlView" ref="183948302"/>
+																								<int key="NSButtonFlags">-922992385</int>
+																								<int key="NSButtonFlags2">34</int>
+																								<object class="NSCustomResource" key="NSNormalImage">
+																									<string key="NSClassName">NSImage</string>
+																									<string key="NSResourceName">KeyTemplate</string>
+																								</object>
+																								<string key="NSAlternateContents"/>
+																								<string key="NSKeyEquivalent"/>
+																								<int key="NSPeriodicDelay">400</int>
+																								<int key="NSPeriodicInterval">75</int>
+																							</object>
+																						</object>
+																						<object class="NSTextField" id="797420065">
+																							<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">
+																								<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="NSBackgroundColor" ref="644242225"/>
+																								<reference key="NSTextColor" ref="434026568"/>
+																							</object>
+																						</object>
+																						<object class="NSTextField" id="357022441">
+																							<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">
+																								<int key="NSCellFlags">-2076049856</int>
+																								<int key="NSCellFlags2">272631296</int>
+																								<string key="NSContents"/>
+																								<reference key="NSSupport" ref="807120225"/>
+																								<reference key="NSControlView" ref="357022441"/>
+																								<bool key="NSDrawsBackground">YES</bool>
+																								<reference key="NSBackgroundColor" ref="211632616"/>
+																								<object class="NSColor" key="NSTextColor">
+																									<int key="NSColorSpace">3</int>
+																									<bytes key="NSWhite">MC40OTU5Njc3NDE5AA</bytes>
+																								</object>
+																							</object>
+																						</object>
 																					</object>
 																					<string key="NSFrame">{{6, 6}, {356, 382}}</string>
 																					<reference key="NSSuperview" ref="159800861"/>
@@ -1364,7 +1422,7 @@
 				<string key="NSWindowTitle">Error Detail</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{100, 100}</string>
 				<object class="NSView" key="NSWindowView" id="536120400">
 					<nil key="NSNextResponder"/>
@@ -1404,9 +1462,9 @@
 																</object>
 																<object class="NSMutableArray" key="dict.values">
 																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSColor" id="646863217">
+																	<object class="NSColor" id="47423510">
 																		<int key="NSColorSpace">1</int>
-																		<bytes key="NSRGB">MC45MDE5NjA3OTAyIDAuOTAxOTYwNzkwMiAwLjkwMTk2MDc5MDIAA</bytes>
+																		<bytes key="NSRGB">MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA</bytes>
 																	</object>
 																	<object class="NSFont">
 																		<string key="NSName">LucidaGrande</string>
@@ -1527,7 +1585,7 @@
 																</object>
 																<object class="NSMutableArray" key="dict.values">
 																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<reference ref="646863217"/>
+																	<reference ref="47423510"/>
 																	<object class="NSFont">
 																		<string key="NSName">LucidaGrande-Bold</string>
 																		<double key="NSSize">10</double>
@@ -1690,7 +1748,7 @@
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{100, 119}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSFrameAutosaveName"/>
 			</object>
 			<object class="NSUserDefaultsController" id="642702582">
@@ -2622,35 +2680,6 @@
 					<int key="connectionID">5448</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: sshPassword</string>
-						<reference key="source" ref="21480939"/>
-						<reference key="destination" ref="545410097"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="21480939"/>
-							<reference key="NSDestination" ref="545410097"/>
-							<string key="NSLabel">value: sshPassword</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">sshPassword</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSContinuouslyUpdatesValue</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<boolean value="YES"/>
-									<string>optional if public key is available</string>
-								</object>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5450</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">helpButton</string>
 						<reference key="source" ref="545410097"/>
@@ -2778,6 +2807,230 @@
 					</object>
 					<int key="connectionID">5491</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sshSSHKeyButton</string>
+						<reference key="source" ref="545410097"/>
+						<reference key="destination" ref="183948302"/>
+					</object>
+					<int key="connectionID">5494</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">chooseSSHKey:</string>
+						<reference key="source" ref="545410097"/>
+						<reference key="destination" ref="183948302"/>
+					</object>
+					<int key="connectionID">5495</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: sshPassword</string>
+						<reference key="source" ref="21480939"/>
+						<reference key="destination" ref="545410097"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="21480939"/>
+							<reference key="NSDestination" ref="545410097"/>
+							<string key="NSLabel">value: sshPassword</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">sshPassword</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSContinuouslyUpdatesValue</string>
+								<boolean value="YES" key="NS.object.0"/>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">5504</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: sshKeyLocationEnabled</string>
+						<reference key="source" ref="627782947"/>
+						<reference key="destination" ref="545410097"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="627782947"/>
+							<reference key="NSDestination" ref="545410097"/>
+							<string key="NSLabel">hidden: sshKeyLocationEnabled</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">sshKeyLocationEnabled</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSMultipleValuesPlaceholder</string>
+									<string>NSNoSelectionPlaceholder</string>
+									<string>NSNotApplicablePlaceholder</string>
+									<string>NSNullPlaceholder</string>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<integer value="0"/>
+									<integer value="0"/>
+									<integer value="0"/>
+									<integer value="0"/>
+								</object>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">5549</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: sshKeyLocationEnabled</string>
+						<reference key="source" ref="183948302"/>
+						<reference key="destination" ref="545410097"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="183948302"/>
+							<reference key="NSDestination" ref="545410097"/>
+							<string key="NSLabel">value: sshKeyLocationEnabled</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">sshKeyLocationEnabled</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSMultipleValuesPlaceholder</string>
+									<string>NSNoSelectionPlaceholder</string>
+									<string>NSNotApplicablePlaceholder</string>
+									<string>NSNullPlaceholder</string>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<integer value="0"/>
+									<integer value="0"/>
+									<integer value="0"/>
+									<integer value="0"/>
+								</object>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">5551</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: sshKeyLocationEnabled</string>
+						<reference key="source" ref="21480939"/>
+						<reference key="destination" ref="545410097"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="21480939"/>
+							<reference key="NSDestination" ref="545410097"/>
+							<string key="NSLabel">hidden: sshKeyLocationEnabled</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">sshKeyLocationEnabled</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">5559</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: sshKeyLocationEnabled</string>
+						<reference key="source" ref="797420065"/>
+						<reference key="destination" ref="545410097"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="797420065"/>
+							<reference key="NSDestination" ref="545410097"/>
+							<string key="NSLabel">hidden: sshKeyLocationEnabled</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">sshKeyLocationEnabled</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSMultipleValuesPlaceholder</string>
+									<string>NSNoSelectionPlaceholder</string>
+									<string>NSNotApplicablePlaceholder</string>
+									<string>NSNullPlaceholder</string>
+									<string>NSValueTransformerName</string>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<integer value="1"/>
+									<integer value="1"/>
+									<integer value="1"/>
+									<integer value="1"/>
+									<string>NSNegateBoolean</string>
+								</object>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">5561</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: sshKeyLocationEnabled</string>
+						<reference key="source" ref="357022441"/>
+						<reference key="destination" ref="545410097"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="357022441"/>
+							<reference key="NSDestination" ref="545410097"/>
+							<string key="NSLabel">hidden: sshKeyLocationEnabled</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">sshKeyLocationEnabled</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSMultipleValuesPlaceholder</string>
+									<string>NSNoSelectionPlaceholder</string>
+									<string>NSNotApplicablePlaceholder</string>
+									<string>NSNullPlaceholder</string>
+									<string>NSValueTransformerName</string>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<integer value="1"/>
+									<integer value="1"/>
+									<integer value="1"/>
+									<integer value="1"/>
+									<string>NSNegateBoolean</string>
+								</object>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">5562</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: sshKeyLocation</string>
+						<reference key="source" ref="357022441"/>
+						<reference key="destination" ref="545410097"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="357022441"/>
+							<reference key="NSDestination" ref="545410097"/>
+							<string key="NSLabel">value: sshKeyLocation</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">sshKeyLocation</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSContinuouslyUpdatesValue</string>
+								<boolean value="YES" key="NS.object.0"/>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">5563</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">toolTip: sshKeyLocation</string>
+						<reference key="source" ref="357022441"/>
+						<reference key="destination" ref="545410097"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="357022441"/>
+							<reference key="NSDestination" ref="545410097"/>
+							<string key="NSLabel">toolTip: sshKeyLocation</string>
+							<string key="NSBinding">toolTip</string>
+							<string key="NSKeyPath">sshKeyLocation</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">5570</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2974,6 +3227,106 @@
 						<reference key="parent" ref="699163511"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">5455</int>
+						<reference key="object" ref="642702582"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5468</int>
+						<reference key="object" ref="9858888"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="471954922"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Context Menu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5469</int>
+						<reference key="object" ref="471954922"/>
+						<reference key="parent" ref="9858888"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5475</int>
+						<reference key="object" ref="221133754"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="270183415"/>
+						</object>
+						<reference key="parent" ref="805249222"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5476</int>
+						<reference key="object" ref="270183415"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="949612237"/>
+						</object>
+						<reference key="parent" ref="221133754"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5477</int>
+						<reference key="object" ref="949612237"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="751753648"/>
+							<reference ref="623685715"/>
+						</object>
+						<reference key="parent" ref="270183415"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5478</int>
+						<reference key="object" ref="751753648"/>
+						<reference key="parent" ref="949612237"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5479</int>
+						<reference key="object" ref="623685715"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="455108754"/>
+						</object>
+						<reference key="parent" ref="949612237"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5481</int>
+						<reference key="object" ref="455108754"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="536740264"/>
+							<reference ref="965148975"/>
+							<reference ref="997359603"/>
+							<reference ref="43427774"/>
+							<reference ref="513442721"/>
+						</object>
+						<reference key="parent" ref="623685715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5482</int>
+						<reference key="object" ref="536740264"/>
+						<reference key="parent" ref="455108754"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5483</int>
+						<reference key="object" ref="965148975"/>
+						<reference key="parent" ref="455108754"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5484</int>
+						<reference key="object" ref="997359603"/>
+						<reference key="parent" ref="455108754"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5485</int>
+						<reference key="object" ref="43427774"/>
+						<reference key="parent" ref="455108754"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5486</int>
+						<reference key="object" ref="513442721"/>
+						<reference key="parent" ref="455108754"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">5168</int>
 						<reference key="object" ref="456162506"/>
 						<object class="NSMutableArray" key="children">
@@ -3039,6 +3392,9 @@
 						<reference key="object" ref="326102394"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="797420065"/>
+							<reference ref="357022441"/>
+							<reference ref="183948302"/>
 							<reference ref="1030226140"/>
 							<reference ref="615962367"/>
 							<reference ref="358903996"/>
@@ -3063,6 +3419,48 @@
 						<reference key="parent" ref="159800861"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">5525</int>
+						<reference key="object" ref="797420065"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1004204108"/>
+						</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"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5523</int>
+						<reference key="object" ref="357022441"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="31454463"/>
+						</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"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5492</int>
+						<reference key="object" ref="183948302"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="510891456"/>
+						</object>
+						<reference key="parent" ref="326102394"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5493</int>
+						<reference key="object" ref="510891456"/>
+						<reference key="parent" ref="183948302"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">5264</int>
 						<reference key="object" ref="1030226140"/>
 						<object class="NSMutableArray" key="children">
@@ -3785,106 +4183,6 @@
 						<reference key="object" ref="757039715"/>
 						<reference key="parent" ref="990947983"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5455</int>
-						<reference key="object" ref="642702582"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5468</int>
-						<reference key="object" ref="9858888"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="471954922"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Context Menu</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5469</int>
-						<reference key="object" ref="471954922"/>
-						<reference key="parent" ref="9858888"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5475</int>
-						<reference key="object" ref="221133754"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="270183415"/>
-						</object>
-						<reference key="parent" ref="805249222"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5476</int>
-						<reference key="object" ref="270183415"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="949612237"/>
-						</object>
-						<reference key="parent" ref="221133754"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5477</int>
-						<reference key="object" ref="949612237"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="751753648"/>
-							<reference ref="623685715"/>
-						</object>
-						<reference key="parent" ref="270183415"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5478</int>
-						<reference key="object" ref="751753648"/>
-						<reference key="parent" ref="949612237"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5479</int>
-						<reference key="object" ref="623685715"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="455108754"/>
-						</object>
-						<reference key="parent" ref="949612237"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5481</int>
-						<reference key="object" ref="455108754"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="536740264"/>
-							<reference ref="965148975"/>
-							<reference ref="997359603"/>
-							<reference ref="43427774"/>
-							<reference ref="513442721"/>
-						</object>
-						<reference key="parent" ref="623685715"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5482</int>
-						<reference key="object" ref="536740264"/>
-						<reference key="parent" ref="455108754"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5483</int>
-						<reference key="object" ref="965148975"/>
-						<reference key="parent" ref="455108754"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5484</int>
-						<reference key="object" ref="997359603"/>
-						<reference key="parent" ref="455108754"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5485</int>
-						<reference key="object" ref="43427774"/>
-						<reference key="parent" ref="455108754"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5486</int>
-						<reference key="object" ref="513442721"/>
-						<reference key="parent" ref="455108754"/>
-					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -4077,12 +4375,19 @@
 					<string>5484.IBPluginDependency</string>
 					<string>5485.IBPluginDependency</string>
 					<string>5486.IBPluginDependency</string>
+					<string>5492.IBAttributePlaceholdersKey</string>
+					<string>5492.IBPluginDependency</string>
+					<string>5493.IBPluginDependency</string>
+					<string>5523.IBPluginDependency</string>
+					<string>5524.IBPluginDependency</string>
+					<string>5525.IBPluginDependency</string>
+					<string>5526.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{564, 184}, {882, 563}}</string>
+					<string>{{120, 184}, {882, 563}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
@@ -4440,6 +4745,20 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="183948302"/>
+							<string key="toolTip">Choose a custom SSH key file to use with this connection.  Standard locations like ~/.ssh are checked automatically.</string>
+						</object>
+					</object>
+					<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>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -4458,7 +4777,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">5491</int>
+			<int key="maxID">5575</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4697,6 +5016,8 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addFavorite:</string>
+							<string>cancelMySQLConnection:</string>
+							<string>chooseSSHKey:</string>
 							<string>editFavorites:</string>
 							<string>initiateConnection:</string>
 							<string>reverseSortFavorites:</string>
@@ -4713,6 +5034,8 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -4720,6 +5043,8 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addFavorite:</string>
+							<string>cancelMySQLConnection:</string>
+							<string>chooseSSHKey:</string>
 							<string>editFavorites:</string>
 							<string>initiateConnection:</string>
 							<string>reverseSortFavorites:</string>
@@ -4734,6 +5059,14 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
+								<string key="name">cancelMySQLConnection:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">chooseSSHKey:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">editFavorites:</string>
 								<string key="candidateClassName">id</string>
 							</object>
@@ -4782,6 +5115,7 @@
 							<string>sshConnectionFormContainer</string>
 							<string>sshPasswordField</string>
 							<string>sshSQLHostField</string>
+							<string>sshSSHKeyButton</string>
 							<string>sshSSHPasswordField</string>
 							<string>standardConnectionFormContainer</string>
 							<string>standardPasswordField</string>
@@ -4808,6 +5142,7 @@
 							<string>NSView</string>
 							<string>NSSecureTextField</string>
 							<string>NSTextField</string>
+							<string>NSButton</string>
 							<string>NSSecureTextField</string>
 							<string>NSView</string>
 							<string>NSSecureTextField</string>
@@ -4837,6 +5172,7 @@
 							<string>sshConnectionFormContainer</string>
 							<string>sshPasswordField</string>
 							<string>sshSQLHostField</string>
+							<string>sshSSHKeyButton</string>
 							<string>sshSSHPasswordField</string>
 							<string>standardConnectionFormContainer</string>
 							<string>standardPasswordField</string>
@@ -4921,6 +5257,10 @@
 								<string key="candidateClassName">NSTextField</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">sshSSHKeyButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">sshSSHPasswordField</string>
 								<string key="candidateClassName">NSSecureTextField</string>
 							</object>
@@ -5410,6 +5750,13 @@
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
 						<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
 					</object>
 				</object>
@@ -5720,6 +6067,7 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>KeyTemplate</string>
 				<string>NSActionTemplate</string>
 				<string>NSMenuCheckmark</string>
 				<string>NSMenuMixedState</string>
@@ -5727,6 +6075,7 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{16, 8}</string>
 				<string>{10, 10}</string>
 				<string>{9, 8}</string>
 				<string>{7, 2}</string>