diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index 0295f6cd..193cb860 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -5,10 +5,9 @@ from typing import List, Optional from PySide2 import QtGui, QtWidgets from PySide2.QtCore import QItemSelectionModel, QPoint, Qt -from PySide2.QtWidgets import QVBoxLayout -from dcs.task import CAP, CAS +from PySide2.QtWidgets import QVBoxLayout, QTextEdit +from jinja2 import Environment, FileSystemLoader, select_autoescape -import qt_ui.uiconstants as CONST from game import db from game.settings import Settings from qt_ui.windows.newgame.QCampaignList import ( @@ -39,7 +38,6 @@ class NewGameWizard(QtWidgets.QWizard): self.generatedGame = None def accept(self): - logging.info("New Game Wizard accept") logging.info("======================") @@ -112,7 +110,9 @@ class FactionSelection(QtWidgets.QWizardPage): # Factions selection self.factionsGroup = QtWidgets.QGroupBox("Factions") - self.factionsGroupLayout = QtWidgets.QGridLayout() + self.factionsGroupLayout = QtWidgets.QHBoxLayout() + self.blueGroupLayout = QtWidgets.QGridLayout() + self.redGroupLayout = QtWidgets.QGridLayout() blueFaction = QtWidgets.QLabel("Player Faction :") self.blueFactionSelect = QtWidgets.QComboBox() @@ -124,6 +124,13 @@ class FactionSelection(QtWidgets.QWizardPage): self.redFactionSelect = QtWidgets.QComboBox() redFaction.setBuddy(self.redFactionSelect) + # Faction description + self.blueFactionDescription = QTextEdit("") + self.blueFactionDescription.setReadOnly(True) + + self.redFactionDescription = QTextEdit("") + self.redFactionDescription.setReadOnly(True) + # Setup default selected factions for i, r in enumerate(db.FACTIONS): self.redFactionSelect.addItem(r) @@ -132,20 +139,16 @@ class FactionSelection(QtWidgets.QWizardPage): if r == "USA 2005": self.blueFactionSelect.setCurrentIndex(i) - self.blueSideRecap = QtWidgets.QLabel("") - self.blueSideRecap.setFont(CONST.FONT_PRIMARY_I) - self.blueSideRecap.setWordWrap(True) + self.blueGroupLayout.addWidget(blueFaction, 0, 0) + self.blueGroupLayout.addWidget(self.blueFactionSelect, 0, 1) + self.blueGroupLayout.addWidget(self.blueFactionDescription, 1, 0, 1, 2) - self.redSideRecap = QtWidgets.QLabel("") - self.redSideRecap.setFont(CONST.FONT_PRIMARY_I) - self.redSideRecap.setWordWrap(True) + self.redGroupLayout.addWidget(redFaction, 0, 0) + self.redGroupLayout.addWidget(self.redFactionSelect, 0, 1) + self.redGroupLayout.addWidget(self.redFactionDescription, 1, 0, 1, 2) - self.factionsGroupLayout.addWidget(blueFaction, 0, 0) - self.factionsGroupLayout.addWidget(self.blueFactionSelect, 0, 1) - self.factionsGroupLayout.addWidget(self.blueSideRecap, 1, 0, 1, 2) - self.factionsGroupLayout.addWidget(redFaction, 2, 0) - self.factionsGroupLayout.addWidget(self.redFactionSelect, 2, 1) - self.factionsGroupLayout.addWidget(self.redSideRecap, 3, 0, 1, 2) + self.factionsGroupLayout.addLayout(self.blueGroupLayout) + self.factionsGroupLayout.addLayout(self.redGroupLayout) self.factionsGroup.setLayout(self.factionsGroupLayout) # Create required mod layout @@ -171,39 +174,44 @@ class FactionSelection(QtWidgets.QWizardPage): def updateUnitRecap(self): - self.requiredMods.setText("