Changeset 227 for trunk/Forms/FormMain.pas

Timestamp:

Jan 20, 2025, 11:38:55 AM (42 hours ago)

Author:

chronos

Message:

• Modified: Do not reference global Core object if possible.

File:

• trunk/Forms/FormMain.pas (modified) (11 diffs)

trunk/Forms/FormMain.pas

@@ -46 +46 @@
     CheckBoxCaseSensitive: TCheckBox;
     CoolBar1: TCoolBar;
+    JobProgressView1: TJobProgressView;
     LastOpenedList1: TLastOpenedList;
     ListViewAcronyms: TListView;
@@ -272 +273 @@
   FormCheck := TFormCheck.Create(Self);
   try
-    FormCheck.LoadConfig;
+    FormCheck.LoadConfig(TRegistryContext.Create(Core.Core.ApplicationInfo1.RegistryRoot,
+      Core.Core.ApplicationInfo1.RegistryKey));
     FormCheck.ShowModal;
-    FormCheck.SaveConfig;
+    FormCheck.SaveConfig(TRegistryContext.Create(Core.Core.ApplicationInfo1.RegistryRoot,
+      Core.Core.ApplicationInfo1.RegistryKey));
   finally
     FreeAndNil(FormCheck);
@@ -286 +289 @@
   FormExport := TFormExport.Create(Self);
   try
+    FormExport.AcronymDb := Core.Core.AcronymDb;
     FormExport.ShowModal;
   finally
@@ -322 +326 @@
 begin
   AFileClose.Execute;
-  if not Assigned(Core.Core.AcronymDb)  then begin
+  if not Assigned(Core.Core.AcronymDb) then begin
     Core.Core.AcronymDb := TAcronymDb.Create;
     Core.Core.AcronymDb.FileName := DefaultFileName;
@@ -406 +410 @@
   FormImport := TFormImport.Create(Self);
   try
+    FormImport.AcronymDb := Core.Core.AcronymDb;
     FormImport.ShowModal;
     UpdateAcronymsList;
@@ -422 +427 @@
     if Assigned(ListViewAcronyms.Selected) then
       FormAcronyms.FocusAcronym := ListViewAcronyms.Selected.Data;
+    FormAcronyms.AcronymDb := Core.Core.AcronymDb;
     FormAcronyms.Acronyms := Core.Core.AcronymDb.Acronyms;
     FormAcronyms.ShowModal;
@@ -435 +441 @@
   ImportTotalItemCount := 0;
   Core.Core.AcronymDb.AddedCount := 0;
-  Core.Core.JobProgressView1.AddJob(SProcessImportSources, ProcessImportsJob);
-  Core.Core.JobProgressView1.Start;
+  JobProgressView1.AddJob(SProcessImportSources, ProcessImportsJob);
+  JobProgressView1.Start;
   ShowMessage(Format(SAddedCount, [ImportTotalItemCount, Core.Core.AcronymDb.AddedCount]));
   UpdateAcronymsList;
@@ -493 +499 @@
   FormAcronyms := TFormAcronyms.Create(Self);
   try
+    FormAcronyms.AcronymDb := Core.Core.AcronymDb;
     FormAcronyms.Acronyms := Core.Core.AcronymDb.Acronyms;
     FormAcronyms.ShowModal;
@@ -508 +515 @@
   FormCategories := TFormCategories.Create(Self);
   try
+    FormCategories.AcronymDb := Core.Core.AcronymDb;
     FormCategories.Categories := Core.Core.AcronymDb.Categories;
     FormCategories.ShowModal;
@@ -529 +537 @@
   FormImportFormats := TFormImportFormats.Create(Self);
   try
+    FormImportFormats.AcronymDb := Core.Core.AcronymDb;
     FormImportFormats.ImportFormats := Core.Core.AcronymDb.ImportFormats;
     FormImportFormats.ShowModal;
@@ -544 +553 @@
   try
     FormImportSources.ImportSources := Core.Core.AcronymDb.ImportSources;
+    FormImportSources.AcronymDb := Core.Core.AcronymDb;
     FormImportSources.ShowModal;
     UpdateAcronymsList;