Changeset 55 for trunk/Forms

Timestamp:

Aug 18, 2014, 9:34:15 AM (10 years ago)

Author:

chronos

Message:

• Fixed: More translation of TGroupBox and TComboBox items.
• Fixed: Shape of hexagon was not regular due to rounding error in polygon generation and drawing. Cells are now generated internally as bigger to avoid rounding error.
• Fixed: After game end do not allow to execute End turn and End game actions.
• Added: Preparation for random voronoi map. So far hidden in developer mode as algorithm is missing.

Location:

trunk/Forms

Files:

• UFormNew.lfm (modified) (8 diffs)
• UFormNew.pas (modified) (4 diffs)
• UFormPlayer.pas (modified) (2 diffs)
• UFormSettings.lfm (modified) (3 diffs)
• UFormSettings.lrt (modified) (1 diff)
• UFormSettings.pas (modified) (3 diffs)

trunk/Forms/UFormNew.lfm

@@ -240 +240 @@
     end
     object RadioGroupGrowAmount: TRadioGroup
-      Left = 360
+      Left = 376
       Height = 76
       Top = 97
-      Width = 241
+      Width = 305
       AutoFill = True
       Caption = 'Per turn grow amount'
@@ -254 +254 @@
       ChildSizing.ControlsPerLine = 1
       ClientHeight = 49
-      ClientWidth = 237
+      ClientWidth = 301
       Items.Strings = (
         'By one'
@@ -264 +264 @@
       Left = 8
       Height = 105
-      Top = 185
-      Width = 185
+      Top = 184
+      Width = 312
       AutoFill = True
       Caption = 'Growing cells'
@@ -276 +276 @@
       ChildSizing.ControlsPerLine = 1
       ClientHeight = 78
-      ClientWidth = 181
+      ClientWidth = 308
       Items.Strings = (
         'None'
@@ -285 +285 @@
     end
     object ComboBoxGridType: TComboBox
-      Left = 312
-      Height = 37
+      Left = 473
+      Height = 33
       Top = 201
       Width = 208
@@ -299 +299 @@
     end
     object Label5: TLabel
-      Left = 216
+      Left = 336
       Height = 25
       Top = 201
@@ -315 +315 @@
     end
     object ComboBoxWinObjective: TComboBox
-      Left = 160
-      Height = 37
+      Left = 232
+      Height = 33
       Top = 305
-      Width = 208
+      Width = 328
       ItemHeight = 0
       Items.Strings = (
@@ -338 +338 @@
     end
     object SpinEditNeutralUnits: TSpinEdit
-      Left = 272
-      Height = 35
-      Top = 343
+      Left = 384
+      Height = 35
+      Top = 344
       Width = 98
       MaxValue = 99

trunk/Forms/UFormNew.pas

@@ -69 +69 @@
     Players: TPlayers;
   public
+    procedure Translate;
     procedure ReloadView;
     procedure Load(Game: TGame);
@@ -82 +83 @@
 
 uses
-  UFormPlayer;
+  UFormPlayer, UCore;
+
+resourcestring
+  SGridTypeHexagon = 'Hexagonal';
+  SGridTypeSquare = 'Square';
+  SGridTypeTriangle = 'Triangonal';
+  SGridTypeVoronoi = 'Voronoi random';
+  SWinObjectiveDefeatAllOponents = 'Defeat all oponents';
+  SWinObjectiveDefeatAllCities = 'Defeat all oponents cities';
+  SWinObjectiveCapturePosition = 'Capture position';
+  SWinObjectiveStayAliveForTurns = 'Stay alive for number of turns';
+  SGrowNone = 'None';
+  SGrowPlayerCities = 'Player cities';
+  SGrowPlayerAllCells = 'Player all cells';
+  SGrowAmountByOne = 'By one';
+  SGrowAmountBySquareRoot = 'By square root';
+
 
 { TFormNew }
@@ -141 +158 @@
 end;
 
+procedure TFormNew.Translate;
+var
+  LastIndex: Integer;
+begin
+  with ComboBoxGridType do begin
+    LastIndex := ItemIndex;
+    Clear;
+    Items.Add(SGridTypeHexagon);
+    Items.Add(SGridTypeSquare);
+    Items.Add(SGridTypeTriangle);
+    if Core.DevelMode then
+      Items.Add(SGridTypeVoronoi);
+    ItemIndex := LastIndex;
+  end;
+  with ComboBoxWinObjective do begin
+    LastIndex := ItemIndex;
+    Clear;
+    Items.Add(SWinObjectiveDefeatAllOponents);
+    Items.Add(SWinObjectiveDefeatAllCities);
+    Items.Add(SWinObjectiveCapturePosition);
+    Items.Add(SWinObjectiveStayAliveForTurns);
+    ItemIndex := LastIndex;
+  end;
+  with RadioGroupGrowCells do begin
+    LastIndex := ItemIndex;
+    Items.Clear;
+    Items.Add(SGrowNone);
+    Items.Add(SGrowPlayerCities);
+    Items.Add(SGrowPlayerAllCells);
+    ItemIndex := LastIndex;
+  end;
+  with RadioGroupGrowAmount do begin
+    LastIndex := ItemIndex;
+    Items.Clear;
+    Items.Add(SGrowAmountByOne);
+    Items.Add(SGrowAmountBySquareRoot);
+    ItemIndex := LastIndex;
+  end;
+end;
+
 procedure TFormNew.ReloadView;
 begin
@@ -148 +205 @@
   ButtonPlayerAdd.Enabled := Players.Count < MaxPlayerCount;
   APlayerModify.Enabled := Assigned(ListView1.Selected);
+  Translate;
 end;
 

trunk/Forms/UFormPlayer.pas

@@ -25 +25 @@
     { private declarations }
   public
+    procedure Translate;
     procedure Load(Player: TPlayer);
     procedure Save(Player: TPlayer);
@@ -36 +37 @@
 {$R *.lfm}
 
+resourcestring
+  SHuman = 'Human';
+  SComputer = 'Computer';
+
 { TFormPlayer }
+
+procedure TFormPlayer.Translate;
+var
+  LastIndex: Integer;
+begin
+  with ComboBox1 do begin
+    LastIndex := ItemIndex;
+    Clear;
+    Items.Add(SHuman);
+    Items.Add(SComputer);
+    ItemIndex := LastIndex;
+  end;
+end;
 
 procedure TFormPlayer.Load(Player: TPlayer);

trunk/Forms/UFormSettings.lfm

@@ -29 +29 @@
   object Label1: TLabel
     Left = 20
-    Height = 22
+    Height = 25
     Top = 26
-    Width = 80
+    Width = 95
     Caption = 'Language:'
     ParentColor = False
@@ -37 +37 @@
   object ComboBoxLanguage: TComboBox
     Left = 178
-    Height = 32
+    Height = 37
     Top = 24
     Width = 196
@@ -44 +44 @@
     TabOrder = 2
   end
+  object CheckBoxDevelMode: TCheckBox
+    Left = 16
+    Height = 27
+    Top = 80
+    Width = 176
+    Caption = 'Developer mode'
+    TabOrder = 3
+  end
 end

trunk/Forms/UFormSettings.lrt

@@ -3 +3 @@
 TFORMSETTINGS.BUTTONCANCEL.CAPTION=Cancel
 TFORMSETTINGS.LABEL1.CAPTION=Language:
+TFORMSETTINGS.CHECKBOXDEVELMODE.CAPTION=Developer mode

trunk/Forms/UFormSettings.pas

@@ -15 +15 @@
     ButtonOk: TButton;
     ButtonCancel: TButton;
+    CheckBoxDevelMode: TCheckBox;
     ComboBoxLanguage: TComboBox;
     Label1: TLabel;
@@ -41 +42 @@
    ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
    if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
+   CheckBoxDevelMode.Checked := Core.DevelMode;
 end;
 
@@ -47 +49 @@
   if ComboBoxLanguage.ItemIndex <> -1 then
     Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+  Core.DevelMode := CheckBoxDevelMode.Checked;
 end;