Changeset 130 for trunk/Forms

Timestamp:

Jun 18, 2017, 11:27:44 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Require at least 2 players for a game.
• Fixed: Translate more strings.

Location:

trunk/Forms

Files:

• UFormCharts.pas (modified) (4 diffs)
• UFormNew.lfm (modified) (31 diffs)
• UFormNew.pas (modified) (2 diffs)

trunk/Forms/UFormCharts.pas

@@ -23 +23 @@
   public
     procedure Redraw;
+    procedure Translate;
   end;
 
@@ -34 +35 @@
 uses
   UCore, UGame;
+
+resourcestring
+  SOccupiedCells = 'Occupied cells';
+  SMilitaryPower = 'Military power';
+  SDiscoveredCells = 'Discovered cells';
+  SCitiesCount = 'Cities count';
+
 
 { TFormCharts }
@@ -50 +58 @@
 begin
   Core.PersistentForm.Load(Self);
+  if (ComboBox1.ItemIndex = -1) and (ComboBox1.Items.Count > 0) then
+    ComboBox1.ItemIndex := 0;
   Redraw;
+  Translate;
 end;
 
@@ -74 +85 @@
 end;
 
+procedure TFormCharts.Translate;
+var
+  LastIndex: Integer;
+begin
+  with ComboBox1 do begin
+    LastIndex := ItemIndex;
+    Clear;
+    Items.Add(SOccupiedCells);
+    Items.Add(SMilitaryPower);
+    Items.Add(SDiscoveredCells);
+    Items.Add(SCitiesCount);
+    ItemIndex := LastIndex;
+  end;
+end;
+
 end.
 

trunk/Forms/UFormNew.lfm

@@ -13 +13 @@
   OnShow = FormShow
   Position = poMainFormCenter
-  LCLVersion = '1.4.4.0'
+  LCLVersion = '1.6.4.0'
   object ButtonCancel: TButton
     Left = 454
@@ -47 +47 @@
     object TabSheet1: TTabSheet
       Caption = 'Players'
-      ClientHeight = 398
-      ClientWidth = 854
+      ClientHeight = 397
+      ClientWidth = 663
       object ListView1: TListView
         Left = 4
-        Height = 348
+        Height = 347
         Top = 4
-        Width = 846
+        Width = 655
         Align = alTop
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -90 +90 @@
         Left = 224
         Height = 25
-        Top = 360
+        Top = 359
         Width = 83
         Action = APlayerRemove
@@ -99 +99 @@
         Left = 16
         Height = 25
-        Top = 360
+        Top = 359
         Width = 83
         Action = APlayerAdd
@@ -108 +108 @@
         Left = 120
         Height = 25
-        Top = 360
+        Top = 359
         Width = 83
         Action = APlayerModify
@@ -118 +118 @@
     object TabSheet2: TTabSheet
       Caption = 'Map'
-      ClientHeight = 401
-      ClientWidth = 661
+      ClientHeight = 397
+      ClientWidth = 663
       object Label1: TLabel
         Left = 8
-        Height = 25
+        Height = 24
         Top = 9
-        Width = 89
+        Width = 95
         Caption = 'Map width:'
         ParentColor = False
@@ -130 +130 @@
       object Label2: TLabel
         Left = 8
-        Height = 25
+        Height = 24
         Top = 57
-        Width = 95
+        Width = 102
         Caption = 'Map height:'
         ParentColor = False
@@ -138 +138 @@
       object SpinEditMapSizeX: TSpinEdit
         Left = 128
-        Height = 33
+        Height = 34
         Top = 4
         Width = 98
@@ -148 +148 @@
       object SpinEditMapSizeY: TSpinEdit
         Left = 128
-        Height = 33
+        Height = 34
         Top = 55
         Width = 98
@@ -160 +160 @@
         Height = 46
         Top = 8
-        Width = 410
+        Width = 412
         Max = 100
         Min = 2
@@ -173 +173 @@
         Height = 46
         Top = 49
-        Width = 410
+        Width = 412
         Max = 100
         Min = 2
@@ -184 +184 @@
       object Label5: TLabel
         Left = 8
-        Height = 25
+        Height = 24
         Top = 104
-        Width = 77
+        Width = 83
         Caption = 'Grid type:'
         ParentColor = False
@@ -192 +192 @@
       object ComboBoxGridType: TComboBox
         Left = 146
-        Height = 33
+        Height = 34
         Top = 104
         Width = 208
-        ItemHeight = 25
+        ItemHeight = 0
         Items.Strings = (
           'Hexagonal'
@@ -206 +206 @@
       object ComboBoxMapShape: TComboBox
         Left = 146
-        Height = 33
+        Height = 34
         Top = 144
         Width = 208
-        ItemHeight = 25
+        ItemHeight = 0
         Items.Strings = (
           'Hexagonal'
@@ -221 +221 @@
       object Label8: TLabel
         Left = 8
-        Height = 25
+        Height = 24
         Top = 144
-        Width = 92
+        Width = 98
         Caption = 'Map shape:'
         ParentColor = False
@@ -231 +231 @@
         Height = 27
         Top = 110
-        Width = 173
+        Width = 175
         Anchors = [akTop, akLeft, akRight]
         AutoSize = False
@@ -239 +239 @@
       object SpinEditVoidPercent: TSpinEdit
         Left = 216
-        Height = 33
+        Height = 34
         Top = 224
         Width = 106
@@ -248 +248 @@
       object CheckBoxVoid: TCheckBox
         Left = 8
-        Height = 29
+        Height = 28
         Top = 232
-        Width = 177
+        Width = 187
         Caption = 'Inaccessible places'
         OnChange = CheckBoxVoidChange
@@ -257 +257 @@
       object CheckBoxCity: TCheckBox
         Left = 8
-        Height = 29
+        Height = 28
         Top = 272
-        Width = 72
+        Width = 71
         Caption = 'Cities'
         OnChange = CheckBoxCityChange
@@ -266 +266 @@
       object SpinEditCityPercent: TSpinEdit
         Left = 216
-        Height = 33
+        Height = 34
         Top = 272
         Width = 106
@@ -275 +275 @@
       object Label4: TLabel
         Left = 331
-        Height = 25
+        Height = 24
         Top = 272
         Width = 15
@@ -283 +283 @@
       object Label3: TLabel
         Left = 331
-        Height = 25
+        Height = 24
         Top = 232
         Width = 15
@@ -291 +291 @@
       object SpinEditNeutralUnits: TSpinEdit
         Left = 408
-        Height = 33
+        Height = 34
         Top = 352
         Width = 98
@@ -301 +301 @@
       object Label7: TLabel
         Left = 8
-        Height = 25
+        Height = 24
         Top = 352
-        Width = 207
+        Width = 227
         Caption = 'Max random neutral units:'
         ParentColor = False
@@ -309 +309 @@
       object EditImageFile: TEdit
         Left = 144
-        Height = 33
+        Height = 34
         Top = 184
-        Width = 394
+        Width = 396
         Anchors = [akTop, akLeft, akRight]
         TabOrder = 12
       end
       object ButtonImageBrowse: TButton
-        Left = 546
+        Left = 548
         Height = 25
         Top = 192
@@ -327 +327 @@
       object Label9: TLabel
         Left = 8
-        Height = 25
+        Height = 24
         Top = 184
-        Width = 82
+        Width = 90
         Caption = 'Image file:'
         ParentColor = False
@@ -335 +335 @@
       object CheckBoxBridges: TCheckBox
         Left = 8
-        Height = 29
+        Height = 28
         Top = 310
-        Width = 199
+        Width = 210
         Caption = 'Bridges between cells'
         TabOrder = 14
@@ -344 +344 @@
     object TabSheet3: TTabSheet
       Caption = 'Rules'
-      ClientHeight = 398
-      ClientWidth = 854
+      ClientHeight = 397
+      ClientWidth = 663
       object RadioGroupGrowCells: TRadioGroup
         Left = 15
@@ -360 +360 @@
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 75
+        ClientHeight = 79
         ClientWidth = 308
         Items.Strings = (
@@ -382 +382 @@
         Top = 240
         Width = 328
-        ItemHeight = 25
+        ItemHeight = 0
         Items.Strings = (
           'Defeat all oponents'
@@ -406 +406 @@
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 46
+        ClientHeight = 50
         ClientWidth = 301
         Items.Strings = (

trunk/Forms/UFormNew.pas

@@ -90 +90 @@
     procedure Translate;
     procedure ReloadView;
+    procedure UpdateInterface;
     procedure Load(Game: TGame);
     procedure Save(Game: TGame);
@@ -229 +230 @@
   ListView1.Items.Count := Players.Count;
   ListView1.Refresh;
-  ButtonPlayerRemove.Enabled := Assigned(ListView1.Selected) and (Players.Count > 1);
-  ButtonPlayerAdd.Enabled := Players.Count < MaxPlayerCount;
+  Translate;
+  UpdateInterface;
+end;
+
+procedure TFormNew.UpdateInterface;
+begin
+  APlayerRemove.Enabled := Assigned(ListView1.Selected) and (Players.Count > 2);
+  APlayerAdd.Enabled := Players.Count < MaxPlayerCount;
   APlayerModify.Enabled := Assigned(ListView1.Selected);
   EditImageFile.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
   ButtonImageBrowse.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
-  Translate;
 end;