Changeset 219 for trunk/Forms/FormAcronyms.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/FormAcronyms.pas (moved) (moved from trunk/Forms/UFormAcronyms.pas ) (15 diffs)

trunk/Forms/FormAcronyms.pas

@@ -1 @@
-unit UFormAcronyms;
-
-{$mode delphi}
+unit FormAcronyms;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UListViewSort, UAcronym, LazUTF8, fgl;
+  Menus, ActnList, ListViewSort, Acronym, LazUTF8, Generics.Collections,
+  Generics.Defaults, FormEx;
 
 type
@@ -13 +12 @@
   { TFormAcronyms }
 
-  TFormAcronyms = class(TForm)
+  TFormAcronyms = class(TFormEx)
     AAdd: TAction;
     ASelectAll: TAction;
@@ -36 +35 @@
     procedure ARemoveExecute(Sender: TObject);
     procedure ASelectAllExecute(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -52 +50 @@
     FAcronyms: TAcronyms;
     MeaningCount: Integer;
-    procedure FilterList(List: TFPGObjectList<TObject>);
+    function AcronymComparer(constref Item1, Item2: TAcronym): Integer;
+    procedure FilterList(List: TObjectList<TObject>);
     procedure SetAcronyms(AValue: TAcronyms);
     procedure UpdateAcronymsList;
@@ -61 +60 @@
   end;
 
-var
-  FormAcronyms: TFormAcronyms;
 
 implementation
@@ -69 +66 @@
 
 uses
-  UCore, UFormMain, UFormAcronym;
+  Core, FormAcronym;
 
 resourcestring
@@ -117 +114 @@
   I: Integer;
 begin
-  Core.PersistentForm1.Load(Self);
   ListViewFilter1.UpdateFromListView(ListViewAcronyms);
   UpdateAcronymsList;
-  Core.ScaleDPI1.ScaleControl(ToolBar1, Core.ScaleDPI1.DesignDPI);
+  Core.Core.ScaleDPI1.ScaleControl(ToolBar1, Core.Core.ScaleDPI1.DesignDPI);
 
   // Focus line with acronym
@@ -140 +136 @@
   Meaning: TAcronymMeaning;
   I: Integer;
+  FormAcronym: TFormAcronym;
 begin
   TempEntry := TAcronymEntry.Create;
@@ -175 +172 @@
   Meaning: TAcronymMeaning;
   I: Integer;
+  FormAcronym: TFormAcronym;
 begin
   if Assigned(ListViewAcronyms.Selected) then
@@ -194 +192 @@
         (TempEntry.Meaning <> Name) or
         (TempEntry.Description <> Description) or
-        not FormMain.CompareStrings(TempEntry.Categories, TempCategories) then begin
+        not Core.Core.CompareStrings(TempEntry.Categories, TempCategories) then begin
           // TODO: Update item inplace if possible
           Acronyms.Db.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Selected.Data));
@@ -246 +244 @@
 end;
 
-procedure TFormAcronyms.FormClose(Sender: TObject; var CloseAction: TCloseAction
-  );
-begin
-  Core.PersistentForm1.Save(Self);
-end;
-
 procedure TFormAcronyms.FormCreate(Sender: TObject);
 var
@@ -258 +250 @@
   FocusAcronym := nil;
   MeaningCount := 0;
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
   for I := 0 to ToolBar1.ButtonCount - 1 do
     ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;
@@ -288 +278 @@
 end;
 
+function TFormAcronyms.AcronymComparer(constref Item1, Item2: TAcronym): Integer;
+begin
+  Result := CompareStr(TAcronym(Item1).Name, TAcronym(Item2).Name);
+end;
+
 procedure TFormAcronyms.ListViewSort1Filter(ListViewSort: TListViewSort);
 begin
-  Acronyms.Db.Acronyms.Sort(AcronymComparer);
+  Acronyms.Db.Acronyms.Sort(TComparer<TAcronym>.Construct(AcronymComparer));
   Acronyms.Db.AssignToList(ListViewSort1.List);
   MeaningCount := ListViewSort1.List.Count;
@@ -296 +291 @@
 end;
 
-procedure TFormAcronyms.FilterList(List: TFPGObjectList<TObject>);
+procedure TFormAcronyms.FilterList(List: TObjectList<TObject>);
 var
   I: Integer;