Changeset 227 for trunk/Forms/FormImportSources.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/FormImportSources.pas (modified) (11 diffs)

trunk/Forms/FormImportSources.pas

@@ -62 +62 @@
   public
     ImportSources: TImportSources;
+    AcronymDb: TAcronymDb;
     procedure UpdateList;
     procedure UpdateInterface;
@@ -72 +73 @@
 
 uses
-  Core, FormMain, FormImportSource;
+  FormMain, FormImportSource;
 
 resourcestring
@@ -168 +169 @@
 begin
   UpdateList;
-  Core.Core.ScaleDPI1.ScaleControl(ToolBar1, Core.Core.ScaleDPI1.DesignDPI);
+  ScaleDPI.ScaleControl(ToolBar1, ScaleDPI.DesignDPI);
 end;
 
@@ -176 +177 @@
   if Assigned(Item) and (Change = ctState) then begin
     TImportSource(Item.Data).Enabled := Item.Checked;
-    Core.Core.AcronymDb.Modified := True;
+    AcronymDb.Modified := True;
   end;
 end;
@@ -190 +191 @@
   FormImportSource := TFormImportSource.Create(Self);
   try
+    FormImportSource.AcronymDb := AcronymDb;
     FormImportSource.Load(NewImportSource);
     if FormImportSource.ShowModal = mrOk then begin
@@ -198 +200 @@
         // Update reverse references
         for I := 0 to NewImportSource.Categories.Count - 1 do
-          if TAcronymCategory(NewImportSource.Categories.Items[I]).ImportSources.IndexOf(NewImportSource) = -1 then
-            TAcronymCategory(NewImportSource.Categories.Items[I]).ImportSources.Add(NewImportSource);
+          if NewImportSource.Categories.Items[I].ImportSources.IndexOf(NewImportSource) = -1 then
+            NewImportSource.Categories.Items[I].ImportSources.Add(NewImportSource);
 
         NewImportSource := nil;
-        Core.Core.AcronymDb.Modified := True;
+        AcronymDb.Modified := True;
         UpdateList;
       end else ShowMessage(Format(SImportSourceAlreadyExists, [NewImportSource.Name]));
@@ -219 +221 @@
   if ListView1.Items[I].Selected then begin
     TImportSource(ListView1.Items[I].Data).Enabled := False;
-    Core.Core.AcronymDb.Modified := True;
+    AcronymDb.Modified := True;
   end;
   UpdateList;
@@ -231 +233 @@
   if ListView1.Items[I].Selected then begin
     TImportSource(ListView1.Items[I].Data).Enabled := True;
-    Core.Core.AcronymDb.Modified := True;
+    AcronymDb.Modified := True;
   end;
   UpdateList;
@@ -246 +248 @@
     FormImportSource := TFormImportSource.Create(Self);
     try
+      FormImportSource.AcronymDb := AcronymDb;
       FormImportSource.Load(NewImportSource);
       if FormImportSource.ShowModal = mrOk then begin
@@ -252 +255 @@
           if not Assigned(ImportSources.SearchByName(NewImportSource.Name)) then begin;
             TImportSource(ListView1.Selected.Data).Assign(NewImportSource);
-            Core.Core.AcronymDb.Modified := True;
+            AcronymDb.Modified := True;
           end else ShowMessage(Format(SImportSourceAlreadyExists, [NewImportSource.Name]));
         end else begin
           TImportSource(ListView1.Selected.Data).Assign(NewImportSource);
-          Core.Core.AcronymDb.Modified := True;
+          AcronymDb.Modified := True;
         end;
 
@@ -274 +277 @@
 begin
   if Assigned(ListView1.Selected) then begin
-    Core.Core.AcronymDb.AddedCount := 0;
+    AcronymDb.AddedCount := 0;
     JobProgressView1.AddJob(SProcessSelectedSource, ProcessImportJob);
     JobProgressView1.Start;
     ShowMessage(Format(SAddedCount, [TImportSource(ListView1.Selected.Data).ItemCount,
-      Core.Core.AcronymDb.AddedCount]));
+      AcronymDb.AddedCount]));
   end;
 end;