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

trunk/Forms/FormAcronyms.pas

@@ -50 +50 @@
     FAcronyms: TAcronyms;
     MeaningCount: Integer;
+    function CompareStrings(Strings1, Strings2: TStrings): Boolean;
     function AcronymComparer(constref Item1, Item2: TAcronym): Integer;
     procedure FilterList(List: TObjectList<TObject>);
@@ -55 +56 @@
     procedure UpdateAcronymsList;
   public
+    AcronymDb: TAcronymDb;
     FocusAcronym: TAcronymMeaning;
     property Acronyms: TAcronyms read FAcronyms write SetAcronyms;
@@ -66 +68 @@
 
 uses
-  Core, FormAcronym;
+  FormAcronym;
 
 resourcestring
@@ -116 +118 @@
   ListViewFilter1.UpdateFromListView(ListViewAcronyms);
   UpdateAcronymsList;
-  Core.Core.ScaleDPI1.ScaleControl(ToolBar1, Core.Core.ScaleDPI1.DesignDPI);
+  ScaleDPI.ScaleControl(ToolBar1, ScaleDPI.DesignDPI);
 
   // Focus line with acronym
@@ -131 +133 @@
 end;
 
+function TFormAcronyms.CompareStrings(Strings1, Strings2: TStrings): Boolean;
+var
+  I: Integer;
+begin
+  Result := Strings1.Count = Strings2.Count;
+  if not Result then Exit;
+  for I := 0 to Strings1.Count - 1 do
+    if (Strings1[I] <> Strings2[I]) or (Strings1.Objects[I] <> Strings2.Objects[I]) then begin
+      Result := False;
+      Exit;
+    end;
+end;
+
 procedure TFormAcronyms.AAddExecute(Sender: TObject);
 var
@@ -144 +159 @@
   FormAcronym := TFormAcronym.Create(Self);
   try
+    FormAcronym.AcronymDb := AcronymDb;
     FormAcronym.Load(TempEntry);
     if FormAcronym.ShowModal = mrOk then begin
@@ -186 +202 @@
     FormAcronym := TFormAcronym.Create(Self);
     try
+      FormAcronym.AcronymDb := AcronymDb;
       FormAcronym.Load(TempEntry);
       if FormAcronym.ShowModal = mrOk then begin
@@ -192 +209 @@
         (TempEntry.Meaning <> Name) or
         (TempEntry.Description <> Description) or
-        not Core.Core.CompareStrings(TempEntry.Categories, TempCategories) then begin
+        not CompareStrings(TempEntry.Categories, TempCategories) then begin
           // TODO: Update item inplace if possible
           Acronyms.Db.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Selected.Data));
@@ -201 +218 @@
           // Update reverse references
           for I := 0 to Meaning.Categories.Count - 1 do
-            if TAcronymCategory(Meaning.Categories.Items[I]).AcronymMeanings.IndexOf(Meaning) = -1 then
-              TAcronymCategory(Meaning.Categories.Items[I]).AcronymMeanings.Add(Meaning);
+            if Meaning.Categories.Items[I].AcronymMeanings.IndexOf(Meaning) = -1 then
+              Meaning.Categories.Items[I].AcronymMeanings.Add(Meaning);
           Acronyms.Db.Update;
           UpdateAcronymsList;