Changeset 155

Timestamp:

Aug 16, 2024, 9:51:02 AM (4 months ago)

Author:

chronos

Message:

• Modified: Show action icons in key shortcuts form.

Location:

trunk

Files:

• Forms/FormKeyShortcuts.lfm (modified) (1 diff)
• Forms/FormKeyShortcuts.pas (modified) (6 diffs)
• Forms/FormMain.pas (modified) (1 diff)
• LazFuck.lpi (modified) (1 diff)

trunk/Forms/FormKeyShortcuts.lfm

@@ -32 +32 @@
         Width = 127
       end>
-    LargeImages = Core.ImageListLarge
     PopupMenu = PopupMenu1
     ReadOnly = True
     RowSelect = True
-    SmallImages = Core.ImageListSmall
     TabOrder = 0
     ViewStyle = vsReport

trunk/Forms/FormKeyShortcuts.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ComCtrls, ActnList, LCLProc, Menus, FormEx, Generics.Collections;
+  ComCtrls, ActnList, LCLProc, Menus, FormEx, Generics.Collections, ImgList;
 
 type
@@ -19 +19 @@
     procedure FormShow(Sender: TObject);
     procedure MenuItem1Click(Sender: TObject);
+  private
+    function GetImageList: TCustomImageList;
+    procedure SetImageList(AValue: TCustomImageList);
   public
     SourceComponents: TObjectList<TComponent>;
+    MainForm: TForm;
     procedure LoadFromComponent(C: TComponent);
+    property ImageList: TCustomImageList read GetImageList write SetImageList;
   end;
 
@@ -27 +32 @@
 implementation
 
-uses
-  FormMain;
+{$R *.lfm}
 
 resourcestring
@@ -67 +71 @@
 end;
 
+function TFormKeyShortcuts.GetImageList: TCustomImageList;
+begin
+  Result := ListView1.SmallImages;
+end;
+
+procedure TFormKeyShortcuts.SetImageList(AValue: TCustomImageList);
+begin
+  ListView1.SmallImages := AValue
+end;
+
 procedure TFormKeyShortcuts.LoadFromComponent(C: TComponent);
 var
@@ -84 +98 @@
           NewItem.Data := TAction(Actions[I]);
           with NewItem.SubItems do begin
-            if C.Owner is TFormMain then Add(SMainForm)
+            if C.Owner = MainForm then Add(SMainForm)
             else if C.Owner is TDataModule then Add(SGlobal)
             else if C.Owner is TForm then Add(TForm(C.Owner).Caption)
@@ -96 +110 @@
 end;
 
-initialization
-  {$I FormKeyShortcuts.lrs}
-
 end.
 

trunk/Forms/FormMain.pas

@@ -513 +513 @@
 begin
   if not Assigned(FormKeyShortcuts) then FormKeyShortcuts := TFormKeyShortcuts.Create(nil);
+  FormKeyShortcuts.ImageList := Core.Core.ImageListMain;
+  FormKeyShortcuts.MainForm := Self;
   FormKeyShortcuts.SourceComponents.Clear;
   FormKeyShortcuts.SourceComponents.Add(Self);

trunk/LazFuck.lpi

@@ -277 +277 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormKeyShortcuts"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit32>