Changeset 298 for trunk/Forms

Timestamp:

Jul 10, 2019, 5:35:15 PM (5 years ago)

Author:

chronos

Message:

• Added: New item list type reference. Used in players for reference to selected nation.
• Modified: New game players selection migrated to dynamic item/list forms.

Location:

trunk/Forms

Files:

• UFormItem.pas (modified) (4 diffs)
• UFormList.lfm (modified) (1 diff)
• UFormList.pas (modified) (9 diffs)
• UFormNew.pas (modified) (5 diffs)
• UFormPlayer.lfm (modified) (2 diffs)

trunk/Forms/UFormItem.pas

@@ -91 +91 @@
   J: Integer;
   Control: TControl;
+  ReferenceList: TItemList;
+  ReferenceItem: TItem;
 begin
   Fields := Item.GetFields;
@@ -111 +113 @@
       end;
     end
+    else if DataType = dtReference then begin
+      TComboBox(Control).Items.BeginUpdate;
+      try
+        TComboBox(Control).Items.Clear;
+        ReferenceList := Item.GetReferenceList(Index);
+        if Assigned(ReferenceList) then
+          for J := 0 to ReferenceList.Count - 1 do
+            TComboBox(Control).Items.AddObject(TItem(ReferenceList[J]).Name, ReferenceList[J]);
+        ReferenceItem := TItem(Item.GetValueReference(Index));
+        TComboBox(Control).ItemIndex := TComboBox(Control).Items.IndexOfObject(ReferenceItem);
+      finally
+        TComboBox(Control).Items.EndUpdate;
+      end;
+    end
     else raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[DataType]]));
   end;
@@ -131 +147 @@
     else if DataType = dtBoolean then Item.SetValueBoolean(Index, TCheckBox(Control).Checked)
     else if DataType = dtEnumeration then Item.SetValueEnumeration(Index, TUndefinedEnum(TComboBox(Control).ItemIndex))
+    else if DataType = dtReference then begin
+      if TComboBox(Control).ItemIndex <> -1 then
+        Item.SetValueReference(Index, TItem(TComboBox(Control).Items.Objects[TComboBox(Control).ItemIndex]))
+        else Item.SetValueReference(Index, nil);
+    end
     else raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[DataType]]));
   end;
@@ -173 +194 @@
       TComboBox(NewControl).Style := csDropDownList;
     end else
+    if DataType = dtReference then begin
+      NewControl := TComboBox.Create(nil);
+      NewControl.Width := 200;
+      TComboBox(NewControl).Style := csDropDownList;
+    end else
     if DataType = dtBoolean then begin
       NewControl := TCheckBox.Create(nil);

trunk/Forms/UFormList.lfm

@@ -11 +11 @@
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.2.0'
   object ListView1: TListView
     Left = 0

trunk/Forms/UFormList.pas

@@ -51 +51 @@
     procedure UpdateListViewColumns;
   public
+    MinItemCount: Integer;
+    MaxItemCount: Integer;
     procedure UpdateInterface;
     procedure UpdateList;
@@ -70 +72 @@
   SRemoveItems = 'Remove items';
   SRemoveItemsQuery = 'Do you want to remove selected items?';
-  SNewItem = 'New item';
+  SNew = 'New';
 
 { TFormList }
@@ -83 +85 @@
       for I := ListView1.Items.Count - 1 downto 0 do
         if ListView1.Items[I].Selected then begin
+          if List.Count <= MinItemCount then Break;
           ListView1.Items[I].Selected := False;
           List.Remove(TItem(ListView1.Items[I].Data));
@@ -99 +102 @@
   if Assigned(ListView1.Selected) then
   with TItem(ListView1.Selected.Data) do begin
-    TempEntry := List.GetItemClass.Create;
+    TempEntry := List.CreateItem;
     TempEntry.Assign(TItem(ListView1.Selected.Data));
     FormItem := TFormItem.Create(Self);
@@ -121 +124 @@
   FormItem: TFormItem;
 begin
-  TempEntry := List.GetItemClass.Create;
+  if (MaxItemCount <> -1) and (List.Count >= MaxItemCount) then Exit;
+
+  TempEntry := List.CreateItem;
   FormItem := TFormItem.Create(Self);
   try
-    TempEntry.Name := SNewItem;
+    TempEntry.Name := SNew + ' ' + LowerCase(List.GetItemClass.GetClassName);
     FormItem.Item := TempEntry;
     if FormItem.ShowModal = mrOk then begin
@@ -143 +148 @@
   FormItem: TFormItem;
 begin
-  TempEntry := List.GetItemClass.Create;
+  if (MaxItemCount <> -1) and (List.Count >= MaxItemCount) then Exit;
+
+  TempEntry := List.CreateItem;
   TempEntry.Assign(TItem(ListView1.Selected.Data));
   FormItem := TFormItem.Create(Self);
@@ -183 +190 @@
   for I := 0 to ToolBar1.ButtonCount - 1 do
     ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;
+  MinItemCount := 0;
+  MaxItemCount := -1;
 end;
 
@@ -197 +206 @@
   var DefaultDraw: Boolean);
 var
+  ItemFields: TItemFields;
   ItemField: TItemField;
 begin
-  ItemField := TItem(Item.Data).GetField(SubItem);
-  if ItemField.DataType = dtColor then
-  with ListView1.Canvas do begin
-    Brush.Color := TItem(Item.Data).GetValueColor(ItemField.Index);
-    Brush.Style := bsSolid;
-    FillRect(Item.DisplayRectSubItem(1, drBounds));
-  end;
-  ItemField.Free;
+  ItemFields := TItem(Item.Data).GetFields;
+  try
+    ItemField := ItemFields[SubItem];
+    if ItemField.DataType = dtColor then
+    with ListView1.Canvas do begin
+      Brush.Color := TItem(Item.Data).GetValueColor(ItemField.Index);
+      Brush.Style := bsSolid;
+      FillRect(Item.DisplayRectSubItem(SubItem, drBounds));
+    end;
+  finally
+    ItemFields.Free;
+  end;
 end;
 
@@ -272 +286 @@
 procedure TFormList.UpdateInterface;
 begin
-  ARemove.Enabled := Assigned(FList) and Assigned(ListView1.Selected);
+  ARemove.Enabled := Assigned(FList) and Assigned(ListView1.Selected) and (List.Count > MinItemCount);
   AModify.Enabled := Assigned(FList) and Assigned(ListView1.Selected);
-  AAdd.Enabled := Assigned(FList);
+  AAdd.Enabled := Assigned(FList) and ((MaxItemCount = -1) or ((MaxItemCount <> -1) and (List.Count < MaxItemCount)));
+  AClone.Enabled := Assigned(FList) and ((MaxItemCount = -1) or ((MaxItemCount <> -1) and (List.Count < MaxItemCount)));
   ASelectAll.Enabled := ListView1.Items.Count > 0;
 end;

trunk/Forms/UFormNew.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, UGame, UGeometry, UPlayer,
-  UGameServer, UServerList, UMap, UFormPlayers, UGameSystem;
+  UGameServer, UServerList, UMap, UGameSystem, UFormList;
 
 type
@@ -144 +144 @@
     MapPreviewRedrawPending: Boolean;
     NewRandSeed: Cardinal;
-    FormPlayers: TFormPlayers;
+    FormPlayers: TFormList;
     procedure LoadGame(Game: TGame);
     procedure SaveGame(Game: TGame);
@@ -385 +385 @@
   if Assigned(FServer) then begin
     Load(FServer);
-    FormPlayers.Players := FServer.Game.Players;
+    FormPlayers.List := FServer.Game.Players;
   end else begin
-    FormPlayers.Players := nil;
+    FormPlayers.List := nil;
   end;
 end;
@@ -402 +402 @@
   GamePreview.GeneratePlayers := False;
   GamePreview.New;
-  GamePreview.CurrentPlayer := GamePreview.Players.First;
+  GamePreview.CurrentPlayer := TPlayer(GamePreview.Players.First);
   Bitmap := Image1.Picture.Bitmap;
   Bitmap.SetSize(Image1.Width, Image1.Height);
@@ -534 +534 @@
   FormChat.Align := alClient;
   FormChat.Show;
-  FormPlayers := TFormPlayers.Create(nil);
+  FormPlayers := TFormList.Create(nil);
   FormPlayers.MinItemCount := MinPlayerCount;
   FormPlayers.MaxItemCount := MaxPlayerCount;

trunk/Forms/UFormPlayer.lfm

@@ -1 +1 @@
 object FormPlayer: TFormPlayer
-  Left = 470
+  Left = 1304
   Height = 338
-  Top = 157
+  Top = 318
   Width = 543
   Caption = 'Player'
@@ -14 +14 @@
   OnShow = FormShow
   Position = poMainFormCenter
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.2.0'
   object Label1: TLabel
     Left = 20