Changeset 145 for trunk/Forms/FormOptions.pas

Timestamp:

Jun 5, 2023, 6:44:57 PM (11 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/Forms/FormOptions.pas (moved) (moved from trunk/Forms/UFormOptions.pas ) (9 diffs)

trunk/Forms/FormOptions.pas

@@ -1 @@
-unit UFormOptions;
+unit FormOptions;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Spin, ComCtrls, ExtCtrls, UTarget, UTheme;
+  Spin, ComCtrls, ExtCtrls, Target, Theme;
 
 type
@@ -47 +47 @@
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-    { private declarations }
   public
     procedure UpdateInterface;
@@ -55 +53 @@
   end;
 
-var
-  FormOptions: TFormOptions;
 
 implementation
@@ -63 +59 @@
 
 uses
-  UCore, ULanguages;
+  Core, Languages;
 
 { TFormOptions }
@@ -69 +65 @@
 procedure TFormOptions.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
+  Core.Core.PersistentForm1.Load(Self);
 end;
 
@@ -91 +87 @@
 procedure TFormOptions.Load;
 begin
-  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator.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;
-  CheckBoxReopenLastFile.Checked := Core.OpenProjectOnStart;
-  CheckBoxOptimizeAddSub.Checked := Core.Optimizations.AddSub;
-  CheckBoxOptimizeSetZero.Checked := Core.Optimizations.SetZero;
-  CheckBoxOptimizeMerge.Checked := Core.Optimizations.Merge;
-  CheckBoxOptimizeRelativeIndexes.Checked := Core.Optimizations.RelativeIndexes;
-  CheckBoxOptimizeCopyMultiply.Checked := Core.Optimizations.CopyMultiply;
-  SpinEditDPIX.Value := Core.ScaleDPI1.DPI.X;
-  SpinEditDPIY.Value := Core.ScaleDPI1.DPI.Y;
-  CheckBoxDPIAuto.Checked := Core.ScaleDPI1.AutoDetect;
-  ComboBoxOptimization.ItemIndex := Integer(Core.OptimizationLevel);
-  SpinEditCellSize.Value := Core.CellSize;
-  SpinEditMemorySize.Value := Core.MemorySize;
-  CheckBoxDebugEnabled.Checked := Core.DebugEnabled;
-  if Core.OptionsFormTabIndex < PageControl1.PageCount then
-    PageControl1.TabIndex := Core.OptionsFormTabIndex
-    else PageControl1.TabIndex := 0;
+  with Core.Core do begin
+    ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Translator.Language);
+    if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
+    ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(ThemeManager.Theme);
+    if ComboBoxTheme.ItemIndex = -1 then ComboBoxTheme.ItemIndex := 0;
+    CheckBoxReopenLastFile.Checked := OpenProjectOnStart;
+    CheckBoxOptimizeAddSub.Checked := Optimizations.AddSub;
+    CheckBoxOptimizeSetZero.Checked := Optimizations.SetZero;
+    CheckBoxOptimizeMerge.Checked := Optimizations.Merge;
+    CheckBoxOptimizeRelativeIndexes.Checked := Optimizations.RelativeIndexes;
+    CheckBoxOptimizeCopyMultiply.Checked := Optimizations.CopyMultiply;
+    SpinEditDPIX.Value := ScaleDPI1.DPI.X;
+    SpinEditDPIY.Value := ScaleDPI1.DPI.Y;
+    CheckBoxDPIAuto.Checked := ScaleDPI1.AutoDetect;
+    ComboBoxOptimization.ItemIndex := Integer(OptimizationLevel);
+    SpinEditCellSize.Value := CellSize;
+    SpinEditMemorySize.Value := MemorySize;
+    CheckBoxDebugEnabled.Checked := DebugEnabled;
+    if OptionsFormTabIndex < PageControl1.PageCount then
+      PageControl1.TabIndex := OptionsFormTabIndex
+      else PageControl1.TabIndex := 0;
+  end;
   UpdateInterface;
 end;
@@ -116 +114 @@
 procedure TFormOptions.Save;
 begin
+  with Core.Core do begin
   if ComboBoxLanguage.ItemIndex <> -1 then
-    Core.Translator.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+    Translator.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
   if ComboBoxTheme.ItemIndex <> -1 then
-    Core.ThemeManager.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
-  Core.OpenProjectOnStart := CheckBoxReopenLastFile.Checked;
-  Core.ScaleDPI1.DPI := Point(SpinEditDPIX.Value, SpinEditDPIY.Value);
-  Core.ScaleDPI1.AutoDetect := CheckBoxDPIAuto.Checked;
-  Core.OptimizationLevel := TCompilerOptimization(ComboBoxOptimization.ItemIndex);
-  Core.CellSize := SpinEditCellSize.Value;
-  Core.MemorySize := SpinEditMemorySize.Value;
-  Core.Optimizations.AddSub := CheckBoxOptimizeAddSub.Checked;
-  Core.Optimizations.SetZero := CheckBoxOptimizeSetZero.Checked;
-  Core.Optimizations.Merge := CheckBoxOptimizeMerge.Checked;
-  Core.Optimizations.RelativeIndexes := CheckBoxOptimizeRelativeIndexes.Checked;
-  Core.Optimizations.CopyMultiply := CheckBoxOptimizeCopyMultiply.Checked;
-  Core.DebugEnabled := CheckBoxDebugEnabled.Checked;
-  Core.OptionsFormTabIndex := PageControl1.TabIndex;
+    ThemeManager.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
+    OpenProjectOnStart := CheckBoxReopenLastFile.Checked;
+    ScaleDPI1.DPI := Point(SpinEditDPIX.Value, SpinEditDPIY.Value);
+    ScaleDPI1.AutoDetect := CheckBoxDPIAuto.Checked;
+    OptimizationLevel := TCompilerOptimization(ComboBoxOptimization.ItemIndex);
+    CellSize := SpinEditCellSize.Value;
+    MemorySize := SpinEditMemorySize.Value;
+    Optimizations.AddSub := CheckBoxOptimizeAddSub.Checked;
+    Optimizations.SetZero := CheckBoxOptimizeSetZero.Checked;
+    Optimizations.Merge := CheckBoxOptimizeMerge.Checked;
+    Optimizations.RelativeIndexes := CheckBoxOptimizeRelativeIndexes.Checked;
+    Optimizations.CopyMultiply := CheckBoxOptimizeCopyMultiply.Checked;
+    DebugEnabled := CheckBoxDebugEnabled.Checked;
+    OptionsFormTabIndex := PageControl1.TabIndex;
+  end;
 end;
 
@@ -157 +157 @@
   );
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;
 
 procedure TFormOptions.FormCreate(Sender: TObject);
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
-  Core.ThemeManager.Themes.LoadToStrings(ComboBoxTheme.Items);
-  Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
+  with Core.Core do begin
+    Translator.TranslateComponentRecursive(Self);
+    ThemeManager.UseTheme(Self);
+    ThemeManager.Themes.LoadToStrings(ComboBoxTheme.Items);
+    Translator.LanguageListToStrings(ComboBoxLanguage.Items);
+  end;
   ComboBoxOptimization.Items.Clear;
   ComboBoxOptimization.Items.Add(CompilerOptimizationText[coNone]);