opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modify release-download-button, so it points to the portable download link if the running version is a portable

Browse Source
This commit is contained in:
Ansgar Becker
2021-05-08 09:27:15 +02:00
parent 940bbb7470
commit c5d95c1ce2
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
out/locale/en/LC_MESSAGES/default.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: HeidiSQL\n" "Project-Id-Version: HeidiSQL\n"
"POT-Creation-Date: 2012-11-05 21:40\n" "POT-Creation-Date: 2012-11-05 21:40\n"
"PO-Revision-Date: 2021-04-23 15:44+0200\n" "PO-Revision-Date: 2021-05-08 09:23+0200\n"
"Last-Translator: Ansgar Becker <anse@heidisql.com>\n" "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n" "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: en\n" "Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.4.2\n" "X-Generator: Poedit 2.4.3\n"
#. AboutBox..Caption #. AboutBox..Caption
#: about.dfm:5 #: about.dfm:5
@ -5417,8 +5417,8 @@ msgid "Released: %s"
msgstr "Released: %s" msgstr "Released: %s"
#: updatecheck.pas:152 #: updatecheck.pas:152
msgid "Download version %s" msgid "Download version %s (%s)"
msgstr "Download version %s" msgstr "Download version %s (%s)"
#: updatecheck.pas:168 #: updatecheck.pas:168
msgid "Revision %d (yours: %d)" msgid "Revision %d (yours: %d)"

22
source/updatecheck.pas
View File

@ -4,7 +4,7 @@ interface
uses uses
Windows, Messages, SysUtils, Classes, Forms, StdCtrls, IniFiles, Controls, Graphics, Windows, Messages, SysUtils, Classes, Forms, StdCtrls, IniFiles, Controls, Graphics,
apphelpers, gnugettext, ExtCtrls, extra_controls; apphelpers, gnugettext, ExtCtrls, extra_controls, System.StrUtils;
type type
TfrmUpdateCheck = class(TExtForm) TfrmUpdateCheck = class(TExtForm)
@ -110,7 +110,7 @@ var
CheckfileDownload: THttpDownLoad; CheckfileDownload: THttpDownLoad;
CheckFilename: String; CheckFilename: String;
Ini: TIniFile; Ini: TIniFile;
ReleaseVersion: String; ReleaseVersion, ReleasePackage: String;
ReleaseRevision: Integer; ReleaseRevision: Integer;
Note: String; Note: String;
Compiled: TDateTime; Compiled: TDateTime;
@ -147,12 +147,13 @@ begin
ReleaseVersion := Ini.ReadString(INISECT_RELEASE, 'Version', 'unknown'); ReleaseVersion := Ini.ReadString(INISECT_RELEASE, 'Version', 'unknown');
ReleaseRevision := Ini.ReadInteger(INISECT_RELEASE, 'Revision', 0); ReleaseRevision := Ini.ReadInteger(INISECT_RELEASE, 'Revision', 0);
ReleaseURL := Ini.ReadString(INISECT_RELEASE, 'URL', ''); ReleaseURL := Ini.ReadString(INISECT_RELEASE, 'URL', '');
ReleasePackage := IfThen(AppSettings.PortableMode, 'portable', 'installer');
memoRelease.Lines.Add(f_('Version %s (yours: %s)', [ReleaseVersion, Mainform.AppVersion])); memoRelease.Lines.Add(f_('Version %s (yours: %s)', [ReleaseVersion, Mainform.AppVersion]));
memoRelease.Lines.Add(f_('Released: %s', [Ini.ReadString(INISECT_RELEASE, 'Date', '')])); memoRelease.Lines.Add(f_('Released: %s', [Ini.ReadString(INISECT_RELEASE, 'Date', '')]));
Note := Ini.ReadString(INISECT_RELEASE, 'Note', ''); Note := Ini.ReadString(INISECT_RELEASE, 'Note', '');
if Note <> '' then if Note <> '' then
memoRelease.Lines.Add(_('Notes') + ': ' + Note); memoRelease.Lines.Add(_('Notes') + ': ' + Note);
btnRelease.Caption := f_('Download version %s', [ReleaseVersion]); btnRelease.Caption := f_('Download version %s (%s)', [ReleaseVersion, ReleasePackage]);
// Enable the download button if the current version is outdated // Enable the download button if the current version is outdated
groupRelease.Enabled := ReleaseRevision > Mainform.AppVerRevision; groupRelease.Enabled := ReleaseRevision > Mainform.AppVerRevision;
btnRelease.Enabled := groupRelease.Enabled; btnRelease.Enabled := groupRelease.Enabled;
@ -187,11 +188,22 @@ end;
{** {**
Download release installer via web browser Download release package via web browser
} }
procedure TfrmUpdateCheck.btnReleaseClick(Sender: TObject); procedure TfrmUpdateCheck.btnReleaseClick(Sender: TObject);
var
DownloadParam: String;
begin begin
ShellExec(APPDOMAIN+'download.php?download=installer'); if AppSettings.PortableMode then begin
if GetExecutableBits = 64 then
DownloadParam := 'portable-64'
else
DownloadParam := 'portable';
end else begin
DownloadParam := 'installer';
end;
ShellExec(APPDOMAIN+'download.php?download='+DownloadParam);
end; end;