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

Misc UI changes to new game wizard and mission result window.

Browse Source
This commit is contained in:
Khopa 2020-08-09 16:37:10 +02:00
parent 2de48b3918
commit 7354a34f1a
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qt_ui/windows/QNewGameWizard.py
View File

@ -263,6 +263,9 @@ class TheaterConfiguration(QtWidgets.QWizardPage):
self.setPixmap(QtWidgets.QWizard.LogoPixmap, self.setPixmap(QtWidgets.QWizard.LogoPixmap,
QtGui.QPixmap('./resources/ui/wizard/logo1.png')) QtGui.QPixmap('./resources/ui/wizard/logo1.png'))
self.setPixmap(QtWidgets.QWizard.WatermarkPixmap,
QtGui.QPixmap('./resources/ui/wizard/watermark3.png'))
# Terrain selection # Terrain selection
terrainGroup = QtWidgets.QGroupBox("Terrain") terrainGroup = QtWidgets.QGroupBox("Terrain")
terrainCaucasusSmall = QtWidgets.QRadioButton("Caucasus - Western Georgia") terrainCaucasusSmall = QtWidgets.QRadioButton("Caucasus - Western Georgia")
@ -348,9 +351,9 @@ class TheaterConfiguration(QtWidgets.QWizardPage):
layout = QtWidgets.QGridLayout() layout = QtWidgets.QGridLayout()
layout.setColumnMinimumWidth(0, 20) layout.setColumnMinimumWidth(0, 20)
layout.addWidget(terrainGroup) layout.addWidget(terrainGroup, 0, 0, 3, 1)
layout.addWidget(mapSettingsGroup) layout.addWidget(mapSettingsGroup, 0, 1, 1, 1)
layout.addWidget(timeGroup) layout.addWidget(timeGroup, 1, 1, 1, 1)
self.setLayout(layout) self.setLayout(layout)

24
qt_ui/windows/QWaitingForMissionResultWindow.py
View File

@ -39,7 +39,6 @@ class QWaitingForMissionResultWindow(QDialog):
self.gameEvent = gameEvent self.gameEvent = gameEvent
self.game = game self.game = game
self.setWindowTitle("Waiting for mission completion.") self.setWindowTitle("Waiting for mission completion.")
self.setWindowFlag(QtCore.Qt.WindowCloseButtonHint, False)
self.setWindowIcon(QIcon("./resources/icon.png")) self.setWindowIcon(QIcon("./resources/icon.png"))
self.setMinimumHeight(570) self.setMinimumHeight(570)
@ -73,7 +72,8 @@ class QWaitingForMissionResultWindow(QDialog):
"<p>Then host a server with the mission, and tell your friends to join !</p>" + \ "<p>Then host a server with the mission, and tell your friends to join !</p>" + \
"<i>(The step in the mission editor is important, and fix a game breaking bug.)</i>" + \ "<i>(The step in the mission editor is important, and fix a game breaking bug.)</i>" + \
"<h2>Finishing</h2>" + \ "<h2>Finishing</h2>" + \
"<p>Once you have played the mission, click on the \"Accept Results\" button.</p>" "<p>Once you have played the mission, click on the \"Accept Results\" button.</p>" + \
"<p>If DCS Liberation does not detect mission end, use the manually submit button, and choose the state.json file.</p>"
self.instructions_text = QTextEdit(TEXT) self.instructions_text = QTextEdit(TEXT)
self.instructions_text.setReadOnly(True) self.instructions_text.setReadOnly(True)
@ -88,12 +88,12 @@ class QWaitingForMissionResultWindow(QDialog):
self.actions_layout = QHBoxLayout() self.actions_layout = QHBoxLayout()
self.actions.setLayout(self.actions_layout) self.actions.setLayout(self.actions_layout)
manually_submit = QPushButton("Manually Submit [Advanced users]") self.manually_submit = QPushButton("Manually Submit [Advanced users]")
manually_submit.clicked.connect(self.submit_manually) self.manually_submit.clicked.connect(self.submit_manually)
self.actions_layout.addWidget(manually_submit) self.actions_layout.addWidget(self.manually_submit)
cancel = QPushButton("Abort mission") self.cancel = QPushButton("Abort mission")
cancel.clicked.connect(self.close) self.cancel.clicked.connect(self.close)
self.actions_layout.addWidget(cancel) self.actions_layout.addWidget(self.cancel)
self.gridLayout.addWidget(self.actions, 2, 0) self.gridLayout.addWidget(self.actions, 2, 0)
progress_bar.start() progress_bar.start()
@ -128,11 +128,15 @@ class QWaitingForMissionResultWindow(QDialog):
self.gridLayout.addWidget(QLabel("<b>Mission is being played</b>"), 1, 0) self.gridLayout.addWidget(QLabel("<b>Mission is being played</b>"), 1, 0)
self.gridLayout.addWidget(self.actions, 2, 0) self.gridLayout.addWidget(self.actions, 2, 0)
else: else:
bottom_layout = QHBoxLayout()
#self.gridLayout.addWidget(QLabel("<b>Mission is over !</b>"), 1, 0) #self.gridLayout.addWidget(QLabel("<b>Mission is over !</b>"), 1, 0)
proceed = QPushButton("Accept results") proceed = QPushButton("Accept results")
proceed.setProperty("style", "btn-primary") proceed.setProperty("style", "btn-success")
proceed.clicked.connect(lambda: self.process_debriefing(debriefing)) proceed.clicked.connect(lambda: self.process_debriefing(debriefing))
self.gridLayout.addWidget(proceed, 1, 0) bottom_layout.addWidget(self.manually_submit)
bottom_layout.addWidget(self.cancel)
bottom_layout.addWidget(proceed)
self.gridLayout.addLayout(bottom_layout, 1, 0)
def on_debriefing_udpate(self, debriefing): def on_debriefing_udpate(self, debriefing):
print("On Debriefing update") print("On Debriefing update")