opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove download link for plink in SSH tunnel tab, and provide plink.exe v0.73 through the installer

Browse Source
This commit is contained in:
Ansgar Becker
2020-06-24 17:22:43 +02:00
parent 1981afdf3b
commit 08f0cbdb4f
6 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
out/heidisql.iss
View File

@@ -91,6 +91,8 @@ Source: "gpl.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "plugins64\*.dll"; DestDir: "{app}\plugins"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "plugins32\*.dll"; DestDir: "{app}\plugins"; Check: not Is64BitInstallMode; Flags: ignoreversion
Source: "Snippets\*.sql"; DestDir: "{userdocs}\{#ProgName}\Snippets";
Source: "plink-64.exe"; DestDir: "{app}"; DestName: "plink.exe"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "plink-32.exe"; DestDir: "{app}"; DestName: "plink.exe"; Check: not Is64BitInstallMode; Flags: ignoreversion
; MySQL + MariaDB:
Source: "libmariadb64.dll"; DestDir: "{app}"; DestName: "libmariadb.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "libmariadb32.dll"; DestDir: "{app}"; DestName: "libmariadb.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion

BIN
out/plink-32.exe Normal file
View File

Binary file not shown.

BIN
out/plink-64.exe Normal file
View File

Binary file not shown.

2
source/apphelpers.pas
View File

@@ -3517,7 +3517,7 @@ begin
InitSetting(asPort, 'Port', 0, False, '', True);
InitSetting(asLibrary, 'Library', 0, False, 'libmariadb.dll', True);
InitSetting(asAllProviders, 'AllProviders', 0, False);
InitSetting(asPlinkExecutable, 'PlinkExecutable', 0, False, '');
InitSetting(asPlinkExecutable, 'PlinkExecutable', 0, False, 'plink.exe');
InitSetting(asSSHtunnelHost, 'SSHtunnelHost', 0, False, '', True);
InitSetting(asSSHtunnelHostPort, 'SSHtunnelHostPort', 22, False, '', True);
InitSetting(asSSHtunnelPort, 'SSHtunnelPort', 0, False, '', True);

38
source/connections.dfm
View File

@@ -363,7 +363,7 @@ object connform: Tconnform
371)
object lblSSHLocalPort: TLabel
Left = 3
Top = 190
Top = 174
Width = 51
Height = 13
Caption = 'Local port:'
@@ -371,7 +371,7 @@ object connform: Tconnform
end
object lblSSHUser: TLabel
Left = 3
Top = 82
Top = 66
Width = 52
Height = 13
Caption = 'Username:'
@@ -379,7 +379,7 @@ object connform: Tconnform
end
object lblSSHPassword: TLabel
Left = 3
Top = 109
Top = 93
Width = 50
Height = 13
Caption = 'Password:'
@@ -394,7 +394,7 @@ object connform: Tconnform
end
object lblSSHhost: TLabel
Left = 3
Top = 55
Top = 39
Width = 81
Height = 13
Caption = 'SSH host + port:'
@@ -402,32 +402,22 @@ object connform: Tconnform
end
object lblSSHkeyfile: TLabel
Left = 3
Top = 163
Top = 147
Width = 75
Height = 13
Caption = 'Private key file:'
FocusControl = editSSHPrivateKey
end
object lblDownloadPlink: TLabel
Left = 120
Top = 33
Width = 93
Height = 13
Cursor = crHandPoint
Hint = 'http://www.chiark.greenend.org.uk/~sgtatham/putty/'
Caption = 'Download plink.exe'
OnClick = lblDownloadPlinkClick
end
object lblPlinkTimeout: TLabel
Left = 3
Top = 136
Top = 120
Width = 86
Height = 13
Caption = 'plink.exe timeout:'
end
object editSSHlocalport: TEdit
Left = 120
Top = 187
Top = 171
Width = 294
Height = 21
Anchors = [akLeft, akTop, akRight]
@@ -438,7 +428,7 @@ object connform: Tconnform
end
object editSSHUser: TEdit
Left = 120
Top = 79
Top = 63
Width = 294
Height = 21
Anchors = [akLeft, akTop, akRight]
@@ -450,7 +440,7 @@ object connform: Tconnform
end
object editSSHPassword: TEdit
Left = 120
Top = 106
Top = 90
Width = 294
Height = 21
Anchors = [akLeft, akTop, akRight]
@@ -479,7 +469,7 @@ object connform: Tconnform
end
object editSSHhost: TEdit
Left = 120
Top = 52
Top = 36
Width = 230
Height = 21
Anchors = [akLeft, akTop, akRight]
@@ -490,7 +480,7 @@ object connform: Tconnform
end
object editSSHport: TEdit
Left = 356
Top = 52
Top = 36
Width = 58
Height = 21
Anchors = [akTop, akRight]
@@ -501,7 +491,7 @@ object connform: Tconnform
end
object editSSHPrivateKey: TButtonedEdit
Left = 120
Top = 160
Top = 144
Width = 294
Height = 21
Anchors = [akLeft, akTop, akRight]
@@ -518,7 +508,7 @@ object connform: Tconnform
end
object editSSHTimeout: TEdit
Left = 120
Top = 133
Top = 117
Width = 60
Height = 21
TabOrder = 5
@@ -527,7 +517,7 @@ object connform: Tconnform
end
object updownSSHTimeout: TUpDown
Left = 180
Top = 133
Top = 117
Width = 17
Height = 21
Associate = editSSHTimeout

10
source/connections.pas
View File

@@ -68,7 +68,6 @@ type
editSSHport: TEdit;
editSSHPrivateKey: TButtonedEdit;
lblSSHkeyfile: TLabel;
lblDownloadPlink: TLabel;
editDatabases: TButtonedEdit;
lblDatabase: TLabel;
chkLoginPrompt: TCheckBox;
@@ -157,7 +156,6 @@ type
procedure PickFile(Sender: TObject);
procedure editSSHPlinkExeChange(Sender: TObject);
procedure editHostChange(Sender: TObject);
procedure lblDownloadPlinkClick(Sender: TObject);
procedure editDatabasesRightButtonClick(Sender: TObject);
procedure chkLoginPromptClick(Sender: TObject);
procedure ListSessionsGetNodeDataSize(Sender: TBaseVirtualTree;
@@ -250,8 +248,6 @@ var
begin
// Fix GUI stuff
HasSizeGrip := True;
lblDownloadPlink.Font.Style := [fsUnderline];
lblDownloadPlink.Font.Color := clBlue;
Width := AppSettings.ReadInt(asSessionManagerWindowWidth);
Height := AppSettings.ReadInt(asSessionManagerWindowHeight);
@@ -1500,10 +1496,4 @@ begin
end;
procedure Tconnform.lblDownloadPlinkClick(Sender: TObject);
begin
ShellExec(TLabel(Sender).Hint);
end;
end.