Changeset 219 for trunk/Forms/FormCategories.pas

Timestamp:

Jan 17, 2025, 9:05:54 PM (4 days ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Modified: Remove U prefix from unit names.
• Modified: Use Gneeric.Collections instead of fgl.
• Modified: Do not use global form variables.

File:

• trunk/Forms/FormCategories.pas (moved) (moved from trunk/Forms/UFormCategories.pas ) (16 diffs)

trunk/Forms/FormCategories.pas

@@ -1 @@
-unit UFormCategories;
-
-{$mode delphi}
+unit FormCategories;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ActnList, Menus, UAcronym, UListViewSort;
+  ActnList, Menus, Acronym, ListViewSort, FormEx;
 
 type
@@ -13 +11 @@
   { TFormCategories }
 
-  TFormCategories = class(TForm)
+  TFormCategories = class(TFormEx)
     AAdd: TAction;
     AEnable: TAction;
@@ -41 +39 @@
     procedure ARemoveExecute(Sender: TObject);
     procedure ASelectAllExecute(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -53 +50 @@
     function ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
     procedure ListViewSort1Filter(ListViewSort: TListViewSort);
-  private
-    { private declarations }
   public
     Categories: TAcronymCategories;
@@ -61 +56 @@
   end;
 
-var
-  FormCategories: TFormCategories;
 
 implementation
@@ -69 +62 @@
 
 uses
-  UCore;
+  Core;
 
 resourcestring
@@ -82 +75 @@
 procedure TFormCategories.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
   UpdateList;
-  Core.ScaleDPI1.ScaleControl(ToolBar1, Core.ScaleDPI1.DesignDPI);
+  Core.Core.ScaleDPI1.ScaleControl(ToolBar1, Core.Core.ScaleDPI1.DesignDPI);
 end;
 
@@ -92 +84 @@
   if Assigned(Item) and (Change = ctState) then begin
     TAcronymCategory(Item.Data).Enabled := Item.Checked;
-    Core.AcronymDb.Modified := True;
+    Core.Core.AcronymDb.Modified := True;
   end;
 end;
@@ -102 +94 @@
   S := InputBox(SCategory, SCategoryQuery, '');
   if S <> '' then begin
-    if not Assigned(Core.AcronymDb.Categories.SearchByName(S)) then begin;
-      TAcronymCategory(Core.AcronymDb.Categories[Core.AcronymDb.Categories.Add(TAcronymCategory.Create)]).Name := S;
-      Core.AcronymDb.Modified := True;
-      Core.AcronymDb.Update;
+    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;
       UpdateList;
     end else ShowMessage(Format(SCategoryAlreadyExists, [S]));
@@ -118 +110 @@
   if ListViewCategories.Items[I].Selected then begin
     TAcronymCategory(ListViewCategories.Items[I].Data).Enabled := False;
-    Core.AcronymDb.Modified := True;
+    Core.Core.AcronymDb.Modified := True;
   end;
   UpdateList;
@@ -130 +122 @@
   if ListViewCategories.Items[I].Selected then begin
     TAcronymCategory(ListViewCategories.Items[I].Data).Enabled := True;
-    Core.AcronymDb.Modified := True;
+    Core.Core.AcronymDb.Modified := True;
   end;
   UpdateList;
@@ -142 +134 @@
     S := InputBox(SCategory, SCategoryQuery, ListViewCategories.Selected.Caption);
     if S <> ListViewCategories.Selected.Caption then begin
-      if not Assigned(Core.AcronymDb.Categories.SearchByName(S)) then begin;
+      if not Assigned(Core.Core.AcronymDb.Categories.SearchByName(S)) then begin;
         TAcronymCategory(ListViewCategories.Selected.Data).Name := S;
-        Core.AcronymDb.Modified := True;
-        Core.AcronymDb.Update;
+        Core.Core.AcronymDb.Modified := True;
+        Core.Core.AcronymDb.Update;
         UpdateList;
       end else ShowMessage(Format(SCategoryAlreadyExists, [S]));
@@ -177 +169 @@
 end;
 
-procedure TFormCategories.FormClose(Sender: TObject;
-  var CloseAction: TCloseAction);
-begin
-  Core.PersistentForm1.Save(Self);
-end;
-
 procedure TFormCategories.FormCreate(Sender: TObject);
 var
   I: Integer;
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
   for I := 0 to ToolBar1.ButtonCount - 1 do
     ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;
@@ -237 +221 @@
 procedure TFormCategories.ListViewSort1Filter(ListViewSort: TListViewSort);
 begin
-  Core.AcronymDb.Categories.AssignToList(ListViewSort1.List);
+  Core.Core.AcronymDb.Categories.AssignToList(ListViewSort1.List);
 end;
 
@@ -243 +227 @@
 begin
   ListViewSort1.Refresh;
-  ListViewCategories.Items.Count := Core.AcronymDb.Categories.Count;
+  ListViewCategories.Items.Count := Core.Core.AcronymDb.Categories.Count;
   ListViewCategories.Refresh;
   UpdateInterface;