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

trunk/Forms/FormImportSource.pas

@@ -44 +44 @@
     procedure FormShow(Sender: TObject);
   public
+    AcronymDb: TAcronymDb;
     procedure UpdateInterface;
     procedure Load(ImportSource: TImportSource);
@@ -55 +56 @@
 
 uses
-  Core, FormImportFormat, FormCategorySelect;
+  FormImportFormat, FormCategorySelect;
 
 { TFormImportSource }
@@ -73 +74 @@
         FormImportFormat.Save(NewImportFormat);
         TImportFormat(ComboBox1.Items.Objects[ComboBox1.ItemIndex]).Assign(NewImportFormat);
-        Core.Core.AcronymDb.Modified := True;
+        AcronymDb.Modified := True;
         ComboBox1.Items.Strings[ComboBox1.ItemIndex] := NewImportFormat.Name;
       end;
@@ -100 +101 @@
   FormCategorySelect := TFormCategorySelect.Create(Self);
   try
+    FormCategorySelect.AcronymDb := AcronymDb;
     FormCategorySelect.Load(ListBox1.Items);
     if FormCategorySelect.ShowModal = mrOk then begin
@@ -136 +138 @@
   EditName.Text := ImportSource.Name;
   EditURL.Text := ImportSource.URL;
-  while ComboBox1.Items.Count > Core.Core.AcronymDb.ImportFormats.Count do
+  while ComboBox1.Items.Count > AcronymDb.ImportFormats.Count do
     ComboBox1.Items.Delete(ComboBox1.Items.Count - 1);
-  while ComboBox1.Items.Count < Core.Core.AcronymDb.ImportFormats.Count do
+  while ComboBox1.Items.Count < AcronymDb.ImportFormats.Count do
     ComboBox1.Items.Add('');
-  for I := 0 to Core.Core.AcronymDb.ImportFormats.Count - 1 do begin
-    ComboBox1.Items[I] := TImportFormat(Core.Core.AcronymDb.ImportFormats[I]).Name;
-    ComboBox1.Items.Objects[I] := Core.Core.AcronymDb.ImportFormats[I];
+  for I := 0 to AcronymDb.ImportFormats.Count - 1 do begin
+    ComboBox1.Items[I] := TImportFormat(AcronymDb.ImportFormats[I]).Name;
+    ComboBox1.Items.Objects[I] := AcronymDb.ImportFormats[I];
   end;
   ComboBox1.ItemIndex := ComboBox1.Items.IndexOfObject(ImportSource.Format);