From a792c73cae179c5088a50c89bad42dffe46e1840 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sat, 6 Nov 2021 16:19:27 -0700 Subject: [PATCH] Restore missing income multiplier labels. Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1712 (cherry picked from commit a23e7fe83dbaf442c36b17e820fc11eb802db420) --- qt_ui/windows/newgame/QNewGameWizard.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index 222ef1e3..ffc19fdc 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -5,17 +5,17 @@ from datetime import timedelta from typing import List from PySide2 import QtGui, QtWidgets -from PySide2.QtCore import QItemSelectionModel, QPoint, Qt, QDate -from PySide2.QtWidgets import QVBoxLayout, QTextEdit, QLabel, QCheckBox +from PySide2.QtCore import QDate, QItemSelectionModel, QPoint, Qt +from PySide2.QtWidgets import QCheckBox, QLabel, QTextEdit, QVBoxLayout from jinja2 import Environment, FileSystemLoader, select_autoescape from game import db from game.campaignloader.campaign import Campaign +from game.factions.faction import Faction from game.settings import Settings from game.theater.start_generator import GameGenerator, GeneratorSettings, ModSettings -from game.factions.faction import Faction from qt_ui.widgets.QLiberationCalendar import QLiberationCalendar -from qt_ui.widgets.spinsliders import FloatSpinSlider, TimeInputs, CurrencySpinner +from qt_ui.widgets.spinsliders import CurrencySpinner, FloatSpinSlider, TimeInputs from qt_ui.windows.AirWingConfigurationDialog import AirWingConfigurationDialog from qt_ui.windows.newgame.QCampaignList import QCampaignList @@ -472,11 +472,12 @@ class DifficultyAndAutomationOptions(QtWidgets.QWizardPage): economy_layout = QtWidgets.QVBoxLayout() economy_group.setLayout(economy_layout) - # TODO: Put labels back. + economy_layout.addWidget(QLabel("Player income multiplier")) player_income = FloatSpinSlider(0, 5, 1, divisor=10) self.registerField("player_income_multiplier", player_income.spinner) economy_layout.addLayout(player_income) + economy_layout.addWidget(QLabel("Enemy income multiplier")) enemy_income = FloatSpinSlider(0, 5, 1, divisor=10) self.registerField("enemy_income_multiplier", enemy_income.spinner) economy_layout.addLayout(enemy_income)