Changeset 23 for trunk/Forms/FormMain.pas

Timestamp:

Apr 4, 2025, 9:22:05 AM (2 weeks ago)

Author:

chronos

Message:

• Modified: All unit renamed to names without U prefix.
• Modified: Removed global form variables.
• Modified: Code cleanup.

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, ComCtrls,
-  Menus, ActnList, ExtCtrls;
+  Menus, ActnList, ExtCtrls, FormBrowse, FormProjectGroup;
 
 type
@@ -50 +50 @@
     procedure FormActivate(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure MenuItemFileClick(Sender: TObject);
@@ -55 +57 @@
     Initialized: Boolean;
   public
+    FormBrowse: TFormBrowse;
+    FormProjectGroup: TFormProjectGroup;
     procedure ProjectGroupOpenRecentExecute(Sender: TObject);
     procedure OpenRecentExecute(Sender: TObject);
@@ -60 +64 @@
     procedure DockInit;
   end;
-
-var
-  FormMain: TFormMain;
 
 
@@ -70 +71 @@
 
 uses
-  UCore, UFormBrowse, UFormProjectGroup;
+  Core;
 
 { TFormMain }
@@ -86 +87 @@
 procedure TFormMain.OpenRecentExecute(Sender: TObject);
 begin
-  Core.ProjectOpen(Core.LastOpenedListProject.Items[TMenuItem(Sender).MenuIndex]);
+  Core.Core.ProjectOpen(Core.Core.LastOpenedListProject.Items[TMenuItem(Sender).MenuIndex]);
 end;
 
 procedure TFormMain.ProjectGroupOpenRecentExecute(Sender: TObject);
 begin
-  Core.ProjectGroupOpen(Core.LastOpenedListProjectGroup.Items[TMenuItem(Sender).MenuIndex]);
+  Core.Core.ProjectGroupOpen(Core.Core.LastOpenedListProjectGroup.Items[TMenuItem(Sender).MenuIndex]);
 end;
 
@@ -98 +99 @@
   if not Initialized then begin
     Initialized := True;
-    Core.Init;
+    Core.Core.Init;
   end;
 end;
@@ -104 +105 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Core.Done;
+  Core.Core.Done;
+end;
+
+procedure TFormMain.FormCreate(Sender: TObject);
+begin
+  FormBrowse := TFormBrowse.Create(nil);
+  FormProjectGroup := TFormProjectGroup.Create(nil);
+end;
+
+procedure TFormMain.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(FormProjectGroup);
+  FreeAndNil(FormBrowse);
 end;
 
@@ -114 +127 @@
 begin
   NewCaption := '';
-  if Assigned(Core.Project) then
-    NewCaption := Core.Project.Directory + ' (' + Core.Project.Backend.Name + ') - ';
+  if Assigned(Core.Core.Project) then
+    NewCaption := Core.Core.Project.Directory + ' (' + Core.Core.Project.Backend.Name + ') - ';
   NewCaption := NewCaption + AppName;
   Caption := NewCaption;