Changeset 86 for trunk/Forms/FormSettings.pas

Timestamp:

Jun 7, 2024, 12:47:11 PM (5 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Used TFormEx for all forms for code simplification.
• Fixed: Fullscreen mode switching error.

File:

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

trunk/Forms/FormSettings.pas

@@ -1 @@
-unit UFormSettings;
-
-{$mode delphi}
+unit FormSettings;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
-  Languages, Theme;
+  Languages, Theme, FormEx;
 
 type
@@ -13 +11 @@
   { TFormSettings }
 
-  TFormSettings = class(TForm)
+  TFormSettings = class(TFormEx)
     ButtonOk: TButton;
     ButtonCancel: TButton;
@@ -24 +22 @@
     procedure ButtonCancelClick(Sender: TObject);
     procedure ButtonOkClick(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-
-  public
-
   end;
-
-var
-  FormSettings: TFormSettings;
 
 
@@ -42 +32 @@
 
 uses
-  UCore;
+  Core;
 
 resourcestring
   SLanguageChangeTitle = 'Language change';
   SLanguageChangeMessage = 'Interface language was changed. It may require restart of application.';
-
 
 { TFormSettings }
@@ -58 +47 @@
 procedure TFormSettings.ButtonOkClick(Sender: TObject);
 begin
-  Core.Game.AnimationDuration := TrackBar1.Position;
+  Core.Core.Game.AnimationDuration := TrackBar1.Position;
   if ComboBoxLanguage.ItemIndex <> -1 then begin
-    if (Core.Translator1.Language <> TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex])) then
+    if (Core.Core.Translator1.Language <> TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex])) then
       MessageDlg(SLanguageChangeTitle, SLanguageChangeMessage, mtInformation, [mbOk], 0);
-    Core.Translator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+    Core.Core.Translator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
   end;
   if ComboBoxTheme.ItemIndex <> -1 then
-    Core.ThemeManager1.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
+    Core.Core.ThemeManager1.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
   ModalResult := mrOk;
-end;
-
-procedure TFormSettings.FormClose(Sender: TObject; var CloseAction: TCloseAction
-  );
-begin
-  Core.PersistentForm1.Save(Self);
 end;
 
 procedure TFormSettings.FormCreate(Sender: TObject);
 begin
-  Core.Translator1.TranslateComponentRecursive(Self);
-  Core.Translator1.LanguageListToStrings(ComboBoxLanguage.Items);
-  Core.ThemeManager1.UseTheme(Self);
-  Core.ThemeManager1.Themes.LoadToStrings(ComboBoxTheme.Items);
+  Core.Core.Translator1.LanguageListToStrings(ComboBoxLanguage.Items);
+  Core.Core.ThemeManager1.Themes.LoadToStrings(ComboBoxTheme.Items);
 end;
 
 procedure TFormSettings.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
-  TrackBar1.Position := Core.Game.AnimationDuration;
-  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator1.Language);
+  TrackBar1.Position := Core.Core.Game.AnimationDuration;
+  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;
 end;