Changeset 210 for branches/highdpi/Locale.pas

Timestamp:

May 9, 2020, 4:02:07 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved HighDPI branch. Imported new changes from trunk branch.

File:

• branches/highdpi/Locale.pas (modified) (6 diffs)

branches/highdpi/Locale.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ScreenTools, Messg, ButtonA, Registry, fgl, Directories, DrawDlg, UDpiControls;
+  UDpiControls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  ScreenTools, Messg, ButtonA, Registry, fgl, Directories, DrawDlg, ButtonC;
 
 type
@@ -27 +27 @@
 
   TLocaleDlg = class(TDrawDlg)
+    ButtonFullscreen: TButtonC;
     List: TDpiListBox;
     OKBtn: TButtonA;
     CancelBtn: TButtonA;
+    procedure ButtonFullscreenClick(Sender: TObject);
     procedure CancelBtnClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -101 +103 @@
   OkBtn.Graphic := GrExt[HGrSystem].Data;
   CancelBtn.Graphic := GrExt[HGrSystem].Data;
+
+  ButtonFullscreen.Graphic := GrExt[HGrSystem].Data;
+  if FullScreen then ButtonFullscreen.ButtonIndex := 3
+    else ButtonFullscreen.ButtonIndex := 2;
 end;
 
 procedure TLocaleDlg.CancelBtnClick(Sender: TObject);
 begin
-  ModalResult := mrOk;
+  ModalResult := mrCancel;
+end;
+
+procedure TLocaleDlg.ButtonFullscreenClick(Sender: TObject);
+begin
+  FullScreen := not FullScreen;
+  ButtonFullscreen.ButtonIndex := ButtonFullscreen.ButtonIndex xor 1;
 end;
 
@@ -114 +126 @@
 
 procedure TLocaleDlg.FormPaint(Sender: TObject);
+var
+  S: string;
 begin
   PaintBackground(self, 3, 3, ClientWidth - 6, ClientHeight - 6);
@@ -124 +138 @@
   BtnFrame(Canvas, OKBtn.BoundsRect, MainTexture);
   BtnFrame(Canvas, CancelBtn.BoundsRect, MainTexture);
+
+  RFrame(Canvas, ButtonFullscreen.Left - 1, ButtonFullscreen.Top - 1,
+    ButtonFullscreen.Left + 12, ButtonFullscreen.Top + 12, MainTexture.clBevelShade,
+    MainTexture.clBevelLight);
+
+  s := Phrases.Lookup('SETTINGS', 0);
+  LoweredTextOut(Canvas, -2, MainTexture, ButtonFullscreen.Left + 32,
+    ButtonFullscreen.Top - 4, s);
 end;
 
@@ -138 +160 @@
 begin
   LocaleCode := Languages[List.ItemIndex].ShortName;
-  ModalResult := mrCancel;
+  ModalResult := mrOk;
 end;