diff --git a/qt_ui/windows/QNewGameWizard.py b/qt_ui/windows/QNewGameWizard.py index a9601acc..dff5752e 100644 --- a/qt_ui/windows/QNewGameWizard.py +++ b/qt_ui/windows/QNewGameWizard.py @@ -263,6 +263,9 @@ class TheaterConfiguration(QtWidgets.QWizardPage): self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap('./resources/ui/wizard/logo1.png')) + self.setPixmap(QtWidgets.QWizard.WatermarkPixmap, + QtGui.QPixmap('./resources/ui/wizard/watermark3.png')) + # Terrain selection terrainGroup = QtWidgets.QGroupBox("Terrain") terrainCaucasusSmall = QtWidgets.QRadioButton("Caucasus - Western Georgia") @@ -348,9 +351,9 @@ class TheaterConfiguration(QtWidgets.QWizardPage): layout = QtWidgets.QGridLayout() layout.setColumnMinimumWidth(0, 20) - layout.addWidget(terrainGroup) - layout.addWidget(mapSettingsGroup) - layout.addWidget(timeGroup) + layout.addWidget(terrainGroup, 0, 0, 3, 1) + layout.addWidget(mapSettingsGroup, 0, 1, 1, 1) + layout.addWidget(timeGroup, 1, 1, 1, 1) self.setLayout(layout) diff --git a/qt_ui/windows/QWaitingForMissionResultWindow.py b/qt_ui/windows/QWaitingForMissionResultWindow.py index 8d96871c..399fa256 100644 --- a/qt_ui/windows/QWaitingForMissionResultWindow.py +++ b/qt_ui/windows/QWaitingForMissionResultWindow.py @@ -39,7 +39,6 @@ class QWaitingForMissionResultWindow(QDialog): self.gameEvent = gameEvent self.game = game self.setWindowTitle("Waiting for mission completion.") - self.setWindowFlag(QtCore.Qt.WindowCloseButtonHint, False) self.setWindowIcon(QIcon("./resources/icon.png")) self.setMinimumHeight(570) @@ -73,7 +72,8 @@ class QWaitingForMissionResultWindow(QDialog): "

Then host a server with the mission, and tell your friends to join !

" + \ "(The step in the mission editor is important, and fix a game breaking bug.)" + \ "

Finishing

" + \ - "

Once you have played the mission, click on the \"Accept Results\" button.

" + "

Once you have played the mission, click on the \"Accept Results\" button.

" + \ + "

If DCS Liberation does not detect mission end, use the manually submit button, and choose the state.json file.

" self.instructions_text = QTextEdit(TEXT) self.instructions_text.setReadOnly(True) @@ -88,12 +88,12 @@ class QWaitingForMissionResultWindow(QDialog): self.actions_layout = QHBoxLayout() self.actions.setLayout(self.actions_layout) - manually_submit = QPushButton("Manually Submit [Advanced users]") - manually_submit.clicked.connect(self.submit_manually) - self.actions_layout.addWidget(manually_submit) - cancel = QPushButton("Abort mission") - cancel.clicked.connect(self.close) - self.actions_layout.addWidget(cancel) + self.manually_submit = QPushButton("Manually Submit [Advanced users]") + self.manually_submit.clicked.connect(self.submit_manually) + self.actions_layout.addWidget(self.manually_submit) + self.cancel = QPushButton("Abort mission") + self.cancel.clicked.connect(self.close) + self.actions_layout.addWidget(self.cancel) self.gridLayout.addWidget(self.actions, 2, 0) progress_bar.start() @@ -128,11 +128,15 @@ class QWaitingForMissionResultWindow(QDialog): self.gridLayout.addWidget(QLabel("Mission is being played"), 1, 0) self.gridLayout.addWidget(self.actions, 2, 0) else: + bottom_layout = QHBoxLayout() #self.gridLayout.addWidget(QLabel("Mission is over !"), 1, 0) proceed = QPushButton("Accept results") - proceed.setProperty("style", "btn-primary") + proceed.setProperty("style", "btn-success") 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): print("On Debriefing update")