Changeset 358 for trunk/Packages

Timestamp:

Dec 31, 2024, 11:06:34 AM (3 weeks ago)

Author:

chronos

Message:

• Fixed: Missing toolbar and context menu images in FormList form.
• Fixed: FormList remove minimal item count limit on items remove.

Location:

trunk/Packages/Common/Forms

Files:

• FormList.lfm (modified) (8 diffs)
• FormList.pas (modified) (4 diffs)

trunk/Packages/Common/Forms/FormList.lfm

@@ -1 +1 @@
 object FormList: TFormList
   Left = 1040
-  Height = 312
+  Height = 300
   Top = 540
-  Width = 417
+  Width = 400
   Caption = 'List'
-  ClientHeight = 312
-  ClientWidth = 417
-  DesignTimePPI = 125
+  ClientHeight = 300
+  ClientWidth = 400
+  DesignTimePPI = 120
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -14 +14 @@
   object ListView1: TListView
     Left = 0
-    Height = 279
+    Height = 268
     Top = 0
-    Width = 417
+    Width = 400
     Align = alClient
     Columns = <    
       item
         Caption = 'Name'
-        Width = 405
+        Width = 389
       end>
     MultiSelect = True
@@ -40 +40 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 33
-    Top = 279
-    Width = 417
+    Top = 268
+    Width = 400
     Align = alBottom
-    Images = Core.ImageListSmall
     ParentFont = False
     ParentShowHint = False
@@ -55 +53 @@
     end
     object ToolButton2: TToolButton
-      Left = 31
+      Left = 30
       Top = 2
       Action = AModify
     end
     object ToolButton3: TToolButton
-      Left = 61
+      Left = 59
       Top = 2
       Action = ARemove
     end
     object ToolButton4: TToolButton
-      Left = 91
+      Left = 88
       Top = 2
       Action = AClone
@@ -71 +69 @@
   end
   object ActionList1: TActionList
-    Images = Core.ImageListSmall
-    Left = 181
-    Top = 141
+    Left = 174
+    Top = 133
     object AAdd: TAction
       Caption = 'Add'
       ImageIndex = 16
       OnExecute = AAddExecute
+      ShortCut = 45
     end
     object AModify: TAction
@@ -83 +81 @@
       ImageIndex = 6
       OnExecute = AModifyExecute
+      ShortCut = 13
     end
     object ARemove: TAction
@@ -88 +87 @@
       ImageIndex = 18
       OnExecute = ARemoveExecute
+      ShortCut = 46
     end
     object AClone: TAction
@@ -101 +101 @@
   end
   object PopupMenu1: TPopupMenu
-    Images = Core.ImageListSmall
-    Left = 306
-    Top = 139
+    Left = 294
+    Top = 133
     object MenuItem1: TMenuItem
       Action = AAdd

trunk/Packages/Common/Forms/FormList.pas

@@ -47 +47 @@
       Selected: Boolean);
   private
+    FImages: TImageList;
     FList: TBaseItemList;
+    procedure SetImages(AValue: TImageList);
     procedure SetList(AValue: TBaseItemList);
     procedure UpdateListViewColumns;
@@ -56 +58 @@
     procedure UpdateList;
     property List: TBaseItemList read FList write SetList;
+    property Images: TImageList read FImages write SetImages;
   end;
 
@@ -264 +267 @@
 end;
 
+procedure TFormList.SetImages(AValue: TImageList);
+begin
+  if FImages = AValue then Exit;
+  FImages := AValue;
+  ToolBar1.Images := FImages;
+  PopupMenu1.Images := FImages;
+end;
+
 procedure TFormList.UpdateListViewColumns;
 var
@@ -293 +304 @@
 procedure TFormList.UpdateInterface;
 begin
-  ARemove.Enabled := Assigned(FList) and Assigned(ListView1.Selected) and (List.Count > MinItemCount);
+  ARemove.Enabled := Assigned(FList) and Assigned(ListView1.Selected) and ((List.Count - ListView1.SelCount) >= MinItemCount);
   AModify.Enabled := Assigned(FList) and Assigned(ListView1.Selected);
   AAdd.Enabled := Assigned(FList) and ((MaxItemCount = -1) or ((MaxItemCount <> -1) and (List.Count < MaxItemCount)));