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

trunk/Forms/FormCategories.pas

@@ -51 +51 @@
     procedure ListViewSort1Filter(ListViewSort: TListViewSort);
   public
+    AcronymDb: TAcronymDb;
     Categories: TAcronymCategories;
     procedure UpdateList;
@@ -60 +61 @@
 
 {$R *.lfm}
-
-uses
-  Core;
 
 resourcestring
@@ -76 +74 @@
 begin
   UpdateList;
-  Core.Core.ScaleDPI1.ScaleControl(ToolBar1, Core.Core.ScaleDPI1.DesignDPI);
+  ScaleDPI.ScaleControl(ToolBar1, ScaleDPI.DesignDPI);
 end;
 
@@ -84 +82 @@
   if Assigned(Item) and (Change = ctState) then begin
     TAcronymCategory(Item.Data).Enabled := Item.Checked;
-    Core.Core.AcronymDb.Modified := True;
+    AcronymDb.Modified := True;
   end;
 end;
@@ -94 +92 @@
   S := InputBox(SCategory, SCategoryQuery, '');
   if S <> '' then begin
-    if not Assigned(Core.Core.AcronymDb.Categories.SearchByName(S)) then begin;
-      TAcronymCategory(Core.Core.AcronymDb.Categories[Core.Core.AcronymDb.Categories.Add(TAcronymCategory.Create)]).Name := S;
-      Core.Core.AcronymDb.Modified := True;
-      Core.Core.AcronymDb.Update;
+    if not Assigned(AcronymDb.Categories.SearchByName(S)) then begin;
+      TAcronymCategory(AcronymDb.Categories[AcronymDb.Categories.Add(TAcronymCategory.Create)]).Name := S;
+      AcronymDb.Modified := True;
+      AcronymDb.Update;
       UpdateList;
     end else ShowMessage(Format(SCategoryAlreadyExists, [S]));
@@ -110 +108 @@
   if ListViewCategories.Items[I].Selected then begin
     TAcronymCategory(ListViewCategories.Items[I].Data).Enabled := False;
-    Core.Core.AcronymDb.Modified := True;
+    AcronymDb.Modified := True;
   end;
   UpdateList;
@@ -122 +120 @@
   if ListViewCategories.Items[I].Selected then begin
     TAcronymCategory(ListViewCategories.Items[I].Data).Enabled := True;
-    Core.Core.AcronymDb.Modified := True;
+    AcronymDb.Modified := True;
   end;
   UpdateList;
@@ -134 +132 @@
     S := InputBox(SCategory, SCategoryQuery, ListViewCategories.Selected.Caption);
     if S <> ListViewCategories.Selected.Caption then begin
-      if not Assigned(Core.Core.AcronymDb.Categories.SearchByName(S)) then begin;
+      if not Assigned(AcronymDb.Categories.SearchByName(S)) then begin;
         TAcronymCategory(ListViewCategories.Selected.Data).Name := S;
-        Core.Core.AcronymDb.Modified := True;
-        Core.Core.AcronymDb.Update;
+        AcronymDb.Modified := True;
+        AcronymDb.Update;
         UpdateList;
       end else ShowMessage(Format(SCategoryAlreadyExists, [S]));
@@ -221 +219 @@
 procedure TFormCategories.ListViewSort1Filter(ListViewSort: TListViewSort);
 begin
-  Core.Core.AcronymDb.Categories.AssignToList(ListViewSort1.List);
+  AcronymDb.Categories.AssignToList(ListViewSort1.List);
 end;
 
@@ -227 +225 @@
 begin
   ListViewSort1.Refresh;
-  ListViewCategories.Items.Count := Core.Core.AcronymDb.Categories.Count;
+  ListViewCategories.Items.Count := AcronymDb.Categories.Count;
   ListViewCategories.Refresh;
   UpdateInterface;