Changeset 266

Timestamp:

Jan 15, 2019, 8:41:53 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Show correct win objective parameters in New game window Rules tab.

Location:

trunk/Forms

Files:

• UFormNew.lfm (modified) (3 diffs)
• UFormNew.pas (modified) (4 diffs)

trunk/Forms/UFormNew.lfm

@@ -1 +1 @@
 object FormNew: TFormNew
-  Left = 365
+  Left = 546
   Height = 748
-  Top = 167
+  Top = 181
   Width = 1154
   Caption = 'New game'
@@ -596 +596 @@
           TabOrder = 3
         end
-        object PageControl2: TPageControl
+        object PageControlWinObjective: TPageControl
           Left = 12
           Height = 78
           Top = 290
           Width = 716
-          ActivePage = TabSheetCaptureCities
+          ActivePage = TabSheetCaptureEntireMap
           Anchors = [akTop, akLeft, akRight]
           ShowTabs = False
-          TabIndex = 1
+          TabIndex = 5
           TabOrder = 4
           object TabSheetDefeatEnemies: TTabSheet
@@ -654 +654 @@
             end
           end
+          object TabSheetNone: TTabSheet
+          end
+          object TabSheetCaptureEntireMap: TTabSheet
+          end
         end
         object CheckBoxEmptyCellsNeutral: TCheckBox

trunk/Forms/UFormNew.pas

@@ -67 +67 @@
     OpenPictureDialog1: TOpenPictureDialog;
     PageControl1: TPageControl;
-    PageControl2: TPageControl;
+    PageControlWinObjective: TPageControl;
     Panel1: TPanel;
     Panel2: TPanel;
@@ -91 +91 @@
     SpinEditVoidPercent: TSpinEdit;
     Splitter1: TSplitter;
+    TabSheetCaptureEntireMap: TTabSheet;
+    TabSheetNone: TTabSheet;
     TabSheetCaptureCells: TTabSheet;
     TabSheetCaptureCities: TTabSheet;
@@ -330 +332 @@
 
 procedure TFormNew.UpdateInterface;
+var
+  WinObjective: TWinObjective;
 begin
   APlayerRemove.Enabled := Assigned(ListViewPlayers.Selected) and (Players.Count > MinPlayerCount);
@@ -344 +348 @@
   AServerAdd.Enabled := RadioButtonModeNetworkClient.Checked;
   AServerModify.Enabled := RadioButtonModeNetworkClient.Checked;
-  PageControl2.TabIndex := ComboBoxWinObjective.ItemIndex;
+  WinObjective := TWinObjective(ComboBoxWinObjective.ItemIndex);
+  case WinObjective of
+    woNone: PageControlWinObjective.TabIndex := PageControlWinObjective.IndexOf(TabSheetNone);
+    woDefeatAllOponents: PageControlWinObjective.TabIndex := PageControlWinObjective.IndexOf(TabSheetDefeatEnemies);
+    woDefeatAllOponentsCities: PageControlWinObjective.TabIndex := PageControlWinObjective.IndexOf(TabSheetCaptureCities);
+    woSpecialCaptureCell: PageControlWinObjective.TabIndex := PageControlWinObjective.IndexOf(TabSheetCaptureCells);
+    woStayAliveForDefinedTurns: PageControlWinObjective.TabIndex := PageControlWinObjective.IndexOf(TabSheetStayAliveTurns);
+    woCaptureEntireMap: PageControlWinObjective.TabIndex := PageControlWinObjective.IndexOf(TabSheetCaptureEntireMap);
+  end;
 end;