From ddc076b1414d5231966a700ccb3bbcbed8c73d12 Mon Sep 17 00:00:00 2001 From: bgreman <47828384+bgreman@users.noreply.github.com> Date: Thu, 24 Jun 2021 10:59:12 -0400 Subject: [PATCH] Implements #1331 by changing the Pass Turn button text on Turn 0. (#1333) (cherry picked from commit 26743154d8da521958ea4fa99164754e9aefadf5) --- changelog.md | 1 + qt_ui/widgets/QTopPanel.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 27e64cb1..cbdb1708 100644 --- a/changelog.md +++ b/changelog.md @@ -21,6 +21,7 @@ Saves from 3.x are not compatible with 4.0. * **[UI]** Carriers and LHAs now match the colour of airfields, and their destination icons are translucent. * **[UI]** Updated intel box text for first turn. * **[UI]** Base Capture Cheat is now usable at all bases and can also be used to transfer player-owned bases to OPFOR. +* **[UI]** Pass Turn button is relabled as "Begin Campaign" on Turn 0. * **[UI]** Added a ruler to the map. * **[Units/Factions/Mods]** Removes MB-339PAN support, as the mod is now deprecated and no longer works with DCS 2.7+. * **[New Game Wizard]** Mods are now selected via checkboxes in the new game wizard, not as separate factions. diff --git a/qt_ui/widgets/QTopPanel.py b/qt_ui/widgets/QTopPanel.py index d3ad018f..3fa91736 100644 --- a/qt_ui/widgets/QTopPanel.py +++ b/qt_ui/widgets/QTopPanel.py @@ -46,7 +46,10 @@ class QTopPanel(QFrame): self.conditionsWidget = QConditionsWidget() self.budgetBox = QBudgetBox(self.game) - self.passTurnButton = QPushButton("Pass Turn") + pass_turn_text = "Pass Turn" + if not self.game or self.game.turn == 0: + pass_turn_text = "Begin Campaign" + self.passTurnButton = QPushButton(pass_turn_text) self.passTurnButton.setIcon(CONST.ICONS["PassTurn"]) self.passTurnButton.setProperty("style", "btn-primary") self.passTurnButton.clicked.connect(self.passTurn) @@ -114,6 +117,8 @@ class QTopPanel(QFrame): self.factionsInfos.setGame(game) self.passTurnButton.setEnabled(True) + if game and game.turn > 0: + self.passTurnButton.setText("Pass Turn") if game and game.turn == 0: self.proceedButton.setEnabled(False)