From a52f4ee50f43aa8d269326dac045809cd873547d Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Wed, 8 Sep 2010 22:16:35 +0000 Subject: - Add a further UI hint in the form of a accessory view to the SSH key location dialogs (Note: r2615 and this commit both shamelessly stole the UI concept from Transmit 4; thanks to Panic for the inspiration!) --- Interfaces/English.lproj/ConnectionView.xib | 126 ++++++++++++++++++----- Interfaces/English.lproj/Preferences.xib | 148 +++++++++++++++++++++------- 2 files changed, 210 insertions(+), 64 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib index eeac316b..9b41e63b 100644 --- a/Interfaces/English.lproj/ConnectionView.xib +++ b/Interfaces/English.lproj/ConnectionView.xib @@ -22,6 +22,7 @@ YES + YES @@ -247,7 +248,7 @@ -2076049856 134350848 - + LucidaGrande 13 16 @@ -1238,34 +1239,34 @@ 75 - + 268 {{7, 49}, {98, 17}} YES - + 68288064 71304192 SSH Key: - + - + 268 {{110, 47}, {198, 22}} YES - + -2076049856 272631296 - + YES @@ -1768,6 +1769,32 @@ + + + 274 + + YES + + + 274 + {{2, 10}, {575, 34}} + + YES + + 67239424 + 138674176 + Choose a custom SSH key file to use with this connection. Note that standard locations like ~/.ssh are checked automatically, as are any files in your SSH configuration. + + + + + + + + {579, 51} + + NSView + @@ -2928,10 +2955,10 @@ hidden: sshKeyLocationEnabled - + - + hidden: sshKeyLocationEnabled hidden @@ -2963,10 +2990,10 @@ hidden: sshKeyLocationEnabled - + - + hidden: sshKeyLocationEnabled hidden @@ -2998,10 +3025,10 @@ value: sshKeyLocation - + - + value: sshKeyLocation value @@ -3018,10 +3045,10 @@ toolTip: sshKeyLocation - + - + toolTip: sshKeyLocation toolTip @@ -3031,6 +3058,14 @@ 5570 + + + sshKeyLocationHelp + + + + 5579 + @@ -3392,8 +3427,8 @@ YES - - + + @@ -3420,31 +3455,31 @@ 5525 - + YES - + 5526 - - + + 5523 - + YES - + 5524 - - + + 5492 @@ -4183,6 +4218,30 @@ + + 5576 + + + YES + + + + SSH Key Selection Help + + + 5577 + + + YES + + + + + + 5578 + + + @@ -4382,6 +4441,10 @@ 5524.IBPluginDependency 5525.IBPluginDependency 5526.IBPluginDependency + 5576.IBEditorWindowLastContentRect + 5576.IBPluginDependency + 5577.IBPluginDependency + 5578.IBPluginDependency YES @@ -4759,6 +4822,10 @@ 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 @@ -4777,7 +4844,7 @@ - 5575 + 5579 @@ -5113,6 +5180,7 @@ socketConnectionFormContainer socketPasswordField sshConnectionFormContainer + sshKeyLocationHelp sshPasswordField sshSQLHostField sshSSHKeyButton @@ -5140,6 +5208,7 @@ NSView NSSecureTextField NSView + NSView NSSecureTextField NSTextField NSButton @@ -5170,6 +5239,7 @@ socketConnectionFormContainer socketPasswordField sshConnectionFormContainer + sshKeyLocationHelp sshPasswordField sshSQLHostField sshSSHKeyButton @@ -5248,6 +5318,10 @@ sshConnectionFormContainer NSView + + sshKeyLocationHelp + NSView + sshPasswordField NSSecureTextField diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 449711bf..559b2fbc 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -21,8 +21,8 @@ YES - + YES @@ -2218,18 +2218,18 @@ 256 YES - + 266 {{119, 33}, {159, 19}} YES - + -2073952703 4326912 - + YES @@ -2238,34 +2238,34 @@ - + 268 {{5, 35}, {109, 14}} YES - + 68288064 71304192 SSH Key: - + - + 265 {{277, 32}, {25, 21}} YES - + 67239424 134348800 - + -926138113 162 @@ -4656,6 +4656,31 @@ AQAAAAA {264, 296} {264, 296} + + + 274 + + YES + + + 274 + {{2, 10}, {575, 34}} + + YES + + 67239424 + 138674176 + Choose a custom SSH key file to use with this connection. Note that standard locations like ~/.ssh are checked automatically, as are any files in your SSH configuration. + + + + + + + + {579, 51} + NSView + @@ -7110,10 +7135,10 @@ AQAAAAA value: selection.sshKeyLocationEnabled - + - + value: selection.sshKeyLocationEnabled value @@ -7192,10 +7217,10 @@ AQAAAAA hidden: selection.sshKeyLocationEnabled - + - + hidden: selection.sshKeyLocationEnabled hidden @@ -7227,7 +7252,7 @@ AQAAAAA delegate - + 1862 @@ -7235,10 +7260,10 @@ AQAAAAA hidden: selection.sshKeyLocationEnabled - + - + hidden: selection.sshKeyLocationEnabled hidden @@ -7270,10 +7295,10 @@ AQAAAAA value: selection.sshKeyLocation - + - + value: selection.sshKeyLocation value @@ -7286,10 +7311,10 @@ AQAAAAA toolTip: selection.sshKeyLocation - + - + toolTip: selection.sshKeyLocation toolTip @@ -7303,10 +7328,18 @@ AQAAAAA chooseSSHKey: - + 1872 + + + sshKeyLocationHelp + + + + 1876 + @@ -8651,9 +8684,9 @@ AQAAAAA - - - + + + @@ -10243,45 +10276,69 @@ AQAAAAA 1835 - + YES - + 1836 - - + + 1851 - + YES - + 1852 - - + + 1859 - + YES - + 1860 - - + + + + + 1873 + + + YES + + + + SSH Key Selection Help + + + 1874 + + + YES + + + + + + 1875 + + @@ -10616,6 +10673,10 @@ AQAAAAA 1859.IBPluginDependency 1859.ImportedFromIB2 1860.IBPluginDependency + 1873.IBEditorWindowLastContentRect + 1873.IBPluginDependency + 1874.IBPluginDependency + 1875.IBPluginDependency 2.IBPluginDependency 24.IBPluginDependency 24.ImportedFromIB2 @@ -11269,6 +11330,10 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{245, 466}, {579, 51}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -11602,7 +11667,7 @@ AQAAAAA - 1872 + 1876 @@ -11973,6 +12038,7 @@ AQAAAAA saveThemeMenuItem socketPasswordField splitViewButtonBar + sshKeyLocationHelp sshPasswordField sshSQLPasswordField standardPasswordField @@ -12017,6 +12083,7 @@ AQAAAAA NSMenuItem NSSecureTextField BWAnchoredButtonBar + NSView NSSecureTextField NSSecureTextField NSSecureTextField @@ -12064,6 +12131,7 @@ AQAAAAA saveThemeMenuItem socketPasswordField splitViewButtonBar + sshKeyLocationHelp sshPasswordField sshSQLPasswordField standardPasswordField @@ -12210,6 +12278,10 @@ AQAAAAA splitViewButtonBar BWAnchoredButtonBar + + sshKeyLocationHelp + NSView + sshPasswordField NSSecureTextField -- cgit v1.2.3