Changeset 349 for trunk/Forms/FormList.pas

Timestamp:

Dec 27, 2024, 10:29:54 AM (13 days ago)

Author:

chronos

Message:

• Fixed: ItemList interface implementation was not working as expected. Implemented as proxy list instead.

File:

• trunk/Forms/FormList.pas (modified) (11 diffs)

trunk/Forms/FormList.pas

@@ -47 +47 @@
       Selected: Boolean);
   private
-    FList: IList<TItem>;
-    procedure SetList(AValue: IList<TItem>);
+    FList: TBaseItemList;
+    procedure SetList(AValue: TBaseItemList);
     procedure UpdateListViewColumns;
   public
@@ -55 +55 @@
     procedure UpdateInterface;
     procedure UpdateList;
-    property List: IList<TItem> read FList write SetList;
+    property List: TBaseItemList read FList write SetList;
   end;
 
@@ -84 +84 @@
           if List.Count <= MinItemCount then Break;
           ListView1.Items[I].Selected := False;
-          List.Remove(TItem(ListView1.Items[I].Data));
+          FList.Remove(TItem(ListView1.Items[I].Data));
         end;
       UpdateList;
@@ -99 +99 @@
   if Assigned(ListView1.Selected) then
   with TItem(ListView1.Selected.Data) do begin
-    TempEntry := List.CreateBaseItem;
+    TempEntry := FList.CreateItem;
     TempEntry.Assign(TItem(ListView1.Selected.Data));
     FormItem := TFormItem.Create(Self);
@@ -121 +121 @@
   FormItem: TFormItem;
 begin
-  if (MaxItemCount <> -1) and (List.Count >= MaxItemCount) then Exit;
-
-  TempEntry := List.CreateBaseItem;
+  if (MaxItemCount <> -1) and (FList.Count >= MaxItemCount) then Exit;
+
+  TempEntry := FList.CreateItem;
   FormItem := TFormItem.Create(Self);
   try
-    TempEntry.Name := List.GetNextAvailableName(SNew + ' ' + LowerCase(List.GetName));
+    TempEntry.Name := FList.GetNextAvailableName(SNew + ' ' + LowerCase(List.GetName));
     FormItem.Item := TempEntry;
     if FormItem.ShowModal = mrOk then begin
-      List.Add(TempEntry);
+      FList.Add(TempEntry);
       TempEntry := nil;
       UpdateList;
@@ -145 +145 @@
   FormItem: TFormItem;
 begin
-  if (MaxItemCount <> -1) and (List.Count >= MaxItemCount) then Exit;
-
-  TempEntry := List.CreateBaseItem;
+  if (MaxItemCount <> -1) and (FList.Count >= MaxItemCount) then Exit;
+
+  TempEntry := FList.CreateItem;
   TempEntry.Assign(TItem(ListView1.Selected.Data));
   FormItem := TFormItem.Create(Self);
@@ -154 +154 @@
     FormItem.Item := TempEntry;
     if FormItem.ShowModal = mrOk then begin
-      List.Add(TempEntry);
+      FList.Add(TempEntry);
       TempEntry := nil;
       UpdateList;
@@ -222 +222 @@
 begin
   if Item.Index < ListView1.Items.Count then
-  with TItem(List[Item.Index]) do begin
+  with FList[Item.Index] do begin
     //Item.Caption := GetName;
-    Item.Data := List[Item.Index];
-    Fields := List.GetItemFields;
+    Item.Data := FList[Item.Index];
+    Fields := FList.GetItemFields;
     try
       for I := 0 to Fields.Count - 1 do begin
@@ -256 +256 @@
 end;
 
-procedure TFormList.SetList(AValue: IList<TItem>);
+procedure TFormList.SetList(AValue: TBaseItemList);
 begin
   if FList = AValue then Exit;
@@ -269 +269 @@
   Fields: TItemFields;
 begin
+  if not Assigned(FList) then begin
+    while ListView1.Columns.Count > 0 do
+      ListView1.Columns.Delete(ListView1.Columns.Count - 1);
+    Exit;
+  end;
   Fields := List.GetItemFields;
   ListView1.Columns.BeginUpdate;
@@ -297 +302 @@
 procedure TFormList.UpdateList;
 begin
-  if Assigned(List) then ListView1.Items.Count := List.Count
+  if Assigned(FList) then ListView1.Items.Count := FList.Count
     else ListView1.Items.Count := 0;
   ListView1.Refresh;