Changeset 32 for trunk/Forms/FormMain.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/Forms/FormMain.pas (moved) (moved from trunk/Forms/UFormMain.pas ) (10 diffs)

trunk/Forms/FormMain.pas

@@ -1 @@
-unit UFormMain;
+unit FormMain;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  ComCtrls, UFormTables;
+  ComCtrls, FormTables, FormEx;
 
 type
@@ -11 +11 @@
   { TFormMain }
 
-  TFormMain = class(TForm)
+  TFormMain = class(TFormEx)
     CoolBar1: TCoolBar;
     MainMenu1: TMainMenu;
@@ -41 +41 @@
   end;
 
-var
-  FormMain: TFormMain;
-
 
 implementation
@@ -50 +47 @@
 
 uses
-  UCore;
+  Core;
 
 { TFormMain }
@@ -56 +53 @@
 procedure TFormMain.FormActivate(Sender: TObject);
 begin
-  Core.Init;
+  Core.Core.Init;
   // TODO: Toolbar height is incorrectly calculated
   ToolBar1.ButtonHeight := ToolBar1.Height;
@@ -63 +60 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Core.Done;
-  Core.PersistentForm1.Save(Self);
+  Core.Core.Done;
 end;
 
@@ -79 +75 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self, True);
   SetToolbarHints;
   DockInit;
@@ -86 +81 @@
 procedure TFormMain.DockInit;
 begin
-  FormTables.ManualDock(FormMain, nil, alClient);
+  FormTables.ManualDock(Self, nil, alClient);
   FormTables.Align := alClient;
   FormTables.Show;
@@ -96 +91 @@
 begin
   NewCaption := Application.Title;
-  if Assigned(Core.DbClient) then
-    NewCaption := Core.DbClient.ConnectProfile.Name + ' - ' + NewCaption;
-  FormMain.Caption := NewCaption;
+  if Assigned(Core.Core.DbClient) then
+    NewCaption := Core.Core.DbClient.ConnectProfile.Name + ' - ' + NewCaption;
+  Caption := NewCaption;
   FormTables.UpdateInterface;
 end;