From d58e30d0eb86927d48dfc3de9b18ed750f0072f3 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Sat, 3 Feb 2018 16:00:38 +0100 Subject: [PATCH] Add an "Environment" label on the about dialog, showing Windows version, Windows Store package name, or Wine --- out/locale/en/LC_MESSAGES/default.po | 3 +++ source/about.dfm | 14 +++++++++++--- source/about.pas | 13 +++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po index cbac7686..2306f2c1 100644 --- a/out/locale/en/LC_MESSAGES/default.po +++ b/out/locale/en/LC_MESSAGES/default.po @@ -3755,6 +3755,9 @@ msgstr "None" msgid "Compiled on:" msgstr "Compiled on:" +msgid "Environment:" +msgstr "Environment:" + #: bineditor.pas:175 texteditor.pas:259 msgid "Apply modifications?" msgstr "Apply modifications?" diff --git a/source/about.dfm b/source/about.dfm index 43d236f9..80644d91 100644 --- a/source/about.dfm +++ b/source/about.dfm @@ -49,7 +49,7 @@ object AboutBox: TAboutBox end object lblAppCompiled: TLabel Left = 117 - Top = 60 + Top = 62 Width = 72 Height = 13 Caption = 'lblAppCompiled' @@ -58,7 +58,7 @@ object AboutBox: TAboutBox end object lblAppWebpage: TLabel Left = 117 - Top = 78 + Top = 100 Width = 75 Height = 13 Cursor = crHandPoint @@ -1381,7 +1381,7 @@ object AboutBox: TAboutBox end object lblCredits: TLabel Left = 117 - Top = 97 + Top = 119 Width = 34 Height = 13 Cursor = crHandPoint @@ -1398,6 +1398,14 @@ object AboutBox: TAboutBox OnClick = lblCreditsClick OnMouseMove = MouseOver end + object lblEnvironment: TLabel + Left = 117 + Top = 81 + Width = 70 + Height = 13 + Caption = 'lblEnvironment' + PopupMenu = popupLabels + end object btnClose: TButton Left = 373 Top = 282 diff --git a/source/about.pas b/source/about.pas index 0062a493..1be6c705 100644 --- a/source/about.pas +++ b/source/about.pas @@ -26,6 +26,7 @@ type lblCredits: TLabel; popupLabels: TPopupMenu; menuCopyLabel: TMenuItem; + lblEnvironment: TLabel; procedure OpenURL(Sender: TObject); procedure MouseOver(Sender: TObject; Shift: TShiftState; X, Y: Integer); procedure FormShow(Sender: TObject); @@ -141,6 +142,18 @@ begin lblAppWebpage.Caption := APPDOMAIN; lblAppWebpage.Hint := APPDOMAIN+'?place='+EncodeURLParam(lblAppWebpage.Name); ImageHeidisql.Hint := APPDOMAIN+'?place='+EncodeURLParam(ImageHeidisql.Name); + lblEnvironment.Caption := _('Environment:'); + if RunningAsUwp then begin + lblEnvironment.Caption := lblEnvironment.Caption + + ' Windows v'+IntToStr(Win32MajorVersion)+'.'+IntToStr(Win32MinorVersion) + + ', Store Package ' + GetUwpFullName; + end else if MainForm.IsWine then begin + lblEnvironment.Caption := lblEnvironment.Caption + + ' Linux/Wine'; + end else begin + lblEnvironment.Caption := lblEnvironment.Caption + + ' Windows v'+IntToStr(Win32MajorVersion)+'.'+IntToStr(Win32MinorVersion); + end; Screen.Cursor := crDefault; end;