Changeset 149 for trunk/Forms/FormSettings.pas

Timestamp:

Jun 5, 2023, 8:45:38 PM (12 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.

File:

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

trunk/Forms/FormSettings.pas

@@ -1 @@
-unit UFormSettings;
+unit FormSettings;
 
 interface
@@ -40 +40 @@
   end;
 
-var
-  FormSettings: TFormSettings;
-
 
 implementation
@@ -49 +46 @@
 
 uses
-  UCore, Theme;
+  Core, Theme;
 
 { TFormSettings }
@@ -55 +52 @@
 procedure TFormSettings.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
+  Core.Core.PersistentForm1.Load(Self);
 
-  Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
-  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator.Language);
+  Core.Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
+  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Core.Translator.Language);
   if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
 
-  Core.ThemeManager1.Themes.LoadToStrings(ComboBoxTheme.Items);
-  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.ThemeManager1.Theme);
+  Core.Core.ThemeManager1.Themes.LoadToStrings(ComboBoxTheme.Items);
+  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.Core.ThemeManager1.Theme);
   if ComboBoxTheme.ItemIndex = -1 then ComboBoxTheme.ItemIndex := 0;
 end;
@@ -69 +66 @@
 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.ThemeManager1.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
+    Core.Core.ThemeManager1.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
 end;
 
@@ -87 +84 @@
   );
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;
 
 procedure TFormSettings.FormCreate(Sender: TObject);
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager1.UseTheme(Self);
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager1.UseTheme(Self);
 end;
 
 procedure TFormSettings.LoadData;
 begin
-  CheckBoxAutomaticDPI.Checked := Core.ScaleDPI1.AutoDetect;
-  SpinEditDPI.Value := Core.ScaleDPI1.DPI.X;
-  CheckBoxReopenLastFileOnStart.Checked := Core.ReopenLastFileOnStart;
-  EditDefaultVcardVersion.Text := Core.DefaultVcardVersion;
-  EditMapUrl.Text := Core.MapUrl;
+  with Core.Core do begin
+    CheckBoxAutomaticDPI.Checked := ScaleDPI1.AutoDetect;
+    SpinEditDPI.Value := ScaleDPI1.DPI.X;
+    CheckBoxReopenLastFileOnStart.Checked := ReopenLastFileOnStart;
+    EditDefaultVcardVersion.Text := DefaultVcardVersion;
+    EditMapUrl.Text := MapUrl;
+  end;
   UpdateInterface;
 end;
@@ -108 +107 @@
 procedure TFormSettings.SaveData;
 begin
-  Core.ScaleDPI1.AutoDetect := CheckBoxAutomaticDPI.Checked;
-  Core.ScaleDPI1.DPI := Point(SpinEditDPI.Value, SpinEditDPI.Value);
-  Core.ReopenLastFileOnStart := CheckBoxReopenLastFileOnStart.Checked;
-  Core.DefaultVcardVersion := EditDefaultVcardVersion.Text;
-  Core.MapUrl := EditMapUrl.Text;
+  with Core.Core do begin
+    ScaleDPI1.AutoDetect := CheckBoxAutomaticDPI.Checked;
+    ScaleDPI1.DPI := Point(SpinEditDPI.Value, SpinEditDPI.Value);
+    ReopenLastFileOnStart := CheckBoxReopenLastFileOnStart.Checked;
+    DefaultVcardVersion := EditDefaultVcardVersion.Text;
+    MapUrl := EditMapUrl.Text;
+  end;
 end;