Changeset 32 for trunk/Core.pas

Timestamp:

Jun 29, 2024, 7:58:36 AM (5 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from units names.
• Modified: Use TFormEx for all forms.

File:

• trunk/Core.pas (moved) (moved from trunk/UCore.pas ) (7 diffs)

trunk/Core.pas

@@ -1 @@
-unit UCore;
+unit Core;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Controls, ActnList, UDatabase, Translator,
-  ApplicationInfo, PersistentForm, Forms, RegistryEx, ScaleDPI;
+  Classes, SysUtils, FileUtil, Controls, ActnList, DbEngine, Translator,
+  ApplicationInfo, PersistentForm, Forms, RegistryEx, ScaleDPI, Theme, FormMain;
 
 type
@@ -18 +18 @@
     AExit: TAction;
     ActionList1: TActionList;
+    ThemeManager1: TThemeManager;
     Translator1: TTranslator;
     ImageList1: TImageList;
@@ -37 +38 @@
     Preferences: TPreferences;
     DbManager: TDbManager;
+    FormMain: TFormMain;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -55 +57 @@
 
 uses
-  UFormTables, UFormConnect, FormAbout, UFormDatabases, UFormPreferences,
-  UFormMain;
+  FormTables, FormAbout, FormDatabases, FormPreferences, FormEx;
 
 {$R *.lfm}
@@ -66 +67 @@
   DbManager := TDbManager.Create;
   Preferences := TPreferences.Create;
+
+  TFormEx.ScaleDPI := ScaleDPI1;
+  TFormEx.Translator := Translator1;
+  TFormEx.ThemeManager := ThemeManager1;
+  TFormEx.PersistentForm := PersistentForm1;
+
+  FormMain := TFormMain.Create(nil);
+  FormMain.Show;
 end;
 
 procedure TCore.DataModuleDestroy(Sender: TObject);
 begin
+  FreeAndNil(FormMain);
   DbClient := nil;
   FreeAndNil(Preferences);
@@ -89 +99 @@
   with TFormDatabases.Create(nil) do
   try
+    DbManager := Self.DbManager;
     if ShowModal = mrOk then begin
       DbClient := nil;
@@ -201 +212 @@
   SaveConfig;
   DbClient := nil;
+  Application.Terminate;
 end;