diff options
23 files changed, 4796 insertions, 174 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h index 7e60ccb2..864eb413 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h @@ -139,6 +139,11 @@ NSInteger maxAllowedPacketSize; unsigned long connectionThreadId; + BOOL useSSL; + NSString *sslKeyFilePath; + NSString *sslCertificatePath; + NSString *sslCACertificatePath; + NSString *encoding, *previousEncoding; NSStringEncoding *stringEncoding; BOOL encodingUsesLatin1Transport, previousEncodingUsesLatin1Transport; @@ -207,6 +212,7 @@ // Connection details - (BOOL)setPort:(NSInteger)thePort; - (BOOL)setPassword:(NSString *)thePassword; +- (BOOL) setSSL:(BOOL)shouldUseSSL usingKeyFilePath:(NSString *)keyFilePath certificatePath:(NSString *)certificatePath certificateAuthorityCertificatePath:(NSString *)caCertificatePath; // Proxy - (BOOL)setConnectionProxy:(id <MCPConnectionProxy>)proxy; @@ -217,6 +223,7 @@ - (void)disconnect; - (BOOL)reconnect; - (BOOL)isConnected; +- (BOOL)isConnectedViaSSL; - (BOOL)userTriggeredDisconnect; - (BOOL)checkConnection; - (BOOL)pingConnection; diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m index d8905d8d..362c3dc6 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m @@ -48,6 +48,7 @@ BOOL keepAliveActive; const NSUInteger kMCPConnectionDefaultOption = CLIENT_COMPRESS | CLIENT_REMEMBER_OPTIONS | CLIENT_MULTI_RESULTS; const char *kMCPConnectionDefaultSocket = MYSQL_UNIX_ADDR; +const char *kMCPSSLCipherList = "DHE-RSA-AES256-SHA:AES256-SHA:DHE-RSA-AES128-SHA:AES128-SHA:AES256-RMD:AES128-RMD:DES-CBC3-RMD:DHE-RSA-AES256-RMD:DHE-RSA-AES128-RMD:DHE-RSA-DES-CBC3-RMD:RC4-SHA:RC4-MD5:DES-CBC3-SHA:DES-CBC-SHA:EDH-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC-SHA"; const NSUInteger kMCPConnection_Not_Inited = 1000; const NSUInteger kLengthOfTruncationForLog = 100; @@ -111,6 +112,10 @@ static BOOL sTruncateLongFieldInLogs = YES; connectionLogin = nil; connectionSocket = nil; connectionPassword = nil; + useSSL = NO; + sslKeyFilePath = nil; + sslCertificatePath = nil; + sslCACertificatePath = nil; keepAliveThread = NULL; lastKeepAliveTime = 0; pingThread = NULL; @@ -298,6 +303,29 @@ static BOOL sTruncateLongFieldInLogs = YES; return YES; } +/** + * Set the connection to establish secure connections using SSL; must be + * called before connect:. + * This will always attempt to activate SSL if set, but depending on server + * setup connection may sometimes proceed without SSL enabled even if requested; + * it is suggested that after connection, -[MCPConnection isConnectedViaSSL] + * is checked to determine whether SSL is actually active. + */ +- (void) setSSL:(BOOL)shouldUseSSL usingKeyFilePath:(NSString *)keyFilePath certificatePath:(NSString *)certificatePath certificateAuthorityCertificatePath:(NSString *)caCertificatePath +{ + useSSL = shouldUseSSL; + + // Reset the old SSL details + if (sslKeyFilePath) [sslKeyFilePath release], sslKeyFilePath = nil; + if (sslCertificatePath) [sslCertificatePath release], sslCertificatePath = nil; + if (sslCACertificatePath) [sslCACertificatePath release], sslCACertificatePath = nil; + + // Set new details if provided + if (keyFilePath) sslKeyFilePath = [[NSString alloc] initWithString:[keyFilePath stringByExpandingTildeInPath]]; + if (certificatePath) sslCertificatePath = [[NSString alloc] initWithString:[certificatePath stringByExpandingTildeInPath]]; + if (caCertificatePath) sslCACertificatePath = [[NSString alloc] initWithString:[caCertificatePath stringByExpandingTildeInPath]]; +} + #pragma mark - #pragma mark Connection proxy @@ -385,7 +413,18 @@ static BOOL sTruncateLongFieldInLogs = YES; } else { theSocket = [self cStringFromString:connectionSocket]; } - + + // Apply SSL if appropriate + if (useSSL) { + NSLog(@"sdfsdfsfds SET"); + mysql_ssl_set(mConnection, + sslKeyFilePath ? [sslKeyFilePath UTF8String] : NULL, + sslCertificatePath ? [sslCertificatePath UTF8String] : NULL, + sslCACertificatePath ? [sslCACertificatePath UTF8String] : NULL, + NULL, + kMCPSSLCipherList); + } + // Select the password from the provided method if (!connectionPassword) { if (delegate && [delegate respondsToSelector:@selector(keychainPasswordForConnection:)]) { @@ -406,7 +445,7 @@ static BOOL sTruncateLongFieldInLogs = YES; return mConnected = NO; } - + mConnected = YES; userTriggeredDisconnect = NO; connectionStartTime = mach_absolute_time(); @@ -627,6 +666,15 @@ static BOOL sTruncateLongFieldInLogs = YES; } /** + * Returns YES if the MCPConnection is connected to a server via SSL, NO otherwise. + */ +- (BOOL)isConnectedViaSSL +{ + if (![self isConnected]) return NO; + return (mysql_get_ssl_cipher(mConnection))?YES:NO; +} + +/** * Returns YES if the user chose to disconnect at the last "connection failure" * prompt, NO otherwise. */ @@ -1255,6 +1303,16 @@ void performThreadedKeepAlive(void *ptr) if (theSocket == NULL) { theSocket = kMCPConnectionDefaultSocket; } + + // Apply SSL if appropriate + if (useSSL) { + mysql_ssl_set(mConnection, + sslKeyFilePath ? [sslKeyFilePath UTF8String] : NULL, + sslCertificatePath ? [sslCertificatePath UTF8String] : NULL, + sslCACertificatePath ? [sslCACertificatePath UTF8String] : NULL, + NULL, + kMCPSSLCipherList); + } theRet = mysql_real_connect(mConnection, theHost, theLogin, thePass, NULL, port, theSocket, mConnectionFlags); if (theRet != mConnection) { @@ -1833,6 +1891,14 @@ void performThreadedKeepAlive(void *ptr) } else { thePass = [self cStringFromString:connectionPassword]; } + if (useSSL) { + mysql_ssl_set(mConnection, + sslKeyFilePath ? [sslKeyFilePath UTF8String] : NULL, + sslCertificatePath ? [sslCertificatePath UTF8String] : NULL, + sslCACertificatePath ? [sslCACertificatePath UTF8String] : NULL, + NULL, + kMCPSSLCipherList); + } // Connect connectionSetupStatus = mysql_real_connect(killerConnection, theHost, theLogin, thePass, NULL, connectionPort, theSocket, mConnectionFlags); @@ -1850,13 +1916,18 @@ void performThreadedKeepAlive(void *ptr) NSData *encodedKillQueryData = NSStringDataUsingLossyEncoding(killQueryString, killerConnectionEncoding, 1); const char *killQueryCString = [encodedKillQueryData bytes]; unsigned long killQueryCStringLength = [encodedKillQueryData length]; - if (mysql_real_query(killerConnection, killQueryCString, killQueryCStringLength) == 0) { - mysql_close(killerConnection); + int killerReturnError = mysql_real_query(killerConnection, killQueryCString, killQueryCStringLength); + mysql_close(killerConnection); + if (killerReturnError == 0) { queryCancelUsedReconnect = NO; return; } - mysql_close(killerConnection); + NSLog(@"Task cancellation: kill query failed (Returned status %d)", killerReturnError); + } else { + NSLog(@"Task cancellation connection failed (error %u)", mysql_errno(killerConnection)); } + } else { + NSLog(@"Task cancelletion MySQL init failed."); } // Reset the connection @@ -2333,6 +2404,14 @@ void performThreadedKeepAlive(void *ptr) } else { theSocket = [self cStringFromString:connectionSocket]; } + if (useSSL) { + mysql_ssl_set(mConnection, + sslKeyFilePath ? [sslKeyFilePath UTF8String] : NULL, + sslCertificatePath ? [sslCertificatePath UTF8String] : NULL, + sslCACertificatePath ? [sslCACertificatePath UTF8String] : NULL, + NULL, + kMCPSSLCipherList); + } if (!connectionPassword) { if (delegate && [delegate respondsToSelector:@selector(keychainPasswordForConnection:)]) { thePass = [self cStringFromString:[delegate keychainPasswordForConnection:self]]; @@ -3135,6 +3214,9 @@ void performThreadedKeepAlive(void *ptr) if (connectionLogin) [connectionLogin release]; if (connectionSocket) [connectionSocket release]; if (connectionPassword) [connectionPassword release]; + if (sslKeyFilePath) [sslKeyFilePath release]; + if (sslCertificatePath) [sslCertificatePath release]; + if (sslCACertificatePath) [sslCACertificatePath release]; if (serverVersionString) [serverVersionString release], serverVersionString = nil; if (structure) [structure release], structure = nil; if (allKeysofDbStructure) [allKeysofDbStructure release], allKeysofDbStructure = nil; diff --git a/Frameworks/MCPKit/MySQL/include/mysql.h b/Frameworks/MCPKit/MySQL/include/mysql.h index d114afb6..dcf3e167 100644 --- a/Frameworks/MCPKit/MySQL/include/mysql.h +++ b/Frameworks/MCPKit/MySQL/include/mysql.h @@ -44,7 +44,9 @@ extern "C" { #endif #ifndef _global_h /* If not standard header */ +#ifndef MYSQL_ABI_CHECK #include <sys/types.h> +#endif #ifdef __LCC__ #include <winsock2.h> /* For windows */ #endif diff --git a/Frameworks/MCPKit/MySQL/include/mysql_com.h b/Frameworks/MCPKit/MySQL/include/mysql_com.h index db5a5eb8..7d3dd3d4 100644 --- a/Frameworks/MCPKit/MySQL/include/mysql_com.h +++ b/Frameworks/MCPKit/MySQL/include/mysql_com.h @@ -277,6 +277,16 @@ typedef struct st_net { /** Client library sqlstate buffer. Set along with the error message. */ char sqlstate[SQLSTATE_LENGTH+1]; void *extension; +#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY) + /* + Controls whether a big packet should be skipped. + + Initially set to FALSE by default. Unauthenticated sessions must have + this set to FALSE so that the server can't be tricked to read packets + indefinitely. + */ + my_bool skip_big_packet; +#endif } NET; diff --git a/Frameworks/MCPKit/MySQL/include/mysql_version.h b/Frameworks/MCPKit/MySQL/include/mysql_version.h index 7017707c..736c2021 100644 --- a/Frameworks/MCPKit/MySQL/include/mysql_version.h +++ b/Frameworks/MCPKit/MySQL/include/mysql_version.h @@ -9,11 +9,11 @@ #include <custom_conf.h> #else #define PROTOCOL_VERSION 10 -#define MYSQL_SERVER_VERSION "5.1.46" +#define MYSQL_SERVER_VERSION "5.1.50" #define MYSQL_BASE_VERSION "mysqld-5.1" #define MYSQL_SERVER_SUFFIX_DEF "" #define FRM_VER 6 -#define MYSQL_VERSION_ID 50146 +#define MYSQL_VERSION_ID 50150 #define MYSQL_PORT 3306 #define MYSQL_PORT_DEFAULT 0 #define MYSQL_UNIX_ADDR "/tmp/mysql.sock" diff --git a/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a b/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a Binary files differindex 512d3b52..ab6939c1 100644 --- a/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a +++ b/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a diff --git a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a Binary files differindex a9ae37fe..b04f6c35 100644 --- a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a +++ b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib index f61c82e7..6ef08db6 100644 --- a/Interfaces/English.lproj/ConnectionView.xib +++ b/Interfaces/English.lproj/ConnectionView.xib @@ -22,7 +22,6 @@ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="5588"/> - <integer value="5576"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -123,7 +122,7 @@ <object class="NSColor" key="NSBackgroundColor"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MQA</bytes> - <object class="NSColorSpace" key="NSCustomColorSpace"> + <object class="NSColorSpace" key="NSCustomColorSpace" id="886601921"> <int key="NSID">2</int> </object> </object> @@ -424,21 +423,48 @@ <int key="NSvFlags">269</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="644973446"> + <object class="NSButton" id="508687946"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 149}, {226, 22}}</string> + <string key="NSFrame">{{108, 10}, {230, 18}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="859982751"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents"/> + <object class="NSButtonCell" key="NSCell" id="184523755"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Connect using SSL</string> <object class="NSFont" key="NSSupport" id="807120225"> <string key="NSName">LucidaGrande</string> <double key="NSSize">13</double> <int key="NSfFlags">1044</int> </object> + <reference key="NSControlView" ref="508687946"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <object class="NSCustomResource" key="NSNormalImage" id="804903244"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSSwitch</string> + </object> + <object class="NSButtonImageSource" key="NSAlternateImage" id="791350007"> + <string key="NSImageName">NSSwitch</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="644973446"> + <reference key="NSNextResponder" ref="233374444"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{110, 174}, {226, 22}}</string> + <reference key="NSSuperview" ref="233374444"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="859982751"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> <reference key="NSControlView" ref="644973446"/> <bool key="NSDrawsBackground">YES</bool> <object class="NSColor" key="NSBackgroundColor" id="211632616"> @@ -461,7 +487,7 @@ <object class="NSTextField" id="786098118"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 151}, {98, 17}}</string> + <string key="NSFrame">{{7, 176}, {98, 17}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="393023945"> @@ -485,7 +511,7 @@ <object class="NSTextField" id="810791200"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 183}, {226, 22}}</string> + <string key="NSFrame">{{110, 208}, {226, 22}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1040289660"> @@ -503,7 +529,7 @@ <object class="NSTextField" id="445567924"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 185}, {98, 17}}</string> + <string key="NSFrame">{{7, 210}, {98, 17}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="485990188"> @@ -519,7 +545,7 @@ <object class="NSTextField" id="978463433"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 115}, {226, 22}}</string> + <string key="NSFrame">{{110, 140}, {226, 22}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="925313159"> @@ -536,7 +562,7 @@ <object class="NSTextField" id="987440606"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 117}, {98, 17}}</string> + <string key="NSFrame">{{7, 142}, {98, 17}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="377431100"> @@ -552,7 +578,7 @@ <object class="NSTextField" id="211629203"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 81}, {226, 22}}</string> + <string key="NSFrame">{{110, 106}, {226, 22}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="646391991"> @@ -569,7 +595,7 @@ <object class="NSTextField" id="105635377"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 83}, {98, 17}}</string> + <string key="NSFrame">{{7, 108}, {98, 17}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="785119002"> @@ -585,7 +611,7 @@ <object class="NSTextField" id="950381827"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 47}, {226, 22}}</string> + <string key="NSFrame">{{110, 72}, {226, 22}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="925102591"> @@ -603,7 +629,7 @@ <object class="NSTextField" id="788113046"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 49}, {98, 17}}</string> + <string key="NSFrame">{{7, 74}, {98, 17}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="441978581"> @@ -619,7 +645,7 @@ <object class="NSTextField" id="1013612483"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 13}, {226, 22}}</string> + <string key="NSFrame">{{110, 38}, {226, 22}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1003825843"> @@ -637,7 +663,7 @@ <object class="NSTextField" id="910543023"> <reference key="NSNextResponder" ref="233374444"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 15}, {98, 17}}</string> + <string key="NSFrame">{{7, 40}, {98, 17}}</string> <reference key="NSSuperview" ref="233374444"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="588889019"> @@ -651,7 +677,196 @@ </object> </object> </object> - <string key="NSFrame">{{6, 156}, {356, 232}}</string> + <string key="NSFrame">{{6, 131}, {356, 257}}</string> + <reference key="NSSuperview" ref="32802602"/> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="31135925"> + <reference key="NSNextResponder" ref="32802602"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="104955330"> + <reference key="NSNextResponder" ref="31135925"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{-3, 15}, {107, 17}}</string> + <reference key="NSSuperview" ref="31135925"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="69612386"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71304192</int> + <string key="NSContents">CA Cert:</string> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="104955330"/> + <reference key="NSBackgroundColor" ref="644242225"/> + <reference key="NSTextColor" ref="434026568"/> + </object> + </object> + <object class="NSTextField" id="638710413"> + <reference key="NSNextResponder" ref="31135925"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{109, 13}, {199, 22}}</string> + <reference key="NSSuperview" ref="31135925"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="791857368"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272631296</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="638710413"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="211632616"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + <reference key="NSCustomColorSpace" ref="886601921"/> + </object> + </object> + </object> + <object class="NSButton" id="839299955"> + <reference key="NSNextResponder" ref="31135925"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{307, 12}, {29, 24}}</string> + <reference key="NSSuperview" ref="31135925"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="1013426677"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="839299955"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <object class="NSCustomResource" key="NSNormalImage" id="22774617"> + <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="684819179"> + <reference key="NSNextResponder" ref="31135925"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{-3, 49}, {107, 17}}</string> + <reference key="NSSuperview" ref="31135925"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="371333119"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71304192</int> + <string key="NSContents">Certificate:</string> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="684819179"/> + <reference key="NSBackgroundColor" ref="644242225"/> + <reference key="NSTextColor" ref="434026568"/> + </object> + </object> + <object class="NSTextField" id="950540175"> + <reference key="NSNextResponder" ref="31135925"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{109, 47}, {199, 22}}</string> + <reference key="NSSuperview" ref="31135925"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="196185392"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272631296</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="950540175"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="211632616"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + <reference key="NSCustomColorSpace" ref="886601921"/> + </object> + </object> + </object> + <object class="NSButton" id="945929172"> + <reference key="NSNextResponder" ref="31135925"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{307, 46}, {29, 24}}</string> + <reference key="NSSuperview" ref="31135925"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="1000000271"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="945929172"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="22774617"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSTextField" id="1034069158"> + <reference key="NSNextResponder" ref="31135925"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{-3, 83}, {107, 17}}</string> + <reference key="NSSuperview" ref="31135925"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="943522732"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71304192</int> + <string key="NSContents">Key File:</string> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="1034069158"/> + <reference key="NSBackgroundColor" ref="644242225"/> + <reference key="NSTextColor" ref="434026568"/> + </object> + </object> + <object class="NSTextField" id="679511995"> + <reference key="NSNextResponder" ref="31135925"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{109, 81}, {199, 22}}</string> + <reference key="NSSuperview" ref="31135925"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="650760201"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272631296</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="679511995"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="211632616"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41MDQwMzIyNTgxAA</bytes> + </object> + </object> + </object> + <object class="NSButton" id="586011242"> + <reference key="NSNextResponder" ref="31135925"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{307, 80}, {29, 24}}</string> + <reference key="NSSuperview" ref="31135925"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="85329089"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="586011242"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="22774617"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + </object> + <string key="NSFrame">{{6, 28}, {356, 104}}</string> <reference key="NSSuperview" ref="32802602"/> <string key="NSClassName">NSView</string> </object> @@ -665,7 +880,7 @@ <object class="NSTabViewItem" id="517771995"> <string key="NSIdentifier">2</string> <object class="NSView" key="NSView" id="962671066"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder" ref="134031646"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -674,10 +889,32 @@ <int key="NSvFlags">269</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="16421625"> + <reference key="NSNextResponder" ref="394302879"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{108, 11}, {230, 18}}</string> + <reference key="NSSuperview" ref="394302879"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="972347112"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Connect using SSL</string> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="16421625"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="804903244"/> + <reference key="NSAlternateImage" ref="791350007"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> <object class="NSTextField" id="68541783"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 115}, {226, 22}}</string> + <string key="NSFrame">{{110, 141}, {226, 22}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="279442436"> @@ -694,7 +931,7 @@ <object class="NSTextField" id="607362814"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 117}, {98, 17}}</string> + <string key="NSFrame">{{7, 143}, {98, 17}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="798396187"> @@ -710,7 +947,7 @@ <object class="NSTextField" id="512253301"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 81}, {226, 22}}</string> + <string key="NSFrame">{{110, 107}, {226, 22}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="251554254"> @@ -727,7 +964,7 @@ <object class="NSTextField" id="789391730"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 83}, {98, 17}}</string> + <string key="NSFrame">{{7, 109}, {98, 17}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="797213431"> @@ -743,7 +980,7 @@ <object class="NSTextField" id="58217156"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 47}, {226, 22}}</string> + <string key="NSFrame">{{110, 73}, {226, 22}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="185246669"> @@ -761,7 +998,7 @@ <object class="NSTextField" id="745773732"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 49}, {98, 17}}</string> + <string key="NSFrame">{{7, 75}, {98, 17}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="728524936"> @@ -777,7 +1014,7 @@ <object class="NSTextField" id="728228957"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 13}, {226, 22}}</string> + <string key="NSFrame">{{110, 39}, {226, 22}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="299457759"> @@ -795,7 +1032,7 @@ <object class="NSTextField" id="591324856"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 15}, {98, 17}}</string> + <string key="NSFrame">{{7, 41}, {98, 17}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="317867885"> @@ -811,7 +1048,7 @@ <object class="NSTextField" id="474825058"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 149}, {226, 22}}</string> + <string key="NSFrame">{{110, 175}, {226, 22}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="684614893"> @@ -829,7 +1066,7 @@ <object class="NSTextField" id="459734357"> <reference key="NSNextResponder" ref="394302879"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{7, 151}, {98, 17}}</string> + <string key="NSFrame">{{7, 177}, {98, 17}}</string> <reference key="NSSuperview" ref="394302879"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="352725628"> @@ -843,12 +1080,199 @@ </object> </object> </object> - <string key="NSFrame">{{6, 190}, {356, 198}}</string> + <string key="NSFrame">{{6, 164}, {356, 224}}</string> + <reference key="NSSuperview" ref="962671066"/> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="866600720"> + <reference key="NSNextResponder" ref="962671066"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="98826968"> + <reference key="NSNextResponder" ref="866600720"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{-3, 15}, {107, 17}}</string> + <reference key="NSSuperview" ref="866600720"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="730590428"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71304192</int> + <string key="NSContents">CA Cert:</string> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="98826968"/> + <reference key="NSBackgroundColor" ref="644242225"/> + <reference key="NSTextColor" ref="434026568"/> + </object> + </object> + <object class="NSTextField" id="484504415"> + <reference key="NSNextResponder" ref="866600720"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{109, 13}, {199, 22}}</string> + <reference key="NSSuperview" ref="866600720"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="169093017"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272631296</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="484504415"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="211632616"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + <reference key="NSCustomColorSpace" ref="886601921"/> + </object> + </object> + </object> + <object class="NSButton" id="680939705"> + <reference key="NSNextResponder" ref="866600720"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{307, 12}, {29, 24}}</string> + <reference key="NSSuperview" ref="866600720"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="308087760"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="680939705"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="22774617"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSTextField" id="521125104"> + <reference key="NSNextResponder" ref="866600720"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{-3, 49}, {107, 17}}</string> + <reference key="NSSuperview" ref="866600720"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="1025158673"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71304192</int> + <string key="NSContents">Certificate:</string> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="521125104"/> + <reference key="NSBackgroundColor" ref="644242225"/> + <reference key="NSTextColor" ref="434026568"/> + </object> + </object> + <object class="NSTextField" id="216069484"> + <reference key="NSNextResponder" ref="866600720"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{109, 47}, {199, 22}}</string> + <reference key="NSSuperview" ref="866600720"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="276609847"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272631296</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="216069484"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="211632616"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + <reference key="NSCustomColorSpace" ref="886601921"/> + </object> + </object> + </object> + <object class="NSButton" id="988136593"> + <reference key="NSNextResponder" ref="866600720"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{307, 46}, {29, 24}}</string> + <reference key="NSSuperview" ref="866600720"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="559442548"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="988136593"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="22774617"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSTextField" id="57862599"> + <reference key="NSNextResponder" ref="866600720"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{-3, 83}, {107, 17}}</string> + <reference key="NSSuperview" ref="866600720"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="357553281"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71304192</int> + <string key="NSContents">Key File:</string> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="57862599"/> + <reference key="NSBackgroundColor" ref="644242225"/> + <reference key="NSTextColor" ref="434026568"/> + </object> + </object> + <object class="NSTextField" id="51601157"> + <reference key="NSNextResponder" ref="866600720"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{109, 81}, {199, 22}}</string> + <reference key="NSSuperview" ref="866600720"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="575863174"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272631296</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="51601157"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="211632616"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41MDQwMzIyNTgxAA</bytes> + </object> + </object> + </object> + <object class="NSButton" id="237955939"> + <reference key="NSNextResponder" ref="866600720"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{307, 80}, {29, 24}}</string> + <reference key="NSSuperview" ref="866600720"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="167444868"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="807120225"/> + <reference key="NSControlView" ref="237955939"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="22774617"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + </object> + <string key="NSFrame">{{6, 61}, {356, 104}}</string> <reference key="NSSuperview" ref="962671066"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrame">{{10, 33}, {360, 371}}</string> + <reference key="NSSuperview" ref="134031646"/> </object> <string key="NSLabel">Socket</string> <reference key="NSColor" ref="644242225"/> @@ -857,7 +1281,7 @@ <object class="NSTabViewItem" id="591192172"> <string key="NSIdentifier">Item 2</string> <object class="NSView" key="NSView" id="159800861"> - <reference key="NSNextResponder" ref="134031646"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1214,10 +1638,7 @@ <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> + <reference key="NSNormalImage" ref="22774617"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">400</int> @@ -1267,21 +1688,20 @@ </object> </object> <string key="NSFrame">{{10, 33}, {360, 371}}</string> - <reference key="NSSuperview" ref="134031646"/> </object> <string key="NSLabel">SSH</string> <reference key="NSColor" ref="644242225"/> <reference key="NSTabView" ref="134031646"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="591192172"/> + <reference key="NSSelectedTabViewItem" ref="517771995"/> <reference key="NSFont" ref="807120225"/> <int key="NSTvFlags">0</int> <bool key="NSAllowTruncatedLabels">YES</bool> <bool key="NSDrawsBackground">YES</bool> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="159800861"/> + <reference ref="962671066"/> </object> </object> <object class="NSButton" id="460592307"> @@ -1807,7 +2227,7 @@ </object> </object> <object class="NSCustomView" id="567906875"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1829,7 +2249,84 @@ </object> </object> <string key="NSFrameSize">{579, 51}</string> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="12066713"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="538839943"> + <reference key="NSNextResponder" ref="12066713"/> + <int key="NSvFlags">274</int> + <string key="NSFrame">{{2, 10}, {575, 17}}</string> + <reference key="NSSuperview" ref="12066713"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="124352014"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">138674176</int> + <string key="NSContents">Please select the SSL key file to use when establishing a secure connection.</string> + <reference key="NSSupport" ref="951888633"/> + <reference key="NSControlView" ref="538839943"/> + <reference key="NSBackgroundColor" ref="644242225"/> + <reference key="NSTextColor" ref="434026568"/> + </object> + </object> + </object> + <string key="NSFrameSize">{579, 34}</string> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="136328549"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="802544195"> + <reference key="NSNextResponder" ref="136328549"/> + <int key="NSvFlags">274</int> + <string key="NSFrame">{{2, 10}, {575, 17}}</string> + <reference key="NSSuperview" ref="136328549"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="196059550"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">138674176</int> + <string key="NSContents">Please select the client SSL certificate file to use when establishing a secure connection.</string> + <reference key="NSSupport" ref="951888633"/> + <reference key="NSControlView" ref="802544195"/> + <reference key="NSBackgroundColor" ref="644242225"/> + <reference key="NSTextColor" ref="434026568"/> + </object> + </object> + </object> + <string key="NSFrameSize">{579, 34}</string> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="3577372"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="761812578"> + <reference key="NSNextResponder" ref="3577372"/> + <int key="NSvFlags">274</int> + <string key="NSFrame">{{2, 10}, {575, 34}}</string> + <reference key="NSSuperview" ref="3577372"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="444474564"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">138674176</int> + <string key="NSContents">Please select the client SSL Certificate Authority certificate to use when establishing a secure connection. This must be the same as the server CA certificate.</string> + <reference key="NSSupport" ref="951888633"/> + <reference key="NSControlView" ref="761812578"/> + <reference key="NSBackgroundColor" ref="644242225"/> + <reference key="NSTextColor" ref="434026568"/> + </object> + </object> + </object> + <string key="NSFrameSize">{579, 51}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> @@ -2880,14 +3377,6 @@ <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"/> @@ -3111,6 +3600,716 @@ </object> <int key="connectionID">5592</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">standardConnectionSSLDetailsContainer</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="31135925"/> + </object> + <int key="connectionID">5620</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: useSSL</string> + <reference key="source" ref="508687946"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="508687946"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: useSSL</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">useSSL</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">5627</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: sslCACertFileLocation</string> + <reference key="source" ref="638710413"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="638710413"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">toolTip: sslCACertFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">sslCACertFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5637</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: sslCertificateFileLocation</string> + <reference key="source" ref="950540175"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="950540175"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">toolTip: sslCertificateFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">sslCertificateFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5639</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: sslKeyFileLocation</string> + <reference key="source" ref="679511995"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="679511995"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">toolTip: sslKeyFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">sslKeyFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5641</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: useSSL</string> + <reference key="source" ref="31135925"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="31135925"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">hidden: useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">useSSL</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">5649</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">updateSSLInterface:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="508687946"/> + </object> + <int key="connectionID">5651</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="183948302"/> + </object> + <int key="connectionID">5661</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="586011242"/> + </object> + <int key="connectionID">5662</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="945929172"/> + </object> + <int key="connectionID">5663</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="839299955"/> + </object> + <int key="connectionID">5664</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">standardSSLKeyFileButton</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="586011242"/> + </object> + <int key="connectionID">5665</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">standardSSLCertificateButton</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="945929172"/> + </object> + <int key="connectionID">5666</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">standardSSLCACertButton</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="839299955"/> + </object> + <int key="connectionID">5667</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sslKeyFileLocationHelp</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="12066713"/> + </object> + <int key="connectionID">5671</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslKeyFileLocationEnabled</string> + <reference key="source" ref="586011242"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="586011242"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslKeyFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslKeyFileLocationEnabled</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">5673</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslCertificateFileLocationEnabled</string> + <reference key="source" ref="945929172"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="945929172"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslCertificateFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslCertificateFileLocationEnabled</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">5677</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslCACertFileLocationEnabled</string> + <reference key="source" ref="839299955"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="839299955"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslCACertFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslCACertFileLocationEnabled</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">5679</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sslCACertLocationHelp</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="3577372"/> + </object> + <int key="connectionID">5686</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sslCertificateLocationHelp</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="136328549"/> + </object> + <int key="connectionID">5687</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslCertificateFileLocationEnabled</string> + <reference key="source" ref="988136593"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="988136593"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslCertificateFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslCertificateFileLocationEnabled</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">5707</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: sslCertificateFileLocation</string> + <reference key="source" ref="216069484"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="216069484"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">toolTip: sslCertificateFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">sslCertificateFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5708</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: useSSL</string> + <reference key="source" ref="866600720"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="866600720"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">hidden: useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">useSSL</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">5710</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslKeyFileLocationEnabled</string> + <reference key="source" ref="237955939"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="237955939"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslKeyFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslKeyFileLocationEnabled</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">5711</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: sslCACertFileLocation</string> + <reference key="source" ref="484504415"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="484504415"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">toolTip: sslCACertFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">sslCACertFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5712</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: sslKeyFileLocation</string> + <reference key="source" ref="51601157"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="51601157"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">toolTip: sslKeyFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">sslKeyFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5714</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslCACertFileLocationEnabled</string> + <reference key="source" ref="680939705"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="680939705"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslCACertFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslCACertFileLocationEnabled</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">5715</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="237955939"/> + </object> + <int key="connectionID">5717</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="680939705"/> + </object> + <int key="connectionID">5718</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="988136593"/> + </object> + <int key="connectionID">5719</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: useSSL</string> + <reference key="source" ref="16421625"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="16421625"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: useSSL</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">useSSL</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">5722</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">updateSSLInterface:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="16421625"/> + </object> + <int key="connectionID">5723</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">socketConnectionSSLDetailsContainer</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="866600720"/> + </object> + <int key="connectionID">5724</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">socketSSLCACertButton</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="680939705"/> + </object> + <int key="connectionID">5725</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">socketSSLCertificateButton</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="988136593"/> + </object> + <int key="connectionID">5726</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">socketSSLKeyFileButton</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="237955939"/> + </object> + <int key="connectionID">5727</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslCACertFileLocation</string> + <reference key="source" ref="638710413"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="638710413"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslCACertFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslCACertFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5730</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslCertificateFileLocation</string> + <reference key="source" ref="950540175"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="950540175"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslCertificateFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslCertificateFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5731</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslKeyFileLocation</string> + <reference key="source" ref="679511995"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="679511995"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslKeyFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslKeyFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5732</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslKeyFileLocation</string> + <reference key="source" ref="51601157"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="51601157"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslKeyFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslKeyFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5733</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslCACertFileLocation</string> + <reference key="source" ref="484504415"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="484504415"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslCACertFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslCACertFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5734</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: sslCertificateFileLocation</string> + <reference key="source" ref="216069484"/> + <reference key="destination" ref="545410097"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="216069484"/> + <reference key="NSDestination" ref="545410097"/> + <string key="NSLabel">value: sslCertificateFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">sslCertificateFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5735</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -3907,6 +5106,7 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="394302879"/> + <reference ref="866600720"/> </object> <reference key="parent" ref="517771995"/> </object> @@ -3925,6 +5125,7 @@ <reference ref="512253301"/> <reference ref="607362814"/> <reference ref="68541783"/> + <reference ref="16421625"/> </object> <reference key="parent" ref="962671066"/> </object> @@ -4074,6 +5275,7 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="233374444"/> + <reference ref="31135925"/> </object> <reference key="parent" ref="253369045"/> </object> @@ -4094,6 +5296,7 @@ <reference ref="978463433"/> <reference ref="786098118"/> <reference ref="644973446"/> + <reference ref="508687946"/> </object> <reference key="parent" ref="32802602"/> </object> @@ -4299,6 +5502,392 @@ <reference key="object" ref="607446274"/> <reference key="parent" ref="570492783"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">5593</int> + <reference key="object" ref="508687946"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="184523755"/> + </object> + <reference key="parent" ref="233374444"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5594</int> + <reference key="object" ref="184523755"/> + <reference key="parent" ref="508687946"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5595</int> + <reference key="object" ref="31135925"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="679511995"/> + <reference ref="1034069158"/> + <reference ref="586011242"/> + <reference ref="945929172"/> + <reference ref="950540175"/> + <reference ref="684819179"/> + <reference ref="839299955"/> + <reference ref="638710413"/> + <reference ref="104955330"/> + </object> + <reference key="parent" ref="32802602"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5596</int> + <reference key="object" ref="679511995"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="650760201"/> + </object> + <reference key="parent" ref="31135925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5597</int> + <reference key="object" ref="650760201"/> + <reference key="parent" ref="679511995"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5598</int> + <reference key="object" ref="1034069158"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="943522732"/> + </object> + <reference key="parent" ref="31135925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5599</int> + <reference key="object" ref="943522732"/> + <reference key="parent" ref="1034069158"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5600</int> + <reference key="object" ref="586011242"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="85329089"/> + </object> + <reference key="parent" ref="31135925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5601</int> + <reference key="object" ref="85329089"/> + <reference key="parent" ref="586011242"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5604</int> + <reference key="object" ref="945929172"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1000000271"/> + </object> + <reference key="parent" ref="31135925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5605</int> + <reference key="object" ref="950540175"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="196185392"/> + </object> + <reference key="parent" ref="31135925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5606</int> + <reference key="object" ref="684819179"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="371333119"/> + </object> + <reference key="parent" ref="31135925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5607</int> + <reference key="object" ref="371333119"/> + <reference key="parent" ref="684819179"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5608</int> + <reference key="object" ref="196185392"/> + <reference key="parent" ref="950540175"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5609</int> + <reference key="object" ref="1000000271"/> + <reference key="parent" ref="945929172"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5612</int> + <reference key="object" ref="839299955"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1013426677"/> + </object> + <reference key="parent" ref="31135925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5613</int> + <reference key="object" ref="638710413"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="791857368"/> + </object> + <reference key="parent" ref="31135925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5614</int> + <reference key="object" ref="104955330"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="69612386"/> + </object> + <reference key="parent" ref="31135925"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5615</int> + <reference key="object" ref="69612386"/> + <reference key="parent" ref="104955330"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5616</int> + <reference key="object" ref="791857368"/> + <reference key="parent" ref="638710413"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5617</int> + <reference key="object" ref="1013426677"/> + <reference key="parent" ref="839299955"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5668</int> + <reference key="object" ref="12066713"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="538839943"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">SSL Key File Selection Help</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5669</int> + <reference key="object" ref="538839943"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="124352014"/> + </object> + <reference key="parent" ref="12066713"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5670</int> + <reference key="object" ref="124352014"/> + <reference key="parent" ref="538839943"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5680</int> + <reference key="object" ref="3577372"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="761812578"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">SSL CA Cert File Selection Help</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5681</int> + <reference key="object" ref="761812578"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="444474564"/> + </object> + <reference key="parent" ref="3577372"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5682</int> + <reference key="object" ref="444474564"/> + <reference key="parent" ref="761812578"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5683</int> + <reference key="object" ref="136328549"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="802544195"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">SSL Certificate File Selection Help</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5684</int> + <reference key="object" ref="802544195"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="196059550"/> + </object> + <reference key="parent" ref="136328549"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5685</int> + <reference key="object" ref="196059550"/> + <reference key="parent" ref="802544195"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5688</int> + <reference key="object" ref="866600720"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="98826968"/> + <reference ref="484504415"/> + <reference ref="680939705"/> + <reference ref="521125104"/> + <reference ref="216069484"/> + <reference ref="988136593"/> + <reference ref="237955939"/> + <reference ref="57862599"/> + <reference ref="51601157"/> + </object> + <reference key="parent" ref="962671066"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5689</int> + <reference key="object" ref="98826968"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="730590428"/> + </object> + <reference key="parent" ref="866600720"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5690</int> + <reference key="object" ref="484504415"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="169093017"/> + </object> + <reference key="parent" ref="866600720"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5691</int> + <reference key="object" ref="680939705"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="308087760"/> + </object> + <reference key="parent" ref="866600720"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5692</int> + <reference key="object" ref="521125104"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1025158673"/> + </object> + <reference key="parent" ref="866600720"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5693</int> + <reference key="object" ref="216069484"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="276609847"/> + </object> + <reference key="parent" ref="866600720"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5694</int> + <reference key="object" ref="988136593"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="559442548"/> + </object> + <reference key="parent" ref="866600720"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5695</int> + <reference key="object" ref="237955939"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="167444868"/> + </object> + <reference key="parent" ref="866600720"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5696</int> + <reference key="object" ref="57862599"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="357553281"/> + </object> + <reference key="parent" ref="866600720"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5697</int> + <reference key="object" ref="51601157"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="575863174"/> + </object> + <reference key="parent" ref="866600720"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5698</int> + <reference key="object" ref="575863174"/> + <reference key="parent" ref="51601157"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5699</int> + <reference key="object" ref="357553281"/> + <reference key="parent" ref="57862599"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5700</int> + <reference key="object" ref="167444868"/> + <reference key="parent" ref="237955939"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5701</int> + <reference key="object" ref="559442548"/> + <reference key="parent" ref="988136593"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5702</int> + <reference key="object" ref="276609847"/> + <reference key="parent" ref="216069484"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5703</int> + <reference key="object" ref="1025158673"/> + <reference key="parent" ref="521125104"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5704</int> + <reference key="object" ref="308087760"/> + <reference key="parent" ref="680939705"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5705</int> + <reference key="object" ref="169093017"/> + <reference key="parent" ref="484504415"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5706</int> + <reference key="object" ref="730590428"/> + <reference key="parent" ref="98826968"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5720</int> + <reference key="object" ref="16421625"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="972347112"/> + </object> + <reference key="parent" ref="394302879"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5721</int> + <reference key="object" ref="972347112"/> + <reference key="parent" ref="16421625"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -4501,12 +6090,75 @@ <string>5576.IBPluginDependency</string> <string>5577.IBPluginDependency</string> <string>5578.IBPluginDependency</string> + <string>5588.IBPluginDependency</string> + <string>5589.IBPluginDependency</string> + <string>5590.IBPluginDependency</string> + <string>5593.IBPluginDependency</string> + <string>5594.IBPluginDependency</string> + <string>5595.IBPluginDependency</string> + <string>5596.IBPluginDependency</string> + <string>5597.IBPluginDependency</string> + <string>5598.IBPluginDependency</string> + <string>5599.IBPluginDependency</string> + <string>5600.IBAttributePlaceholdersKey</string> + <string>5600.IBPluginDependency</string> + <string>5601.IBPluginDependency</string> + <string>5604.IBAttributePlaceholdersKey</string> + <string>5604.IBPluginDependency</string> + <string>5605.IBPluginDependency</string> + <string>5606.IBPluginDependency</string> + <string>5607.IBPluginDependency</string> + <string>5608.IBPluginDependency</string> + <string>5609.IBPluginDependency</string> + <string>5612.IBAttributePlaceholdersKey</string> + <string>5612.IBPluginDependency</string> + <string>5613.IBPluginDependency</string> + <string>5614.IBPluginDependency</string> + <string>5615.IBPluginDependency</string> + <string>5616.IBPluginDependency</string> + <string>5617.IBPluginDependency</string> + <string>5668.IBEditorWindowLastContentRect</string> + <string>5668.IBPluginDependency</string> + <string>5669.IBPluginDependency</string> + <string>5670.IBPluginDependency</string> + <string>5680.IBEditorWindowLastContentRect</string> + <string>5680.IBPluginDependency</string> + <string>5681.IBPluginDependency</string> + <string>5682.IBPluginDependency</string> + <string>5683.IBEditorWindowLastContentRect</string> + <string>5683.IBPluginDependency</string> + <string>5684.IBPluginDependency</string> + <string>5685.IBPluginDependency</string> + <string>5688.IBPluginDependency</string> + <string>5689.IBPluginDependency</string> + <string>5690.IBPluginDependency</string> + <string>5691.IBAttributePlaceholdersKey</string> + <string>5691.IBPluginDependency</string> + <string>5692.IBPluginDependency</string> + <string>5693.IBPluginDependency</string> + <string>5694.IBAttributePlaceholdersKey</string> + <string>5694.IBPluginDependency</string> + <string>5695.IBAttributePlaceholdersKey</string> + <string>5695.IBPluginDependency</string> + <string>5696.IBPluginDependency</string> + <string>5697.IBPluginDependency</string> + <string>5698.IBPluginDependency</string> + <string>5699.IBPluginDependency</string> + <string>5700.IBPluginDependency</string> + <string>5701.IBPluginDependency</string> + <string>5702.IBPluginDependency</string> + <string>5703.IBPluginDependency</string> + <string>5704.IBPluginDependency</string> + <string>5705.IBPluginDependency</string> + <string>5706.IBPluginDependency</string> + <string>5720.IBPluginDependency</string> + <string>5721.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{118, 243}, {882, 475}}</string> + <string>{{126, 318}, {882, 475}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -4881,6 +6533,111 @@ <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> + <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 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="586011242"/> + <string key="toolTip">Click to choose the SSL key file to use when establishing a secure connection</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="945929172"/> + <string key="toolTip">Click to choose the client SSL certificate file to use when establishing a secure connection</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 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="839299955"/> + <string key="toolTip">Click to choose the client SSL Certificate Authority certificate to use when establishing a secure connection</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>{{245, 483}, {579, 34}}</string> + <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> + <string>{{245, 483}, {579, 34}}</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> + <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="680939705"/> + <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> + <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="988136593"/> + <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> + <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="237955939"/> + <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> + <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> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -4899,7 +6656,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">5592</int> + <int key="maxID">5735</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -5139,13 +6896,14 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>addFavorite:</string> <string>cancelMySQLConnection:</string> - <string>chooseSSHKey:</string> + <string>chooseKeyLocation:</string> <string>editFavorites:</string> <string>initiateConnection:</string> <string>reverseSortFavorites:</string> <string>showHelp:</string> <string>sortFavorites:</string> <string>updateFavoriteSelection:</string> + <string>updateSSLInterface:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -5158,6 +6916,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -5166,13 +6925,14 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>addFavorite:</string> <string>cancelMySQLConnection:</string> - <string>chooseSSHKey:</string> + <string>chooseKeyLocation:</string> <string>editFavorites:</string> <string>initiateConnection:</string> <string>reverseSortFavorites:</string> <string>showHelp:</string> <string>sortFavorites:</string> <string>updateFavoriteSelection:</string> + <string>updateSSLInterface:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -5185,7 +6945,7 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">chooseSSHKey:</string> + <string key="name">chooseKeyLocation:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> @@ -5212,6 +6972,10 @@ <string key="name">updateFavoriteSelection:</string> <string key="candidateClassName">id</string> </object> + <object class="IBActionInfo"> + <string key="name">updateSSLInterface:</string> + <string key="candidateClassName">id</string> + </object> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -5234,16 +6998,27 @@ <string>progressIndicator</string> <string>progressIndicatorText</string> <string>socketConnectionFormContainer</string> + <string>socketConnectionSSLDetailsContainer</string> <string>socketPasswordField</string> + <string>socketSSLCACertButton</string> + <string>socketSSLCertificateButton</string> + <string>socketSSLKeyFileButton</string> <string>sshConnectionFormContainer</string> <string>sshKeyLocationHelp</string> <string>sshPasswordField</string> <string>sshSQLHostField</string> <string>sshSSHKeyButton</string> <string>sshSSHPasswordField</string> + <string>sslCACertLocationHelp</string> + <string>sslCertificateLocationHelp</string> + <string>sslKeyFileLocationHelp</string> <string>standardConnectionFormContainer</string> + <string>standardConnectionSSLDetailsContainer</string> <string>standardPasswordField</string> <string>standardSQLHostField</string> + <string>standardSSLCACertButton</string> + <string>standardSSLCertificateButton</string> + <string>standardSSLKeyFileButton</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -5263,7 +7038,11 @@ <string>NSProgressIndicator</string> <string>NSTextField</string> <string>NSView</string> + <string>NSView</string> <string>NSSecureTextField</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> <string>NSView</string> <string>NSView</string> <string>NSSecureTextField</string> @@ -5271,8 +7050,15 @@ <string>NSButton</string> <string>NSSecureTextField</string> <string>NSView</string> + <string>NSView</string> + <string>NSView</string> + <string>NSView</string> + <string>NSView</string> <string>NSSecureTextField</string> <string>NSTextField</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> </object> </object> <object class="NSMutableDictionary" key="toOneOutletInfosByName"> @@ -5295,16 +7081,27 @@ <string>progressIndicator</string> <string>progressIndicatorText</string> <string>socketConnectionFormContainer</string> + <string>socketConnectionSSLDetailsContainer</string> <string>socketPasswordField</string> + <string>socketSSLCACertButton</string> + <string>socketSSLCertificateButton</string> + <string>socketSSLKeyFileButton</string> <string>sshConnectionFormContainer</string> <string>sshKeyLocationHelp</string> <string>sshPasswordField</string> <string>sshSQLHostField</string> <string>sshSSHKeyButton</string> <string>sshSSHPasswordField</string> + <string>sslCACertLocationHelp</string> + <string>sslCertificateLocationHelp</string> + <string>sslKeyFileLocationHelp</string> <string>standardConnectionFormContainer</string> + <string>standardConnectionSSLDetailsContainer</string> <string>standardPasswordField</string> <string>standardSQLHostField</string> + <string>standardSSLCACertButton</string> + <string>standardSSLCertificateButton</string> + <string>standardSSLKeyFileButton</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -5373,10 +7170,26 @@ <string key="candidateClassName">NSView</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">socketConnectionSSLDetailsContainer</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">socketPasswordField</string> <string key="candidateClassName">NSSecureTextField</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">socketSSLCACertButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">socketSSLCertificateButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">socketSSLKeyFileButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">sshConnectionFormContainer</string> <string key="candidateClassName">NSView</string> </object> @@ -5401,10 +7214,26 @@ <string key="candidateClassName">NSSecureTextField</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">sslCACertLocationHelp</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sslCertificateLocationHelp</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sslKeyFileLocationHelp</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">standardConnectionFormContainer</string> <string key="candidateClassName">NSView</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">standardConnectionSSLDetailsContainer</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">standardPasswordField</string> <string key="candidateClassName">NSSecureTextField</string> </object> @@ -5412,6 +7241,18 @@ <string key="name">standardSQLHostField</string> <string key="candidateClassName">NSTextField</string> </object> + <object class="IBToOneOutletInfo"> + <string key="name">standardSSLCACertButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">standardSSLCertificateButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">standardSSLKeyFileButton</string> + <string key="candidateClassName">NSButton</string> + </object> </object> </object> <reference key="sourceIdentifier" ref="968459546"/> @@ -6207,6 +8048,7 @@ <string>NSActionTemplate</string> <string>NSMenuCheckmark</string> <string>NSMenuMixedState</string> + <string>NSSwitch</string> <string>button_edit</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -6215,6 +8057,7 @@ <string>{10, 10}</string> <string>{9, 8}</string> <string>{7, 2}</string> + <string>{15, 15}</string> <string>{32, 23}</string> </object> </object> diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 3838f860..1eb04fe7 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -18,13 +18,12 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>788</string> <string>788</string> - <string>1.2.2</string> + <string>1.2.5</string> </object> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="25"/> - <integer value="6210"/> + <integer value="5999"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -92,6 +91,7 @@ <int key="NSvFlags">290</int> <string key="NSFrame">{{5, 2}, {204, 19}}</string> <reference key="NSSuperview" ref="801427893"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSSearchFieldCell" key="NSCell" id="134854992"> <int key="NSCellFlags">343014976</int> @@ -184,6 +184,7 @@ <int key="NSvFlags">4362</int> <string key="NSFrameSize">{218, 38}</string> <reference key="NSSuperview" ref="494991824"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> <nil key="NSNextResponder"/> @@ -273,6 +274,7 @@ </object> <string key="NSFrame">{{1, 1}, {218, 38}}</string> <reference key="NSSuperview" ref="607475905"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="970881282"/> <reference key="NSDocView" ref="970881282"/> <object class="NSColor" key="NSBGColor" id="1024678221"> @@ -288,6 +290,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {15, 8}}</string> <reference key="NSSuperview" ref="607475905"/> + <reference key="NSWindow"/> <reference key="NSTarget" ref="607475905"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.42105263471603394</double> @@ -297,6 +300,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {223, 15}}</string> <reference key="NSSuperview" ref="607475905"/> + <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="607475905"/> <string key="NSAction">_doScroller:</string> @@ -305,6 +309,7 @@ </object> <string key="NSFrame">{{-1, -13}, {220, 40}}</string> <reference key="NSSuperview" ref="801427893"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="494991824"/> <int key="NSsFlags">2</int> <reference key="NSVScroller" ref="196112633"/> @@ -315,6 +320,7 @@ </object> <string key="NSFrameSize">{214, 26}</string> <reference key="NSSuperview" ref="213762440"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="BWCustomView" id="1017775084"> @@ -337,6 +343,7 @@ <int key="NSvFlags">4352</int> <string key="NSFrameSize">{214, 354}</string> <reference key="NSSuperview" ref="73685676"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> <nil key="NSNextResponder"/> @@ -403,6 +410,7 @@ </object> <string key="NSFrameSize">{214, 354}</string> <reference key="NSSuperview" ref="233472824"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="251040077"/> <reference key="NSDocView" ref="251040077"/> <reference key="NSBGColor" ref="1024678221"/> @@ -413,6 +421,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{197, 0}, {15, 292}}</string> <reference key="NSSuperview" ref="233472824"/> + <reference key="NSWindow"/> <reference key="NSTarget" ref="233472824"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">0.096045196056365967</double> @@ -423,6 +432,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {141, 11}}</string> <reference key="NSSuperview" ref="233472824"/> + <reference key="NSWindow"/> <int key="NSsFlags">257</int> <reference key="NSTarget" ref="233472824"/> <string key="NSAction">_doScroller:</string> @@ -431,6 +441,7 @@ </object> <string key="NSFrameSize">{214, 354}</string> <reference key="NSSuperview" ref="1017775084"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="73685676"/> <int key="NSsFlags">528</int> <reference key="NSVScroller" ref="693168867"/> @@ -441,11 +452,13 @@ </object> <string key="NSFrame">{{0, 27}, {214, 354}}</string> <reference key="NSSuperview" ref="213762440"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrameSize">{214, 381}</string> <reference key="NSSuperview" ref="131633443"/> + <reference key="NSWindow"/> <int key="NSDividerStyle">2</int> <object class="NSColor" key="BWSVColor"> <int key="NSColorSpace">6</int> @@ -479,6 +492,7 @@ </object> <string key="NSFrameSize">{214, 381}</string> <reference key="NSSuperview" ref="298095498"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="BWCustomView" id="192579410"> @@ -501,6 +515,7 @@ <int key="NSvFlags">4352</int> <string key="NSFrameSize">{214, 145}</string> <reference key="NSSuperview" ref="685057119"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> <nil key="NSNextResponder"/> @@ -567,6 +582,7 @@ </object> <string key="NSFrameSize">{214, 145}</string> <reference key="NSSuperview" ref="298226231"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="347093764"/> <reference key="NSDocView" ref="347093764"/> <reference key="NSBGColor" ref="1024678221"/> @@ -577,6 +593,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {15, 20}}</string> <reference key="NSSuperview" ref="298226231"/> + <reference key="NSWindow"/> <reference key="NSTarget" ref="298226231"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">0.48965516686439514</double> @@ -587,6 +604,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {141, 11}}</string> <reference key="NSSuperview" ref="298226231"/> + <reference key="NSWindow"/> <int key="NSsFlags">257</int> <reference key="NSTarget" ref="298226231"/> <string key="NSAction">_doScroller:</string> @@ -595,6 +613,7 @@ </object> <string key="NSFrameSize">{214, 145}</string> <reference key="NSSuperview" ref="192579410"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="685057119"/> <int key="NSsFlags">512</int> <reference key="NSVScroller" ref="245346414"/> @@ -605,11 +624,13 @@ </object> <string key="NSFrame">{{0, 382}, {214, 145}}</string> <reference key="NSSuperview" ref="298095498"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrame">{{0, 23}, {214, 527}}</string> <reference key="NSSuperview" ref="372294785"/> + <reference key="NSWindow"/> <int key="NSDividerStyle">2</int> <reference key="BWSVColor" ref="304829493"/> <bool key="BWSVColorIsEnabled">NO</bool> @@ -660,6 +681,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{-1, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="28219887"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredButtonCell" key="NSCell" id="283448047"> <int key="NSCellFlags">67239424</int> @@ -684,6 +706,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{30, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="28219887"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="321871356"> <int key="NSCellFlags">71433792</int> @@ -871,6 +894,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{61, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="28219887"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredButtonCell" key="NSCell" id="227511715"> <int key="NSCellFlags">67239424</int> @@ -895,6 +919,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{92, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="28219887"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredButtonCell" key="NSCell" id="708016222"> <int key="NSCellFlags">-2080244224</int> @@ -921,6 +946,7 @@ </object> <string key="NSFrame">{{0, 1}, {214, 23}}</string> <reference key="NSSuperview" ref="372294785"/> + <reference key="NSWindow"/> <bool key="BWABBIsResizable">YES</bool> <bool key="BWABBIsAtBottom">YES</bool> <bool key="BWABBHandleIsRightAligned">NO</bool> @@ -929,6 +955,7 @@ </object> <string key="NSFrameSize">{214, 550}</string> <reference key="NSSuperview" ref="937377983"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="604818293"> @@ -941,6 +968,7 @@ <int key="NSvFlags">274</int> <string key="NSFrame">{{-7, -10}, {741, 564}}</string> <reference key="NSSuperview" ref="604818293"/> + <reference key="NSWindow"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabViewItem" id="831053945"> @@ -965,6 +993,7 @@ <int key="NSvFlags">-2147483356</int> <string key="NSFrame">{{124, -1}, {33, 25}}</string> <reference key="NSSuperview" ref="220777809"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="598509241"> <int key="NSCellFlags">-2080244224</int> @@ -999,12 +1028,14 @@ <int key="NSvFlags">4352</int> <string key="NSFrameSize">{694, 289}</string> <reference key="NSSuperview" ref="16936123"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="926883367"> <reference key="NSNextResponder" ref="639957061"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{694, 17}</string> <reference key="NSSuperview" ref="639957061"/> + <reference key="NSWindow"/> <reference key="NSTableView" ref="715508012"/> </object> <object class="_NSCornerView" key="NSCornerView" id="868771861"> @@ -1012,6 +1043,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-26, 0}, {16, 17}}</string> <reference key="NSSuperview" ref="22340145"/> + <reference key="NSWindow"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1572,6 +1604,7 @@ </object> <string key="NSFrame">{{1, 17}, {694, 289}}</string> <reference key="NSSuperview" ref="22340145"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="715508012"/> <reference key="NSDocView" ref="715508012"/> <reference key="NSBGColor" ref="1024678221"/> @@ -1582,6 +1615,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{674, 17}, {15, 274}}</string> <reference key="NSSuperview" ref="22340145"/> + <reference key="NSWindow"/> <reference key="NSTarget" ref="22340145"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.9480968713760376</double> @@ -1591,6 +1625,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{1, 291}, {694, 15}}</string> <reference key="NSSuperview" ref="22340145"/> + <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="22340145"/> <string key="NSAction">_doScroller:</string> @@ -1606,6 +1641,7 @@ </object> <string key="NSFrame">{{1, 0}, {694, 17}}</string> <reference key="NSSuperview" ref="22340145"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="926883367"/> <reference key="NSDocView" ref="926883367"/> <reference key="NSBGColor" ref="1024678221"/> @@ -1615,6 +1651,7 @@ </object> <string key="NSFrame">{{-1, 22}, {696, 307}}</string> <reference key="NSSuperview" ref="220777809"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="16936123"/> <int key="NSsFlags">562</int> <reference key="NSVScroller" ref="943144555"/> @@ -1629,6 +1666,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{-1, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="413143172"> <int key="NSCellFlags">-1543373312</int> @@ -1653,6 +1691,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{93, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="917381158"> <int key="NSCellFlags">-2080244224</int> @@ -1677,6 +1716,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{30, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="578226656"> <int key="NSCellFlags">-1543373312</int> @@ -1701,6 +1741,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{61, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="626480887"> <int key="NSCellFlags">-1543373312</int> @@ -1737,6 +1778,7 @@ </object> <string key="NSFrame">{{125, 2}, {538, 23}}</string> <reference key="NSSuperview" ref="220777809"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="4715"> <int key="NSCellFlags">130560</int> @@ -1757,6 +1799,7 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{663, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1072754876"> <int key="NSCellFlags">-1543373312</int> @@ -1779,6 +1822,7 @@ </object> <string key="NSFrameSize">{695, 329}</string> <reference key="NSSuperview" ref="628830973"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="1063281455"> @@ -1796,6 +1840,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{3, 3}, {49, 14}}</string> <reference key="NSSuperview" ref="813716908"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="907218783"> <int key="NSCellFlags">68288064</int> @@ -1834,6 +1879,7 @@ </object> <string key="NSFrame">{{678, 4}, {10, 13}}</string> <reference key="NSSuperview" ref="813716908"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="545156725"> <int key="NSCellFlags">130560</int> @@ -1852,6 +1898,7 @@ </object> <string key="NSFrame">{{0, 181}, {695, 20}}</string> <reference key="NSSuperview" ref="1063281455"/> + <reference key="NSWindow"/> <object class="NSColor" key="BWGBFillStartingColor"> <int key="NSColorSpace">1</int> <bytes key="NSRGB">MC42NzU3Njg0OTQ2IDAuNzIxOTQ4MTQ2OCAwLjc2NTMwNjExNTIAA</bytes> @@ -1875,6 +1922,7 @@ <bool key="BWGBHasTopBorder">NO</bool> <bool key="BWGBHasBottomBorder">NO</bool> <bool key="BWGBHasGradient">NO</bool> + <bool key="BWGBHasFillColor">NO</bool> <float key="BWGBTopInsetAlpha">0.0</float> <float key="BWGBBottomInsetAlpha">0.0</float> </object> @@ -1893,12 +1941,14 @@ <int key="NSvFlags">4352</int> <string key="NSFrameSize">{694, 140}</string> <reference key="NSSuperview" ref="794929378"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="459548655"> <reference key="NSNextResponder" ref="1038672854"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{694, 17}</string> <reference key="NSSuperview" ref="1038672854"/> + <reference key="NSWindow"/> <reference key="NSTableView" ref="584834515"/> </object> <object class="_NSCornerView" key="NSCornerView" id="476444025"> @@ -1906,6 +1956,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-26, 0}, {16, 17}}</string> <reference key="NSSuperview" ref="376224367"/> + <reference key="NSWindow"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2161,6 +2212,7 @@ </object> <string key="NSFrame">{{1, 17}, {694, 140}}</string> <reference key="NSSuperview" ref="376224367"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="584834515"/> <reference key="NSDocView" ref="584834515"/> <reference key="NSBGColor" ref="1024678221"/> @@ -2171,6 +2223,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{611, 17}, {15, 126}}</string> <reference key="NSSuperview" ref="376224367"/> + <reference key="NSWindow"/> <reference key="NSTarget" ref="376224367"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.97794115543365479</double> @@ -2180,6 +2233,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{1, 143}, {610, 15}}</string> <reference key="NSSuperview" ref="376224367"/> + <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="376224367"/> <string key="NSAction">_doScroller:</string> @@ -2194,6 +2248,7 @@ </object> <string key="NSFrame">{{1, 0}, {694, 17}}</string> <reference key="NSSuperview" ref="376224367"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="459548655"/> <reference key="NSDocView" ref="459548655"/> <reference key="NSBGColor" ref="1024678221"/> @@ -2203,6 +2258,7 @@ </object> <string key="NSFrame">{{-1, 23}, {696, 158}}</string> <reference key="NSSuperview" ref="1063281455"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="794929378"/> <int key="NSsFlags">562</int> <reference key="NSVScroller" ref="1019209947"/> @@ -2217,6 +2273,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{-1, 0}, {32, 25}}</string> <reference key="NSSuperview" ref="1063281455"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="326048025"> <int key="NSCellFlags">-1543373312</int> @@ -2238,6 +2295,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{61, 0}, {32, 25}}</string> <reference key="NSSuperview" ref="1063281455"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="153146827"> <int key="NSCellFlags">-2080244224</int> @@ -2259,6 +2317,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{30, 0}, {32, 25}}</string> <reference key="NSSuperview" ref="1063281455"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="345927225"> <int key="NSCellFlags">-1543373312</int> @@ -2292,6 +2351,7 @@ </object> <string key="NSFrame">{{93, 1}, {602, 23}}</string> <reference key="NSSuperview" ref="1063281455"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="372723860"> <int key="NSCellFlags">130560</int> @@ -2307,16 +2367,19 @@ </object> <string key="NSFrame">{{0, 330}, {695, 201}}</string> <reference key="NSSuperview" ref="628830973"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrame">{{7, 10}, {695, 531}}</string> <reference key="NSSuperview" ref="461236772"/> + <reference key="NSWindow"/> <int key="NSDividerStyle">2</int> </object> </object> <string key="NSFrame">{{10, 7}, {706, 544}}</string> <reference key="NSSuperview" ref="714795046"/> + <reference key="NSWindow"/> </object> <string key="NSLabel">Structure</string> <reference key="NSColor" ref="62854682"/> @@ -6051,11 +6114,13 @@ </object> <string key="NSFrame">{{215, 0}, {729, 550}}</string> <reference key="NSSuperview" ref="937377983"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrame">{{0, -1}, {944, 550}}</string> <reference key="NSSuperview" ref="632807581"/> + <reference key="NSWindow"/> <bool key="NSIsVertical">YES</bool> <int key="NSDividerStyle">2</int> <string key="NSAutosaveName">DBViewSplitter</string> @@ -6063,6 +6128,7 @@ </object> <string key="NSFrameSize">{943, 549}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSWindowTemplate" id="554105051"> @@ -7075,8 +7141,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <bool key="NS.raise.underflow">YES</bool> <bool key="NS.raise.dividebyzero">YES</bool> </object> - <string key="NS.decimal">,</string> - <string key="NS.thousand">.</string> + <string key="NS.decimal">.</string> + <string key="NS.thousand">,</string> <bool key="NS.hasthousands">NO</bool> <bool key="NS.localized">YES</bool> <bool key="NS.allowsfloats">NO</bool> @@ -9616,7 +9682,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="730777562"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">265</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -9635,13 +9701,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>NeXT TIFF v4.0 pasteboard type</string> </object> </object> - <string key="NSFrame">{{13, -2}, {22, 22}}</string> + <string key="NSFrame">{{5, -2}, {101, 22}}</string> <reference key="NSSuperview" ref="730777562"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="1052485434"> <int key="NSCellFlags">130560</int> <int key="NSCellFlags2">33554432</int> - <int key="NSAlign">0</int> + <int key="NSAlign">8</int> <int key="NSScale">0</int> <int key="NSStyle">0</int> <bool key="NSAnimates">YES</bool> @@ -9674,6 +9740,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <string key="NSFrameSize">{110, 20}</string> + <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="260025442"> @@ -23331,7 +23398,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{144, 203}, {943, 549}}</string> + <string>{{59, 203}, {943, 549}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 559b2fbc..d5f42095 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="1176"/> - <integer value="1717"/> + <integer value="2041"/> + <integer value="1174"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -605,7 +605,7 @@ <reference key="NSNextResponder" ref="594324362"/> <int key="NSvFlags">12</int> <string key="NSFrame">{{202.5, 176}, {360, 5}}</string> - <string key="NSBounds">{{7.5, 0}, {345, 5}}</string> + <string key="NSBounds">{{8, 0}, {344, 5}}</string> <reference key="NSSuperview" ref="594324362"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -1877,14 +1877,14 @@ <object class="NSTabViewItem" id="912523923"> <string key="NSIdentifier">1</string> <object class="NSView" key="NSView" id="922389102"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder" ref="961025550"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTextField" id="796172881"> <reference key="NSNextResponder" ref="922389102"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{119, 153}, {165, 19}}</string> + <string key="NSFrame">{{119, 153}, {183, 19}}</string> <reference key="NSSuperview" ref="922389102"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="994019596"> @@ -1902,7 +1902,7 @@ <object class="NSSecureTextField" id="755342553"> <reference key="NSNextResponder" ref="922389102"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{119, 180}, {165, 19}}</string> + <string key="NSFrame">{{119, 180}, {183, 19}}</string> <reference key="NSSuperview" ref="922389102"/> <bool key="NSEnabled">YES</bool> <object class="NSSecureTextFieldCell" key="NSCell" id="1031469346"> @@ -1923,7 +1923,7 @@ <object class="NSTextField" id="133134378"> <reference key="NSNextResponder" ref="922389102"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{119, 207}, {165, 19}}</string> + <string key="NSFrame">{{119, 207}, {183, 19}}</string> <reference key="NSSuperview" ref="922389102"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="738673778"> @@ -1940,7 +1940,7 @@ <object class="NSTextField" id="707085995"> <reference key="NSNextResponder" ref="922389102"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{119, 126}, {165, 19}}</string> + <string key="NSFrame">{{119, 126}, {183, 19}}</string> <reference key="NSSuperview" ref="922389102"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="961856924"> @@ -1958,7 +1958,7 @@ <object class="NSTextField" id="77492794"> <reference key="NSNextResponder" ref="922389102"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{119, 234}, {165, 19}}</string> + <string key="NSFrame">{{119, 234}, {183, 19}}</string> <reference key="NSSuperview" ref="922389102"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="621427359"> @@ -2052,8 +2052,212 @@ <reference key="NSTextColor" ref="1035618107"/> </object> </object> + <object class="NSButton" id="326313579"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{116, 102}, {188, 18}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="950446242"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">Connect using SSL</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="326313579"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="752798171"/> + <reference key="NSAlternateImage" ref="888311049"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="268169583"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{277, 75}, {25, 22}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="721674097"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="268169583"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <object class="NSCustomResource" key="NSNormalImage" id="529804053"> + <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="333745503"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{119, 77}, {159, 19}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="868655700"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272762368</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="333745503"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="1001357688"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41MDQwMzIyNTgxAA</bytes> + </object> + </object> + </object> + <object class="NSTextField" id="353141525"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{4, 79}, {110, 14}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="229843945"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">Key File:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="353141525"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + </object> + <object class="NSButton" id="712641149"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{277, 49}, {25, 21}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="360573421"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="712641149"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="529804053"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSTextField" id="9988131"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{119, 50}, {159, 19}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="324715931"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272762368</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="9988131"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="1001357688"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + <object class="NSColorSpace" key="NSCustomColorSpace" id="84599190"> + <int key="NSID">2</int> + </object> + </object> + </object> + </object> + <object class="NSTextField" id="881733166"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{4, 52}, {110, 14}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="239831076"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">Certificate:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="881733166"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + </object> + <object class="NSButton" id="837890813"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{277, 22}, {25, 21}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="168562764"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="837890813"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="529804053"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSTextField" id="1035145804"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{119, 23}, {159, 19}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="88862921"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272762368</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="1035145804"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="1001357688"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + <reference key="NSCustomColorSpace" ref="84599190"/> + </object> + </object> + </object> + <object class="NSTextField" id="323589539"> + <reference key="NSNextResponder" ref="922389102"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{4, 25}, {110, 14}}</string> + <reference key="NSSuperview" ref="922389102"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="201233057"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">CA Cert:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="323589539"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + </object> </object> - <string key="NSFrame">{{10, 7}, {317, 262}}</string> + <string key="NSFrame">{{10, 7}, {335, 262}}</string> + <reference key="NSSuperview" ref="961025550"/> </object> <string key="NSLabel">Standard</string> <reference key="NSColor" ref="700609571"/> @@ -2069,7 +2273,7 @@ <object class="NSTextField" id="634238753"> <reference key="NSNextResponder" ref="839532754"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{119, 180}, {165, 19}}</string> + <string key="NSFrame">{{119, 180}, {183, 19}}</string> <reference key="NSSuperview" ref="839532754"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="77164118"> @@ -2087,7 +2291,7 @@ <object class="NSSecureTextField" id="340136489"> <reference key="NSNextResponder" ref="839532754"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{119, 207}, {165, 19}}</string> + <string key="NSFrame">{{119, 207}, {183, 19}}</string> <reference key="NSSuperview" ref="839532754"/> <bool key="NSEnabled">YES</bool> <object class="NSSecureTextFieldCell" key="NSCell" id="66198316"> @@ -2108,7 +2312,7 @@ <object class="NSTextField" id="596010118"> <reference key="NSNextResponder" ref="839532754"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{119, 153}, {165, 19}}</string> + <string key="NSFrame">{{119, 153}, {183, 19}}</string> <reference key="NSSuperview" ref="839532754"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="283360027"> @@ -2126,7 +2330,7 @@ <object class="NSTextField" id="119091130"> <reference key="NSNextResponder" ref="839532754"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{119, 234}, {165, 19}}</string> + <string key="NSFrame">{{119, 234}, {183, 19}}</string> <reference key="NSSuperview" ref="839532754"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="380690864"> @@ -2204,8 +2408,206 @@ <reference key="NSTextColor" ref="1035618107"/> </object> </object> + <object class="NSButton" id="128846849"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{116, 129}, {188, 18}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="253160955"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">Connect using SSL</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="128846849"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="752798171"/> + <reference key="NSAlternateImage" ref="888311049"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="442151472"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{277, 102}, {25, 22}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="412451460"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="442151472"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="529804053"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSTextField" id="899449715"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{119, 104}, {159, 19}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="330078906"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272762368</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="899449715"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="1001357688"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41MDQwMzIyNTgxAA</bytes> + </object> + </object> + </object> + <object class="NSTextField" id="27450138"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{4, 106}, {110, 14}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="695309429"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">Key File:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="27450138"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + </object> + <object class="NSButton" id="517307940"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{277, 76}, {25, 21}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="238157352"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="517307940"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="529804053"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSTextField" id="194427961"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{119, 77}, {159, 19}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="357528044"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272762368</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="194427961"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="1001357688"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + <reference key="NSCustomColorSpace" ref="84599190"/> + </object> + </object> + </object> + <object class="NSTextField" id="24879395"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{4, 79}, {110, 14}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="138875544"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">Certificate:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="24879395"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + </object> + <object class="NSButton" id="3226998"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{277, 49}, {25, 21}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="432584314"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="3226998"/> + <int key="NSButtonFlags">-922992385</int> + <int key="NSButtonFlags2">34</int> + <reference key="NSNormalImage" ref="529804053"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSTextField" id="170342915"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{119, 50}, {159, 19}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="382406439"> + <int key="NSCellFlags">-2073952703</int> + <int key="NSCellFlags2">272762368</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <string key="NSPlaceholderString">none set</string> + <reference key="NSControlView" ref="170342915"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="1001357688"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + <reference key="NSCustomColorSpace" ref="84599190"/> + </object> + </object> + </object> + <object class="NSTextField" id="543432756"> + <reference key="NSNextResponder" ref="839532754"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{4, 52}, {110, 14}}</string> + <reference key="NSSuperview" ref="839532754"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="142099544"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">CA Cert:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="543432756"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + </object> </object> - <string key="NSFrame">{{10, 7}, {317, 262}}</string> + <string key="NSFrame">{{10, 7}, {335, 262}}</string> </object> <string key="NSLabel">Socket</string> <reference key="NSColor" ref="700609571"/> @@ -2214,7 +2616,7 @@ <object class="NSTabViewItem" id="682271284"> <string key="NSIdentifier">Item 2</string> <object class="NSView" key="NSView" id="404987940"> - <reference key="NSNextResponder" ref="961025550"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2268,10 +2670,7 @@ <reference key="NSControlView" ref="440294697"/> <int key="NSButtonFlags">-926138113</int> <int key="NSButtonFlags2">162</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">KeyTemplate</string> - </object> + <reference key="NSNormalImage" ref="529804053"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">400</int> @@ -2584,20 +2983,19 @@ </object> </object> <string key="NSFrame">{{10, 7}, {335, 262}}</string> - <reference key="NSSuperview" ref="961025550"/> </object> <string key="NSLabel">SSH</string> <reference key="NSColor" ref="700609571"/> <reference key="NSTabView" ref="961025550"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="682271284"/> + <reference key="NSSelectedTabViewItem" ref="912523923"/> <reference key="NSFont" ref="26"/> <int key="NSTvFlags">134217731</int> <bool key="NSAllowTruncatedLabels">YES</bool> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="404987940"/> + <reference ref="922389102"/> </object> </object> <object class="NSTextField" id="415835787"> @@ -4247,6 +4645,13 @@ AQAAAAA</bytes> <string>TableRowCountQueryLevel</string> <string>sshKeyLocationEnabled</string> <string>sshKeyLocation</string> + <string>useSSL</string> + <string>sslKeyFileLocation</string> + <string>sslKeyFileLocationEnabled</string> + <string>sslCertificateFileLocation</string> + <string>sslCertificateFileLocationEnabled</string> + <string>sslCACertFileLocation</string> + <string>sslCACertFileLocationEnabled</string> </object> <bool key="NSEditable">YES</bool> <bool key="NSAutomaticallyPreparesContent">YES</bool> @@ -4311,7 +4716,7 @@ AQAAAAA</bytes> <string key="NSWindowContentMaxSize">{247, 124}</string> <string key="NSWindowContentMinSize">{247, 124}</string> <object class="NSView" key="NSWindowView" id="985350347"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -4418,7 +4823,6 @@ AQAAAAA</bytes> </object> </object> <string key="NSFrameSize">{247, 124}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> <string key="NSMinSize">{247, 146}</string> @@ -4681,6 +5085,82 @@ AQAAAAA</bytes> <string key="NSFrameSize">{579, 51}</string> <string key="NSClassName">NSView</string> </object> + <object class="NSCustomView" id="46104894"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="532539071"> + <reference key="NSNextResponder" ref="46104894"/> + <int key="NSvFlags">274</int> + <string key="NSFrame">{{2, 10}, {575, 17}}</string> + <reference key="NSSuperview" ref="46104894"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="925838195"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">138674176</int> + <string key="NSContents">Please select the SSL key file to use when establishing a secure connection.</string> + <reference key="NSSupport" ref="718282869"/> + <reference key="NSControlView" ref="532539071"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + </object> + </object> + <string key="NSFrameSize">{579, 34}</string> + <reference key="NSSuperview"/> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="962978272"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="624133663"> + <reference key="NSNextResponder" ref="962978272"/> + <int key="NSvFlags">274</int> + <string key="NSFrame">{{2, 10}, {575, 17}}</string> + <reference key="NSSuperview" ref="962978272"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="602926229"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">138674176</int> + <string key="NSContents">Please select the client SSL certificate file to use when establishing a secure connection.</string> + <reference key="NSSupport" ref="718282869"/> + <reference key="NSControlView" ref="624133663"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + </object> + </object> + <string key="NSFrameSize">{579, 34}</string> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="453507512"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="534911197"> + <reference key="NSNextResponder" ref="453507512"/> + <int key="NSvFlags">274</int> + <string key="NSFrame">{{2, 10}, {575, 34}}</string> + <reference key="NSSuperview" ref="453507512"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="921051913"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">138674176</int> + <string key="NSContents">Please select the client SSL Certificate Authority certificate to use when establishing a secure connection. This must be the same as the server CA certificate.</string> + <reference key="NSSupport" ref="718282869"/> + <reference key="NSControlView" ref="534911197"/> + <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"> @@ -7325,20 +7805,1262 @@ AQAAAAA</bytes> <int key="connectionID">1871</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 class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.useSSL</string> + <reference key="source" ref="326313579"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="326313579"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.useSSL</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.useSSL</string> + <object class="NSDictionary" key="NSOptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSAllowsEditingMultipleValuesSelection</string> + <string>NSMultipleValuesPlaceholder</string> + <string>NSNoSelectionPlaceholder</string> + <string>NSNotApplicablePlaceholder</string> + <string>NSNullPlaceholder</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <boolean value="NO"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1903</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: selection.sslKeyFileLocation</string> + <reference key="source" ref="333745503"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="333745503"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">toolTip: selection.sslKeyFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">selection.sslKeyFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1907</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslKeyFileLocationEnabled</string> + <reference key="source" ref="268169583"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="268169583"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslKeyFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslKeyFileLocationEnabled</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">1913</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslCertificateFileLocationEnabled</string> + <reference key="source" ref="712641149"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="712641149"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslCertificateFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslCertificateFileLocationEnabled</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">1922</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: selection.sslCertificateFileLocation</string> + <reference key="source" ref="9988131"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="9988131"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">toolTip: selection.sslCertificateFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">selection.sslCertificateFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1925</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: selection.sslCACertFileLocation</string> + <reference key="source" ref="1035145804"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="1035145804"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">toolTip: selection.sslCACertFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">selection.sslCACertFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1928</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="353141525"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="353141525"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1992</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="881733166"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="881733166"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1993</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="323589539"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="323589539"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1994</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="333745503"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="333745503"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1995</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="9988131"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="9988131"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1996</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="1035145804"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="1035145804"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1997</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="268169583"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="268169583"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1998</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="712641149"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="712641149"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1999</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="837890813"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="837890813"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2000</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslKeyFileLocationEnabled</string> + <reference key="source" ref="442151472"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="442151472"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslKeyFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslKeyFileLocationEnabled</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">2021</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="517307940"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="517307940"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2022</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.useSSL</string> + <reference key="source" ref="128846849"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="128846849"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.useSSL</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.useSSL</string> + <object class="NSDictionary" key="NSOptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSAllowsEditingMultipleValuesSelection</string> + <string>NSMultipleValuesPlaceholder</string> + <string>NSNoSelectionPlaceholder</string> + <string>NSNotApplicablePlaceholder</string> + <string>NSNullPlaceholder</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <boolean value="NO"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2024</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="899449715"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="899449715"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2026</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="27450138"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="27450138"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2027</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="543432756"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="543432756"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2028</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: selection.sslCACertFileLocation</string> + <reference key="source" ref="170342915"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="170342915"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">toolTip: selection.sslCACertFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">selection.sslCACertFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2029</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="194427961"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="194427961"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2030</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="24879395"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="24879395"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2031</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslCertificateFileLocationEnabled</string> + <reference key="source" ref="517307940"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="517307940"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslCertificateFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslCertificateFileLocationEnabled</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">2033</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="170342915"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="170342915"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2034</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="442151472"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="442151472"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2035</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: selection.sslCertificateFileLocation</string> + <reference key="source" ref="194427961"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="194427961"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">toolTip: selection.sslCertificateFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">selection.sslCertificateFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2037</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">toolTip: selection.sslKeyFileLocation</string> + <reference key="source" ref="899449715"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="899449715"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">toolTip: selection.sslKeyFileLocation</string> + <string key="NSBinding">toolTip</string> + <string key="NSKeyPath">selection.sslKeyFileLocation</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2038</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">hidden: selection.useSSL</string> + <reference key="source" ref="3226998"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="3226998"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">hidden: selection.useSSL</string> + <string key="NSBinding">hidden</string> + <string key="NSKeyPath">selection.useSSL</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="0"/> + <integer value="0"/> + <integer value="0"/> + <integer value="0"/> + <string>NSNegateBoolean</string> + </object> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2039</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sslKeyFileLocationHelp</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="46104894"/> + </object> + <int key="connectionID">2049</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sslCertificateLocationHelp</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="962978272"/> + </object> + <int key="connectionID">2050</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sslCACertLocationHelp</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="453507512"/> + </object> + <int key="connectionID">2051</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">standardSSLKeyFileButton</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="268169583"/> + </object> + <int key="connectionID">2052</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">standardSSLCertificateButton</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="712641149"/> + </object> + <int key="connectionID">2053</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">standardSSLCACertButton</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="837890813"/> + </object> + <int key="connectionID">2054</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">socketSSLCACertButton</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="3226998"/> + </object> + <int key="connectionID">2055</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">socketSSLCertificateButton</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="517307940"/> + </object> + <int key="connectionID">2056</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">socketSSLKeyFileButton</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="442151472"/> + </object> + <int key="connectionID">2057</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sshSSHKeyButton</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="440294697"/> + </object> + <int key="connectionID">2058</int> + </object> + <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">chooseSSHKey:</string> + <string key="label">chooseKeyLocation:</string> <reference key="source" ref="1001"/> <reference key="destination" ref="440294697"/> </object> - <int key="connectionID">1872</int> + <int key="connectionID">2059</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">sshKeyLocationHelp</string> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="301032184"/> + <reference key="destination" ref="442151472"/> </object> - <int key="connectionID">1876</int> + <int key="connectionID">2060</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="517307940"/> + </object> + <int key="connectionID">2061</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="3226998"/> + </object> + <int key="connectionID">2062</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="268169583"/> + </object> + <int key="connectionID">2063</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="712641149"/> + </object> + <int key="connectionID">2064</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">chooseKeyLocation:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="837890813"/> + </object> + <int key="connectionID">2065</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslCACertFileLocationEnabled</string> + <reference key="source" ref="837890813"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="837890813"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslCACertFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslCACertFileLocationEnabled</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">2066</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslCACertFileLocationEnabled</string> + <reference key="source" ref="3226998"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="3226998"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslCACertFileLocationEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslCACertFileLocationEnabled</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">2067</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslCACertFileLocation</string> + <reference key="source" ref="170342915"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="170342915"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslCACertFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslCACertFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2068</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslCertificateFileLocation</string> + <reference key="source" ref="194427961"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="194427961"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslCertificateFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslCertificateFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2069</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslKeyFileLocation</string> + <reference key="source" ref="899449715"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="899449715"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslKeyFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslKeyFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2070</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslKeyFileLocation</string> + <reference key="source" ref="333745503"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="333745503"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslKeyFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslKeyFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2071</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslCertificateFileLocation</string> + <reference key="source" ref="9988131"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="9988131"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslCertificateFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslCertificateFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2072</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.sslCACertFileLocation</string> + <reference key="source" ref="1035145804"/> + <reference key="destination" ref="937123943"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="1035145804"/> + <reference key="NSDestination" ref="937123943"/> + <string key="NSLabel">value: selection.sslCACertFileLocation</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.sslCACertFileLocation</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">none set</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">2073</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -8631,6 +10353,16 @@ AQAAAAA</bytes> <reference ref="205311716"/> <reference ref="109184829"/> <reference ref="119091130"/> + <reference ref="128846849"/> + <reference ref="442151472"/> + <reference ref="899449715"/> + <reference ref="27450138"/> + <reference ref="517307940"/> + <reference ref="194427961"/> + <reference ref="24879395"/> + <reference ref="3226998"/> + <reference ref="170342915"/> + <reference ref="543432756"/> </object> <reference key="parent" ref="995302803"/> </object> @@ -8649,6 +10381,16 @@ AQAAAAA</bytes> <reference ref="707085995"/> <reference ref="352560561"/> <reference ref="77492794"/> + <reference ref="326313579"/> + <reference ref="333745503"/> + <reference ref="712641149"/> + <reference ref="9988131"/> + <reference ref="837890813"/> + <reference ref="1035145804"/> + <reference ref="268169583"/> + <reference ref="353141525"/> + <reference ref="881733166"/> + <reference ref="323589539"/> </object> <reference key="parent" ref="912523923"/> </object> @@ -10340,6 +12082,358 @@ AQAAAAA</bytes> <reference key="object" ref="219723569"/> <reference key="parent" ref="200831972"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">1877</int> + <reference key="object" ref="326313579"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="950446242"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1878</int> + <reference key="object" ref="950446242"/> + <reference key="parent" ref="326313579"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1879</int> + <reference key="object" ref="268169583"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="721674097"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1880</int> + <reference key="object" ref="333745503"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="868655700"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1881</int> + <reference key="object" ref="353141525"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="229843945"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1882</int> + <reference key="object" ref="712641149"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="360573421"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1883</int> + <reference key="object" ref="9988131"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="324715931"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1884</int> + <reference key="object" ref="881733166"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="239831076"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1885</int> + <reference key="object" ref="837890813"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="168562764"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1886</int> + <reference key="object" ref="1035145804"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="88862921"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1887</int> + <reference key="object" ref="323589539"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="201233057"/> + </object> + <reference key="parent" ref="922389102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1888</int> + <reference key="object" ref="201233057"/> + <reference key="parent" ref="323589539"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1889</int> + <reference key="object" ref="88862921"/> + <reference key="parent" ref="1035145804"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1890</int> + <reference key="object" ref="168562764"/> + <reference key="parent" ref="837890813"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1891</int> + <reference key="object" ref="239831076"/> + <reference key="parent" ref="881733166"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1892</int> + <reference key="object" ref="324715931"/> + <reference key="parent" ref="9988131"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1893</int> + <reference key="object" ref="360573421"/> + <reference key="parent" ref="712641149"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1894</int> + <reference key="object" ref="229843945"/> + <reference key="parent" ref="353141525"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1895</int> + <reference key="object" ref="868655700"/> + <reference key="parent" ref="333745503"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1896</int> + <reference key="object" ref="721674097"/> + <reference key="parent" ref="268169583"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2001</int> + <reference key="object" ref="128846849"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="253160955"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2002</int> + <reference key="object" ref="442151472"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="412451460"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2003</int> + <reference key="object" ref="899449715"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="330078906"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2004</int> + <reference key="object" ref="27450138"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="695309429"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2005</int> + <reference key="object" ref="517307940"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="238157352"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2006</int> + <reference key="object" ref="194427961"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="357528044"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2007</int> + <reference key="object" ref="24879395"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="138875544"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2008</int> + <reference key="object" ref="3226998"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="432584314"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2009</int> + <reference key="object" ref="170342915"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="382406439"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2010</int> + <reference key="object" ref="543432756"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="142099544"/> + </object> + <reference key="parent" ref="839532754"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2011</int> + <reference key="object" ref="142099544"/> + <reference key="parent" ref="543432756"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2012</int> + <reference key="object" ref="382406439"/> + <reference key="parent" ref="170342915"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2013</int> + <reference key="object" ref="432584314"/> + <reference key="parent" ref="3226998"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2014</int> + <reference key="object" ref="138875544"/> + <reference key="parent" ref="24879395"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2015</int> + <reference key="object" ref="357528044"/> + <reference key="parent" ref="194427961"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2016</int> + <reference key="object" ref="238157352"/> + <reference key="parent" ref="517307940"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2017</int> + <reference key="object" ref="695309429"/> + <reference key="parent" ref="27450138"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2018</int> + <reference key="object" ref="330078906"/> + <reference key="parent" ref="899449715"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2019</int> + <reference key="object" ref="412451460"/> + <reference key="parent" ref="442151472"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2020</int> + <reference key="object" ref="253160955"/> + <reference key="parent" ref="128846849"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2040</int> + <reference key="object" ref="453507512"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="534911197"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">SSL CA Cert File Selection Help</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2041</int> + <reference key="object" ref="46104894"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="532539071"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">SSL Key File Selection Help</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2042</int> + <reference key="object" ref="962978272"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="624133663"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">SSL Certificate File Selection Help</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2043</int> + <reference key="object" ref="624133663"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="602926229"/> + </object> + <reference key="parent" ref="962978272"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2044</int> + <reference key="object" ref="602926229"/> + <reference key="parent" ref="624133663"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2045</int> + <reference key="object" ref="532539071"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="925838195"/> + </object> + <reference key="parent" ref="46104894"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2046</int> + <reference key="object" ref="925838195"/> + <reference key="parent" ref="532539071"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2047</int> + <reference key="object" ref="534911197"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="921051913"/> + </object> + <reference key="parent" ref="453507512"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2048</int> + <reference key="object" ref="921051913"/> + <reference key="parent" ref="534911197"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -10677,7 +12771,65 @@ AQAAAAA</bytes> <string>1873.IBPluginDependency</string> <string>1874.IBPluginDependency</string> <string>1875.IBPluginDependency</string> + <string>1877.IBPluginDependency</string> + <string>1878.IBPluginDependency</string> + <string>1879.IBAttributePlaceholdersKey</string> + <string>1879.IBPluginDependency</string> + <string>1880.IBPluginDependency</string> + <string>1881.IBPluginDependency</string> + <string>1882.IBAttributePlaceholdersKey</string> + <string>1882.IBPluginDependency</string> + <string>1883.IBPluginDependency</string> + <string>1884.IBPluginDependency</string> + <string>1885.IBAttributePlaceholdersKey</string> + <string>1885.IBPluginDependency</string> + <string>1886.IBPluginDependency</string> + <string>1887.IBPluginDependency</string> + <string>1888.IBPluginDependency</string> + <string>1889.IBPluginDependency</string> + <string>1890.IBPluginDependency</string> + <string>1891.IBPluginDependency</string> + <string>1892.IBPluginDependency</string> + <string>1893.IBPluginDependency</string> + <string>1894.IBPluginDependency</string> + <string>1895.IBPluginDependency</string> + <string>1896.IBPluginDependency</string> <string>2.IBPluginDependency</string> + <string>2001.IBPluginDependency</string> + <string>2002.IBAttributePlaceholdersKey</string> + <string>2002.IBPluginDependency</string> + <string>2003.IBPluginDependency</string> + <string>2004.IBPluginDependency</string> + <string>2005.IBAttributePlaceholdersKey</string> + <string>2005.IBPluginDependency</string> + <string>2006.IBPluginDependency</string> + <string>2007.IBPluginDependency</string> + <string>2008.IBAttributePlaceholdersKey</string> + <string>2008.IBPluginDependency</string> + <string>2009.IBPluginDependency</string> + <string>2010.IBPluginDependency</string> + <string>2011.IBPluginDependency</string> + <string>2012.IBPluginDependency</string> + <string>2013.IBPluginDependency</string> + <string>2014.IBPluginDependency</string> + <string>2015.IBPluginDependency</string> + <string>2016.IBPluginDependency</string> + <string>2017.IBPluginDependency</string> + <string>2018.IBPluginDependency</string> + <string>2019.IBPluginDependency</string> + <string>2020.IBPluginDependency</string> + <string>2040.IBEditorWindowLastContentRect</string> + <string>2040.IBPluginDependency</string> + <string>2041.IBEditorWindowLastContentRect</string> + <string>2041.IBPluginDependency</string> + <string>2042.IBEditorWindowLastContentRect</string> + <string>2042.IBPluginDependency</string> + <string>2043.IBPluginDependency</string> + <string>2044.IBPluginDependency</string> + <string>2045.IBPluginDependency</string> + <string>2046.IBPluginDependency</string> + <string>2047.IBPluginDependency</string> + <string>2048.IBPluginDependency</string> <string>24.IBPluginDependency</string> <string>24.ImportedFromIB2</string> <string>25.IBPluginDependency</string> @@ -11336,6 +13488,106 @@ AQAAAAA</bytes> <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="268169583"/> + <string key="toolTip">Click to choose the SSL key file to use when establishing a secure connection</string> + </object> + </object> + <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="712641149"/> + <string key="toolTip">Click to choose the client SSL certificate file to use when establishing a secure connection</string> + </object> + </object> + <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="837890813"/> + <string key="toolTip">Click to choose the client SSL Certificate Authority certificate to use when establishing a secure connection</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> + <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> + <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="442151472"/> + <string key="toolTip">Click to choose the SSL key file to use when establishing a secure connection</string> + </object> + </object> + <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="517307940"/> + <string key="toolTip">Click to choose the client SSL certificate file to use when establishing a secure connection</string> + </object> + </object> + <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="3226998"/> + <string key="toolTip">Click to choose the client SSL Certificate Authority certificate to use when establishing a secure connection</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> + <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>{{245, 466}, {579, 51}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{245, 483}, {579, 34}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{245, 483}, {579, 34}}</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> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -11373,7 +13625,7 @@ AQAAAAA</bytes> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{320, 375}, {580, 381}}</string> + <string>{{55, 304}, {580, 381}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -11667,7 +13919,7 @@ AQAAAAA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">1876</int> + <int key="maxID">2073</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -11799,7 +14051,7 @@ AQAAAAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <string>addFavorite:</string> <string>changeFont:</string> - <string>chooseSSHKey:</string> + <string>chooseKeyLocation:</string> <string>closePanelSheet:</string> <string>displayAutoUpdatePreferences:</string> <string>displayEditorPreferences:</string> @@ -11862,7 +14114,7 @@ AQAAAAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <string>addFavorite:</string> <string>changeFont:</string> - <string>chooseSSHKey:</string> + <string>chooseKeyLocation:</string> <string>closePanelSheet:</string> <string>displayAutoUpdatePreferences:</string> <string>displayEditorPreferences:</string> @@ -11899,7 +14151,7 @@ AQAAAAA</bytes> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">chooseSSHKey:</string> + <string key="name">chooseKeyLocation:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> @@ -12037,11 +14289,21 @@ AQAAAAA</bytes> <string>removeThemeButton</string> <string>saveThemeMenuItem</string> <string>socketPasswordField</string> + <string>socketSSLCACertButton</string> + <string>socketSSLCertificateButton</string> + <string>socketSSLKeyFileButton</string> <string>splitViewButtonBar</string> <string>sshKeyLocationHelp</string> <string>sshPasswordField</string> <string>sshSQLPasswordField</string> + <string>sshSSHKeyButton</string> + <string>sslCACertLocationHelp</string> + <string>sslCertificateLocationHelp</string> + <string>sslKeyFileLocationHelp</string> <string>standardPasswordField</string> + <string>standardSSLCACertButton</string> + <string>standardSSLCertificateButton</string> + <string>standardSSLKeyFileButton</string> <string>tableCell</string> <string>tablesView</string> <string>themeNameSaveButton</string> @@ -12082,11 +14344,21 @@ AQAAAAA</bytes> <string>id</string> <string>NSMenuItem</string> <string>NSSecureTextField</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> <string>BWAnchoredButtonBar</string> <string>NSView</string> <string>NSSecureTextField</string> <string>NSSecureTextField</string> + <string>NSButton</string> + <string>NSView</string> + <string>NSView</string> + <string>NSView</string> <string>NSSecureTextField</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> <string>id</string> <string>NSView</string> <string>id</string> @@ -12130,11 +14402,21 @@ AQAAAAA</bytes> <string>removeThemeButton</string> <string>saveThemeMenuItem</string> <string>socketPasswordField</string> + <string>socketSSLCACertButton</string> + <string>socketSSLCertificateButton</string> + <string>socketSSLKeyFileButton</string> <string>splitViewButtonBar</string> <string>sshKeyLocationHelp</string> <string>sshPasswordField</string> <string>sshSQLPasswordField</string> + <string>sshSSHKeyButton</string> + <string>sslCACertLocationHelp</string> + <string>sslCertificateLocationHelp</string> + <string>sslKeyFileLocationHelp</string> <string>standardPasswordField</string> + <string>standardSSLCACertButton</string> + <string>standardSSLCertificateButton</string> + <string>standardSSLKeyFileButton</string> <string>tableCell</string> <string>tablesView</string> <string>themeNameSaveButton</string> @@ -12275,6 +14557,18 @@ AQAAAAA</bytes> <string key="candidateClassName">NSSecureTextField</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">socketSSLCACertButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">socketSSLCertificateButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">socketSSLKeyFileButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">splitViewButtonBar</string> <string key="candidateClassName">BWAnchoredButtonBar</string> </object> @@ -12291,10 +14585,38 @@ AQAAAAA</bytes> <string key="candidateClassName">NSSecureTextField</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">sshSSHKeyButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sslCACertLocationHelp</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sslCertificateLocationHelp</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sslKeyFileLocationHelp</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">standardPasswordField</string> <string key="candidateClassName">NSSecureTextField</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">standardSSLCACertButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">standardSSLCertificateButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">standardSSLKeyFileButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">tableCell</string> <string key="candidateClassName">id</string> </object> diff --git a/Resources/English.lproj/ConnectionView.strings b/Resources/English.lproj/ConnectionView.strings Binary files differindex 95354610..460f15cf 100644 --- a/Resources/English.lproj/ConnectionView.strings +++ b/Resources/English.lproj/ConnectionView.strings diff --git a/Resources/English.lproj/DBView.strings b/Resources/English.lproj/DBView.strings Binary files differindex 9310758a..0276e134 100644 --- a/Resources/English.lproj/DBView.strings +++ b/Resources/English.lproj/DBView.strings diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings Binary files differindex 273cff5d..29fdc2a8 100644 --- a/Resources/English.lproj/Localizable.strings +++ b/Resources/English.lproj/Localizable.strings diff --git a/Resources/English.lproj/Preferences.strings b/Resources/English.lproj/Preferences.strings Binary files differindex 422ecee6..4f1861aa 100644 --- a/Resources/English.lproj/Preferences.strings +++ b/Resources/English.lproj/Preferences.strings diff --git a/Resources/English.lproj/UserManagerView.strings b/Resources/English.lproj/UserManagerView.strings Binary files differindex 72deec21..bf8bad55 100644 --- a/Resources/English.lproj/UserManagerView.strings +++ b/Resources/English.lproj/UserManagerView.strings diff --git a/Resources/Images/titlebarlock.png b/Resources/Images/titlebarlock.png Binary files differnew file mode 100644 index 00000000..ecdf9d00 --- /dev/null +++ b/Resources/Images/titlebarlock.png diff --git a/Scripts/build-mysql-client.sh b/Scripts/build-mysql-client.sh index 3870162c..1641053c 100755 --- a/Scripts/build-mysql-client.sh +++ b/Scripts/build-mysql-client.sh @@ -17,10 +17,10 @@ DEBUG='NO' CLEAN='NO' # C/C++ compiler flags -export CFLAGS='-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 -arch x86_64 -O3 -fno-omit-frame-pointer -mmacosx-version-min=10.5' +export CFLAGS='-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 -arch x86_64 -O3 -fno-omit-frame-pointer -fno-exceptions -mmacosx-version-min=10.5' export CXXFLAGS='-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 -arch x86_64 -O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mmacosx-version-min=10.5' -CONFIGURE_OPTIONS='--without-server --enable-thread-safe-client --disable-dependency-tracking --enable-local-infile' +CONFIGURE_OPTIONS='--without-server --enable-thread-safe-client --disable-dependency-tracking --enable-local-infile --with-ssl --enable-assembler --with-mysqld-ldflags=-all-static' BINARY_DISTRIBUTION_SCRIPT='scripts/make_binary_distribution' usage() diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index 3aac3054..73622f40 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -77,6 +77,13 @@ NSString *database; NSString *socket; NSString *port; + int useSSL; + int sslKeyFileLocationEnabled; + NSString *sslKeyFileLocation; + int sslCertificateFileLocationEnabled; + NSString *sslCertificateFileLocation; + int sslCACertFileLocationEnabled; + NSString *sslCACertFileLocation; NSString *sshHost; NSString *sshUser; NSString *sshPassword; @@ -103,9 +110,14 @@ IBOutlet NSView *connectionResizeContainer; IBOutlet NSView *standardConnectionFormContainer; + IBOutlet NSView *standardConnectionSSLDetailsContainer; IBOutlet NSView *socketConnectionFormContainer; + IBOutlet NSView *socketConnectionSSLDetailsContainer; IBOutlet NSView *sshConnectionFormContainer; IBOutlet NSView *sshKeyLocationHelp; + IBOutlet NSView *sslKeyFileLocationHelp; + IBOutlet NSView *sslCertificateLocationHelp; + IBOutlet NSView *sslCACertLocationHelp; IBOutlet NSTextField *standardSQLHostField; IBOutlet NSTextField *sshSQLHostField; @@ -114,6 +126,12 @@ IBOutlet NSSecureTextField *sshPasswordField; IBOutlet NSSecureTextField *sshSSHPasswordField; IBOutlet NSButton *sshSSHKeyButton; + IBOutlet NSButton *standardSSLKeyFileButton; + IBOutlet NSButton *standardSSLCertificateButton; + IBOutlet NSButton *standardSSLCACertButton; + IBOutlet NSButton *socketSSLKeyFileButton; + IBOutlet NSButton *socketSSLCertificateButton; + IBOutlet NSButton *socketSSLCACertButton; IBOutlet NSButton *addToFavoritesButton; IBOutlet NSButton *connectButton; @@ -137,6 +155,13 @@ @property (readwrite, retain) NSString *database; @property (readwrite, retain) NSString *socket; @property (readwrite, retain) NSString *port; +@property (readwrite, assign) int useSSL; +@property (readwrite, assign) int sslKeyFileLocationEnabled; +@property (readwrite, retain) NSString *sslKeyFileLocation; +@property (readwrite, assign) int sslCertificateFileLocationEnabled; +@property (readwrite, retain) NSString *sslCertificateFileLocation; +@property (readwrite, assign) int sslCACertFileLocationEnabled; +@property (readwrite, retain) NSString *sslCACertFileLocation; @property (readwrite, retain) NSString *sshHost; @property (readwrite, retain) NSString *sshUser; @property (readwrite, retain) NSString *sshPassword; @@ -165,9 +190,10 @@ - (void)addConnectionToDocument; // Interface interaction -- (IBAction)chooseSSHKey:(id)sender; +- (IBAction)chooseKeyLocation:(id)sender; - (IBAction)editFavorites:(id)sender; - (IBAction)showHelp:(id)sender; +- (IBAction)updateSSLInterface:(id)sender; - (void)resizeTabViewToConnectionType:(NSUInteger)theType animating:(BOOL)animate; - (IBAction)sortFavorites:(id)sender; - (IBAction)reverseSortFavorites:(id)sender; diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 258a0b0f..aefca1fd 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -51,6 +51,13 @@ @synthesize database; @synthesize socket; @synthesize port; +@synthesize useSSL; +@synthesize sslKeyFileLocationEnabled; +@synthesize sslKeyFileLocation; +@synthesize sslCertificateFileLocationEnabled; +@synthesize sslCertificateFileLocation; +@synthesize sslCACertFileLocationEnabled; +@synthesize sslCACertFileLocation; @synthesize sshHost; @synthesize sshUser; @synthesize sshPassword; @@ -130,8 +137,8 @@ if (tableRow < [favorites count]) { previousType = [[[favorites objectAtIndex:tableRow] objectForKey:@"type"] integerValue]; - [self resizeTabViewToConnectionType:[[[favorites objectAtIndex:tableRow] objectForKey:@"type"] integerValue] animating:NO]; [favoritesTable selectRowIndexes:[NSIndexSet indexSetWithIndex:tableRow] byExtendingSelection:NO]; + [self resizeTabViewToConnectionType:[[[favorites objectAtIndex:tableRow] objectForKey:@"type"] integerValue] animating:NO]; [favoritesTable scrollRowToVisible:[favoritesTable selectedRow]]; } else { previousType = SPTCPIPConnection; @@ -196,7 +203,35 @@ // Ensure that a socket connection is not inadvertently used if (![self checkHost]) return; - + + // If SSL keys have been supplied, verify they exist + if (([self type] == SPTCPIPConnection || [self type] == SPSocketConnection) && [self useSSL]) { + if (sslKeyFileLocationEnabled && sslKeyFileLocation + && ![[NSFileManager defaultManager] fileExistsAtPath:[sslKeyFileLocation stringByExpandingTildeInPath]]) + { + [self setSslKeyFileLocationEnabled:NSOffState]; + [self setSslKeyFileLocation:nil]; + SPBeginAlertSheet(NSLocalizedString(@"SSL Key File not found", @"SSL key file check error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocument parentWindow], self, nil, nil, NSLocalizedString(@"A SSL key file location was specified, but no file was found in the specified location. Please re-select the key file and try again.", @"SSL key file not found message")); + return; + } + if (sslCertificateFileLocationEnabled && sslCertificateFileLocation + && ![[NSFileManager defaultManager] fileExistsAtPath:[sslCertificateFileLocation stringByExpandingTildeInPath]]) + { + [self setSslCertificateFileLocationEnabled:NSOffState]; + [self setSslCertificateFileLocation:nil]; + SPBeginAlertSheet(NSLocalizedString(@"SSL Certificate File not found", @"SSL certificate file check error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocument parentWindow], self, nil, nil, NSLocalizedString(@"A SSL certificate location was specified, but no file was found in the specified location. Please re-select the certificate and try again.", @"SSL certificate file not found message")); + return; + } + if (sslCACertFileLocationEnabled && sslCACertFileLocation + && ![[NSFileManager defaultManager] fileExistsAtPath:[sslCACertFileLocation stringByExpandingTildeInPath]]) + { + [self setSslCACertFileLocationEnabled:NSOffState]; + [self setSslCACertFileLocation:nil]; + SPBeginAlertSheet(NSLocalizedString(@"SSL Certificate Authority File not found", @"SSL certificate authority file check error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocument parentWindow], self, nil, nil, NSLocalizedString(@"A SSL Certificate Authority certificate location was specified, but no file was found in the specified location. Please re-select the Certificate Authority certificate and try again.", @"SSL CA certificate file not found message")); + return; + } + } + // Basic details have validated - start the connection process animating isConnecting = YES; cancellingConnection = NO; @@ -479,47 +514,114 @@ #pragma mark Interface interaction /** - * Opens the SSH key selection window, ready to select a SSH key. + * Opens the SSH/SSL key selection window, ready to select a key file. */ -- (IBAction)chooseSSHKey:(id)sender +- (IBAction)chooseKeyLocation:(id)sender { [favoritesTable deselectAll:self]; NSString *directoryPath = nil; NSString *filePath = nil; + NSArray *permittedFileTypes = nil; + NSOpenPanel *openPanel = [NSOpenPanel openPanel]; - // If the custom key location is currently disabled - after the button - // action - leave it disabled and return without showing the sheet. - if (!sshKeyLocationEnabled) { - return; - } + // Switch details by sender. + // First, SSH keys: + if (sender == sshSSHKeyButton) { + + // If the custom key location is currently disabled - after the button + // action - leave it disabled and return without showing the sheet. + if (!sshKeyLocationEnabled) { + return; + } + + // Otherwise open a panel at the last or default location + if (sshKeyLocation && [sshKeyLocation length]) { + filePath = [sshKeyLocation lastPathComponent]; + directoryPath = [sshKeyLocation stringByDeletingLastPathComponent]; + } + + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"", nil]; + [openPanel setAccessoryView:sshKeyLocationHelp]; - // Otherwise open a panel at the last or default location - if (sshKeyLocation && [sshKeyLocation length]) { - filePath = [sshKeyLocation lastPathComponent]; - directoryPath = [sshKeyLocation stringByDeletingLastPathComponent]; + // SSL key file location: + } else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton) { + if ([sender state] == NSOffState) { + [self setSslKeyFileLocation:nil]; + return; + } + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"key", @"", nil]; + [openPanel setAccessoryView:sslKeyFileLocationHelp]; + + // SSL certificate file location: + } else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton) { + if ([sender state] == NSOffState) { + [self setSslCertificateFileLocation:nil]; + return; + } + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"", nil]; + [openPanel setAccessoryView:sslCertificateLocationHelp]; + + // SSL CA certificate file location: + } else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton) { + if ([sender state] == NSOffState) { + [self setSslCACertFileLocation:nil]; + return; + } + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"", nil]; + [openPanel setAccessoryView:sslCACertLocationHelp]; } - NSOpenPanel *openPanel = [NSOpenPanel openPanel]; - [openPanel setAccessoryView:sshKeyLocationHelp]; [openPanel beginSheetForDirectory:directoryPath file:filePath - types:[NSArray arrayWithObjects:@"pem", @"", nil] + types:permittedFileTypes modalForWindow:[tableDocument parentWindow] modalDelegate:self - didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + didEndSelector:@selector(chooseKeyLocationSheetDidEnd:returnCode:contextInfo:) + contextInfo:sender]; } /** - * Called after closing the SSH key selection sheet. + * Called after closing the SSH/SSL key selection sheet. */ -- (void)chooseSSHKeySheetDidEnd:(NSOpenPanel *)openPanel returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +- (void)chooseKeyLocationSheetDidEnd:(NSOpenPanel *)openPanel returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - if (returnCode == NSCancelButton) { - [self setSshKeyLocationEnabled:NSOffState]; - return; + NSString *abbreviatedFileName = [[openPanel filename] stringByAbbreviatingWithTildeInPath]; + + // SSH key file selection + if (contextInfo == sshSSHKeyButton) { + if (returnCode == NSCancelButton) { + [self setSshKeyLocationEnabled:NSOffState]; + return; + } + [self setSshKeyLocation:abbreviatedFileName]; + + // SSL key file selection + } else if (contextInfo == standardSSLKeyFileButton || contextInfo == socketSSLKeyFileButton) { + if (returnCode == NSCancelButton) { + [self setSslKeyFileLocationEnabled:NSOffState]; + [self setSslKeyFileLocation:nil]; + return; + } + [self setSslKeyFileLocation:abbreviatedFileName]; + + // SSL certificate file selection + } else if (contextInfo == standardSSLCertificateButton || contextInfo == socketSSLCertificateButton) { + if (returnCode == NSCancelButton) { + [self setSslCertificateFileLocationEnabled:NSOffState]; + [self setSslCertificateFileLocation:nil]; + return; + } + [self setSslCertificateFileLocation:abbreviatedFileName]; + + // SSL CA certificate file selection + } else if (contextInfo == standardSSLCACertButton || contextInfo == socketSSLCACertButton) { + if (returnCode == NSCancelButton) { + [self setSslCACertFileLocationEnabled:NSOffState]; + [self setSslCACertFileLocation:nil]; + return; + } + [self setSslCACertFileLocation:abbreviatedFileName]; } - [self setSshKeyLocation:[[openPanel filename] stringByAbbreviatingWithTildeInPath]]; } /** @@ -544,6 +646,14 @@ [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:SPLOCALIZEDURL_CONNECTIONHELP]]; } +/** + * Resize parts of the interface to reflect SSL status. + */ +- (IBAction)updateSSLInterface:(id)sender +{ + [self resizeTabViewToConnectionType:[self type] animating:YES]; +} + #pragma mark - #pragma mark Connection details interaction and display @@ -638,9 +748,11 @@ switch (theType) { case SPTCPIPConnection: targetResizeRect = [standardConnectionFormContainer frame]; + if ([self useSSL]) additionalFormHeight += [standardConnectionSSLDetailsContainer frame].size.height; break; case SPSocketConnection: targetResizeRect = [socketConnectionFormContainer frame]; + if ([self useSSL]) additionalFormHeight += [socketConnectionSSLDetailsContainer frame].size.height; break; case SPSSHTunnelConnection: targetResizeRect = [sshConnectionFormContainer frame]; @@ -761,18 +873,29 @@ if (connectionSSHKeychainItemAccount) [connectionSSHKeychainItemAccount release], connectionSSHKeychainItemAccount = nil; // Update key-value properties from the selected favourite, using empty strings where not found - [self setType:([self valueForKeyPath:@"selectedFavorite.type"] ? [[self valueForKeyPath:@"selectedFavorite.type"] integerValue] : SPTCPIPConnection)]; - [self setName:([self valueForKeyPath:@"selectedFavorite.name"] ? [self valueForKeyPath:@"selectedFavorite.name"] : @"")]; - [self setHost:([self valueForKeyPath:@"selectedFavorite.host"] ? [self valueForKeyPath:@"selectedFavorite.host"] : @"")]; - [self setSocket:([self valueForKeyPath:@"selectedFavorite.socket"] ? [self valueForKeyPath:@"selectedFavorite.socket"] : @"")]; - [self setUser:([self valueForKeyPath:@"selectedFavorite.user"] ? [self valueForKeyPath:@"selectedFavorite.user"] : @"")]; - [self setPort:([self valueForKeyPath:@"selectedFavorite.port"] ? [self valueForKeyPath:@"selectedFavorite.port"] : @"")]; - [self setDatabase:([self valueForKeyPath:@"selectedFavorite.database"] ? [self valueForKeyPath:@"selectedFavorite.database"] : @"")]; - [self setSshHost:([self valueForKeyPath:@"selectedFavorite.sshHost"] ? [self valueForKeyPath:@"selectedFavorite.sshHost"] : @"")]; - [self setSshUser:([self valueForKeyPath:@"selectedFavorite.sshUser"] ? [self valueForKeyPath:@"selectedFavorite.sshUser"] : @"")]; - [self setSshKeyLocationEnabled:([self valueForKeyPath:@"selectedFavorite.sshKeyLocationEnabled"] ? [[self valueForKeyPath:@"selectedFavorite.sshKeyLocationEnabled"] intValue] : NSOffState)]; - [self setSshKeyLocation:([self valueForKeyPath:@"selectedFavorite.sshKeyLocation"] ? [self valueForKeyPath:@"selectedFavorite.sshKeyLocation"] : @"")]; - [self setSshPort:([self valueForKeyPath:@"selectedFavorite.sshPort"] ? [self valueForKeyPath:@"selectedFavorite.sshPort"] : @"")]; + NSDictionary *fav = [self selectedFavorite]; + [self setType:([fav objectForKey:@"type"] ? [[fav objectForKey:@"type"] integerValue] : SPTCPIPConnection)]; + [self setName:([fav objectForKey:@"name"] ? [fav objectForKey:@"name"] : @"")]; + [self setHost:([fav objectForKey:@"host"] ? [fav objectForKey:@"host"] : @"")]; + [self setSocket:([fav objectForKey:@"socket"] ? [fav objectForKey:@"socket"] : @"")]; + [self setUser:([fav objectForKey:@"user"] ? [fav objectForKey:@"user"] : @"")]; + [self setPort:([fav objectForKey:@"port"] ? [fav objectForKey:@"port"] : @"")]; + [self setUseSSL:([fav objectForKey:@"useSSL"] ? [[fav objectForKey:@"useSSL"] intValue] : NSOffState)]; + [self setSslKeyFileLocationEnabled:([fav objectForKey:@"sslKeyFileLocationEnabled"] ? [[fav objectForKey:@"sslKeyFileLocationEnabled"] intValue] : NSOffState)]; + [self setSslKeyFileLocation:([fav objectForKey:@"sslKeyFileLocation"] ? [fav objectForKey:@"sslKeyFileLocation"] : @"")]; + [self setSslCertificateFileLocationEnabled:([fav objectForKey:@"sslCertificateFileLocationEnabled"] ? [[fav objectForKey:@"sslCertificateFileLocationEnabled"] intValue] : NSOffState)]; + [self setSslCertificateFileLocation:([fav objectForKey:@"sslCertificateFileLocation"] ? [fav objectForKey:@"sslCertificateFileLocation"] : @"")]; + [self setSslCACertFileLocationEnabled:([fav objectForKey:@"sslCACertFileLocationEnabled"] ? [[fav objectForKey:@"sslCACertFileLocationEnabled"] intValue] : NSOffState)]; + [self setSslCACertFileLocation:([fav objectForKey:@"sslCACertFileLocation"] ? [fav objectForKey:@"sslCACertFileLocation"] : @"")]; + [self setDatabase:([fav objectForKey:@"database"] ? [fav objectForKey:@"database"] : @"")]; + [self setSshHost:([fav objectForKey:@"sshHost"] ? [fav objectForKey:@"sshHost"] : @"")]; + [self setSshUser:([fav objectForKey:@"sshUser"] ? [fav objectForKey:@"sshUser"] : @"")]; + [self setSshKeyLocationEnabled:([fav objectForKey:@"sshKeyLocationEnabled"] ? [[fav objectForKey:@"sshKeyLocationEnabled"] intValue] : NSOffState)]; + [self setSshKeyLocation:([fav objectForKey:@"sshKeyLocation"] ? [fav objectForKey:@"sshKeyLocation"] : @"")]; + [self setSshPort:([fav objectForKey:@"sshPort"] ? [fav objectForKey:@"sshPort"] : @"")]; + + // Trigger an interface update + [self resizeTabViewToConnectionType:[self type] animating:YES]; // Check whether the password exists in the keychain, and if so add it; also record the // keychain details so we can pass around only those details if the password doesn't change @@ -863,6 +986,13 @@ if ([self socket]) [newFavorite setObject:[self socket] forKey:@"socket"]; if ([self user]) [newFavorite setObject:[self user] forKey:@"user"]; if ([self port]) [newFavorite setObject:[self port] forKey:@"port"]; + if ([self useSSL]) [newFavorite setObject:[NSNumber numberWithInt:[self useSSL]] forKey:@"useSSL"]; + [newFavorite setObject:[NSNumber numberWithInt:[self sslKeyFileLocationEnabled]] forKey:@"sslKeyFileLocationEnabled"]; + if ([self sslKeyFileLocation]) [newFavorite setObject:[self sslKeyFileLocation] forKey:@"sslKeyFileLocation"]; + [newFavorite setObject:[NSNumber numberWithInt:[self sslCertificateFileLocationEnabled]] forKey:@"sslCertificateFileLocationEnabled"]; + if ([self sslCertificateFileLocation]) [newFavorite setObject:[self sslCertificateFileLocation] forKey:@"sslCertificateFileLocation"]; + [newFavorite setObject:[NSNumber numberWithInt:[self sslCACertFileLocationEnabled]] forKey:@"sslCACertFileLocationEnabled"]; + if ([self sslCACertFileLocation]) [newFavorite setObject:[self sslCACertFileLocation] forKey:@"sslCACertFileLocation"]; if ([self database]) [newFavorite setObject:[self database] forKey:@"database"]; if ([self sshHost]) [newFavorite setObject:[self sshHost] forKey:@"sshHost"]; if ([self sshUser]) [newFavorite setObject:[self sshUser] forKey:@"sshUser"]; @@ -1248,7 +1378,16 @@ [progressIndicator stopAnimation:self]; [progressIndicatorText setHidden:YES]; [addToFavoritesButton setHidden:NO]; - + + // If SSL was enabled, check it was established correctly + if (useSSL && ([self type] == SPTCPIPConnection || [self type] == SPSocketConnection)) { + if (![mySQLConnection isConnectedViaSSL]) { + SPBeginAlertSheet(NSLocalizedString(@"SSL connection not established", @"SSL requested but not used title"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocument parentWindow], nil, nil, nil, NSLocalizedString(@"You requested that the connection should be established using SSL, but MySQL made the connection without SSL.\n\nThis may be because the server does not support SSL connections, or has SSL disabled; or insufficient details were supplied to establish an SSL connection.\n\nThis connection is not encrypted.", @"SSL connection requested but not established error detail")); + } else { + [tableDocument setStatusIconToImageWithName:@"titlebarlock"]; + } + } + // Re-enable favorites table view [favoritesTable setEnabled:YES]; [favoritesTable display]; @@ -1289,10 +1428,19 @@ if (!connectionKeychainItemName && [self password]) { [mySQLConnection setPassword:[self password]]; } + + // Enable SSL if set + if ([self useSSL]) { + [mySQLConnection setSSL:YES + usingKeyFilePath:[self sslKeyFileLocationEnabled] ? [self sslKeyFileLocation] : nil + certificatePath:[self sslCertificateFileLocationEnabled] ? [self sslCertificateFileLocation] : nil + certificateAuthorityCertificatePath:[self sslCACertFileLocationEnabled] ? [self sslCACertFileLocation] : nil]; + } + // Connection delegate must be set before actual connection attempt is made [mySQLConnection setDelegate:tableDocument]; - + // Set whether or not we should enable delegate logging according to the prefs [mySQLConnection setDelegateQueryLogging:[prefs boolForKey:SPConsoleEnableLogging]]; diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 648a7691..1a0ae6d6 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -267,10 +267,17 @@ [connectionController setHost:@""]; [connectionController setPort:@""]; [connectionController setSocket:@""]; + [connectionController setUseSSL:NSOffState]; + [connectionController setSslKeyFileLocationEnabled:NSOffState]; + [connectionController setSslKeyFileLocation:nil]; + [connectionController setSslCertificateFileLocationEnabled:NSOffState]; + [connectionController setSslCertificateFileLocation:nil]; + [connectionController setSslCACertFileLocationEnabled:NSOffState]; + [connectionController setSslCACertFileLocation:nil]; [connectionController setSshHost:@""]; [connectionController setSshUser:@""]; [connectionController setSshKeyLocationEnabled:NSOffState]; - [connectionController setSshKeyLocation:@""]; + [connectionController setSshKeyLocation:nil]; [connectionController setSshPort:@""]; [connectionController setDatabase:@""]; [connectionController setPassword:nil]; @@ -468,6 +475,22 @@ [connectionController setHost:[connection objectForKey:@"host"]]; if([connection objectForKey:@"port"]) [connectionController setPort:[NSString stringWithFormat:@"%ld", (long)[[connection objectForKey:@"port"] integerValue]]]; + + if([connection objectForKey:@"useSSL"]) + [connectionController setUseSSL:[[connection objectForKey:@"useSSL"] intValue]]; + if([connection objectForKey:@"sslKeyFileLocationEnabled"]) + [connectionController setSslKeyFileLocationEnabled:[[connection objectForKey:@"sslKeyFileLocationEnabled"] intValue]]; + if([connection objectForKey:@"sslKeyFileLocation"]) + [connectionController setSslKeyFileLocation:[connection objectForKey:@"sslKeyFileLocation"]]; + if([connection objectForKey:@"sslCertificateFileLocationEnabled"]) + [connectionController setSslCertificateFileLocationEnabled:[[connection objectForKey:@"sslCertificateFileLocationEnabled"] intValue]]; + if([connection objectForKey:@"sslCertificateFileLocation"]) + [connectionController setSslCertificateFileLocation:[connection objectForKey:@"sslCertificateFileLocation"]]; + if([connection objectForKey:@"sslCACertFileLocationEnabled"]) + [connectionController setSslCACertFileLocationEnabled:[[connection objectForKey:@"sslCACertFileLocationEnabled"] intValue]]; + if([connection objectForKey:@"sslCACertFileLocation"]) + [connectionController setSslCACertFileLocation:[connection objectForKey:@"sslCACertFileLocation"]]; + if([connection objectForKey:@"kcid"] && [(NSString *)[connection objectForKey:@"kcid"] length]) [self setKeychainID:[connection objectForKey:@"kcid"]]; @@ -530,6 +553,8 @@ [spfDocData setObject:[NSNumber numberWithBool:NO] forKey:@"auto_connect"]; + [connectionController updateSSLInterface:self]; + if([spf objectForKey:@"auto_connect"] && [[spf valueForKey:@"auto_connect"] boolValue]) { [spfDocData setObject:[NSNumber numberWithBool:YES] forKey:@"auto_connect"]; [connectionController initiateConnection:self]; @@ -3292,6 +3317,14 @@ [connection setObject:[self host] forKey:@"host"]; [connection setObject:[self user] forKey:@"user"]; + [connection setObject:[NSNumber numberWithInt:[connectionController useSSL]] forKey:@"useSSL"]; + [connection setObject:[NSNumber numberWithInt:[connectionController sslKeyFileLocationEnabled]] forKey:@"sslKeyFileLocationEnabled"]; + [connection setObject:[connectionController sslKeyFileLocation] forKey:@"sslKeyFileLocation"]; + [connection setObject:[NSNumber numberWithInt:[connectionController sslCertificateFileLocationEnabled]] forKey:@"sslCertificateFileLocationEnabled"]; + [connection setObject:[connectionController sslCertificateFileLocation] forKey:@"sslCertificateFileLocation"]; + [connection setObject:[NSNumber numberWithInt:[connectionController sslCACertFileLocationEnabled]] forKey:@"sslCACertFileLocationEnabled"]; + [connection setObject:[connectionController sslCACertFileLocation] forKey:@"sslCACertFileLocation"]; + switch([connectionController type]) { case SPTCPIPConnection: aString = @"SPTCPIPConnection"; diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h index 7d8e0375..9f85ecc1 100644 --- a/Source/SPPreferenceController.h +++ b/Source/SPPreferenceController.h @@ -57,8 +57,18 @@ IBOutlet NSTextField *favoriteUserTextFieldSocket; IBOutlet NSTextField *favoriteUserTextFieldSSH; IBOutlet NSTextField *favoriteHostTextFieldSSH; + IBOutlet NSButton *sshSSHKeyButton; + IBOutlet NSButton *standardSSLKeyFileButton; + IBOutlet NSButton *standardSSLCertificateButton; + IBOutlet NSButton *standardSSLCACertButton; + IBOutlet NSButton *socketSSLKeyFileButton; + IBOutlet NSButton *socketSSLCertificateButton; + IBOutlet NSButton *socketSSLCACertButton; IBOutlet NSMenuItem *favoritesSortByMenuItem; IBOutlet NSView *sshKeyLocationHelp; + IBOutlet NSView *sslKeyFileLocationHelp; + IBOutlet NSView *sslCertificateLocationHelp; + IBOutlet NSView *sslCACertLocationHelp; IBOutlet NSWindow *enterNameWindow; IBOutlet NSTextField *enterNameLabel; @@ -133,7 +143,7 @@ - (IBAction)closePanelSheet:(id)sender; - (IBAction)duplicateTheme:(id)sender; - (IBAction)removeTheme:(id)sender; -- (IBAction)chooseSSHKey:(id)sender; +- (IBAction)chooseKeyLocation:(id)sender; // Toolbar item IBAction methods - (IBAction)displayGeneralPreferences:(id)sender; diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index c1f3877a..d05868b9 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -409,8 +409,8 @@ NSNumber *favoriteid = [NSNumber numberWithInteger:[[NSString stringWithFormat:@"%f", [[NSDate date] timeIntervalSince1970]] hash]]; // Create default favorite - NSMutableDictionary *favorite = [NSMutableDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"New Favorite", [NSNumber numberWithInteger:0], @"", @"", @"", @"", @"", @"", @"", [NSNumber numberWithInt:NSOffState], @"", @"", favoriteid, nil] - forKeys:[NSArray arrayWithObjects:@"name", @"type", @"host", @"socket", @"user", @"port", @"database", @"sshHost", @"sshUser", @"sshKeyLocationEnabled", @"sshKeyLocation", @"sshPort", @"id", nil]]; + NSMutableDictionary *favorite = [NSMutableDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"New Favorite", [NSNumber numberWithInteger:0], @"", @"", @"", @"", [NSNumber numberWithInt:NSOffState], [NSNumber numberWithInt:NSOffState], [NSNumber numberWithInt:NSOffState], [NSNumber numberWithInt:NSOffState], @"", @"", @"", [NSNumber numberWithInt:NSOffState], @"", @"", favoriteid, nil] + forKeys:[NSArray arrayWithObjects:@"name", @"type", @"host", @"socket", @"user", @"port", @"useSSL", @"sslKeyFileLocationEnabled", @"sslCertificateFileLocationEnabled", @"sslCACertFileLocationEnabled", @"database", @"sshHost", @"sshUser", @"sshKeyLocationEnabled", @"sshKeyLocation", @"sshPort", @"id", nil]]; [favoritesController addObject:favorite]; [favoritesController setSelectedObjects:[NSArray arrayWithObject:favorite]]; @@ -686,47 +686,115 @@ } /** - * Opens the SSH key selection window, ready to select a SSH key. + * Opens the SSH/SSL key selection window, ready to select a key file. */ -- (IBAction)chooseSSHKey:(id)sender + - (IBAction)chooseKeyLocation:(id)sender { NSString *directoryPath = nil; NSString *filePath = nil; + NSArray *permittedFileTypes = nil; + NSOpenPanel *openPanel = [NSOpenPanel openPanel]; - // If the custom key location is currently disabled - after the button - // action - leave it disabled and return without showing the sheet. - if (![[favoritesController valueForKeyPath:@"selection.sshKeyLocationEnabled"] intValue]) { - return; - } + // Switch details by sender. + // First, SSH keys: + if (sender == sshSSHKeyButton) { - // Otherwise open a panel at the last or default location - if ([favoritesController valueForKeyPath:@"selection.sshKeyLocation"] && [[favoritesController valueForKeyPath:@"selection.sshKeyLocation"] length]) { - filePath = [[favoritesController valueForKeyPath:@"selection.sshKeyLocation"] lastPathComponent]; - directoryPath = [[favoritesController valueForKeyPath:@"selection.sshKeyLocation"] stringByDeletingLastPathComponent]; - } + // If the custom key location is currently disabled - after the button + // action - leave it disabled and return without showing the sheet. + if (![favoritesController valueForKeyPath:@"selection.sshKeyLocationEnabled"]) { + return; + } + // Otherwise open a panel at the last or default location + NSString *sshKeyLocation = [favoritesController valueForKeyPath:@"selection.sshKeyLocation"]; + if (sshKeyLocation && [sshKeyLocation length]) { + filePath = [sshKeyLocation lastPathComponent]; + directoryPath = [sshKeyLocation stringByDeletingLastPathComponent]; + } + + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"", nil]; + [openPanel setAccessoryView:sshKeyLocationHelp]; + + // SSL key file location: + } else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton) { + if ([sender state] == NSOffState) { + [favoritesController setValue:nil forKeyPath:@"selection.sslKeyFileLocation"]; + return; + } + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"key", @"", nil]; + [openPanel setAccessoryView:sslKeyFileLocationHelp]; + + // SSL certificate file location: + } else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton) { + if ([sender state] == NSOffState) { + [favoritesController setValue:nil forKeyPath:@"selection.sslCertificateFileLocation"]; + return; + } + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"", nil]; + [openPanel setAccessoryView:sslCertificateLocationHelp]; + + // SSL CA certificate file location: + } else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton) { + if ([sender state] == NSOffState) { + [favoritesController setValue:nil forKeyPath:@"selection.sslCACertFileLocation"]; + return; + } + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"", nil]; + [openPanel setAccessoryView:sslCACertLocationHelp]; + } - NSOpenPanel *openPanel = [NSOpenPanel openPanel]; - [openPanel setAccessoryView:sshKeyLocationHelp]; [openPanel beginSheetForDirectory:directoryPath file:filePath - types:[NSArray arrayWithObjects:@"pem", @"", nil] + types:permittedFileTypes modalForWindow:preferencesWindow modalDelegate:self - didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + didEndSelector:@selector(chooseKeyLocationSheetDidEnd:returnCode:contextInfo:) + contextInfo:sender]; } /** - * Called after closing the SSH key selection sheet. + * Called after closing the SSH/SSL key selection sheet. */ -- (void)chooseSSHKeySheetDidEnd:(NSOpenPanel *)openPanel returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +- (void)chooseKeyLocationSheetDidEnd:(NSOpenPanel *)openPanel returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - if (returnCode == NSCancelButton) { - [favoritesController setValue:[NSNumber numberWithInt:NSOffState] forKeyPath:@"selection.sshKeyLocationEnabled"]; - return; + NSString *abbreviatedFileName = [[openPanel filename] stringByAbbreviatingWithTildeInPath]; + + // SSH key file selection + if (contextInfo == sshSSHKeyButton) { + if (returnCode == NSCancelButton) { + [favoritesController setValue:[NSNumber numberWithInt:NSOffState] forKeyPath:@"selection.sshKeyLocationEnabled"]; + return; + } + [favoritesController setValue:abbreviatedFileName forKeyPath:@"selection.sshKeyLocation"]; + [self setSshKeyLocation:abbreviatedFileName]; + + // SSL key file selection + } else if (contextInfo == standardSSLKeyFileButton || contextInfo == socketSSLKeyFileButton) { + if (returnCode == NSCancelButton) { + [favoritesController setValue:[NSNumber numberWithInt:NSOffState] forKeyPath:@"selection.sslKeyFileLocationEnabled"]; + [favoritesController setValue:nil forKeyPath:@"selection.sslKeyFileLocation"]; + return; + } + [favoritesController setValue:abbreviatedFileName forKeyPath:@"selection.sslKeyFileLocation"]; + + // SSL certificate file selection + } else if (contextInfo == standardSSLCertificateButton || contextInfo == socketSSLCertificateButton) { + if (returnCode == NSCancelButton) { + [favoritesController setValue:[NSNumber numberWithInt:NSOffState] forKeyPath:@"selection.sslCertificateFileLocationEnabled"]; + [favoritesController setValue:nil forKeyPath:@"selection.sslCertificateFileLocation"]; + return; + } + [favoritesController setValue:abbreviatedFileName forKeyPath:@"selection.sslCertificateFileLocation"]; + + // SSL CA certificate file selection + } else if (contextInfo == standardSSLCACertButton || contextInfo == socketSSLCACertButton) { + if (returnCode == NSCancelButton) { + [favoritesController setValue:[NSNumber numberWithInt:NSOffState] forKeyPath:@"selection.sslCACertFileLocationEnabled"]; + [favoritesController setValue:nil forKeyPath:@"selection.sslCACertFileLocation"]; + return; + } + [favoritesController setValue:abbreviatedFileName forKeyPath:@"selection.sslCACertFileLocation"]; } - [favoritesController setValue:[[openPanel filename] stringByAbbreviatingWithTildeInPath] forKeyPath:@"selection.sshKeyLocation"]; } #pragma mark - diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 011b5723..47dcb7e4 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -210,6 +210,7 @@ 589235321020C1230011DE00 /* SPHistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = 589235301020C1230011DE00 /* SPHistoryController.m */; }; 589582151154F8F400EDCC28 /* SPMainThreadTrampoline.m in Sources */ = {isa = PBXBuildFile; fileRef = 589582141154F8F400EDCC28 /* SPMainThreadTrampoline.m */; }; 589ED05B11E0ACD100C1DCEA /* DMLocalizedNib.m in Sources */ = {isa = PBXBuildFile; fileRef = 589ED05A11E0ACD100C1DCEA /* DMLocalizedNib.m */; }; + 58A137CD123ED5E6000B1B75 /* titlebarlock.png in Resources */ = {isa = PBXBuildFile; fileRef = 58A137CC123ED5E6000B1B75 /* titlebarlock.png */; }; 58A8A72711A0149100B95749 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 58A8A72611A0149100B95749 /* MainWindow.xib */; }; 58A8A79111A036C000B95749 /* SPWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 58A8A79011A036C000B95749 /* SPWindowController.m */; }; 58B9074A11BD9B34000826E5 /* overflowImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 58B9070A11BD9B34000826E5 /* overflowImage.png */; }; @@ -805,6 +806,7 @@ 589582131154F8F400EDCC28 /* SPMainThreadTrampoline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPMainThreadTrampoline.h; sourceTree = "<group>"; }; 589582141154F8F400EDCC28 /* SPMainThreadTrampoline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPMainThreadTrampoline.m; sourceTree = "<group>"; }; 589ED05A11E0ACD100C1DCEA /* DMLocalizedNib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DMLocalizedNib.m; sourceTree = "<group>"; }; + 58A137CC123ED5E6000B1B75 /* titlebarlock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = titlebarlock.png; sourceTree = "<group>"; }; 58A8A72411A0148400B95749 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainWindow.xib; sourceTree = "<group>"; }; 58A8A78F11A036C000B95749 /* SPWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPWindowController.h; sourceTree = "<group>"; }; 58A8A79011A036C000B95749 /* SPWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPWindowController.m; sourceTree = "<group>"; }; @@ -1783,6 +1785,7 @@ B5E2C5F90F2353B5007446E0 /* table-property.png */, 17E641B40EF02036001BC333 /* table-small.tiff */, 584F5F8E0F50ACD800036517 /* table-view-small.tiff */, + 58A137CC123ED5E6000B1B75 /* titlebarlock.png */, B57748380F7A8B57003B34F9 /* toolbar-preferences-general.tiff */, B577483E0F7A8B57003B34F9 /* toolbar-preferences-tables.tiff */, B577483B0F7A8B57003B34F9 /* toolbar-preferences-favorites.png */, @@ -2531,6 +2534,7 @@ 17A7773811C52E61001E27B4 /* IndexesView.xib in Resources */, 17D3649811DFE61B00CC9413 /* blue-tick.tiff in Resources */, 58E205FC1234FE4F00A97059 /* KeyTemplate.pdf in Resources */, + 58A137CD123ED5E6000B1B75 /* titlebarlock.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; |
