Changeset 96 for trunk/Forms/UFormOptions.pas

Timestamp:

Aug 2, 2018, 10:41:11 AM (6 years ago)

Author:

chronos

Message:

• Added: Theming support.
• Modified: Items in Options dialog divided to two pages.

File:

• trunk/Forms/UFormOptions.pas (modified) (8 diffs)

trunk/Forms/UFormOptions.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Spin, UTarget;
+  Spin, ComCtrls, ExtCtrls, UTarget, UTheme;
 
 type
@@ -17 +17 @@
     ButtonCancel: TButton;
     CheckBox1: TCheckBox;
+    CheckBoxDPIAuto: TCheckBox;
     CheckBoxOptimizeAddSub: TCheckBox;
-    CheckBoxDPIAuto: TCheckBox;
+    CheckBoxOptimizeCopyMultiply: TCheckBox;
     CheckBoxOptimizeMerge: TCheckBox;
     CheckBoxOptimizeRelativeIndexes: TCheckBox;
-    CheckBoxOptimizeCopyMultiply: TCheckBox;
     ComboBoxLanguage: TComboBox;
     ComboBoxOptimization: TComboBox;
+    ComboBoxTheme: TComboBox;
     Label1: TLabel;
     Label2: TLabel;
@@ -29 +30 @@
     Label4: TLabel;
     LabelDPI: TLabel;
+    LabelTheme: TLabel;
     LabelX: TLabel;
+    PageControl1: TPageControl;
+    Panel1: TPanel;
+    Panel2: TPanel;
+    SpinEditCellSize: TSpinEdit;
     SpinEditDPIX: TSpinEdit;
     SpinEditDPIY: TSpinEdit;
-    SpinEditCellSize: TSpinEdit;
     SpinEditMemorySize: TSpinEdit;
-    procedure ButtonOkClick(Sender: TObject);
+    TabSheetGeneral: TTabSheet;
+    TabSheetBuild: TTabSheet;
     procedure CheckBoxDPIAutoChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -62 +68 @@
 begin
   Core.PersistentForm1.Load(Self);
-
-  Core.CoolTranslator1.LanguageListToStrings(ComboBoxLanguage.Items);
-  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
-  if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
-  CheckBox1.Checked := Core.OpenProjectOnStart;
 end;
 
@@ -87 +88 @@
 procedure TFormOptions.Load;
 begin
+  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
+  if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
+  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.ThemeManager.Theme);
+  if ComboBoxTheme.ItemIndex = -1 then ComboBoxTheme.ItemIndex := 0;
+  CheckBox1.Checked := Core.OpenProjectOnStart;
   CheckBoxOptimizeAddSub.Checked := Core.Optimizations.AddSub;
   CheckBoxOptimizeMerge.Checked := Core.Optimizations.Merge;
@@ -102 +108 @@
 procedure TFormOptions.Save;
 begin
+  if ComboBoxLanguage.ItemIndex <> -1 then
+    Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+  if ComboBoxTheme.ItemIndex <> -1 then
+    Core.ThemeManager.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
+  Core.OpenProjectOnStart := CheckBox1.Checked;
   Core.ScaleDPI1.DPI := Point(SpinEditDPIX.Value, SpinEditDPIY.Value);
   Core.ScaleDPI1.AutoDetect := CheckBoxDPIAuto.Checked;
@@ -111 +122 @@
   Core.Optimizations.RelativeIndexes := CheckBoxOptimizeRelativeIndexes.Checked;
   Core.Optimizations.CopyMultiply := CheckBoxOptimizeCopyMultiply.Checked;
-end;
-
-procedure TFormOptions.ButtonOkClick(Sender: TObject);
-begin
-  if ComboBoxLanguage.ItemIndex <> -1 then
-    Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
-  Core.OpenProjectOnStart := CheckBox1.Checked;
 end;
 
@@ -134 +138 @@
 begin
   Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.ThemeManager.UseTheme(Self);
+  Core.ThemeManager.Themes.LoadToStrings(ComboBoxTheme.Items);
+  Core.CoolTranslator1.LanguageListToStrings(ComboBoxLanguage.Items);
 end;