Changeset 219 for trunk/Forms/FormSettings.pas

Timestamp:

Jan 17, 2025, 9:05:54 PM (4 days ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Modified: Remove U prefix from unit names.
• Modified: Use Gneeric.Collections instead of fgl.
• Modified: Do not use global form variables.

File:

• trunk/Forms/FormSettings.pas (moved) (moved from trunk/Forms/UFormSettings.pas ) (8 diffs)

trunk/Forms/FormSettings.pas

@@ -1 @@
-unit UFormSettings;
-
-{$mode delphi}
+unit FormSettings;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Menus, Spin, ExtCtrls, ULanguages;
+  Menus, Spin, ExtCtrls, Languages, FormEx;
 
 type
@@ -13 +11 @@
   { TFormSettings }
 
-  TFormSettings = class(TForm)
+  TFormSettings = class(TFormEx)
     Bevel1: TBevel;
     ButtonOk: TButton;
@@ -28 +26 @@
     Label3: TLabel;
     SpinEditDPI: TSpinEdit;
-    procedure ButtonOkClick(Sender: TObject);
     procedure CheckBoxAutomaticDPIChange(Sender: TObject);
     procedure CheckBoxStartOnLogonChange(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
-    procedure FormShow(Sender: TObject);
-  private
-    { private declarations }
   public
     procedure Load;
@@ -42 +35 @@
   end;
 
-var
-  FormSettings: TFormSettings;
 
 implementation
@@ -50 +41 @@
 
 uses
-  UCore, UTheme;
+  Core, Theme;
 
 { TFormSettings }
-
-procedure TFormSettings.FormShow(Sender: TObject);
-begin
-  Core.PersistentForm1.Load(Self);
-end;
-
-procedure TFormSettings.ButtonOkClick(Sender: TObject);
-begin
-end;
 
 procedure TFormSettings.CheckBoxAutomaticDPIChange(Sender: TObject);
@@ -73 +55 @@
 end;
 
-procedure TFormSettings.FormClose(Sender: TObject; var CloseAction: TCloseAction
-  );
-begin
-  Core.PersistentForm1.Save(Self);
-end;
-
 procedure TFormSettings.FormCreate(Sender: TObject);
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
-  Core.ThemeManager.Themes.LoadToStrings(ComboBoxTheme.Items);
-  Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager.Themes.LoadToStrings(ComboBoxTheme.Items);
+  Core.Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
 end;
 
 procedure TFormSettings.Load;
 begin
-  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator.Language);
+  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Core.Translator.Language);
   if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
-  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.ThemeManager.Theme);
+  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.Core.ThemeManager.Theme);
   if ComboBoxTheme.ItemIndex = -1 then ComboBoxTheme.ItemIndex := 0;
-  CheckBoxAlwaysOnTop.Checked := Core.AlwaysOnTop;
-  CheckBoxStartOnLogon.Checked := Core.StartOnLogon;
-  CheckBoxStartMinimizedToTray.Checked := Core.StartMinimizedToTray;
-  CheckBoxAutomaticDPI.Checked := Core.ScaleDPI1.AutoDetect;
-  SpinEditDPI.Value := Core.ScaleDPI1.DPI.X;
-  CheckBoxReopenLastFileOnStart.Checked := Core.ReopenLastFileOnStart;
+  CheckBoxAlwaysOnTop.Checked := Core.Core.AlwaysOnTop;
+  CheckBoxStartOnLogon.Checked := Core.Core.StartOnLogon;
+  CheckBoxStartMinimizedToTray.Checked := Core.Core.StartMinimizedToTray;
+  CheckBoxAutomaticDPI.Checked := Core.Core.ScaleDPI1.AutoDetect;
+  SpinEditDPI.Value := Core.Core.ScaleDPI1.DPI.X;
+  CheckBoxReopenLastFileOnStart.Checked := Core.Core.ReopenLastFileOnStart;
   UpdateInterface;
 end;
@@ -105 +80 @@
 begin
   if ComboBoxLanguage.ItemIndex <> -1 then
-    Core.Translator.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+    Core.Core.Translator.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
   if ComboBoxTheme.ItemIndex <> -1 then
-    Core.ThemeManager.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
-  Core.AlwaysOnTop := CheckBoxAlwaysOnTop.Checked;
-  Core.StartOnLogon := CheckBoxStartOnLogon.Checked;
-  Core.StartMinimizedToTray := CheckBoxStartMinimizedToTray.Checked;
-  Core.ScaleDPI1.AutoDetect := CheckBoxAutomaticDPI.Checked;
-  Core.ScaleDPI1.DPI := Point(SpinEditDPI.Value, SpinEditDPI.Value);
-  Core.ReopenLastFileOnStart := CheckBoxReopenLastFileOnStart.Checked;
+    Core.Core.ThemeManager.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
+  Core.Core.AlwaysOnTop := CheckBoxAlwaysOnTop.Checked;
+  Core.Core.StartOnLogon := CheckBoxStartOnLogon.Checked;
+  Core.Core.StartMinimizedToTray := CheckBoxStartMinimizedToTray.Checked;
+  Core.Core.ScaleDPI1.AutoDetect := CheckBoxAutomaticDPI.Checked;
+  Core.Core.ScaleDPI1.DPI := Point(SpinEditDPI.Value, SpinEditDPI.Value);
+  Core.Core.ReopenLastFileOnStart := CheckBoxReopenLastFileOnStart.Checked;
 end;