• add accessory view for Save Connection

- options:
-- Include session data (selected table, queries, status, etc.)
-- Save passwords + Encrypt SPF file with password for safety reasons

Note: SP gives this warning in the Console:
NSSecureTextFieldCell detected a field editor (_NSSavePanelTextView) that is not a NSTextView subclass designed to work with the cell. Ignoring... 

Why?

3 files changed, 534 insertions, 2 deletions

diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index cea60e1f..c0ea5d22 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -185,6 +185,7 @@
 																					</object>
 																					<string key="NSFrameSize">{212, 26}</string>
 																					<reference key="NSSuperview" ref="199860064"/>
+																					<reference key="NSNextKeyView" ref="643201879"/>
 																					<reference key="NSDocView" ref="643201879"/>
 																					<object class="NSColor" key="NSBGColor" id="529261656">
 																						<int key="NSColorSpace">6</int>
@@ -220,6 +221,7 @@
 																			</object>
 																			<string key="NSFrameSize">{212, 26}</string>
 																			<reference key="NSSuperview" ref="801427893"/>
+																			<reference key="NSNextKeyView" ref="588922296"/>
 																			<int key="NSsFlags">0</int>
 																			<reference key="NSVScroller" ref="540853896"/>
 																			<reference key="NSHScroller" ref="566705316"/>
@@ -334,6 +336,7 @@
 																					</object>
 																					<string key="NSFrameSize">{212, 354}</string>
 																					<reference key="NSSuperview" ref="233472824"/>
+																					<reference key="NSNextKeyView" ref="251040077"/>
 																					<reference key="NSDocView" ref="251040077"/>
 																					<object class="NSColor" key="NSBGColor" id="1024678221">
 																						<int key="NSColorSpace">6</int>
@@ -365,6 +368,7 @@
 																			</object>
 																			<string key="NSFrameSize">{212, 354}</string>
 																			<reference key="NSSuperview" ref="1017775084"/>
+																			<reference key="NSNextKeyView" ref="73685676"/>
 																			<int key="NSsFlags">528</int>
 																			<reference key="NSVScroller" ref="693168867"/>
 																			<reference key="NSHScroller" ref="656188692"/>
@@ -489,6 +493,7 @@
 																	</object>
 																	<string key="NSFrameSize">{212, 145}</string>
 																	<reference key="NSSuperview" ref="298226231"/>
+																	<reference key="NSNextKeyView" ref="347093764"/>
 																	<reference key="NSDocView" ref="347093764"/>
 																	<reference key="NSBGColor" ref="1024678221"/>
 																	<int key="NScvFlags">6</int>
@@ -515,6 +520,7 @@
 															</object>
 															<string key="NSFrameSize">{212, 145}</string>
 															<reference key="NSSuperview" ref="192579410"/>
+															<reference key="NSNextKeyView" ref="685057119"/>
 															<int key="NSsFlags">512</int>
 															<reference key="NSVScroller" ref="245346414"/>
 															<reference key="NSHScroller" ref="353686052"/>
@@ -2121,6 +2127,7 @@
 																		</object>
 																		<string key="NSFrame">{{1, 17}, {688, 455}}</string>
 																		<reference key="NSSuperview" ref="33038697"/>
+																		<reference key="NSNextKeyView" ref="22576329"/>
 																		<reference key="NSDocView" ref="22576329"/>
 																		<reference key="NSBGColor" ref="1024678221"/>
 																		<int key="NScvFlags">2</int>
@@ -2154,6 +2161,7 @@
 																		</object>
 																		<string key="NSFrame">{{1, 0}, {688, 17}}</string>
 																		<reference key="NSSuperview" ref="33038697"/>
+																		<reference key="NSNextKeyView" ref="457166030"/>
 																		<reference key="NSDocView" ref="457166030"/>
 																		<reference key="NSBGColor" ref="1024678221"/>
 																		<int key="NScvFlags">4</int>
@@ -2162,6 +2170,7 @@
 																</object>
 																<string key="NSFrame">{{6, 32}, {690, 473}}</string>
 																<reference key="NSSuperview" ref="1013108064"/>
+																<reference key="NSNextKeyView" ref="545438501"/>
 																<int key="NSsFlags">562</int>
 																<reference key="NSVScroller" ref="398797698"/>
 																<reference key="NSHScroller" ref="178353583"/>
@@ -11343,6 +11352,102 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSFrameSize">{110, 20}</string>
 				<string key="NSClassName">NSView</string>
 			</object>
+			<object class="NSCustomView" id="721763950">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">268</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSButton" id="612342309">
+						<reference key="NSNextResponder" ref="721763950"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{18, 57}, {151, 18}}</string>
+						<reference key="NSSuperview" ref="721763950"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="557172944">
+							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags2">0</int>
+							<string key="NSContents">Include session data</string>
+							<reference key="NSSupport" ref="244931163"/>
+							<reference key="NSControlView" ref="612342309"/>
+							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags2">130</int>
+							<reference key="NSNormalImage" ref="653588312"/>
+							<reference key="NSAlternateImage" ref="386686735"/>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+					</object>
+					<object class="NSButton" id="33459578">
+						<reference key="NSNextResponder" ref="721763950"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{18, 32}, {121, 18}}</string>
+						<reference key="NSSuperview" ref="721763950"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="735841378">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">0</int>
+							<string key="NSContents">Save passwords</string>
+							<reference key="NSSupport" ref="244931163"/>
+							<reference key="NSControlView" ref="33459578"/>
+							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags2">130</int>
+							<reference key="NSNormalImage" ref="653588312"/>
+							<reference key="NSAlternateImage" ref="386686735"/>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+					</object>
+					<object class="NSButton" id="842051747">
+						<reference key="NSNextResponder" ref="721763950"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{47, 7}, {166, 18}}</string>
+						<reference key="NSSuperview" ref="721763950"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="256201367">
+							<int key="NSCellFlags">-1543373312</int>
+							<int key="NSCellFlags2">131072</int>
+							<string key="NSContents">Encrypt file with password:</string>
+							<reference key="NSSupport" ref="26"/>
+							<reference key="NSControlView" ref="842051747"/>
+							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags2">130</int>
+							<reference key="NSNormalImage" ref="653588312"/>
+							<reference key="NSAlternateImage" ref="386686735"/>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+					</object>
+					<object class="NSSecureTextField" id="953813003">
+						<reference key="NSNextResponder" ref="721763950"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{215, 7}, {117, 19}}</string>
+						<reference key="NSSuperview" ref="721763950"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSSecureTextFieldCell" key="NSCell" id="856645815">
+							<int key="NSCellFlags">879885888</int>
+							<int key="NSCellFlags2">272761856</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="26"/>
+							<reference key="NSControlView" ref="953813003"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="480189472"/>
+							<reference key="NSTextColor" ref="690893883"/>
+							<object class="NSArray" key="NSAllowedInputLocales">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<string>NSAllRomanInputSourcesLocaleIdentifier</string>
+							</object>
+						</object>
+					</object>
+				</object>
+				<string key="NSFrameSize">{352, 84}</string>
+				<string key="NSClassName">NSView</string>
+			</object>
 			<object class="NSUserDefaultsController" id="461189245">
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
@@ -15034,6 +15139,94 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<int key="connectionID">6374</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">saveConnectionAccessory</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="721763950"/>
+					</object>
+					<int key="connectionID">6387</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">saveConnectionIncludeData</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="612342309"/>
+					</object>
+					<int key="connectionID">6388</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">saveConnectionSavePassword</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="33459578"/>
+					</object>
+					<int key="connectionID">6389</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">saveConnectionEncrypt</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="842051747"/>
+					</object>
+					<int key="connectionID">6390</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">saveConnectionEncryptString</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="953813003"/>
+					</object>
+					<int key="connectionID">6391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="612342309"/>
+						<reference key="destination" ref="33459578"/>
+					</object>
+					<int key="connectionID">6392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="33459578"/>
+						<reference key="destination" ref="842051747"/>
+					</object>
+					<int key="connectionID">6393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="842051747"/>
+						<reference key="destination" ref="953813003"/>
+					</object>
+					<int key="connectionID">6394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">saveConnectionAccessoryPasswordButton:</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="33459578"/>
+					</object>
+					<int key="connectionID">6401</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">saveConnectionAccessoryPasswordButton:</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="842051747"/>
+					</object>
+					<int key="connectionID">6402</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="953813003"/>
+						<reference key="destination" ref="427689665"/>
+					</object>
+					<int key="connectionID">6404</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -21187,6 +21380,75 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="object" ref="564763515"/>
 						<reference key="parent" ref="538700903"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6375</int>
+						<reference key="object" ref="721763950"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="33459578"/>
+							<reference ref="612342309"/>
+							<reference ref="842051747"/>
+							<reference ref="953813003"/>
+						</object>
+						<reference key="parent" ref="1043842561"/>
+						<string key="objectName">Save SPF Accessory</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6376</int>
+						<reference key="object" ref="612342309"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="557172944"/>
+						</object>
+						<reference key="parent" ref="721763950"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6377</int>
+						<reference key="object" ref="557172944"/>
+						<reference key="parent" ref="612342309"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6378</int>
+						<reference key="object" ref="33459578"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="735841378"/>
+						</object>
+						<reference key="parent" ref="721763950"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6379</int>
+						<reference key="object" ref="735841378"/>
+						<reference key="parent" ref="33459578"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6380</int>
+						<reference key="object" ref="842051747"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="256201367"/>
+						</object>
+						<reference key="parent" ref="721763950"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6381</int>
+						<reference key="object" ref="256201367"/>
+						<reference key="parent" ref="842051747"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6384</int>
+						<reference key="object" ref="953813003"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="856645815"/>
+						</object>
+						<reference key="parent" ref="721763950"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6385</int>
+						<reference key="object" ref="856645815"/>
+						<reference key="parent" ref="953813003"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -22447,6 +22709,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>6370.IBPluginDependency</string>
 					<string>6371.IBPluginDependency</string>
 					<string>6372.IBPluginDependency</string>
+					<string>6375.IBEditorWindowLastContentRect</string>
+					<string>6375.IBPluginDependency</string>
+					<string>6376.IBAttributePlaceholdersKey</string>
+					<string>6376.IBPluginDependency</string>
+					<string>6377.IBPluginDependency</string>
+					<string>6378.IBAttributePlaceholdersKey</string>
+					<string>6378.IBPluginDependency</string>
+					<string>6379.IBPluginDependency</string>
+					<string>6380.IBPluginDependency</string>
+					<string>6381.IBPluginDependency</string>
+					<string>6384.IBPluginDependency</string>
+					<string>6385.IBPluginDependency</string>
 					<string>654.IBPluginDependency</string>
 					<string>654.ImportedFromIB2</string>
 					<string>655.IBPluginDependency</string>
@@ -24261,6 +24535,32 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{275, 661}, {352, 84}}</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="612342309"/>
+							<string key="toolTip">Save current selected table, view status, and queries</string>
+						</object>
+					</object>
+					<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="33459578"/>
+							<string key="toolTip">ATTENTION: All passwords will be saved in the file! For safety reasons it is recommended to encrypt the file.</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>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -24481,7 +24781,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">6374</int>
+			<int key="maxID">6404</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -25782,6 +26082,195 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 					</object>
 				</object>
 			</object>
+			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">TableDocument</string>
+					<string key="superclassName">NSDocument</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addConnectionToFavorites:</string>
+							<string>addDatabase:</string>
+							<string>analyzeTable:</string>
+							<string>checkTable:</string>
+							<string>checksumTable:</string>
+							<string>chooseDatabase:</string>
+							<string>chooseEncoding:</string>
+							<string>closeDatabaseSheet:</string>
+							<string>closeErrorConnectionSheet:</string>
+							<string>closeSheet:</string>
+							<string>copyCreateTableSyntax:</string>
+							<string>export:</string>
+							<string>exportMultipleTables:</string>
+							<string>exportTable:</string>
+							<string>flushPrivileges:</string>
+							<string>flushTable:</string>
+							<string>import:</string>
+							<string>optimizeTable:</string>
+							<string>removeDatabase:</string>
+							<string>repairTable:</string>
+							<string>saveConnectionAccessoryPasswordButton:</string>
+							<string>saveConnectionSheet:</string>
+							<string>saveServerVariables:</string>
+							<string>setDatabases:</string>
+							<string>showCreateTableSyntax:</string>
+							<string>showMySQLHelp:</string>
+							<string>showUserManager:</string>
+							<string>showVariables:</string>
+							<string>viewContent:</string>
+							<string>viewQuery:</string>
+							<string>viewRelations:</string>
+							<string>viewStatus:</string>
+							<string>viewStructure:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addDatabaseButton</string>
+							<string>chooseDatabaseButton</string>
+							<string>connectionErrorDialog</string>
+							<string>contentViewSplitter</string>
+							<string>createTableSyntaxWindow</string>
+							<string>customQueryInstance</string>
+							<string>customQueryTextView</string>
+							<string>databaseDataInstance</string>
+							<string>databaseEncodingButton</string>
+							<string>databaseNameField</string>
+							<string>databaseSheet</string>
+							<string>dbTablesTableView</string>
+							<string>encodingPopUp</string>
+							<string>extendedTableInfoInstance</string>
+							<string>favoritesButton</string>
+							<string>historyControl</string>
+							<string>listFilterField</string>
+							<string>queryProgressBar</string>
+							<string>saveConnectionAccessory</string>
+							<string>saveConnectionEncrypt</string>
+							<string>saveConnectionEncryptString</string>
+							<string>saveConnectionIncludeData</string>
+							<string>saveConnectionSavePassword</string>
+							<string>saveVariablesButton</string>
+							<string>sidebarGrabber</string>
+							<string>spExportControllerInstance</string>
+							<string>spHistoryControllerInstance</string>
+							<string>syntaxView</string>
+							<string>syntaxViewContent</string>
+							<string>tableContentInstance</string>
+							<string>tableDataInstance</string>
+							<string>tableDumpInstance</string>
+							<string>tableInfoCollapseButton</string>
+							<string>tableInfoTable</string>
+							<string>tableListSplitter</string>
+							<string>tableRelationsInstance</string>
+							<string>tableSourceInstance</string>
+							<string>tableTabView</string>
+							<string>tableWindow</string>
+							<string>tablesListInstance</string>
+							<string>titleAccessoryView</string>
+							<string>titleImageView</string>
+							<string>titleStringView</string>
+							<string>variablesCountTextField</string>
+							<string>variablesSearchField</string>
+							<string>variablesSheet</string>
+							<string>variablesTableView</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>NSWindow</string>
+							<string>NSSplitView</string>
+							<string>NSWindow</string>
+							<string>id</string>
+							<string>NSTextView</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>NSTableView</string>
+							<string>NSPopUpButton</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>NSSearchField</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>NSButton</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>NSButton</string>
+							<string>NSTableView</string>
+							<string>NSSplitView</string>
+							<string>id</string>
+							<string>id</string>
+							<string>NSTabView</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>NSTextField</string>
+							<string>NSSearchField</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBDocumentRelativeSource</string>
+						<string key="minorKey">../../Source/TableDocument.h</string>
+					</object>
+				</object>
+			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string>
diff --git a/Source/TableDocument.h b/Source/TableDocument.h
index 130e061e..17de1f03 100644
--- a/Source/TableDocument.h
+++ b/Source/TableDocument.h
@@ -92,6 +92,12 @@
 	IBOutlet NSWindow *createTableSyntaxWindow;
 	IBOutlet NSWindow *connectionErrorDialog;
 
+	IBOutlet id saveConnectionAccessory;
+	IBOutlet id saveConnectionIncludeData;
+	IBOutlet id saveConnectionSavePassword;
+	IBOutlet id saveConnectionEncrypt;
+	IBOutlet NSSecureTextField *saveConnectionEncryptString;
+
 	SPConnectionController *connectionController;
 	SPUserManager *userManagerInstance;
 	
@@ -176,7 +182,7 @@
 - (NSWindow *)getCreateTableSyntaxWindow;
 - (void) refreshCurrentDatabase;
 - (void)saveConnectionPanelDidEnd:(NSSavePanel *)panel returnCode:(int)returnCode  contextInfo:(void  *)contextInfo;
-
+- (IBAction)saveConnectionAccessoryPasswordButton:(id)sender;
 
 // Getter methods
 - (NSString *)name;
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 86e61f30..a6b4caae 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -1746,6 +1746,13 @@
 		// Save current session (open connection windows as SPF file)
 		// [panel setMessage:NSLocalizedString(@"Save Sequel Pro session", @"Save Sequel Pro session")];
 		[panel setAllowedFileTypes:[NSArray arrayWithObjects:@"spf", nil]];
+		[saveConnectionEncryptString setDelegate:self];
+		[saveConnectionEncryptString setEnabled:YES];
+		[saveConnectionEncryptString setStringValue:@""];
+		[saveConnectionEncryptString setEnabled:NO];
+		[saveConnectionSavePassword setState:NSOffState];
+		[self saveConnectionAccessoryPasswordButton:nil];
+		[panel setAccessoryView:saveConnectionAccessory];
 		filename = [NSString stringWithFormat:@"%@", [self name]];
 		contextInfo = @"saveSPFfile";
 
@@ -1760,6 +1767,36 @@
 				 didEndSelector:@selector(saveConnectionPanelDidEnd:returnCode:contextInfo:) 
 					contextInfo:contextInfo];
 }
+/**
+ * Control the save connection panel's encrypt checkbox and text field
+ • if user changed the status of "Save passwords" and "Encrypt" resp.
+ */
+- (IBAction)saveConnectionAccessoryPasswordButton:(id)sender
+{
+
+	if([saveConnectionSavePassword state] == NSOnState) {
+		[saveConnectionEncrypt setEnabled:YES];
+		if([saveConnectionEncrypt state] == NSOnState) {
+			[saveConnectionEncryptString setEnabled:YES];
+			[saveConnectionEncryptString selectText:nil];
+		} else {
+			[saveConnectionEncryptString setEnabled:YES];
+			[saveConnectionEncryptString setStringValue:@""];
+			[saveConnectionEncryptString setHidden:YES];
+			[saveConnectionEncryptString setHidden:NO];
+			[saveConnectionEncryptString setEnabled:NO];
+		}
+	} else {
+		[saveConnectionEncrypt setEnabled:NO];
+		[saveConnectionEncryptString setEnabled:YES];
+		[saveConnectionEncryptString setStringValue:@""];
+		[saveConnectionEncryptString setHidden:YES];
+		[saveConnectionEncryptString setHidden:NO];
+		[saveConnectionEncryptString setEnabled:NO];
+	}
+
+}
+
 - (void)saveConnectionPanelDidEnd:(NSSavePanel *)panel returnCode:(int)returnCode contextInfo:(void *)contextInfo
 {