Skip to content

Commit 86a96bd

Browse files
committed
ui: hint the user in which path we are going to look for sshpass (macOS and Windows)
Refs #2302
1 parent d79d462 commit 86a96bd

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

extra/locale/heidisql.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: HeidiSQL\n"
99
"POT-Creation-Date: 2012-11-05 21:40\n"
10-
"PO-Revision-Date: 2026-02-22 20:19+0100\n"
10+
"PO-Revision-Date: 2026-02-25 16:13+0100\n"
1111
"Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
1212
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
1313
"Language: en\n"
@@ -6774,8 +6774,8 @@ msgstr "Open file after creation"
67746774
msgid "Source table"
67756775
msgstr "Source table"
67766776

6777-
msgid "Make sure sshpass is available when using a password"
6778-
msgstr "Make sure sshpass is available when using a password"
6777+
msgid "Make sure %s is available when using a password"
6778+
msgstr "Make sure %s is available when using a password"
67796779

67806780
msgid "Copy column names"
67816781
msgstr "Copy column names"

source/connections.lfm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,9 @@ object connform: Tconnform
576576
Left = 199
577577
Height = 15
578578
Top = 141
579-
Width = 283
579+
Width = 173
580580
BorderSpacing.Around = 5
581-
Caption = 'Make sure sshpass is available when using a password'
581+
Caption = 'hint to the user he needs sshpass'
582582
Enabled = False
583583
end
584584
end

source/connections.pas

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,6 +1615,7 @@ procedure Tconnform.ValidateControls;
16151615
editSSHPassword.Enabled := Params.SSHActive;
16161616
lblSshPassHint.Enabled := Params.SSHActive and (editSSHPassword.Text <> '');
16171617
lblSshPassHint.Visible := not Params.SshIsPlink;
1618+
lblSshPassHint.Caption := f_('Make sure %s is available when using a password', [TSecureShellCmd.SshpassPath]);
16181619
lblSSHTimeout.Enabled := Params.SSHActive;
16191620
editSSHTimeout.Enabled := Params.SSHActive;
16201621
lblSSHkeyfile.Enabled := Params.SSHActive;

source/dbconnection.pas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ TSecureShellCmd = class(TObject)
269269
procedure Connect;
270270
constructor Create(Connection: TDBConnection);
271271
destructor Destroy; override;
272-
function SshpassPath: String;
272+
class function SshpassPath: String;
273273
end;
274274

275275
TSQLFunction = class(TPersistent)
@@ -1035,7 +1035,7 @@ destructor TSecureShellCmd.Destroy;
10351035
inherited;
10361036
end;
10371037

1038-
function TSecureShellCmd.SshpassPath: String;
1038+
class function TSecureShellCmd.SshpassPath: String;
10391039
begin
10401040
{$IFDEF DARWIN}
10411041
// See https://www.heidisql.com/forum.php?t=44716

0 commit comments

Comments
 (0)