Changeset 134 for trunk/Forms

Timestamp:

Jul 5, 2017, 6:24:55 PM (7 years ago)

Author:

chronos

Message:

• Added: Player starts units can be configured in player dialog.

Location:

trunk/Forms

Files:

• UFormNew.lfm (modified) (3 diffs)
• UFormPlayer.lfm (modified) (10 diffs)
• UFormPlayer.lrt (modified) (1 diff)
• UFormPlayer.pas (modified) (7 diffs)

trunk/Forms/UFormNew.lfm

@@ -39 +39 @@
     Top = 4
     Width = 669
-    ActivePage = TabSheet2
+    ActivePage = TabSheet1
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 4
-    TabIndex = 1
+    TabIndex = 0
     TabOrder = 2
     object TabSheet1: TTabSheet
@@ -192 +192 @@
       object ComboBoxGridType: TComboBox
         Left = 146
-        Height = 34
+        Height = 38
         Top = 104
         Width = 208
@@ -206 +206 @@
       object ComboBoxMapShape: TComboBox
         Left = 146
-        Height = 34
+        Height = 38
         Top = 144
         Width = 208

trunk/Forms/UFormPlayer.lfm

@@ -1 +1 @@
 object FormPlayer: TFormPlayer
   Left = 470
-  Height = 279
+  Height = 344
   Top = 219
   Width = 522
   Caption = 'Player'
-  ClientHeight = 279
+  ClientHeight = 344
   ClientWidth = 522
-  Constraints.MinHeight = 279
+  Constraints.MinHeight = 344
   Constraints.MinWidth = 522
+  OnShow = FormShow
   Position = poMainFormCenter
-  LCLVersion = '1.4.4.0'
+  LCLVersion = '1.6.4.0'
   object Label1: TLabel
-    Left = 28
-    Height = 25
+    Left = 24
+    Height = 24
     Top = 27
-    Width = 51
+    Width = 56
     Caption = 'Name:'
     ParentColor = False
   end
   object EditName: TEdit
-    Left = 139
-    Height = 33
+    Left = 168
+    Height = 34
     Top = 27
-    Width = 368
+    Width = 339
     Anchors = [akTop, akLeft, akRight]
     TabOrder = 0
@@ -30 +31 @@
     Left = 278
     Height = 25
-    Top = 242
+    Top = 307
     Width = 75
     Anchors = [akRight, akBottom]
@@ -40 +41 @@
     Left = 403
     Height = 25
-    Top = 242
+    Top = 307
     Width = 75
     Anchors = [akRight, akBottom]
@@ -48 +49 @@
     TabOrder = 2
   end
-  object ComboBox1: TComboBox
-    Left = 139
-    Height = 33
+  object ComboBoxMode: TComboBox
+    Left = 168
+    Height = 34
     Top = 72
-    Width = 368
+    Width = 339
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 25
+    ItemHeight = 0
     ItemIndex = 0
     Items.Strings = (
@@ -60 +61 @@
       'Computer'
     )
+    OnChange = ComboBoxModeChange
     Style = csDropDownList
     TabOrder = 3
@@ -66 +68 @@
   object Label2: TLabel
     Left = 24
-    Height = 25
+    Height = 24
     Top = 72
-    Width = 51
+    Width = 53
     Caption = 'Mode:'
     ParentColor = False
@@ -74 +76 @@
   object Label3: TLabel
     Left = 24
-    Height = 25
+    Height = 24
     Top = 128
-    Width = 47
+    Width = 50
     Caption = 'Color:'
     ParentColor = False
   end
   object ColorBox1: TColorBox
-    Left = 139
-    Height = 28
+    Left = 168
+    Height = 38
     Top = 120
-    Width = 368
+    Width = 339
     Style = [cbStandardColors, cbExtendedColors, cbCustomColor, cbPrettyNames]
     Anchors = [akTop, akLeft, akRight]
@@ -92 +94 @@
   object Label4: TLabel
     Left = 24
-    Height = 25
+    Height = 24
     Top = 168
-    Width = 90
+    Width = 98
     Caption = 'Agressivity:'
     ParentColor = False
   end
   object ComboBoxAgressivity: TComboBox
-    Left = 139
-    Height = 33
+    Left = 168
+    Height = 34
     Top = 168
-    Width = 368
+    Width = 339
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 25
+    ItemHeight = 0
     Items.Strings = (
       'Low'
@@ -116 +118 @@
   object CheckBoxDefensive: TCheckBox
     Left = 24
-    Height = 29
+    Height = 28
     Top = 208
     Width = 107
@@ -122 +124 @@
     TabOrder = 6
   end
+  object Label5: TLabel
+    Left = 24
+    Height = 24
+    Top = 248
+    Width = 94
+    Caption = 'Start units:'
+    ParentColor = False
+  end
+  object SpinEditStartUnits: TSpinEdit
+    Left = 224
+    Height = 34
+    Top = 240
+    Width = 112
+    MaxValue = 99
+    TabOrder = 7
+  end
 end

trunk/Forms/UFormPlayer.lrt

@@ -3 +3 @@
 TFORMPLAYER.BUTTONCANCEL.CAPTION=Cancel
 TFORMPLAYER.BUTTONOK.CAPTION=Ok
-TFORMPLAYER.COMBOBOX1.TEXT=Human
+TFORMPLAYER.COMBOBOXMODE.TEXT=Human
 TFORMPLAYER.LABEL2.CAPTION=Mode:
 TFORMPLAYER.LABEL3.CAPTION=Color:
 TFORMPLAYER.LABEL4.CAPTION=Agressivity:
 TFORMPLAYER.CHECKBOXDEFENSIVE.CAPTION=Defensive
+TFORMPLAYER.LABEL5.CAPTION=Start units:

trunk/Forms/UFormPlayer.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ColorBox, UGame;
+  ColorBox, Menus, Spin, UGame;
 
 type
@@ -18 +18 @@
     CheckBoxDefensive: TCheckBox;
     ColorBox1: TColorBox;
-    ComboBox1: TComboBox;
+    ComboBoxMode: TComboBox;
     ComboBoxAgressivity: TComboBox;
     EditName: TEdit;
@@ -25 +25 @@
     Label3: TLabel;
     Label4: TLabel;
+    Label5: TLabel;
+    SpinEditStartUnits: TSpinEdit;
+    procedure ComboBoxModeChange(Sender: TObject);
+    procedure FormShow(Sender: TObject);
   private
     { private declarations }
   public
     procedure Translate;
+    procedure UpdateInterface;
     procedure Load(Player: TPlayer);
     procedure Save(Player: TPlayer);
@@ -43 +48 @@
   SHuman = 'Human';
   SComputer = 'Computer';
-  SAgroNotAttacking = 'Not attacking';
   SAgroLow = 'Low';
   SAgroMedium = 'Medium';
@@ -50 +54 @@
 { TFormPlayer }
 
+procedure TFormPlayer.ComboBoxModeChange(Sender: TObject);
+begin
+  UpdateInterface;
+end;
+
+procedure TFormPlayer.FormShow(Sender: TObject);
+begin
+  UpdateInterface;
+end;
+
 procedure TFormPlayer.Translate;
 var
   LastIndex: Integer;
 begin
-  with ComboBox1 do begin
+  with ComboBoxMode do begin
     LastIndex := ItemIndex;
     Clear;
@@ -71 +85 @@
 end;
 
+procedure TFormPlayer.UpdateInterface;
+begin
+  ComboBoxAgressivity.Visible := ComboBoxMode.ItemIndex = 1;
+  CheckBoxDefensive.Visible := ComboBoxMode.ItemIndex = 1;
+  Label4.Visible := ComboBoxMode.ItemIndex = 1;
+end;
+
 procedure TFormPlayer.Load(Player: TPlayer);
 begin
   EditName.Text := Player.Name;
-  ComboBox1.ItemIndex := Integer(Player.Mode);
+  ComboBoxMode.ItemIndex := Integer(Player.Mode);
   ColorBox1.Selected := Player.Color;
-  Label4.Visible := Player.Mode = pmComputer;
-  ComboBoxAgressivity.Visible := Player.Mode = pmComputer;
   ComboBoxAgressivity.ItemIndex := Integer(Player.Agressivity);
-  CheckBoxDefensive.Visible := Player.Mode = pmComputer;
   CheckBoxDefensive.Checked := Player.Defensive;
+  SpinEditStartUnits.Value := Player.StartUnits;
+  UpdateInterface;
 end;
 
@@ -86 +106 @@
 begin
   Player.Name := EditName.Text;
-  Player.Mode := TPlayerMode(ComboBox1.ItemIndex);
+  Player.Mode := TPlayerMode(ComboBoxMode.ItemIndex);
   Player.Color := ColorBox1.Selected;
   Player.Agressivity := TComputerAgressivity(ComboBoxAgressivity.ItemIndex);
   Player.Defensive := CheckBoxDefensive.Checked;
+  Player.StartUnits := SpinEditStartUnits.Value;
 end;