From f7a69e2454ca3dd1f1a62875522e9fb3dea572b3 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Wed, 8 Sep 2010 21:36:11 +0000 Subject: - Add support for SSH identity files (public keys) in custom locations - Update localisable strings - Fix initial window position --- Interfaces/English.lproj/ConnectionView.xib | 633 +++++++++++++++++++++------- 1 file changed, 491 insertions(+), 142 deletions(-) (limited to 'Interfaces/English.lproj/ConnectionView.xib') diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib index 89382d47..eeac316b 100644 --- a/Interfaces/English.lproj/ConnectionView.xib +++ b/Interfaces/English.lproj/ConnectionView.xib @@ -21,12 +21,12 @@ YES - + YES - com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit YES @@ -359,7 +359,6 @@ - 1 YES 1 YES @@ -407,7 +406,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -1117,7 +1116,7 @@ 268 - {{110, 47}, {226, 22}} + {{110, 47}, {198, 22}} YES @@ -1125,7 +1124,6 @@ 272630784 - optional if public key is available YES @@ -1216,6 +1214,66 @@ + + + 268 + {{307, 46}, {29, 24}} + + YES + + 67239424 + 134217728 + + + + -922992385 + 34 + + NSImage + KeyTemplate + + + + 400 + 75 + + + + + 268 + {{7, 49}, {98, 17}} + + YES + + 68288064 + 71304192 + SSH Key: + + + + + + + + + 268 + {{110, 47}, {198, 22}} + + YES + + -2076049856 + 272631296 + + + + YES + + + 3 + MC40OTU5Njc3NDE5AA + + + {{6, 6}, {356, 382}} @@ -1364,7 +1422,7 @@ Error Detail NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {100, 100} @@ -1404,9 +1462,9 @@ YES - + 1 - MC45MDE5NjA3OTAyIDAuOTAxOTYwNzkwMiAwLjkwMTk2MDc5MDIAA + MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA LucidaGrande @@ -1527,7 +1585,7 @@ YES - + LucidaGrande-Bold 10 @@ -1690,7 +1748,7 @@ {{0, 0}, {1440, 878}} {100, 119} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -2621,35 +2679,6 @@ 5448 - - - value: sshPassword - - - - - - value: sshPassword - value - sshPassword - - YES - - YES - NSContinuouslyUpdatesValue - NSNullPlaceholder - - - YES - - optional if public key is available - - - 2 - - - 5450 - helpButton @@ -2778,6 +2807,230 @@ 5491 + + + sshSSHKeyButton + + + + 5494 + + + + chooseSSHKey: + + + + 5495 + + + + value: sshPassword + + + + + + value: sshPassword + value + sshPassword + + NSContinuouslyUpdatesValue + + + 2 + + + 5504 + + + + hidden: sshKeyLocationEnabled + + + + + + hidden: sshKeyLocationEnabled + hidden + sshKeyLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5549 + + + + value: sshKeyLocationEnabled + + + + + + value: sshKeyLocationEnabled + value + sshKeyLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + + + YES + + + + + + + 2 + + + 5551 + + + + hidden: sshKeyLocationEnabled + + + + + + hidden: sshKeyLocationEnabled + hidden + sshKeyLocationEnabled + 2 + + + 5559 + + + + hidden: sshKeyLocationEnabled + + + + + + hidden: sshKeyLocationEnabled + hidden + sshKeyLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 5561 + + + + hidden: sshKeyLocationEnabled + + + + + + hidden: sshKeyLocationEnabled + hidden + sshKeyLocationEnabled + + YES + + YES + NSMultipleValuesPlaceholder + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSValueTransformerName + + + YES + + + + + NSNegateBoolean + + + 2 + + + 5562 + + + + value: sshKeyLocation + + + + + + value: sshKeyLocation + value + sshKeyLocation + + NSContinuouslyUpdatesValue + + + 2 + + + 5563 + + + + toolTip: sshKeyLocation + + + + + + toolTip: sshKeyLocation + toolTip + sshKeyLocation + 2 + + + 5570 + @@ -2973,6 +3226,106 @@ + + 5455 + + + + + 5468 + + + YES + + + + Context Menu + + + 5469 + + + + + 5475 + + + YES + + + + + + 5476 + + + YES + + + + + + 5477 + + + YES + + + + + + + 5478 + + + + + 5479 + + + YES + + + + + + 5481 + + + YES + + + + + + + + + + 5482 + + + + + 5483 + + + + + 5484 + + + + + 5485 + + + + + 5486 + + + 5168 @@ -3039,6 +3392,9 @@ YES + + + @@ -3062,6 +3418,48 @@ + + 5525 + + + YES + + + + + + 5526 + + + + + 5523 + + + YES + + + + + + 5524 + + + + + 5492 + + + YES + + + + + + 5493 + + + 5264 @@ -3785,106 +4183,6 @@ - - 5455 - - - - - 5468 - - - YES - - - - Context Menu - - - 5469 - - - - - 5475 - - - YES - - - - - - 5476 - - - YES - - - - - - 5477 - - - YES - - - - - - - 5478 - - - - - 5479 - - - YES - - - - - - 5481 - - - YES - - - - - - - - - - 5482 - - - - - 5483 - - - - - 5484 - - - - - 5485 - - - - - 5486 - - - @@ -4077,12 +4375,19 @@ 5484.IBPluginDependency 5485.IBPluginDependency 5486.IBPluginDependency + 5492.IBAttributePlaceholdersKey + 5492.IBPluginDependency + 5493.IBPluginDependency + 5523.IBPluginDependency + 5524.IBPluginDependency + 5525.IBPluginDependency + 5526.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin - {{564, 184}, {882, 563}} + {{120, 184}, {882, 563}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4440,6 +4745,20 @@ 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 + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -4458,7 +4777,7 @@ - 5491 + 5575 @@ -4697,6 +5016,8 @@ YES addFavorite: + cancelMySQLConnection: + chooseSSHKey: editFavorites: initiateConnection: reverseSortFavorites: @@ -4713,6 +5034,8 @@ id id id + id + id @@ -4720,6 +5043,8 @@ YES addFavorite: + cancelMySQLConnection: + chooseSSHKey: editFavorites: initiateConnection: reverseSortFavorites: @@ -4733,6 +5058,14 @@ addFavorite: id + + cancelMySQLConnection: + id + + + chooseSSHKey: + id + editFavorites: id @@ -4782,6 +5115,7 @@ sshConnectionFormContainer sshPasswordField sshSQLHostField + sshSSHKeyButton sshSSHPasswordField standardConnectionFormContainer standardPasswordField @@ -4808,6 +5142,7 @@ NSView NSSecureTextField NSTextField + NSButton NSSecureTextField NSView NSSecureTextField @@ -4837,6 +5172,7 @@ sshConnectionFormContainer sshPasswordField sshSQLHostField + sshSSHKeyButton sshSSHPasswordField standardConnectionFormContainer standardPasswordField @@ -4920,6 +5256,10 @@ sshSQLHostField NSTextField + + sshSSHKeyButton + NSButton + sshSSHPasswordField NSSecureTextField @@ -5406,6 +5746,13 @@ Print.framework/Headers/PDEPluginInterface.h + + NSObject + + IBFrameworkSource + PrintCore.framework/Headers/PDEPluginInterface.h + + NSObject @@ -5720,6 +6067,7 @@ YES YES + KeyTemplate NSActionTemplate NSMenuCheckmark NSMenuMixedState @@ -5727,6 +6075,7 @@ YES + {16, 8} {10, 10} {9, 8} {7, 2} -- cgit v1.2.3