Changeset 279 for trunk/Forms/UFormNew.pas

Timestamp:

Feb 14, 2019, 10:52:04 PM (6 years ago)

Author:

chronos

Message:

• Modified: User interface for the list of players moved to the separate form.

File:

• trunk/Forms/UFormNew.pas (modified) (17 diffs)

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;
+  UGameServer, UServerList, UMap, UFormPlayers;
 
 type
@@ -16 +16 @@
   TFormNew = class(TForm)
     ActionList1: TActionList;
-    APlayerAdd: TAction;
-    APlayerModify: TAction;
-    APlayerRemove: TAction;
     AServerAdd: TAction;
     AServerModify: TAction;
@@ -30 +27 @@
     ButtonImageBrowse: TButton;
     ButtonOk: TButton;
-    ButtonPlayerAdd: TButton;
-    ButtonPlayerModify: TButton;
-    ButtonPlayerRemove: TButton;
     CheckBoxBridges: TCheckBox;
     CheckBoxCity: TCheckBox;
@@ -62 +56 @@
     Label8: TLabel;
     Label9: TLabel;
-    ListViewPlayers: TListView;
     ListViewServers: TListView;
-    MenuItem1: TMenuItem;
-    MenuItem2: TMenuItem;
-    MenuItem3: TMenuItem;
     MenuItem4: TMenuItem;
     MenuItem5: TMenuItem;
@@ -80 +70 @@
     PanelButtons: TPanel;
     PanelChat: TPanel;
-    PopupMenuPlayers: TPopupMenu;
     PopupMenuServers: TPopupMenu;
     RadioButtonModeLocal: TRadioButton;
@@ -111 +100 @@
     TrackBarSizeX: TTrackBar;
     TrackBarSizeY: TTrackBar;
-    procedure APlayerAddExecute(Sender: TObject);
-    procedure APlayerModifyExecute(Sender: TObject);
-    procedure APlayerRemoveExecute(Sender: TObject);
     procedure AServerAddExecute(Sender: TObject);
     procedure AServerModifyExecute(Sender: TObject);
@@ -134 +120 @@
     procedure FormShow(Sender: TObject);
     procedure Image1Resize(Sender: TObject);
-    procedure ListViewPlayersCustomDrawSubItem(Sender: TCustomListView;
-      Item: TListItem; SubItem: Integer; State: TCustomDrawState;
-      var DefaultDraw: Boolean);
-    procedure ListViewPlayersData(Sender: TObject; Item: TListItem);
-    procedure ListViewPlayersDblClick(Sender: TObject);
-    procedure ListViewPlayersKeyPress(Sender: TObject; var Key: char);
-    procedure ListViewPlayersKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
-      );
-    procedure ListViewPlayersSelectItem(Sender: TObject; Item: TListItem;
-      Selected: Boolean);
     procedure ListViewServersData(Sender: TObject; Item: TListItem);
     procedure ListViewServersKeyPress(Sender: TObject; var Key: char);
@@ -166 +142 @@
     MapPreviewRedrawPending: Boolean;
     NewRandSeed: Cardinal;
+    FormPlayers: TFormPlayers;
     procedure LoadGame(Game: TGame);
     procedure SaveGame(Game: TGame);
@@ -216 +193 @@
 { TFormNew }
 
-procedure TFormNew.ListViewPlayersData(Sender: TObject; Item: TListItem);
-begin
-  if (Item.Index >= 0) and (Item.Index < Players.Count) then
-  with Players[Item.Index] do begin
-    Item.Caption := Name;
-    Item.Data := Players[Item.Index];
-    Item.SubItems.Add(PlayerModeText[Mode]);
-    Item.SubItems.Add(''); // Do not show color text
-    Item.SubItems.Add(IntToStr(StartUnits));
-  end;
-end;
-
-procedure TFormNew.ListViewPlayersDblClick(Sender: TObject);
-begin
-  APlayerModify.Execute;
-end;
-
-procedure TFormNew.ListViewPlayersKeyPress(Sender: TObject; var Key: char);
-begin
-  if (Key = #13) then APlayerModify.Execute;
-end;
-
-procedure TFormNew.ListViewPlayersKeyUp(Sender: TObject; var Key: Word;
-  Shift: TShiftState);
-begin
-  if Key = 45 then APlayerAdd.Execute;
-  if Key = 46 then APlayerRemove.Execute;
-end;
-
-procedure TFormNew.ListViewPlayersSelectItem(Sender: TObject; Item: TListItem;
-  Selected: Boolean);
-begin
-  ReloadView;
-end;
-
 procedure TFormNew.ListViewServersData(Sender: TObject; Item: TListItem);
 begin
@@ -339 +281 @@
 procedure TFormNew.LoadGame(Game: TGame);
 begin
-  Players.Assign(Game.Players);
+  FormPlayers.Players.Assign(Game.Players);
   with Game do begin
     CheckBoxSymetricMap.Checked := SymetricMap;
@@ -370 +312 @@
 procedure TFormNew.SaveGame(Game: TGame);
 begin
-  Game.Players.Assign(Players);
+  Game.Players.Assign(FormPlayers.Players);
   with Game do begin
     StoredRandSeed := NewRandSeed;
@@ -510 +452 @@
 procedure TFormNew.ReloadView;
 begin
-  ListViewPlayers.Items.Count := Players.Count;
-  ListViewPlayers.Refresh;
   ListViewServers.Items.Count := ServerList.Items.Count;
   ListViewServers.Refresh;
@@ -522 +462 @@
   WinObjective: TWinObjective;
 begin
-  APlayerRemove.Enabled := Assigned(ListViewPlayers.Selected) and (Players.Count > MinPlayerCount);
-  APlayerAdd.Enabled := Players.Count < MaxPlayerCount;
-  APlayerModify.Enabled := Assigned(ListViewPlayers.Selected);
   EditImageFile.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
   ButtonImageBrowse.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
@@ -566 +503 @@
 end;
 
-procedure TFormNew.ListViewPlayersCustomDrawSubItem(Sender: TCustomListView;
-  Item: TListItem; SubItem: Integer; State: TCustomDrawState;
-  var DefaultDraw: Boolean);
-begin
-  if SubItem = 2 then
-  with ListViewPlayers.Canvas do begin
-    Brush.Color := TPlayer(Item.Data).Color;
-    Brush.Style := bsSolid;
-    FillRect(Item.DisplayRectSubItem(2, drBounds));
-  end;
-end;
-
 procedure TFormNew.FormCreate(Sender: TObject);
 begin
   GamePreview := TGame.Create;
-  Players := TPlayers.Create;
   ServerList := TServerList.Create;
   FormChat := TFormChat.Create(nil);
@@ -587 +511 @@
   FormChat.Align := alClient;
   FormChat.Show;
+  Players := TPlayers.Create;
+  FormPlayers := TFormPlayers.Create(nil);
+  FormPlayers.MinItemCount := MinPlayerCount;
+  FormPlayers.MaxItemCount := MaxPlayerCount;
+  FormPlayers.Players := Players;
+  FormPlayers.ManualDock(Panel2, nil, alClient);
+  FormPlayers.Align := alClient;
+  FormPlayers.Visible := True;
   Translate;
 end;
@@ -636 +568 @@
 begin
   Core.PersistentForm.Save(Self);
-end;
-
-procedure TFormNew.APlayerModifyExecute(Sender: TObject);
-begin
-  FormPlayer := TFormPlayer.Create(nil);
-  try
-    if Assigned(ListViewPlayers.Selected) then begin
-      FormPlayer.Load(TPlayer(ListViewPlayers.Selected.Data));
-       if FormPlayer.ShowModal = mrOk then begin
-         FormPlayer.Save(TPlayer(ListViewPlayers.Selected.Data));
-         ReloadView;
-      end;
-    end;
-  finally
-    FormPlayer.Free;
-  end;
-end;
-
-procedure TFormNew.APlayerRemoveExecute(Sender: TObject);
-var
-  I: Integer;
-begin
-  for I := ListViewPlayers.Items.Count - 1 downto 0 do
-  if ListViewPlayers.Items[I].Selected then begin
-    Players.Remove(ListViewPlayers.Items[I].Data);
-    if Players.Count <= MinPlayerCount then Break;
-  end;
-  ReloadView;
 end;
 
@@ -740 +644 @@
 end;
 
-procedure TFormNew.APlayerAddExecute(Sender: TObject);
-var
-  NewPlayer: TPlayer;
-begin
-  if Players.Count <= (MaxPlayerCount - 1) then begin
-    NewPlayer := TPlayer.Create;
-    NewPlayer.Id := Players.GetNewId;
-    NewPlayer.Name := SPlayer + ' ' + IntToStr(NewPlayer.Id);
-    NewPlayer.Color := PlayerColors[Players.Count];
-    NewPlayer.Mode := pmComputer;
-    NewPlayer.Agressivity := caMedium;
-    Players.Add(NewPlayer);
-    ReloadView;
-  end;
-end;
-
 procedure TFormNew.FormDestroy(Sender: TObject);
 begin
   FreeAndNil(ServerList);
+  FreeAndNil(FormChat);
   FreeAndNil(Players);
-  FreeAndNil(FormChat);
+  FreeAndNil(FormPlayers);
   FreeAndNil(GamePreview);
 end;