Changeset 465 for branches/highdpi/Settings.pas

Timestamp:

Nov 30, 2023, 10:16:14 PM (6 months ago)

Author:

chronos

Message:

• Modified: Updated high dpi branch from trunk.
• Modified: Use generics.collections instead of fgl.
• Modified: Compile with Delphi syntax.

File:

• branches/highdpi/Settings.pas (modified) (9 diffs)

branches/highdpi/Settings.pas

@@ -1 +1 @@
 unit Settings;
-
-{$mode delphi}
 
 interface
@@ -7 +5 @@
 uses
   UDpiControls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  LCLProc, ScreenTools, Messg, ButtonA, Registry, fgl, Directories, DrawDlg,
-  ButtonC, UKeyBindings, ULanguages;
+  LCLProc, ScreenTools, Messg, ButtonA, Directories, DrawDlg, ButtonC,
+  KeyBindings, Languages;
 
 type
@@ -58 +56 @@
 {$R *.lfm}
 
+uses
+  Start;
+
 var
   SFullScreen, SGamma, SRestartMsg, SShortCutPrimary, SShortCutSecondary,
@@ -77 +78 @@
 procedure TSettingsDlg.FormCreate(Sender: TObject);
 begin
+  Color := clBlack;
   LocalKeyBindings := TKeyBindings.Create;
 
@@ -117 +119 @@
   Shift: TShiftState);
 begin
-  if Assigned(CurrentKeyBinding) and not (Key in [16..18]) then begin
+  if (Sender is TDpiEdit) and Assigned(CurrentKeyBinding) and not (Key in [16..18]) then begin
     CurrentKeyBinding.ShortCut := Key or
       (scShift * Integer(ssShift in Shift)) or
@@ -131 +133 @@
   var Key: Word; Shift: TShiftState);
 begin
-  if Assigned(CurrentKeyBinding) and not (Key in [16..18]) then begin
+  if (Sender is TDpiEdit) and Assigned(CurrentKeyBinding) and not (Key in [16..18]) then begin
     CurrentKeyBinding.ShortCut2 := Key or
       (scShift * Integer(ssShift in Shift)) or
@@ -192 +194 @@
 procedure TSettingsDlg.FormShow(Sender: TObject);
 begin
+  Caption := Phrases2.Lookup('ACTIONHEADER_CONFIG');
   ReloadLanguages;
-  Languages.LoadToStrings(ListLanguages.Items);
+  StartDlg.Translator.LanguageListToStrings(ListLanguages.Items);
   ListLanguages.Font.Color := MainTexture.ColorMark;
   ListKeyBindings.Font.Color := MainTexture.ColorMark;
@@ -260 +263 @@
 procedure TSettingsDlg.LoadData;
 begin
-  ListLanguages.ItemIndex := Languages.Search(LocaleCode);
-  if (ListLanguages.ItemIndex = -1) and (Languages.Count > 0) then
-    ListLanguages.ItemIndex := 0;
+  StartDlg.Translator.Language := StartDlg.Translator.Languages.SearchByCode(LocaleCode);
+  StartDlg.Translator.LanguageListToStrings(ListLanguages.Items, False);
+  ListLanguages.ItemIndex := ListLanguages.Items.IndexOfObject(StartDlg.Translator.Language);
+  if ListLanguages.ItemIndex = -1 then ListLanguages.ItemIndex := 0;
   if FullScreen then ButtonFullscreen.ButtonIndex := 3
     else ButtonFullscreen.ButtonIndex := 2;
   LocalGamma := Gamma;
-  LocalKeyBindings.Assign(KeyBindings);
+  LocalKeyBindings.Assign(KeyBindings.KeyBindings);
 end;
 
@@ -274 +278 @@
 begin
   NeedRestart := Gamma <> LocalGamma;
-  LocaleCode := Languages[ListLanguages.ItemIndex].ShortName;
+  if ListLanguages.ItemIndex <> -1 then begin
+    StartDlg.Translator.Language := TLanguage(ListLanguages.Items.Objects[ListLanguages.ItemIndex]);
+    LocaleCode := StartDlg.Translator.Language.Code;
+  end else begin
+    StartDlg.Translator.Language := nil;
+    LocaleCode := '';
+  end;
   FullScreen := (ButtonFullscreen.ButtonIndex and 1) = 1;
   Gamma := LocalGamma;
   if NeedRestart then SimpleMessage(SRestartMsg);
-  KeyBindings.Assign(LocalKeyBindings);
+  KeyBindings.KeyBindings.Assign(LocalKeyBindings);
 end;
 
 end.
 
+
+