From 92e7b9a652b0d1806d732079574aea7270b8a2c0 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Mon, 13 Sep 2010 22:26:54 +0000 Subject: - Implement support for MySQL over SSL for both TCP/IP and Socket connection modes. - Upgrade the MySQL binaries to version 5.1.50 (was 5.1.46) - Enable SSL support in the MySQL libraries (this leads to a large increase in library size, unfortunately) - Enable more optimisations in the MySQL libraries (especially --enable-assembler for faster in-library string processing and --with-mysqld-ldflags=-all-static) This completes support for Issue #27. --- Interfaces/English.lproj/ConnectionView.xib | 3089 +++++++++++--- Interfaces/English.lproj/DBView.xib | 85 +- Interfaces/English.lproj/Preferences.xib | 6114 ++++++++++++++++++--------- 3 files changed, 6760 insertions(+), 2528 deletions(-) (limited to 'Interfaces/English.lproj') 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 @@ YES - YES @@ -123,7 +122,7 @@ 3 MQA - + 2 @@ -424,21 +423,48 @@ 269 YES - + 268 - {{110, 149}, {226, 22}} + {{108, 10}, {230, 18}} YES - - -1804468671 - 272630784 - + + 67239424 + 0 + Connect using SSL LucidaGrande 13 1044 + + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + + 268 + {{110, 174}, {226, 22}} + + YES + + -1804468671 + 272630784 + + YES @@ -461,7 +487,7 @@ 268 - {{7, 151}, {98, 17}} + {{7, 176}, {98, 17}} YES @@ -485,7 +511,7 @@ 268 - {{110, 183}, {226, 22}} + {{110, 208}, {226, 22}} YES @@ -503,7 +529,7 @@ 268 - {{7, 185}, {98, 17}} + {{7, 210}, {98, 17}} YES @@ -519,7 +545,7 @@ 268 - {{110, 115}, {226, 22}} + {{110, 140}, {226, 22}} YES @@ -536,7 +562,7 @@ 268 - {{7, 117}, {98, 17}} + {{7, 142}, {98, 17}} YES @@ -552,7 +578,7 @@ 268 - {{110, 81}, {226, 22}} + {{110, 106}, {226, 22}} YES @@ -569,7 +595,7 @@ 268 - {{7, 83}, {98, 17}} + {{7, 108}, {98, 17}} YES @@ -585,7 +611,7 @@ 268 - {{110, 47}, {226, 22}} + {{110, 72}, {226, 22}} YES @@ -603,7 +629,7 @@ 268 - {{7, 49}, {98, 17}} + {{7, 74}, {98, 17}} YES @@ -619,7 +645,7 @@ 268 - {{110, 13}, {226, 22}} + {{110, 38}, {226, 22}} YES @@ -637,7 +663,7 @@ 268 - {{7, 15}, {98, 17}} + {{7, 40}, {98, 17}} YES @@ -651,7 +677,196 @@ - {{6, 156}, {356, 232}} + {{6, 131}, {356, 257}} + + NSView + + + + 268 + + YES + + + 268 + {{-3, 15}, {107, 17}} + + YES + + 68288064 + 71304192 + CA Cert: + + + + + + + + + 268 + {{109, 13}, {199, 22}} + + YES + + -2073952703 + 272631296 + + + none set + + YES + + + 3 + MC41AA + + + + + + + 268 + {{307, 12}, {29, 24}} + + YES + + 67239424 + 134217728 + + + + -922992385 + 34 + + NSImage + KeyTemplate + + + + 400 + 75 + + + + + 268 + {{-3, 49}, {107, 17}} + + YES + + 68288064 + 71304192 + Certificate: + + + + + + + + + 268 + {{109, 47}, {199, 22}} + + YES + + -2073952703 + 272631296 + + + none set + + YES + + + 3 + MC41AA + + + + + + + 268 + {{307, 46}, {29, 24}} + + YES + + 67239424 + 134217728 + + + + -922992385 + 34 + + + + 400 + 75 + + + + + 268 + {{-3, 83}, {107, 17}} + + YES + + 68288064 + 71304192 + Key File: + + + + + + + + + 268 + {{109, 81}, {199, 22}} + + YES + + -2073952703 + 272631296 + + + none set + + YES + + + 3 + MC41MDQwMzIyNTgxAA + + + + + + 268 + {{307, 80}, {29, 24}} + + YES + + 67239424 + 134217728 + + + + -922992385 + 34 + + + + 400 + 75 + + + + {{6, 28}, {356, 104}} NSView @@ -665,7 +880,7 @@ 2 - + 256 YES @@ -674,10 +889,32 @@ 269 YES + + + 268 + {{108, 11}, {230, 18}} + + YES + + 67239424 + 0 + Connect using SSL + + + 1211912703 + 2 + + + + + 200 + 25 + + 268 - {{110, 115}, {226, 22}} + {{110, 141}, {226, 22}} YES @@ -694,7 +931,7 @@ 268 - {{7, 117}, {98, 17}} + {{7, 143}, {98, 17}} YES @@ -710,7 +947,7 @@ 268 - {{110, 81}, {226, 22}} + {{110, 107}, {226, 22}} YES @@ -727,7 +964,7 @@ 268 - {{7, 83}, {98, 17}} + {{7, 109}, {98, 17}} YES @@ -743,7 +980,7 @@ 268 - {{110, 47}, {226, 22}} + {{110, 73}, {226, 22}} YES @@ -761,7 +998,7 @@ 268 - {{7, 49}, {98, 17}} + {{7, 75}, {98, 17}} YES @@ -777,7 +1014,7 @@ 268 - {{110, 13}, {226, 22}} + {{110, 39}, {226, 22}} YES @@ -795,7 +1032,7 @@ 268 - {{7, 15}, {98, 17}} + {{7, 41}, {98, 17}} YES @@ -811,7 +1048,7 @@ 268 - {{110, 149}, {226, 22}} + {{110, 175}, {226, 22}} YES @@ -829,7 +1066,7 @@ 268 - {{7, 151}, {98, 17}} + {{7, 177}, {98, 17}} YES @@ -843,117 +1080,304 @@ - {{6, 190}, {356, 198}} + {{6, 164}, {356, 224}} NSView - - {{10, 33}, {360, 371}} - - Socket - - - - - Item 2 - - - 256 - - YES - - - 269 + + + 268 YES - - - 268 - {{110, 299}, {226, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - + + 268 - {{7, 301}, {98, 17}} - + {{-3, 15}, {107, 17}} + YES - + 68288064 71304192 - MySQL Host: + CA Cert: - + - - + + 268 - {{110, 265}, {226, 22}} - + {{109, 13}, {199, 22}} + YES - - -1804468671 - 272630784 + + -2073952703 + 272631296 - + none set + YES - + + 3 + MC41AA + + - - + + 268 - {{7, 267}, {98, 17}} - + {{307, 12}, {29, 24}} + YES - + + 67239424 + 134217728 + + + + -922992385 + 34 + + + + 400 + 75 + + + + + 268 + {{-3, 49}, {107, 17}} + + YES + 68288064 71304192 - Username: + Certificate: - + - - + + 268 - {{110, 231}, {226, 22}} - + {{109, 47}, {199, 22}} + YES - - -1804468671 - 272630784 + + -2073952703 + 272631296 - + none set + YES - + + 3 + MC41AA + + - - + + 268 - {{7, 233}, {98, 17}} - + {{307, 46}, {29, 24}} + + YES + + 67239424 + 134217728 + + + + -922992385 + 34 + + + + 400 + 75 + + + + + 268 + {{-3, 83}, {107, 17}} + + YES + + 68288064 + 71304192 + Key File: + + + + + + + + + 268 + {{109, 81}, {199, 22}} + + YES + + -2073952703 + 272631296 + + + none set + + YES + + + 3 + MC41MDQwMzIyNTgxAA + + + + + + 268 + {{307, 80}, {29, 24}} + + YES + + 67239424 + 134217728 + + + + -922992385 + 34 + + + + 400 + 75 + + + + {{6, 61}, {356, 104}} + + NSView + + + {{10, 33}, {360, 371}} + + + Socket + + + + + Item 2 + + + 256 + + YES + + + 269 + + YES + + + 268 + {{110, 299}, {226, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 268 + {{7, 301}, {98, 17}} + + YES + + 68288064 + 71304192 + MySQL Host: + + + + + + + + + 268 + {{110, 265}, {226, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 268 + {{7, 267}, {98, 17}} + + YES + + 68288064 + 71304192 + Username: + + + + + + + + + 268 + {{110, 231}, {226, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 268 + {{7, 233}, {98, 17}} + YES 68288064 @@ -1214,10 +1638,7 @@ -922992385 34 - - NSImage - KeyTemplate - + 400 @@ -1267,21 +1688,20 @@ {{10, 33}, {360, 371}} - SSH - + 0 YES YES YES - + @@ -1807,7 +2227,7 @@ - + 274 YES @@ -1829,7 +2249,84 @@ {579, 51} + NSView + + + + 274 + + YES + + + 274 + {{2, 10}, {575, 17}} + + YES + + 67239424 + 138674176 + Please select the SSL key file to use when establishing a secure connection. + + + + + + + + {579, 34} + NSView + + + + 274 + + YES + + + 274 + {{2, 10}, {575, 17}} + + YES + + 67239424 + 138674176 + Please select the client SSL certificate file to use when establishing a secure connection. + + + + + + + + {579, 34} + NSView + + + + 274 + + YES + + + 274 + {{2, 10}, {575, 34}} + + + YES + + 67239424 + 138674176 + 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. + + + + + + + + {579, 51} + NSView @@ -2879,14 +3376,6 @@ 5494 - - - chooseSSHKey: - - - - 5495 - value: sshPassword @@ -3111,40 +3600,750 @@ 5592 - - - - YES - - 0 - - - - - - -1 - - - First Responder - - - 4826 - - - YES - - - - ConnectionView - - - -2 - - - File's Owner + + + standardConnectionSSLDetailsContainer + + - - -3 + 5620 + + + + value: useSSL + + + + + + value: useSSL + value + useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5627 + + + + toolTip: sslCACertFileLocation + + + + + + toolTip: sslCACertFileLocation + toolTip + sslCACertFileLocation + 2 + + + 5637 + + + + toolTip: sslCertificateFileLocation + + + + + + toolTip: sslCertificateFileLocation + toolTip + sslCertificateFileLocation + 2 + + + 5639 + + + + toolTip: sslKeyFileLocation + + + + + + toolTip: sslKeyFileLocation + toolTip + sslKeyFileLocation + 2 + + + 5641 + + + + hidden: useSSL + + + + + + hidden: useSSL + hidden + useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 5649 + + + + updateSSLInterface: + + + + 5651 + + + + chooseKeyLocation: + + + + 5661 + + + + chooseKeyLocation: + + + + 5662 + + + + chooseKeyLocation: + + + + 5663 + + + + chooseKeyLocation: + + + + 5664 + + + + standardSSLKeyFileButton + + + + 5665 + + + + standardSSLCertificateButton + + + + 5666 + + + + standardSSLCACertButton + + + + 5667 + + + + sslKeyFileLocationHelp + + + + 5671 + + + + value: sslKeyFileLocationEnabled + + + + + + value: sslKeyFileLocationEnabled + value + sslKeyFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5673 + + + + value: sslCertificateFileLocationEnabled + + + + + + value: sslCertificateFileLocationEnabled + value + sslCertificateFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5677 + + + + value: sslCACertFileLocationEnabled + + + + + + value: sslCACertFileLocationEnabled + value + sslCACertFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5679 + + + + sslCACertLocationHelp + + + + 5686 + + + + sslCertificateLocationHelp + + + + 5687 + + + + value: sslCertificateFileLocationEnabled + + + + + + value: sslCertificateFileLocationEnabled + value + sslCertificateFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5707 + + + + toolTip: sslCertificateFileLocation + + + + + + toolTip: sslCertificateFileLocation + toolTip + sslCertificateFileLocation + 2 + + + 5708 + + + + hidden: useSSL + + + + + + hidden: useSSL + hidden + useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 5710 + + + + value: sslKeyFileLocationEnabled + + + + + + value: sslKeyFileLocationEnabled + value + sslKeyFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5711 + + + + toolTip: sslCACertFileLocation + + + + + + toolTip: sslCACertFileLocation + toolTip + sslCACertFileLocation + 2 + + + 5712 + + + + toolTip: sslKeyFileLocation + + + + + + toolTip: sslKeyFileLocation + toolTip + sslKeyFileLocation + 2 + + + 5714 + + + + value: sslCACertFileLocationEnabled + + + + + + value: sslCACertFileLocationEnabled + value + sslCACertFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5715 + + + + chooseKeyLocation: + + + + 5717 + + + + chooseKeyLocation: + + + + 5718 + + + + chooseKeyLocation: + + + + 5719 + + + + value: useSSL + + + + + + value: useSSL + value + useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5722 + + + + updateSSLInterface: + + + + 5723 + + + + socketConnectionSSLDetailsContainer + + + + 5724 + + + + socketSSLCACertButton + + + + 5725 + + + + socketSSLCertificateButton + + + + 5726 + + + + socketSSLKeyFileButton + + + + 5727 + + + + value: sslCACertFileLocation + + + + + + value: sslCACertFileLocation + value + sslCACertFileLocation + + NSNullPlaceholder + none set + + 2 + + + 5730 + + + + value: sslCertificateFileLocation + + + + + + value: sslCertificateFileLocation + value + sslCertificateFileLocation + + NSNullPlaceholder + none set + + 2 + + + 5731 + + + + value: sslKeyFileLocation + + + + + + value: sslKeyFileLocation + value + sslKeyFileLocation + + NSNullPlaceholder + none set + + 2 + + + 5732 + + + + value: sslKeyFileLocation + + + + + + value: sslKeyFileLocation + value + sslKeyFileLocation + + NSNullPlaceholder + none set + + 2 + + + 5733 + + + + value: sslCACertFileLocation + + + + + + value: sslCACertFileLocation + value + sslCACertFileLocation + + NSNullPlaceholder + none set + + 2 + + + 5734 + + + + value: sslCertificateFileLocation + + + + + + value: sslCertificateFileLocation + value + sslCertificateFileLocation + + NSNullPlaceholder + none set + + 2 + + + 5735 + + + + + YES + + 0 + + + + + + -1 + + + First Responder + + + 4826 + + + YES + + + + ConnectionView + + + -2 + + + File's Owner + + + -3 Application @@ -3467,837 +4666,1227 @@ YES - + + + + 5423 + + + YES + + + + + + 5422 + + + + + 5159 + + + YES + + + + + + 5157 + + + YES + + + + + + 4980 + + + YES + + + + + + + + 4981 + + + YES + + + + + + 4982 + + + YES + + + + + + 4985 + + + YES + + + + + + 4986 + + + YES + + + + + + 5166 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5404 + + + YES + + + + + + 5403 + + + YES + + + + + + 5291 + + + YES + + + + + + 5290 + + + YES + + + + + + 5289 + + + YES + + + + + + 5288 + + + YES + + + + + + 5287 + + + YES + + + + + + 5286 + + + YES + + + + + + 5285 + + + YES + + + + + + 5284 + + + YES + + + + + + 5273 + + + YES + + + + + + 5272 + + + YES + + + + + + 5271 + + + YES + + + + + + 5270 + + + YES + + + + + + 5269 + + + YES + + + - 5423 - + 5268 + YES - + - + - 5422 - - + 5267 + + + YES + + + - 5159 - + 5266 + YES - + - + - 5157 - + 5265 + YES - + - + - 4980 - + 5264 + YES - - - + - + - 4981 - + 5492 + YES - + - + - 4982 - + 5523 + YES - + - + - 4985 - + 5525 + YES - + - + - 4986 - + 5526 + + + + + 5524 + + + + + 5493 + + + + + 5283 + + + + + 5282 + + + + + 5281 + + + + + 5280 + + + + + 5279 + + + + + 5278 + + + + + 5277 + + + + + 5276 + + + + + 5275 + + + + + 5274 + + + + + 5299 + + + + + 5298 + + + + + 5297 + + + + + 5296 + + + + + 5295 + + + + + 5294 + + + + + 5293 + + + + + 5292 + + + + + 5406 + + + + + 5405 + + + + + 4983 + YES - + + - + - 5166 - + 5162 + YES - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + - 5404 - + 5218 + YES - + - + - 5403 - + 5386 + YES - + - + - 5291 - + 5385 + YES - + - + - 5290 - + 5219 + YES - + - + - 5289 - + 5217 + YES - + - + - 5288 - + 5216 + YES - + - + - 5287 - + 5215 + YES - + - + - 5286 - + 5214 + YES - + - + - 5285 - + 5213 + YES - + - + - 5284 - + 5212 + YES - + - + - 5273 - + 5227 + + + + + 5226 + + + + + 5225 + + + + + 5224 + + + + + 5223 + + + + + 5222 + + + + + 5220 + + + + + 5388 + + + + + 5387 + + + + + 5221 + + + + + 4984 + YES - + + - + - 5272 - + 5156 + YES - + + + + + + + + + + + + + - + - 5271 - + 5377 + YES - + - + - 5270 - + 5376 + YES - + - + - 5269 - + 5188 + YES - + - + - 5268 - + 5187 + YES - + - + - 5267 - + 5184 + YES - + - + - 5266 - + 5183 + YES - + - + - 5265 - + 5180 + YES - + - + - 5264 - + 5179 + YES - + - + - 5492 - + 5176 + YES - + - + - 5523 - + 5175 + YES - + - + - 5525 - + 5173 + YES - + - - - - 5526 - - - - - 5524 - - - - - 5493 - - - - - 5283 - - - - - 5282 - - - - - 5281 - - + - 5280 - - + 5171 + + + YES + + + - 5279 - - + 5172 + + - 5278 - - + 5174 + + - 5277 - - + 5178 + + - 5276 - - + 5177 + + - 5275 - - + 5182 + + - 5274 - - + 5181 + + - 5299 - - + 5186 + + - 5298 - - + 5185 + + - 5297 - - + 5190 + + - 5296 - - + 5189 + + - 5295 - - + 5379 + + - 5294 - - + 5378 + + - 5293 - - + 5158 + + - 5292 - - + 5160 + + - 5406 - - + 5424 + + - 5405 - - + 4839 + + - 4983 - + 5154 + YES - + - + - 5162 - - - YES - - - - - - - - - - - - + 5155 + + - 5218 - + 5593 + YES - + - + - 5386 - - - YES - - - + 5594 + + - 5385 - + 5595 + YES - + + + + + + + + + - + - 5219 - + 5596 + YES - + - + - 5217 - - - YES - - - + 5597 + + - 5216 - + 5598 + YES - + - + - 5215 - + 5599 + + + + + 5600 + YES - + - + - 5214 - + 5601 + + + + + 5604 + YES - + - + - 5213 - + 5605 + YES - + - + - 5212 - + 5606 + YES - + - - - - 5227 - - + - 5226 - - + 5607 + + - 5225 - - + 5608 + + - 5224 - - + 5609 + + - 5223 - - + 5612 + + + YES + + + - 5222 - - + 5613 + + + YES + + + - 5220 - - + 5614 + + + YES + + + - 5388 - - + 5615 + + - 5387 - - + 5616 + + - 5221 - - + 5617 + + - 4984 - + 5668 + YES - + - + + SSL Key File Selection Help - 5156 - + 5669 + YES - - - - - - - - - - - - + - + - 5377 - + 5670 + + + + + 5680 + YES - + - + + SSL CA Cert File Selection Help - 5376 - + 5681 + YES - + - + - 5188 - + 5682 + + + + + 5683 + YES - + - + + SSL Certificate File Selection Help - 5187 - + 5684 + YES - + - + - 5184 - + 5685 + + + + + 5688 + YES - + + + + + + + + + - + - 5183 - + 5689 + YES - + - + - 5180 - + 5690 + YES - + - + - 5179 - + 5691 + YES - + - + - 5176 - + 5692 + YES - + - + - 5175 - + 5693 + YES - + - + - 5173 - + 5694 + YES - + - + - 5171 - + 5695 + YES - + - - - - 5172 - - - - - 5174 - - - - - 5178 - - - - - 5177 - - - - - 5182 - - + - 5181 - - + 5696 + + + YES + + + - 5186 - - + 5697 + + + YES + + + - 5185 - - + 5698 + + - 5190 - - + 5699 + + - 5189 - - + 5700 + + - 5379 - - + 5701 + + - 5378 - - + 5702 + + - 5158 - - + 5703 + + - 5160 - - + 5704 + + - 5424 - - + 5705 + + - 4839 - - + 5706 + + - 5154 - + 5720 + YES - + - + - 5155 - - + 5721 + + @@ -4501,12 +6090,75 @@ 5576.IBPluginDependency 5577.IBPluginDependency 5578.IBPluginDependency + 5588.IBPluginDependency + 5589.IBPluginDependency + 5590.IBPluginDependency + 5593.IBPluginDependency + 5594.IBPluginDependency + 5595.IBPluginDependency + 5596.IBPluginDependency + 5597.IBPluginDependency + 5598.IBPluginDependency + 5599.IBPluginDependency + 5600.IBAttributePlaceholdersKey + 5600.IBPluginDependency + 5601.IBPluginDependency + 5604.IBAttributePlaceholdersKey + 5604.IBPluginDependency + 5605.IBPluginDependency + 5606.IBPluginDependency + 5607.IBPluginDependency + 5608.IBPluginDependency + 5609.IBPluginDependency + 5612.IBAttributePlaceholdersKey + 5612.IBPluginDependency + 5613.IBPluginDependency + 5614.IBPluginDependency + 5615.IBPluginDependency + 5616.IBPluginDependency + 5617.IBPluginDependency + 5668.IBEditorWindowLastContentRect + 5668.IBPluginDependency + 5669.IBPluginDependency + 5670.IBPluginDependency + 5680.IBEditorWindowLastContentRect + 5680.IBPluginDependency + 5681.IBPluginDependency + 5682.IBPluginDependency + 5683.IBEditorWindowLastContentRect + 5683.IBPluginDependency + 5684.IBPluginDependency + 5685.IBPluginDependency + 5688.IBPluginDependency + 5689.IBPluginDependency + 5690.IBPluginDependency + 5691.IBAttributePlaceholdersKey + 5691.IBPluginDependency + 5692.IBPluginDependency + 5693.IBPluginDependency + 5694.IBAttributePlaceholdersKey + 5694.IBPluginDependency + 5695.IBAttributePlaceholdersKey + 5695.IBPluginDependency + 5696.IBPluginDependency + 5697.IBPluginDependency + 5698.IBPluginDependency + 5699.IBPluginDependency + 5700.IBPluginDependency + 5701.IBPluginDependency + 5702.IBPluginDependency + 5703.IBPluginDependency + 5704.IBPluginDependency + 5705.IBPluginDependency + 5706.IBPluginDependency + 5720.IBPluginDependency + 5721.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin - {{118, 243}, {882, 475}} + {{126, 318}, {882, 475}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4881,6 +6533,111 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Click to choose the SSL key file to use when establishing a secure connection + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Click to choose the client SSL certificate file to use when establishing a secure connection + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Click to choose the client SSL Certificate Authority certificate to use when establishing a secure connection + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{245, 483}, {579, 34}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{245, 466}, {579, 51}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{245, 483}, {579, 34}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Choose a custom SSH key file to use with this connection. Standard locations like ~/.ssh are checked automatically. + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Choose a custom SSH key file to use with this connection. Standard locations like ~/.ssh are checked automatically. + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Choose a custom SSH key file to use with this connection. Standard locations like ~/.ssh are checked automatically. + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -4899,7 +6656,7 @@ - 5592 + 5735 @@ -5139,13 +6896,14 @@ YES addFavorite: cancelMySQLConnection: - chooseSSHKey: + chooseKeyLocation: editFavorites: initiateConnection: reverseSortFavorites: showHelp: sortFavorites: updateFavoriteSelection: + updateSSLInterface: YES @@ -5158,6 +6916,7 @@ id id id + id @@ -5166,13 +6925,14 @@ YES addFavorite: cancelMySQLConnection: - chooseSSHKey: + chooseKeyLocation: editFavorites: initiateConnection: reverseSortFavorites: showHelp: sortFavorites: updateFavoriteSelection: + updateSSLInterface: YES @@ -5185,7 +6945,7 @@ id - chooseSSHKey: + chooseKeyLocation: id @@ -5212,6 +6972,10 @@ updateFavoriteSelection: id + + updateSSLInterface: + id + @@ -5234,16 +6998,27 @@ progressIndicator progressIndicatorText socketConnectionFormContainer + socketConnectionSSLDetailsContainer socketPasswordField + socketSSLCACertButton + socketSSLCertificateButton + socketSSLKeyFileButton sshConnectionFormContainer sshKeyLocationHelp sshPasswordField sshSQLHostField sshSSHKeyButton sshSSHPasswordField + sslCACertLocationHelp + sslCertificateLocationHelp + sslKeyFileLocationHelp standardConnectionFormContainer + standardConnectionSSLDetailsContainer standardPasswordField standardSQLHostField + standardSSLCACertButton + standardSSLCertificateButton + standardSSLKeyFileButton YES @@ -5263,7 +7038,11 @@ NSProgressIndicator NSTextField NSView + NSView NSSecureTextField + NSButton + NSButton + NSButton NSView NSView NSSecureTextField @@ -5271,8 +7050,15 @@ NSButton NSSecureTextField NSView + NSView + NSView + NSView + NSView NSSecureTextField NSTextField + NSButton + NSButton + NSButton @@ -5295,16 +7081,27 @@ progressIndicator progressIndicatorText socketConnectionFormContainer + socketConnectionSSLDetailsContainer socketPasswordField + socketSSLCACertButton + socketSSLCertificateButton + socketSSLKeyFileButton sshConnectionFormContainer sshKeyLocationHelp sshPasswordField sshSQLHostField sshSSHKeyButton sshSSHPasswordField + sslCACertLocationHelp + sslCertificateLocationHelp + sslKeyFileLocationHelp standardConnectionFormContainer + standardConnectionSSLDetailsContainer standardPasswordField standardSQLHostField + standardSSLCACertButton + standardSSLCertificateButton + standardSSLKeyFileButton YES @@ -5372,10 +7169,26 @@ socketConnectionFormContainer NSView + + socketConnectionSSLDetailsContainer + NSView + socketPasswordField NSSecureTextField + + socketSSLCACertButton + NSButton + + + socketSSLCertificateButton + NSButton + + + socketSSLKeyFileButton + NSButton + sshConnectionFormContainer NSView @@ -5400,10 +7213,26 @@ sshSSHPasswordField NSSecureTextField + + sslCACertLocationHelp + NSView + + + sslCertificateLocationHelp + NSView + + + sslKeyFileLocationHelp + NSView + standardConnectionFormContainer NSView + + standardConnectionSSLDetailsContainer + NSView + standardPasswordField NSSecureTextField @@ -5412,6 +7241,18 @@ standardSQLHostField NSTextField + + standardSSLCACertButton + NSButton + + + standardSSLCertificateButton + NSButton + + + standardSSLKeyFileButton + NSButton + @@ -6207,6 +8048,7 @@ NSActionTemplate NSMenuCheckmark NSMenuMixedState + NSSwitch button_edit @@ -6215,6 +8057,7 @@ {10, 10} {9, 8} {7, 2} + {15, 15} {32, 23} 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 @@ YES 788 788 - 1.2.2 + 1.2.5 YES - - + YES @@ -92,6 +91,7 @@ 290 {{5, 2}, {204, 19}} + YES 343014976 @@ -184,6 +184,7 @@ 4362 {218, 38} + YES @@ -273,6 +274,7 @@ {{1, 1}, {218, 38}} + @@ -288,6 +290,7 @@ -2147483392 {{-100, -100}, {15, 8}} + _doScroller: 0.42105263471603394 @@ -297,6 +300,7 @@ -2147483392 {{-100, -100}, {223, 15}} + 1 _doScroller: @@ -305,6 +309,7 @@ {{-1, -13}, {220, 40}} + 2 @@ -315,6 +320,7 @@ {214, 26} + NSView @@ -337,6 +343,7 @@ 4352 {214, 354} + YES @@ -403,6 +410,7 @@ {214, 354} + @@ -413,6 +421,7 @@ -2147483392 {{197, 0}, {15, 292}} + _doScroller: 0.096045196056365967 @@ -423,6 +432,7 @@ -2147483392 {{-100, -100}, {141, 11}} + 257 _doScroller: @@ -431,6 +441,7 @@ {214, 354} + 528 @@ -441,11 +452,13 @@ {{0, 27}, {214, 354}} + NSView {214, 381} + 2 6 @@ -479,6 +492,7 @@ {214, 381} + NSView @@ -501,6 +515,7 @@ 4352 {214, 145} + YES @@ -567,6 +582,7 @@ {214, 145} + @@ -577,6 +593,7 @@ -2147483392 {{-100, -100}, {15, 20}} + _doScroller: 0.48965516686439514 @@ -587,6 +604,7 @@ -2147483392 {{-100, -100}, {141, 11}} + 257 _doScroller: @@ -595,6 +613,7 @@ {214, 145} + 512 @@ -605,11 +624,13 @@ {{0, 382}, {214, 145}} + NSView {{0, 23}, {214, 527}} + 2 NO @@ -660,6 +681,7 @@ 268 {{-1, -1}, {32, 24}} + YES 67239424 @@ -684,6 +706,7 @@ 268 {{30, -1}, {32, 24}} + YES 71433792 @@ -871,6 +894,7 @@ 268 {{61, -1}, {32, 24}} + YES 67239424 @@ -895,6 +919,7 @@ 268 {{92, -1}, {32, 24}} + YES -2080244224 @@ -921,6 +946,7 @@ {{0, 1}, {214, 23}} + YES YES NO @@ -929,6 +955,7 @@ {214, 550} + NSView @@ -941,6 +968,7 @@ 274 {{-7, -10}, {741, 564}} + YES @@ -965,6 +993,7 @@ -2147483356 {{124, -1}, {33, 25}} + YES -2080244224 @@ -999,12 +1028,14 @@ 4352 {694, 289} + YES 256 {694, 17} + @@ -1012,6 +1043,7 @@ -2147483392 {{-26, 0}, {16, 17}} + YES @@ -1572,6 +1604,7 @@ {{1, 17}, {694, 289}} + @@ -1582,6 +1615,7 @@ -2147483392 {{674, 17}, {15, 274}} + _doScroller: 0.9480968713760376 @@ -1591,6 +1625,7 @@ -2147483392 {{1, 291}, {694, 15}} + 1 _doScroller: @@ -1606,6 +1641,7 @@ {{1, 0}, {694, 17}} + @@ -1615,6 +1651,7 @@ {{-1, 22}, {696, 307}} + 562 @@ -1629,6 +1666,7 @@ 292 {{-1, -1}, {32, 25}} + YES -1543373312 @@ -1653,6 +1691,7 @@ 292 {{93, -1}, {32, 25}} + YES -2080244224 @@ -1677,6 +1716,7 @@ 292 {{30, -1}, {32, 25}} + YES -1543373312 @@ -1701,6 +1741,7 @@ 292 {{61, -1}, {32, 25}} + YES -1543373312 @@ -1737,6 +1778,7 @@ {{125, 2}, {538, 23}} + YES 130560 @@ -1757,6 +1799,7 @@ 289 {{663, -1}, {32, 25}} + YES -1543373312 @@ -1779,6 +1822,7 @@ {695, 329} + NSView @@ -1796,6 +1840,7 @@ 268 {{3, 3}, {49, 14}} + YES 68288064 @@ -1834,6 +1879,7 @@ {{678, 4}, {10, 13}} + YES 130560 @@ -1852,6 +1898,7 @@ {{0, 181}, {695, 20}} + 1 MC42NzU3Njg0OTQ2IDAuNzIxOTQ4MTQ2OCAwLjc2NTMwNjExNTIAA @@ -1875,6 +1922,7 @@ NO NO NO + NO 0.0 0.0 @@ -1893,12 +1941,14 @@ 4352 {694, 140} + YES 256 {694, 17} + @@ -1906,6 +1956,7 @@ -2147483392 {{-26, 0}, {16, 17}} + YES @@ -2161,6 +2212,7 @@ {{1, 17}, {694, 140}} + @@ -2171,6 +2223,7 @@ -2147483392 {{611, 17}, {15, 126}} + _doScroller: 0.97794115543365479 @@ -2180,6 +2233,7 @@ -2147483392 {{1, 143}, {610, 15}} + 1 _doScroller: @@ -2194,6 +2248,7 @@ {{1, 0}, {694, 17}} + @@ -2203,6 +2258,7 @@ {{-1, 23}, {696, 158}} + 562 @@ -2217,6 +2273,7 @@ 292 {{-1, 0}, {32, 25}} + YES -1543373312 @@ -2238,6 +2295,7 @@ 292 {{61, 0}, {32, 25}} + YES -2080244224 @@ -2259,6 +2317,7 @@ 292 {{30, 0}, {32, 25}} + YES -1543373312 @@ -2292,6 +2351,7 @@ {{93, 1}, {602, 23}} + YES 130560 @@ -2307,16 +2367,19 @@ {{0, 330}, {695, 201}} + NSView {{7, 10}, {695, 531}} + 2 {{10, 7}, {706, 544}} + Structure @@ -6051,11 +6114,13 @@ {{215, 0}, {729, 550}} + NSView {{0, -1}, {944, 550}} + YES 2 DBViewSplitter @@ -6063,6 +6128,7 @@ {943, 549} + NSView @@ -7075,8 +7141,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES YES - , - . + . + , NO YES NO @@ -9616,7 +9682,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NSView - + 265 YES @@ -9635,13 +9701,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NeXT TIFF v4.0 pasteboard type - {{13, -2}, {22, 22}} + {{5, -2}, {101, 22}} YES 130560 33554432 - 0 + 8 0 0 YES @@ -9674,6 +9740,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {110, 20} + NSView @@ -23331,7 +23398,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{144, 203}, {943, 549}} + {{59, 203}, {943, 549}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin 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 @@ YES - - + + YES @@ -605,7 +605,7 @@ 12 {{202.5, 176}, {360, 5}} - {{7.5, 0}, {345, 5}} + {{8, 0}, {344, 5}} {0, 0} @@ -1877,14 +1877,14 @@ 1 - + 256 YES 266 - {{119, 153}, {165, 19}} + {{119, 153}, {183, 19}} YES @@ -1902,7 +1902,7 @@ 266 - {{119, 180}, {165, 19}} + {{119, 180}, {183, 19}} YES @@ -1923,7 +1923,7 @@ 266 - {{119, 207}, {165, 19}} + {{119, 207}, {183, 19}} YES @@ -1940,7 +1940,7 @@ 266 - {{119, 126}, {165, 19}} + {{119, 126}, {183, 19}} YES @@ -1958,7 +1958,7 @@ 266 - {{119, 234}, {165, 19}} + {{119, 234}, {183, 19}} YES @@ -2052,8 +2052,212 @@ + + + 268 + {{116, 102}, {188, 18}} + + YES + + 67239424 + 131072 + Connect using SSL + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 268 + {{277, 75}, {25, 22}} + + YES + + 67239424 + 134348800 + + + + -922992385 + 34 + + NSImage + KeyTemplate + + + + 400 + 75 + + + + + 268 + {{119, 77}, {159, 19}} + + YES + + -2073952703 + 272762368 + + + none set + + YES + + + 3 + MC41MDQwMzIyNTgxAA + + + + + + 268 + {{4, 79}, {110, 14}} + + YES + + 68288064 + 71435264 + Key File: + + + + + + + + + 268 + {{277, 49}, {25, 21}} + + YES + + 67239424 + 134348800 + + + + -922992385 + 34 + + + + 400 + 75 + + + + + 268 + {{119, 50}, {159, 19}} + + YES + + -2073952703 + 272762368 + + + none set + + YES + + + 3 + MC41AA + + 2 + + + + + + + 268 + {{4, 52}, {110, 14}} + + YES + + 68288064 + 71435264 + Certificate: + + + + + + + + + 268 + {{277, 22}, {25, 21}} + + YES + + 67239424 + 134348800 + + + + -922992385 + 34 + + + + 400 + 75 + + + + + 268 + {{119, 23}, {159, 19}} + + YES + + -2073952703 + 272762368 + + + none set + + YES + + + 3 + MC41AA + + + + + + + 268 + {{4, 25}, {110, 14}} + + YES + + 68288064 + 71435264 + CA Cert: + + + + + + - {{10, 7}, {317, 262}} + {{10, 7}, {335, 262}} + Standard @@ -2069,7 +2273,7 @@ 266 - {{119, 180}, {165, 19}} + {{119, 180}, {183, 19}} YES @@ -2087,7 +2291,7 @@ 266 - {{119, 207}, {165, 19}} + {{119, 207}, {183, 19}} YES @@ -2108,7 +2312,7 @@ 266 - {{119, 153}, {165, 19}} + {{119, 153}, {183, 19}} YES @@ -2126,7 +2330,7 @@ 266 - {{119, 234}, {165, 19}} + {{119, 234}, {183, 19}} YES @@ -2204,32 +2408,62 @@ - - {{10, 7}, {317, 262}} - - Socket - - - - - Item 2 - - - 256 - - YES - - - 266 - {{119, 33}, {159, 19}} - + + + 268 + {{116, 129}, {188, 18}} + YES - + + 67239424 + 131072 + Connect using SSL + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 268 + {{277, 102}, {25, 22}} + + YES + + 67239424 + 134348800 + + + + -922992385 + 34 + + + + 400 + 75 + + + + + 268 + {{119, 104}, {159, 19}} + + YES + -2073952703 - 4326912 + 272762368 - + none set + YES @@ -2238,85 +2472,250 @@ - - + + 268 - {{5, 35}, {109, 14}} - + {{4, 106}, {110, 14}} + YES - + 68288064 - 71304192 - SSH Key: + 71435264 + Key File: - + - - - 265 - {{277, 32}, {25, 21}} - + + + 268 + {{277, 76}, {25, 21}} + YES - + 67239424 134348800 - - -926138113 - 162 - - NSImage - KeyTemplate - + + -922992385 + 34 + 400 75 - - - 266 - {{119, 59}, {183, 19}} - + + + 268 + {{119, 77}, {159, 19}} + YES - - -1804468671 - 4326400 + + -2073952703 + 272762368 - + none set + YES - + + 3 + MC41AA + + - - - 266 - {{119, 33}, {159, 19}} - + + + 268 + {{4, 79}, {110, 14}} + YES - - -1804468671 - 4326400 - + + 68288064 + 71435264 + Certificate: - - YES - - + + + - - - 266 - {{119, 85}, {183, 19}} - + + + 268 + {{277, 49}, {25, 21}} + + YES + + 67239424 + 134348800 + + + + -922992385 + 34 + + + + 400 + 75 + + + + + 268 + {{119, 50}, {159, 19}} + + YES + + -2073952703 + 272762368 + + + none set + + YES + + + 3 + MC41AA + + + + + + + 268 + {{4, 52}, {110, 14}} + + YES + + 68288064 + 71435264 + CA Cert: + + + + + + + + {{10, 7}, {335, 262}} + + Socket + + + + + Item 2 + + + 256 + + YES + + + 266 + {{119, 33}, {159, 19}} + + YES + + -2073952703 + 4326912 + + + + YES + + + 3 + MC41MDQwMzIyNTgxAA + + + + + + 268 + {{5, 35}, {109, 14}} + + YES + + 68288064 + 71304192 + SSH Key: + + + + + + + + + 265 + {{277, 32}, {25, 21}} + + YES + + 67239424 + 134348800 + + + + -926138113 + 162 + + + + 400 + 75 + + + + + 266 + {{119, 59}, {183, 19}} + + YES + + -1804468671 + 4326400 + + + + YES + + + + + + + 266 + {{119, 33}, {159, 19}} + + YES + + -1804468671 + 4326400 + + + + YES + + + + + + + 266 + {{119, 85}, {183, 19}} + YES -1804468671 @@ -2584,20 +2983,19 @@ {{10, 7}, {335, 262}} - SSH - + 134217731 YES YES - + @@ -4247,6 +4645,13 @@ AQAAAAA TableRowCountQueryLevel sshKeyLocationEnabled sshKeyLocation + useSSL + sslKeyFileLocation + sslKeyFileLocationEnabled + sslCertificateFileLocation + sslCertificateFileLocationEnabled + sslCACertFileLocation + sslCACertFileLocationEnabled YES YES @@ -4311,7 +4716,7 @@ AQAAAAA {247, 124} {247, 124} - + 256 YES @@ -4418,7 +4823,6 @@ AQAAAAA {247, 124} - {{0, 0}, {1280, 778}} {247, 146} @@ -4681,6 +5085,82 @@ AQAAAAA {579, 51} NSView + + + 274 + + YES + + + 274 + {{2, 10}, {575, 17}} + + YES + + 67239424 + 138674176 + Please select the SSL key file to use when establishing a secure connection. + + + + + + + + {579, 34} + + NSView + + + + 274 + + YES + + + 274 + {{2, 10}, {575, 17}} + + YES + + 67239424 + 138674176 + Please select the client SSL certificate file to use when establishing a secure connection. + + + + + + + + {579, 34} + NSView + + + + 274 + + YES + + + 274 + {{2, 10}, {575, 34}} + + YES + + 67239424 + 138674176 + 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. + + + + + + + + {579, 51} + NSView + @@ -7324,14 +7804,6 @@ AQAAAAA 1871 - - - chooseSSHKey: - - - - 1872 - sshKeyLocationHelp @@ -7340,3005 +7812,4627 @@ AQAAAAA 1876 - - - - YES - - 0 - - - + + + value: selection.useSSL + + + + + + value: selection.useSSL + value + selection.useSSL + + YES + + YES + NSAllowsEditingMultipleValuesSelection + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + + 2 + - - -2 - - - File's Owner + 1903 + + + + toolTip: selection.sslKeyFileLocation + + + + + + toolTip: selection.sslKeyFileLocation + toolTip + selection.sslKeyFileLocation + 2 + + + 1907 + + + + value: selection.sslKeyFileLocationEnabled + + + + + + value: selection.sslKeyFileLocationEnabled + value + selection.sslKeyFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 1913 + + + + value: selection.sslCertificateFileLocationEnabled + + + + + + value: selection.sslCertificateFileLocationEnabled + value + selection.sslCertificateFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 1922 + + + + toolTip: selection.sslCertificateFileLocation + + + + + + toolTip: selection.sslCertificateFileLocation + toolTip + selection.sslCertificateFileLocation + 2 + + + 1925 + + + + toolTip: selection.sslCACertFileLocation + + + + + + toolTip: selection.sslCACertFileLocation + toolTip + selection.sslCACertFileLocation + 2 + + + 1928 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 1992 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 1993 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 1994 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 1995 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 1996 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 1997 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 1998 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 1999 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2000 + + + + value: selection.sslKeyFileLocationEnabled + + + + + + value: selection.sslKeyFileLocationEnabled + value + selection.sslKeyFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 2021 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2022 + + + + value: selection.useSSL + + + + + + value: selection.useSSL + value + selection.useSSL + + YES + + YES + NSAllowsEditingMultipleValuesSelection + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + + 2 + + + 2024 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2026 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2027 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2028 + + + + toolTip: selection.sslCACertFileLocation + + + + + + toolTip: selection.sslCACertFileLocation + toolTip + selection.sslCACertFileLocation + 2 + + + 2029 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2030 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2031 + + + + value: selection.sslCertificateFileLocationEnabled + + + + + + value: selection.sslCertificateFileLocationEnabled + value + selection.sslCertificateFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 2033 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2034 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2035 + + + + toolTip: selection.sslCertificateFileLocation + + + + + + toolTip: selection.sslCertificateFileLocation + toolTip + selection.sslCertificateFileLocation + 2 + + + 2037 + + + + toolTip: selection.sslKeyFileLocation + + + + + + toolTip: selection.sslKeyFileLocation + toolTip + selection.sslKeyFileLocation + 2 + + + 2038 + + + + hidden: selection.useSSL + + + + + + hidden: selection.useSSL + hidden + selection.useSSL + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 2039 + + + + sslKeyFileLocationHelp + + + + 2049 + + + + sslCertificateLocationHelp + + + + 2050 + + + + sslCACertLocationHelp + + + + 2051 + + + + standardSSLKeyFileButton + + + + 2052 + + + + standardSSLCertificateButton + + + + 2053 + + + + standardSSLCACertButton + + + + 2054 + + + + socketSSLCACertButton + + + + 2055 + + + + socketSSLCertificateButton + + + + 2056 + + + + socketSSLKeyFileButton + + + + 2057 + + + + sshSSHKeyButton + + + + 2058 + + + + chooseKeyLocation: + + + + 2059 + + + + chooseKeyLocation: + + + + 2060 + + + + chooseKeyLocation: + + + + 2061 + + + + chooseKeyLocation: + + + + 2062 + + + + chooseKeyLocation: + + + + 2063 + + + + chooseKeyLocation: + + + + 2064 + + + + chooseKeyLocation: + + + + 2065 + + + + value: selection.sslCACertFileLocationEnabled + + + + + + value: selection.sslCACertFileLocationEnabled + value + selection.sslCACertFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 2066 + + + + value: selection.sslCACertFileLocationEnabled + + + + + + value: selection.sslCACertFileLocationEnabled + value + selection.sslCACertFileLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 2067 + + + + value: selection.sslCACertFileLocation + + + + + + value: selection.sslCACertFileLocation + value + selection.sslCACertFileLocation + + NSNullPlaceholder + none set + + 2 + + + 2068 + + + + value: selection.sslCertificateFileLocation + + + + + + value: selection.sslCertificateFileLocation + value + selection.sslCertificateFileLocation + + NSNullPlaceholder + none set + + 2 + + + 2069 + + + + value: selection.sslKeyFileLocation + + + + + + value: selection.sslKeyFileLocation + value + selection.sslKeyFileLocation + + NSNullPlaceholder + none set + + 2 + + + 2070 + + + + value: selection.sslKeyFileLocation + + + + + + value: selection.sslKeyFileLocation + value + selection.sslKeyFileLocation + + NSNullPlaceholder + none set + + 2 + + + 2071 + + + + value: selection.sslCertificateFileLocation + + + + + + value: selection.sslCertificateFileLocation + value + selection.sslCertificateFileLocation + + NSNullPlaceholder + none set + + 2 + + + 2072 + + + + value: selection.sslCACertFileLocation + + + + + + value: selection.sslCACertFileLocation + value + selection.sslCACertFileLocation + + NSNullPlaceholder + none set + + 2 + + + 2073 + + + + + YES + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + YES + + + + PreferencesPanel + + + 2 + + + + + 17 + + + YES + + + + + + + + + + + + + + + + + + + + General + + + 24 + + + YES + + + + + + 25 + + + YES + + + + + + 26 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 27 + + + + + 28 + + + + + 29 + + + + + 30 + + + + + 31 + + + + + 32 + + + + + 33 + + + + + 34 + + + + + 35 + + + + + 36 + + + + + 37 + + + + + 38 + + + + + 39 + + + + + 40 + + + + + 41 + + + + + 42 + + + + + 43 + + + + + 44 + + + + + 45 + + + + + 46 + + + + + 47 + + + + + 48 + + + + + 49 + + + + + 50 + + + + + 56 + + + YES + + + + + + + + + + + Notifications + + + 60 + + + YES + + + + + + + + + + + + AutoUpdate + + + 94 + + + YES + + + + + + 95 + + + + + 96 + + + YES + + + + + + 97 + + - -1 - + 98 + + + YES + + + + + + 99 + + + + + 100 + + + YES + + + + + + 101 + + + YES + + + + + + 102 + + + + + 110 + + + YES + + + + + + 111 + + + + + 117 + - First Responder - -3 - + 254 + - Application + Favorites - 1 - + 331 + + + Updater + + + 345 + YES - + - - PreferencesPanel + - 2 - - + 346 + + - 17 - + 400 + YES - - - - - - - - - - - - - - - - - + - General + Favorites - 24 - + 401 + YES - + + - + - 25 - + 402 + YES - + + - + - 26 - + 403 + YES - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + + + + 406 + + + YES + + + + + + + + 407 + + + + + 408 + + + + + 409 + + + YES + + + + + + + 410 + + + YES + + + + + + 411 + + + + + 512 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + Tables + + + 513 + + + YES + + + + + + 514 + + + YES + + + - 27 - - + 515 + + + YES + + + - 28 - - + 516 + + + YES + + + - 29 - - + 517 + + + YES + + + - 30 - - + 518 + + + YES + + + - 31 - - + 519 + + + YES + + + - 32 - - + 520 + + + YES + + + - 33 - - + 521 + + + YES + + + - 34 - - + 522 + + - 35 - - + 523 + + - 36 - - + 524 + + - 37 - - + 525 + + - 38 - - + 526 + + - 39 - - + 527 + + - 40 - - + 528 + + - 41 - - + 529 + + - 42 - - + 531 + + + YES + + + - 43 - - + 532 + + + YES + + + - 44 - - + 533 + + - 45 - - + 534 + + - 46 - - + 535 + + + YES + + + - 47 - - + 538 + + - 48 - - + 552 + + - 49 - - + 553 + + - 50 - - + 554 + + - 56 - + 567 + YES - - - - - - - - + - - Notifications + - 60 - + 568 + YES - - - - - - - - - + - - AutoUpdate + - 94 - + 569 + YES - + - - - - 95 - - + - 96 - + 570 + YES - + - - - - 97 - - + - 98 - + 571 + YES - - + - 99 - - + 575 + + - 100 - - - YES - - - + 576 + + - 101 - + 577 + YES - + - + - 102 - - + 578 + + - 110 - + 579 + YES - + - + - 111 - - + 580 + + - 117 - - + 581 + + - 254 - - - Favorites + 582 + + - 331 - + 641 + + + YES + + + + + + - Updater + Network - 345 - + 642 + YES - + - - - - 346 - - + - 400 - + 652 + YES - + - - Favorites + - 401 - + 661 + + + + + 669 + + + + + 674 + YES - - + - + - 402 - + 675 + YES - - + - + - 403 - + 676 + YES - - - - - + - + - 406 - + 677 + + + + + 681 + + + + + 784 + + + + + 785 + YES - - - + - + - 407 - - + 786 + + - 408 - - + 787 + + + YES + + + - 409 - + 788 + YES - - + - + - 410 - + 789 + + + + + 790 + YES - + - + - 411 - - + 791 + + - 512 - + 792 + + + + + 802 + YES - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - Tables + Editor - 513 - + 950 + YES - + - 514 - + 951 + + + + + 957 + YES - + - + - 515 - + 958 + + + + + 1034 + YES - + - + - 516 - + 1036 + YES - + - + - 517 - + 1037 + YES - + - + - 518 - + 1039 + YES - + - + - 519 - + 1040 + YES - + - + - 520 - + 1041 + YES - + - + - 521 - + 1042 + YES - + - + - 522 - - + 1043 + + + YES + + + - 523 - - + 1051 + + - 524 - - + 1052 + + - 525 - - + 1053 + + - 526 - - + 1054 + + - 527 - - + 1055 + + - 528 - - + 1057 + + - 529 - - + 1058 + + - 531 - - - YES - - - + 1060 + + - 532 - + 1046 + YES - + - - - - 533 - - + - 534 - - + 1047 + + - 535 - + 1045 + YES - + - - - - 538 - - - - - 552 - - - - - 553 - - - - - 554 - - + - 567 - - - YES - - - + 1048 + + - 568 - + 1044 + YES - + - + - 569 - + 1049 + YES - + - + - 570 - - - YES - - - + 1050 + + - 571 - + 1083 + YES + - - - - 575 - - - - - 576 - - + - 577 - - - YES - - - + 1084 + + - 578 - - + 1085 + + - 579 - + 1128 + YES - + - + - 580 - - + 1129 + + - 581 - - + 1143 + + + YES + + + - 582 - - + 1144 + + - 641 - + 1148 + YES - - - - - + - - Network + - 642 - - - YES - - - + 1149 + + - 652 - + 1150 + YES - + - - - - 661 - - + - 669 - - + 1151 + + - 674 - + 1152 + YES - + - + - 675 - - - YES - - - + 1153 + + - 676 - + 1154 + YES - + - - - - 677 - - + - 681 - - + 1155 + + - 784 - - + 1156 + + - 785 - + 1170 + YES - + + + - - - - 786 - - + - 787 - + 1171 + YES - + - + - 788 - + 1172 + YES - + - - - - 789 - - + - 790 - + 1173 + YES - + + + + + + + + + + + + + + + + + + - + - 791 - - + 1174 + + + YES + + + + + + + + + + + + + + + + + + + + + + - 792 - - + 1175 + + + YES + + + - 802 - + 1176 + YES - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - Editor + - 950 - + 424 + YES - + - + - 951 - - + 469 + + - 957 - + 425 + YES - + - + - 958 - - + 468 + + - 1034 - + 426 + YES - + - + - 1036 - - - YES - - - + 467 + + - 1037 - + 427 + YES - + - + - 1039 - - - YES - - - + 466 + + - 1040 - + 428 + YES - + - + - 1041 - + 465 + + + + + 436 + YES - + - + - 1042 - + 457 + + + + + 437 + YES - + - + - 1043 - + 456 + + + + + 438 + YES - + - - - - 1051 - - + - 1052 - - + 455 + + - 1053 - - + 439 + + + YES + + + - 1054 - - + 454 + + - 1055 - - + 440 + + + YES + + + - 1057 - - + 453 + + - 1058 - - + 429 + + + YES + + + - 1060 - - + 464 + + - 1046 - + 441 + YES - + - + - 1047 - - + 452 + + - 1045 - + 1180 + YES - + - - - - 1048 - - + - 1044 - + 1181 + YES - + - + - 1049 - + 1182 + YES - + + + - + - 1050 - - + 1183 + + - 1083 - + 1184 + + + + + 1185 + + + + + 1186 + YES - + - + - 1084 - - + 1187 + + - 1085 - - + 432 + + + YES + + + + + + 461 + + - 1128 - + 433 + YES - + - + - 1129 - - + 460 + + - 1143 - + 434 + YES - + - + - 1144 - - + 459 + + - 1148 - + 435 + YES - + - + - 1149 - - + 458 + + - 1150 - + 443 + YES - + - + - 1151 - - + 450 + + - 1152 - + 444 + YES - + - + - 1153 - - + 449 + + - 1154 - + 445 + YES - + - - - - 1155 - - + - 1156 - - + 448 + + - 1170 - + 446 + YES - - - + - + - 1171 - + 447 + + + + + 1200 + YES - + - + - 1172 - + 1201 + YES - + - + - 1173 - + 1203 + YES - - - - - - - - + - + - 1174 - + 1207 + YES - - - - - - - - - - + - + - 1175 - + 1208 + YES - + - + - 1176 - + 1209 + YES - - - - - - - - - - - - - - - - - - - - - + - + - 424 - + 1210 + + + + + 1211 + + + + + 1212 + + + + + 1216 + + + + + 1218 + + + + + 1219 + + + + + 1205 + YES - + - + - 469 - - + 1214 + + - 425 - + 1204 + YES - + - + - 468 - - + 1215 + + + + + 1246 + + + YES + + + - 426 - + 1247 + YES - + - + - 467 - - + 1248 + + + YES + + + - 427 - + 1249 + YES - + - + - 466 - - + 1250 + + + YES + + + - 428 - + 1251 + YES - + - + - 465 - - + 1252 + + + YES + + + - 436 - + 1253 + YES - + - + - 457 - - + 1254 + + + YES + + + - 437 - + 1255 + YES - + - + - 456 - - + 1256 + + - 438 - - - YES - - - + 1257 + + - 455 - - + 1258 + + - 439 - - - YES - - - + 1259 + + - 454 - - + 1260 + + - 440 - - - YES - - - + 1261 + + - 453 - - + 1262 + + - 429 - - - YES - - - + 1263 + + - 464 - - + 1264 + + - 441 - + 1265 + + + + + 1351 + YES - + - + - 452 - - + 1352 + + - 1180 - + 1353 + YES - + - + - 1181 - + 1354 + YES - + - + - 1182 - + 1355 + YES - - - + + + - - - - 1183 - - + - 1184 - - + 1356 + + - 1185 - - + 1357 + + - 1186 - - - YES - - - + 1358 + + - 1187 - - + 1385 + + - 432 - + 1418 + YES - + - - - - 461 - - + - 433 - + 1419 + YES - + - + + + + 1420 + + - 460 - - + 1421 + + - 434 - + 1422 + YES - + - - - - 459 - - + - 435 - + 1423 + YES - + + + + + + + + - + - 458 - - + 1449 + + - 443 - - - YES - - - + 1450 + + - 450 - - + 1451 + + - 444 - - - YES - - - + 1452 + + - 449 - - + 1453 + + - 445 - - - YES - - - + 1454 + + - 448 - - + 1455 + + - 446 - + 1465 + YES - + - + - 447 - - + 1466 + + - 1200 - - - YES - - - + 1467 + + - 1201 - + 1468 + YES - + - + - 1203 - - - YES - - - + 1469 + + - 1207 - + 1470 + YES - + - + - 1208 - + 1471 + YES - + - + - 1209 - + 1472 + YES - + + + - + - 1210 - - + 1473 + + - 1211 - - + 1474 + + - 1212 - - + 1475 + + - 1216 - - + 1485 + + + YES + + + - 1218 - - + 1486 + + - 1219 - - + 1487 + + + YES + + + - 1205 - + 1488 + YES - + - + - 1214 - - + 1489 + + - 1204 - - - YES - - - + 1490 + + - 1215 - - + 1492 + + - 1246 - + 1497 + YES - + - + - 1247 - + 1498 + + + + + 1499 + YES - + - + + + + 1500 + + - 1248 - + 1505 + YES - + - + - 1249 - + 1506 + YES - + - + - 1250 - - - YES - - - + 1507 + + - 1251 - + 1517 + YES - + - + - 1252 - + 1518 + YES - + - + - 1253 - + 1519 + YES - + - + - 1254 - + 1520 + YES - + - + - 1255 - + 1521 + YES - + - - - - 1256 - - + - 1257 - - + 1522 + + - 1258 - - + 1523 + + + YES + + + - 1259 - - + 1524 + + - 1260 - - + 1525 + + - 1261 - - + 1526 + + - 1262 - - + 1527 + + - 1263 - - + 1542 + + + YES + + + - 1264 - - + 1543 + + - 1265 - - + 1546 + + - 1351 - + 1547 + YES - + + + + - + + Context Menu - 1352 - - + 1548 + + - 1353 - + 1549 + + + + + 1551 + + + + + 1583 + YES - + + - + - 1354 - + 1584 + YES - + - + - 1355 - + 1586 + YES - - - + - - - - 1356 - - - - - 1357 - - - - - 1358 - - + - 1385 - - + 1587 + + - 1418 - + 1589 + YES - + - + - 1419 - + 1590 + YES - + + + + + - + - 1420 - - + 1591 + + - 1421 - - + 1592 + + - 1422 - + 1594 + + + + + 1597 + + + + + 1598 + YES - + - + - 1423 - + 1599 + YES - - - - - - - - + + + + + - - - - 1449 - - - - - 1450 - - + - 1451 - - + 1600 + + - 1452 - - + 1601 + + - 1453 - - + 1602 + + - 1454 - - + 1603 + + - 1455 - - + 1604 + + - 1465 - + 1615 + YES - + - + - 1466 - - + 1616 + + - 1467 - - + 1618 + + - 1468 - + 1620 + + + + + 1636 + YES - + - + - 1469 - - + 1639 + + - 1470 - + 1640 + + + + + 1669 + YES - + - + - 1471 - + 1670 + YES - + - + - 1472 - + 1671 + YES - - - + + + + + + - + - 1473 - - + 1672 + + - 1474 - - + 1673 + + - 1475 - - + 1674 + + - 1485 - + 1682 + YES - + + + - + - 1486 - - + 1683 + + - 1487 - - - YES - - - + 1684 + + - 1488 - + 1685 + YES - + + - - - - 1489 - - - - - 1490 - - - - - 1492 - - + - 1497 - + 1687 + YES - + - - - - 1498 - - + - 1499 - + 1688 + YES - + - + - 1500 - - + 1689 + + - 1505 - + 1690 + + + + + 1709 + YES - + - + - 1506 - + 1710 + YES - - + - - 1507 - - + + 1712 + + - 1517 - + 1716 + YES - + - + + Enter Name Sheet - 1518 - + 1717 + YES - + + + + + - + - 1519 - + 1718 + YES - + - + - 1520 - + 1721 + YES - + - + - 1521 - + 1722 + YES - + - - - - 1522 - - + - 1523 - + 1723 + YES - + - + - 1524 - - + 1724 + + - 1525 - - + 1725 + + - 1526 - - + 1726 + + - 1527 - - + 1730 + + - 1542 - + 1738 + YES - + - 1543 - - - - - 1546 - - + 1739 + + - 1547 - + 1740 + YES - - - - + - - Context Menu - - - 1548 - - - - - 1549 - - + - 1551 - - + 1741 + + - 1583 - + 1756 + YES - - + - + + Edit Theme List Sheet - 1584 - + 1757 + YES - + + + + - + - 1586 - + 1759 + YES - + - - - - 1587 - - + - 1589 - - - YES - - - + 1764 + + - 1590 - + 1771 + YES - - - - - + + + - - - - 1591 - - - - - 1592 - - + - 1594 - - + 1772 + + - 1597 - - + 1773 + + - 1598 - + 1774 + YES - + - + - 1599 - + 1776 + YES - - - - - + - - - - 1600 - - - - - 1601 - - - - - 1602 - - + - 1603 - - + 1779 + + - - 1604 - - + + 1796 + + - 1615 - + 1809 + YES - + + - - - - 1616 - - + - 1618 - - + 1810 + + + YES + + + - 1620 - - + 1811 + + - 1636 - + 1812 + YES - + - + - 1639 - - + 1813 + + - 1640 - - + 1814 + + - 1669 - + 1824 + YES - + - + - 1670 - - - YES - - - + 1825 + + - 1671 - + 1835 + YES - - - - - - + - + - 1672 - - + 1836 + + - 1673 - - + 1851 + + + YES + + + - 1674 - - + 1852 + + - 1682 - + 1859 + YES - - - + - - - - 1683 - - + - 1684 - - + 1860 + + - 1685 - + 1873 + YES - - + - + + SSH Key Selection Help - 1687 - + 1874 + YES - + - + - 1688 - + 1875 + + + + + 1877 + YES - + - - - - 1689 - - + - 1690 - - + 1878 + + - 1709 - + 1879 + YES - + - + - 1710 - + 1880 + YES + - + - 1712 - - + 1881 + + + YES + + + - 1716 - + 1882 + YES - + - - Enter Name Sheet + - 1717 - + 1883 + YES - - - - - + - + - 1718 - + 1884 + YES - + - + - 1721 - + 1885 + YES - + - + - 1722 - + 1886 + YES - + - + - 1723 - + 1887 + YES - + - + - 1724 - - + 1888 + + - 1725 - - + 1889 + + - 1726 - - + 1890 + + - 1730 - - + 1891 + + - 1738 - - - YES - - - + 1892 + + - 1739 - - + 1893 + + - 1740 - + 1894 + + + + + 1895 + + + + + 1896 + + + + + 2001 + YES - + - - - - 1741 - - + - 1756 - + 2002 + YES - + - - Edit Theme List Sheet + - 1757 - + 2003 + YES - - - - + - + - 1759 - + 2004 + YES - + - + - 1764 - - + 2005 + + + YES + + + - 1771 - + 2006 + YES - - - + - + - 1772 - - + 2007 + + + YES + + + - 1773 - - + 2008 + + + YES + + + - 1774 - + 2009 + YES - + - + - 1776 - + 2010 + YES - + - + - 1779 - - + 2011 + + - 1796 - - + 2012 + + - 1809 - - - YES - - - - + 2013 + + - 1810 - - - YES - - - + 2014 + + - 1811 - - + 2015 + + - 1812 - - - YES - - - + 2016 + + - 1813 - - + 2017 + + - 1814 - - + 2018 + + - 1824 - - - YES - - - + 2019 + + - 1825 - - + 2020 + + - 1835 - + 2040 + YES - + - - - - 1836 - - + + SSL CA Cert File Selection Help - 1851 - + 2041 + YES - + - + + SSL Key File Selection Help - 1852 - - + 2042 + + + YES + + + + SSL Certificate File Selection Help - 1859 - + 2043 + YES - + - + - 1860 - - + 2044 + + - 1873 - + 2045 + YES - + - - SSH Key Selection Help + - 1874 - + 2046 + + + + + 2047 + YES - + - + - 1875 - - + 2048 + + @@ -10677,7 +12771,65 @@ AQAAAAA 1873.IBPluginDependency 1874.IBPluginDependency 1875.IBPluginDependency + 1877.IBPluginDependency + 1878.IBPluginDependency + 1879.IBAttributePlaceholdersKey + 1879.IBPluginDependency + 1880.IBPluginDependency + 1881.IBPluginDependency + 1882.IBAttributePlaceholdersKey + 1882.IBPluginDependency + 1883.IBPluginDependency + 1884.IBPluginDependency + 1885.IBAttributePlaceholdersKey + 1885.IBPluginDependency + 1886.IBPluginDependency + 1887.IBPluginDependency + 1888.IBPluginDependency + 1889.IBPluginDependency + 1890.IBPluginDependency + 1891.IBPluginDependency + 1892.IBPluginDependency + 1893.IBPluginDependency + 1894.IBPluginDependency + 1895.IBPluginDependency + 1896.IBPluginDependency 2.IBPluginDependency + 2001.IBPluginDependency + 2002.IBAttributePlaceholdersKey + 2002.IBPluginDependency + 2003.IBPluginDependency + 2004.IBPluginDependency + 2005.IBAttributePlaceholdersKey + 2005.IBPluginDependency + 2006.IBPluginDependency + 2007.IBPluginDependency + 2008.IBAttributePlaceholdersKey + 2008.IBPluginDependency + 2009.IBPluginDependency + 2010.IBPluginDependency + 2011.IBPluginDependency + 2012.IBPluginDependency + 2013.IBPluginDependency + 2014.IBPluginDependency + 2015.IBPluginDependency + 2016.IBPluginDependency + 2017.IBPluginDependency + 2018.IBPluginDependency + 2019.IBPluginDependency + 2020.IBPluginDependency + 2040.IBEditorWindowLastContentRect + 2040.IBPluginDependency + 2041.IBEditorWindowLastContentRect + 2041.IBPluginDependency + 2042.IBEditorWindowLastContentRect + 2042.IBPluginDependency + 2043.IBPluginDependency + 2044.IBPluginDependency + 2045.IBPluginDependency + 2046.IBPluginDependency + 2047.IBPluginDependency + 2048.IBPluginDependency 24.IBPluginDependency 24.ImportedFromIB2 25.IBPluginDependency @@ -11336,6 +13488,106 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Click to choose the SSL key file to use when establishing a secure connection + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Click to choose the client SSL certificate file to use when establishing a secure connection + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Click to choose the client SSL Certificate Authority certificate to use when establishing a secure connection + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Click to choose the SSL key file to use when establishing a secure connection + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Click to choose the client SSL certificate file to use when establishing a secure connection + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Click to choose the client SSL Certificate Authority certificate to use when establishing a secure connection + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{245, 466}, {579, 51}} + com.apple.InterfaceBuilder.CocoaPlugin + {{245, 483}, {579, 34}} + com.apple.InterfaceBuilder.CocoaPlugin + {{245, 483}, {579, 34}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -11373,7 +13625,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin - {{320, 375}, {580, 381}} + {{55, 304}, {580, 381}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -11667,7 +13919,7 @@ AQAAAAA - 1876 + 2073 @@ -11799,7 +14051,7 @@ AQAAAAA YES addFavorite: changeFont: - chooseSSHKey: + chooseKeyLocation: closePanelSheet: displayAutoUpdatePreferences: displayEditorPreferences: @@ -11862,7 +14114,7 @@ AQAAAAA YES addFavorite: changeFont: - chooseSSHKey: + chooseKeyLocation: closePanelSheet: displayAutoUpdatePreferences: displayEditorPreferences: @@ -11899,7 +14151,7 @@ AQAAAAA id - chooseSSHKey: + chooseKeyLocation: id @@ -12037,11 +14289,21 @@ AQAAAAA removeThemeButton saveThemeMenuItem socketPasswordField + socketSSLCACertButton + socketSSLCertificateButton + socketSSLKeyFileButton splitViewButtonBar sshKeyLocationHelp sshPasswordField sshSQLPasswordField + sshSSHKeyButton + sslCACertLocationHelp + sslCertificateLocationHelp + sslKeyFileLocationHelp standardPasswordField + standardSSLCACertButton + standardSSLCertificateButton + standardSSLKeyFileButton tableCell tablesView themeNameSaveButton @@ -12082,11 +14344,21 @@ AQAAAAA id NSMenuItem NSSecureTextField + NSButton + NSButton + NSButton BWAnchoredButtonBar NSView NSSecureTextField NSSecureTextField + NSButton + NSView + NSView + NSView NSSecureTextField + NSButton + NSButton + NSButton id NSView id @@ -12130,11 +14402,21 @@ AQAAAAA removeThemeButton saveThemeMenuItem socketPasswordField + socketSSLCACertButton + socketSSLCertificateButton + socketSSLKeyFileButton splitViewButtonBar sshKeyLocationHelp sshPasswordField sshSQLPasswordField + sshSSHKeyButton + sslCACertLocationHelp + sslCertificateLocationHelp + sslKeyFileLocationHelp standardPasswordField + standardSSLCACertButton + standardSSLCertificateButton + standardSSLKeyFileButton tableCell tablesView themeNameSaveButton @@ -12274,6 +14556,18 @@ AQAAAAA socketPasswordField NSSecureTextField + + socketSSLCACertButton + NSButton + + + socketSSLCertificateButton + NSButton + + + socketSSLKeyFileButton + NSButton + splitViewButtonBar BWAnchoredButtonBar @@ -12290,10 +14584,38 @@ AQAAAAA sshSQLPasswordField NSSecureTextField + + sshSSHKeyButton + NSButton + + + sslCACertLocationHelp + NSView + + + sslCertificateLocationHelp + NSView + + + sslKeyFileLocationHelp + NSView + standardPasswordField NSSecureTextField + + standardSSLCACertButton + NSButton + + + standardSSLCertificateButton + NSButton + + + standardSSLKeyFileButton + NSButton + tableCell id -- cgit v1.2.3