Changeset 317 for trunk/Forms/FormSettings.pas

Timestamp:

Jun 21, 2024, 12:44:53 PM (2 weeks ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Use TFormEx for all forms for code simplification.

File:

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

trunk/Forms/FormSettings.pas

@@ -1 @@
-unit UFormSettings;
+unit FormSettings;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Spin, ComCtrls, ExtCtrls;
+  Spin, ComCtrls, ExtCtrls, FormEx;
 
 type
@@ -11 +11 @@
   { TFormSettings }
 
-  TFormSettings = class(TForm)
+  TFormSettings = class(TFormEx)
     ButtonOk: TButton;
     ButtonCancel: TButton;
@@ -35 +35 @@
     TabSheetDebug: TTabSheet;
     procedure CheckBox2Change(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -43 +42 @@
   end;
 
-var
-  FormSettings: TFormSettings;
 
 
@@ -52 +49 @@
 
 uses
-  UCore, Languages, Theme;
+  Core, Languages, Theme;
 
 { TFormSettings }
@@ -62 +59 @@
 end;
 
-procedure TFormSettings.FormClose(Sender: TObject; var CloseAction: TCloseAction
-  );
-begin
-  Core.PersistentForm.Save(Self);
-end;
-
 procedure TFormSettings.FormCreate(Sender: TObject);
 begin
   PageControl1.TabIndex := 0;
-  Core.CoolTranslator1.TranslateComponentRecursive(Self);
-  Core.ThemeManager1.Themes.LoadToStrings(ComboBoxTheme.Items);
-  Core.CoolTranslator1.LanguageListToStrings(ComboBoxLanguage.Items);
+  Core.Core.ThemeManager1.Themes.LoadToStrings(ComboBoxTheme.Items);
+  Core.Core.Translator1.LanguageListToStrings(ComboBoxLanguage.Items);
 end;
 
 procedure TFormSettings.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm.Load(Self);
-  Core.ThemeManager1.UseTheme(Self);
   {$IFDEF DEBUG}
   TabSheetDebug.TabVisible := True;
@@ -89 +77 @@
 procedure TFormSettings.Load;
 begin
-  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
+  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Core.Translator1.Language);
   if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
-  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.ThemeManager1.Theme);
+  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.Core.ThemeManager1.Theme);
   if ComboBoxTheme.ItemIndex = -1 then ComboBoxTheme.ItemIndex := 0;
-  CheckBoxDevelMode.Checked := Core.DevelMode;
-  SpinEditAnimSpeed.Value := Core.AnimationSpeed;
-  CheckBox2.Checked := Core.ScaleDPI1.AutoDetect;
-  SpinEditX.Value := Core.ScaleDPI1.DPI.X;
-  SpinEditY.Value := Core.ScaleDPI1.DPI.Y;
-  CheckBoxAutoSaveTurn.Checked := Core.AutoSaveEnabled;
-  CheckBoxReopenLastFile.Checked := Core.ReopenLastFile;
+  CheckBoxDevelMode.Checked := Core.Core.DevelMode;
+  SpinEditAnimSpeed.Value := Core.Core.AnimationSpeed;
+  CheckBox2.Checked := Core.Core.ScaleDPI1.AutoDetect;
+  SpinEditX.Value := Core.Core.ScaleDPI1.DPI.X;
+  SpinEditY.Value := Core.Core.ScaleDPI1.DPI.Y;
+  CheckBoxAutoSaveTurn.Checked := Core.Core.AutoSaveEnabled;
+  CheckBoxReopenLastFile.Checked := Core.Core.ReopenLastFile;
 end;
 
@@ -105 +93 @@
 begin
   if ComboBoxLanguage.ItemIndex <> -1 then
-    Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+    Core.Core.Translator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
    if ComboBoxTheme.ItemIndex <> -1 then
-    Core.ThemeManager1.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
-  Core.DevelMode := CheckBoxDevelMode.Checked;
-  Core.AnimationSpeed := SpinEditAnimSpeed.Value;
-  Core.ScaleDPI1.AutoDetect := CheckBox2.Checked;
-  Core.ScaleDPI1.DPI := Point(SpinEditX.Value, SpinEditY.Value);
-  Core.AutoSaveEnabled := CheckBoxAutoSaveTurn.Checked;
-  Core.ReopenLastFile := CheckBoxReopenLastFile.Checked;
+    Core.Core.ThemeManager1.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
+  Core.Core.DevelMode := CheckBoxDevelMode.Checked;
+  Core.Core.AnimationSpeed := SpinEditAnimSpeed.Value;
+  Core.Core.ScaleDPI1.AutoDetect := CheckBox2.Checked;
+  Core.Core.ScaleDPI1.DPI := Point(SpinEditX.Value, SpinEditY.Value);
+  Core.Core.AutoSaveEnabled := CheckBoxAutoSaveTurn.Checked;
+  Core.Core.ReopenLastFile := CheckBoxReopenLastFile.Checked;
 end;