weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop_2_2_x' into develop

Browse Source
This commit is contained in:
walterroach
2020-11-21 18:24:36 -06:00
parent bf7df6721a d394d01ea8
commit fc6ca162af
8 changed files with 210 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qt_ui/widgets/QTopPanel.py
View File

@@ -48,12 +48,14 @@ class QTopPanel(QFrame):
self.passTurnButton.setIcon(CONST.ICONS["PassTurn"])
self.passTurnButton.setProperty("style", "btn-primary")
self.passTurnButton.clicked.connect(self.passTurn)
if not self.game:
self.passTurnButton.setEnabled(False)
self.proceedButton = QPushButton("Take off")
self.proceedButton.setIcon(CONST.ICONS["Proceed"])
self.proceedButton.setProperty("style", "start-button")
self.proceedButton.clicked.connect(self.launch_mission)
if self.game and self.game.turn == 0:
if not self.game or self.game.turn == 0:
self.proceedButton.setEnabled(False)
self.factionsInfos = QFactionsInfos(self.game)
@@ -101,6 +103,8 @@ class QTopPanel(QFrame):
self.budgetBox.setGame(game)
self.factionsInfos.setGame(game)
self.passTurnButton.setEnabled(True)
if game and game.turn == 0:
self.proceedButton.setEnabled(False)
else:

2
qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
View File

@@ -161,5 +161,3 @@ class QFlightWaypointTab(QFrame):
def on_change(self):
self.flight_waypoint_list.update_list()
self.on_flight_changed.emit()