Changeset 318 for trunk/Forms/FormKeyShortcuts.pas

Timestamp:

Jun 21, 2024, 3:20:20 PM (5 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/Forms/FormKeyShortcuts.pas (modified) (4 diffs)

trunk/Forms/FormKeyShortcuts.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ComCtrls, ActnList, LCLProc, Menus, FormEx;
+  ComCtrls, ActnList, LCLProc, Menus, FormEx, Generics.Collections;
 
 type
@@ -15 +15 @@
     MenuItem1: TMenuItem;
     PopupMenu1: TPopupMenu;
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure MenuItem1Click(Sender: TObject);
   public
+    SourceComponents: TObjectList<TComponent>;
     procedure LoadFromComponent(C: TComponent);
   end;
@@ -25 +28 @@
 
 uses
-  FormMain, Core;
+  FormMain;
 
 resourcestring
@@ -34 +37 @@
 
 procedure TFormKeyShortcuts.FormShow(Sender: TObject);
+var
+  I: Integer;
 begin
   try
     ListView1.BeginUpdate;
     ListView1.Clear;
-    LoadFromComponent(Core.Core);
-    LoadFromComponent(Core.Core.FormMain);
+    for I := 0 to SourceComponents.Count - 1 do
+      LoadFromComponent(SourceComponents[I]);
   finally
     ListView1.EndUpdate;
   end;
+end;
+
+procedure TFormKeyShortcuts.FormCreate(Sender: TObject);
+begin
+  SourceComponents := TObjectList<TComponent>.Create;
+  SourceComponents.OwnsObjects := False;
+end;
+
+procedure TFormKeyShortcuts.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(SourceComponents);
 end;