Changeset 196 for trunk/Forms

Timestamp:

May 16, 2018, 9:56:24 AM (7 years ago)

Author:

chronos

Message:

• Added: Allow to manage list of servers where to connect as client.

Location:

trunk/Forms

Files:

• UFormMain.pas (modified) (1 diff)
• UFormNew.lfm (modified) (7 diffs)
• UFormNew.pas (modified) (13 diffs)
• UFormServer.lfm (added)
• UFormServer.pas (added)

trunk/Forms/UFormMain.pas

@@ -168 +168 @@
   Core.PersistentForm.Save(Self);
   SaveConfig(Core.XMLConfig1, 'FormMain');
-  Core.XMLConfig1.Flush;
+  Core.Done;
 end;
 

trunk/Forms/UFormNew.lfm

@@ -21 +21 @@
     Top = 4
     Width = 1061
-    ActivePage = TabSheet2
+    ActivePage = TabSheetMode
     Align = alClient
     BorderSpacing.Around = 4
-    TabIndex = 2
+    TabIndex = 0
     TabOrder = 0
     object TabSheetMode: TTabSheet
       Caption = 'Mode'
-      ClientHeight = 297
-      ClientWidth = 759
+      ClientHeight = 523
+      ClientWidth = 1053
       object RadioButtonModeLocal: TRadioButton
         Left = 10
@@ -90 +90 @@
       object ListViewServers: TListView
         Left = 26
-        Height = 97
+        Height = 291
         Top = 181
-        Width = 326
+        Width = 334
         Anchors = [akTop, akLeft, akBottom]
         Columns = <        
@@ -103 +103 @@
             Width = 200
           end>
+        MultiSelect = True
+        OwnerData = True
+        PopupMenu = PopupMenuServers
+        ReadOnly = True
+        RowSelect = True
         TabOrder = 5
         ViewStyle = vsReport
+        OnData = ListViewServersData
+        OnDblClick = AServerModifyExecute
+        OnKeyPress = ListViewServersKeyPress
+        OnSelectItem = ListViewServersSelectItem
+      end
+      object Button1: TButton
+        Left = 27
+        Height = 31
+        Top = 484
+        Width = 94
+        Action = AServerAdd
+        Anchors = [akLeft, akBottom]
+        TabOrder = 6
+      end
+      object Button2: TButton
+        Left = 240
+        Height = 31
+        Top = 484
+        Width = 94
+        Action = AServerRemove
+        Anchors = [akLeft, akBottom]
+        TabOrder = 7
+      end
+      object Button3: TButton
+        Left = 136
+        Height = 30
+        Top = 484
+        Width = 94
+        Action = AServerModify
+        Anchors = [akLeft, akBottom]
+        TabOrder = 8
       end
     end
@@ -137 +173 @@
           end>
         OwnerData = True
-        PopupMenu = PopupMenu1
+        PopupMenu = PopupMenuPlayers
         ReadOnly = True
         RowSelect = True
@@ -557 +593 @@
   object ActionList1: TActionList
     Images = Core.ImageListSmall
-    left = 256
-    top = 440
+    left = 568
+    top = 296
     object APlayerModify: TAction
       Caption = 'Modify player'
@@ -571 +607 @@
       OnExecute = APlayerRemoveExecute
     end
+    object AServerAdd: TAction
+      Caption = 'Add'
+      OnExecute = AServerAddExecute
+    end
+    object AServerRemove: TAction
+      Caption = 'Remove'
+      OnExecute = AServerRemoveExecute
+    end
+    object AServerModify: TAction
+      Caption = 'Modify'
+      OnExecute = AServerModifyExecute
+    end
   end
   object OpenPictureDialog1: TOpenPictureDialog
-    left = 424
-    top = 440
-  end
-  object PopupMenu1: TPopupMenu
-    left = 128
-    top = 440
+    left = 568
+    top = 360
+  end
+  object PopupMenuPlayers: TPopupMenu
+    left = 568
+    top = 232
     object MenuItem1: TMenuItem
       Action = APlayerAdd
@@ -590 +638 @@
     end
   end
+  object PopupMenuServers: TPopupMenu
+    left = 121
+    top = 317
+    object MenuItem4: TMenuItem
+      Action = AServerAdd
+    end
+    object MenuItem6: TMenuItem
+      Action = AServerModify
+    end
+    object MenuItem5: TMenuItem
+      Action = AServerRemove
+    end
+  end
 end

trunk/Forms/UFormNew.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, UGame, UGeometry,
-  UGameServer;
+  UGameServer, UServerList;
 
 type
@@ -15 +15 @@
 
   TFormNew = class(TForm)
+    AServerModify: TAction;
+    AServerAdd: TAction;
+    AServerRemove: TAction;
     APlayerAdd: TAction;
     APlayerRemove: TAction;
     APlayerModify: TAction;
     ActionList1: TActionList;
+    Button1: TButton;
+    Button2: TButton;
+    Button3: TButton;
     ButtonCancel: TButton;
     ButtonImageBrowse: TButton;
@@ -52 +58 @@
     MenuItem2: TMenuItem;
     MenuItem3: TMenuItem;
+    MenuItem4: TMenuItem;
+    MenuItem5: TMenuItem;
+    MenuItem6: TMenuItem;
     OpenPictureDialog1: TOpenPictureDialog;
     PageControl1: TPageControl;
     PanelButtons: TPanel;
     PanelChat: TPanel;
-    PopupMenu1: TPopupMenu;
+    PopupMenuPlayers: TPopupMenu;
+    PopupMenuServers: TPopupMenu;
     RadioButtonModeNetworkServer: TRadioButton;
     RadioButtonModeNetworkClient: TRadioButton;
@@ -79 +89 @@
     procedure APlayerModifyExecute(Sender: TObject);
     procedure APlayerRemoveExecute(Sender: TObject);
+    procedure AServerAddExecute(Sender: TObject);
+    procedure AServerModifyExecute(Sender: TObject);
+    procedure AServerRemoveExecute(Sender: TObject);
     procedure ButtonImageBrowseClick(Sender: TObject);
     procedure CheckBoxCityChange(Sender: TObject);
@@ -97 +110 @@
     procedure ListViewPlayersSelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
+    procedure ListViewServersData(Sender: TObject; Item: TListItem);
+    procedure ListViewServersKeyPress(Sender: TObject; var Key: char);
+    procedure ListViewServersSelectItem(Sender: TObject; Item: TListItem;
+      Selected: Boolean);
     procedure RadioButtonModeLocalChange(Sender: TObject);
     procedure SpinEditMapSizeXChange(Sender: TObject);
@@ -106 +123 @@
     Players: TPlayers;
   public
+    ServerList: TServerList;
     procedure Translate;
     procedure ReloadView;
@@ -121 +139 @@
 
 uses
-  UFormPlayer, UFormChat, UCore;
+  UFormPlayer, UFormChat, UCore, UFormServer;
 
 resourcestring
@@ -141 +159 @@
   SRounded = 'Rounded';
   SFromImageFile = 'From image file';
+  SRemoveServer = 'Remove server';
+  SRemoveServerQuery = 'Do you want to remove server?';
 
 { TFormNew }
@@ -177 +197 @@
 begin
   ReloadView;
+end;
+
+procedure TFormNew.ListViewServersData(Sender: TObject; Item: TListItem);
+begin
+  if Item.Index < ServerList.Items.Count then
+  with TServerInfo(ServerList.Items[Item.Index]) do begin
+    Item.Caption := Name;
+    Item.Data := ServerList.Items[Item.Index];
+    Item.SubItems.Add(Address + ':' + IntToStr(Port));
+  end;
+end;
+
+procedure TFormNew.ListViewServersKeyPress(Sender: TObject; var Key: char);
+begin
+  if Key = #13 then AServerModify.Execute;
+end;
+
+procedure TFormNew.ListViewServersSelectItem(Sender: TObject; Item: TListItem;
+  Selected: Boolean);
+begin
+  UpdateInterface;
 end;
 
@@ -262 +303 @@
   ListViewPlayers.Items.Count := Players.Count;
   ListViewPlayers.Refresh;
+  ListViewServers.Items.Count := ServerList.Items.Count;
+  ListViewServers.Refresh;
   Translate;
   UpdateInterface;
@@ -278 +321 @@
   PanelChat.Visible := RadioButtonModeNetworkClient.Checked or RadioButtonModeNetworkServer.Checked;
   SpinEditNeutralUnits.MaxValue := SpinEditMaxPower.Value;
+  AServerRemove.Enabled := RadioButtonModeNetworkClient.Checked and Assigned(ListViewServers.Selected);
+  AServerAdd.Enabled := RadioButtonModeNetworkClient.Checked;
+  AServerModify.Enabled := RadioButtonModeNetworkClient.Checked;
 end;
 
@@ -350 +396 @@
   if Assigned(ListViewPlayers.Selected) then begin
     Players.Remove(ListViewPlayers.Selected.Data);
+    ReloadView;
+  end;
+end;
+
+procedure TFormNew.AServerAddExecute(Sender: TObject);
+var
+  NewServer: TServerInfo;
+begin
+  FormServer := TFormServer.Create(nil);
+  NewServer := TServerInfo.Create;
+  FormServer.Load(NewServer);
+  if FormServer.ShowModal = mrOK then begin
+    FormServer.Save(NewServer);
+    ServerList.Items.Add(NewServer);
+    ReloadView;
+  end else NewServer.Free;
+  FormServer.Free;
+end;
+
+procedure TFormNew.AServerModifyExecute(Sender: TObject);
+var
+  Server: TServerInfo;
+begin
+  FormServer := TFormServer.Create(nil);
+  Server := TServerInfo(ListViewServers.Selected.Data);
+  FormServer.Load(Server);
+  if FormServer.ShowModal = mrOK then begin
+    FormServer.Save(Server);
+    ReloadView;
+  end;
+  FormServer.Free;
+end;
+
+procedure TFormNew.AServerRemoveExecute(Sender: TObject);
+var
+  I: Integer;
+begin
+  if MessageDlg(SRemoveServer, SRemoveServerQuery,
+  TMsgDlgType.mtConfirmation, [mbCancel, mbOk], 0) = mrOk then begin
+    for I := ListViewServers.Items.Count - 1 downto 0 do
+    if ListViewServers.Items[I].Selected then
+      ServerList.Items.Delete(I);
     ReloadView;
   end;
@@ -424 +512 @@
     LocalNetworkAddress := EditServerAddress.Text;
     LocalNetworkPort := SpinEditServerPort.Value;
+    if Assigned(ListViewServers.Selected) then begin
+      RemoteNetworkAddress := TServerInfo(ListViewServers.Selected.Data).Address;
+      RemoteNetworkPort := TServerInfo(ListViewServers.Selected.Data).Port;
+    end else begin
+      RemoteNetworkAddress := '';
+      RemoteNetworkPort := 0;
+    end;
     Game.PlayersSetting.Assign(Players);
     Game.SymetricMap := CheckBoxSymetricMap.Checked;