Changeset 23 for trunk/Core.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/Core.pas (moved) (moved from trunk/UCore.pas ) (12 diffs)

trunk/Core.pas

@@ -1 @@
-unit UCore;
+unit Core;
 
 interface
 
 uses
-  Classes, SysUtils, XMLConf, LazFileUtils, ActnList, Controls, UVCS, UProject,
-  LastOpenedList, Forms, Dialogs, Menus, Contnrs, UBackend;
+  Classes, SysUtils, XMLConf, LazFileUtils, ActnList, Controls, VCS, Project,
+  LastOpenedList, Forms, Dialogs, Menus, Generics.Collections, Backend, FormMain;
 
 type
@@ -65 +65 @@
     function DetectBackend(Directory: string): TBackend;
   public
-    Backends: TObjectList; // TList<TBackend>
+    Backends: TList<TBackend>;
     Project: TProject;
     ProjectGroup: TProjectGroup;
     UserName: string;
     Email: string;
+    FormMain: TFormMain;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -87 +88 @@
 
 uses
-  UFormMain, UFormBrowse, UFormSettings, UFormCommit, UFormCheckout,
-  USubversion, UBazaar, UCVS, UGit, UFormTest, UFormProjectGroup;
+  FormBrowse, FormSettings, FormCommit, FormCheckout,
+  Subversion, Bazaar, CVS, Git, FormTest, FormProjectGroup;
 
 { TCore }
@@ -94 +95 @@
 procedure TCore.AQuitExecute(Sender: TObject);
 begin
+  FormMain.Close;
   Application.Terminate;
 end;
@@ -123 +125 @@
 
 procedure TCore.ASettingsExecute(Sender: TObject);
-begin
-  FormSettings.Load(XMLConfig1);
-  if FormSettings.ShowModal = mrOk then begin
-    FormSettings.Save(XMLConfig1);
+var
+  FormSettings: TFormSettings;
+begin
+  FormSettings := TFormSettings.Create(nil);
+  try
+    FormSettings.Load(XMLConfig1);
+    if FormSettings.ShowModal = mrOk then begin
+      FormSettings.Save(XMLConfig1);
+    end;
+  finally
+    FormSettings.Free;
   end;
 end;
 
 procedure TCore.AViewTestExecute(Sender: TObject);
-begin
-  FormTest.Show;
+var
+  FormTest: TFormTest;
+begin
+  FormTest := TFormTest.Create(nil);
+  try
+    FormTest.Show;
+  finally
+    FormTest.Free;
+  end;
 end;
 
 procedure TCore.DataModuleCreate(Sender: TObject);
 begin
-  Backends := TObjectList.Create;
+  Backends := TList<TBackend>.Create;
   Project := nil;
+
+  Application.CreateForm(TFormMain, FormMain);
+  FormMain.Show;
 end;
 
@@ -235 +254 @@
     Project.Directory := Directory;
     UpdateInterface;
-    FormBrowse.Directory := Project.Directory;
-    FormBrowse.ReloadList;
+    FormMain.FormBrowse.Directory := Project.Directory;
+    FormMain.FormBrowse.ReloadList;
     LastOpenedListProject.AddItem(Project.Directory);
   end else ShowMessage('Directory ''' + Directory + ''' not recognized as working copy of any of supported VCS systems');
@@ -247 +266 @@
   ProjectGroup.FileName := FileName;
   UpdateInterface;
-  FormProjectGroup.ReloadTree;
+  FormMain.FormProjectGroup.ReloadTree;
   LastOpenedListProjectGroup.AddItem(FileName);
 end;
@@ -266 +285 @@
 begin
   FreeAndNil(Project);
-  FormBrowse.Directory := '';
-  FormBrowse.ReloadList;
+  FormMain.FormBrowse.Directory := '';
+  FormMain.FormBrowse.ReloadList;
   UpdateInterface;
 end;
@@ -275 +294 @@
   FreeAndNil(ProjectGroup);
   UpdateInterface;
-  FormProjectGroup.ReloadTree;
+  FormMain.FormProjectGroup.ReloadTree;
 end;
 
@@ -284 +303 @@
   ProjectGroup.FileName := 'New project group.vcgrp';
   UpdateInterface;
-  FormProjectGroup.ReloadTree;
+  FormMain.FormProjectGroup.ReloadTree;
 end;
 
@@ -320 +339 @@
 var
   TempProject: TProject;
-begin
-  if LastOpenedListRepoURL.Items.Count > 0 then
-    FormCheckout.EditURL.Text := LastOpenedListRepoURL.Items[0];
-  if LastOpenedListNewDir.Items.Count > 0 then
-    FormCheckout.EditDir.Text := LastOpenedListNewDir.Items[0];
-  if FormCheckout.ShowModal = mrOk then begin
-    LastOpenedListRepoURL.AddItem(FormCheckout.EditURL.Text);
-    LastOpenedListNewDir.AddItem(FormCheckout.EditDir.Text);
-    TempProject := TProject.Create;
-    try
-      TempProject.Backend := TBackend(FormCheckout.ComboBox1.Items.Objects[FormCheckout.ComboBox1.ItemIndex]);
-      TempProject.Directory := FormCheckout.EditDir.Text;
-      TempProject.RepositoryURL := FormCheckout.EditURL.Text;
-      TempProject.WorkingCopy.Checkout;
-    finally
-      TempProject.Free;
+  FormCheckout: TFormCheckout;
+begin
+  FormCheckout := TFormCheckout.Create(nil);
+  try
+    if LastOpenedListRepoURL.Items.Count > 0 then
+      FormCheckout.EditURL.Text := LastOpenedListRepoURL.Items[0];
+    if LastOpenedListNewDir.Items.Count > 0 then
+      FormCheckout.EditDir.Text := LastOpenedListNewDir.Items[0];
+    if FormCheckout.ShowModal = mrOk then begin
+      LastOpenedListRepoURL.AddItem(FormCheckout.EditURL.Text);
+      LastOpenedListNewDir.AddItem(FormCheckout.EditDir.Text);
+      TempProject := TProject.Create;
+      try
+        TempProject.Backend := TBackend(FormCheckout.ComboBox1.Items.Objects[FormCheckout.ComboBox1.ItemIndex]);
+        TempProject.Directory := FormCheckout.EditDir.Text;
+        TempProject.RepositoryURL := FormCheckout.EditURL.Text;
+        TempProject.WorkingCopy.Checkout;
+      finally
+        TempProject.Free;
+      end;
+      ProjectOpen(FormCheckout.EditDir.Text);
     end;
-    ProjectOpen(FormCheckout.EditDir.Text);
+  finally
+    FormCheckout.Free;
   end;
 end;
@@ -347 +372 @@
 
 procedure TCore.ACommandCommitExecute(Sender: TObject);
-begin
-  if FormCommit.ShowModal = mrOk then begin
-    Project.WorkingCopy.Commit(FormCommit.MemoMessage.Lines);
+var
+  FormCommit: TFormCommit;
+begin
+  FormCommit := TFormCommit.Create(nil);
+  try
+    if FormCommit.ShowModal = mrOk then begin
+      Project.WorkingCopy.Commit(FormCommit.MemoMessage.Lines);
+    end;
+  finally
+    FormCommit.Free;
   end;
 end;