mirror of
https://github.com/dcs-liberation/dcs_liberation.git
synced 2025-11-10 14:22:26 +00:00
Finish implementation of add/remove squadrons from AirWingConfigurationDialog
Users can now add and remove squadrons with specific buttons. this also allows new aircraft types to be added as well. - rebased existing PR to develop - reverted observable and changed to signals - changed the general concept so that changes only affect the ui data model and not the game directly. Game will only be updated on apply - removed unused code - adopt to review comments - allow user to choose a predefined squadron preset (also alow none value to use the random generator) - Reuse the squadron defs from the default assigner in the AirWing class - allow user to re-roll the squadron nickname (also added new ui icons for the button)
This commit is contained in:
RndName
@@ -26,6 +26,7 @@ from PySide2.QtWidgets import (
|
||||
QCheckBox,
|
||||
QPushButton,
|
||||
QGridLayout,
|
||||
QToolButton,
|
||||
)
|
||||
|
||||
from game import Game
|
||||
@@ -33,10 +34,9 @@ from game.ato.flighttype import FlightType
|
||||
from game.coalition import Coalition
|
||||
from game.dcs.aircrafttype import AircraftType
|
||||
from game.squadrons import AirWing, Pilot, Squadron
|
||||
from game.squadrons.squadrondef import SquadronDef
|
||||
from game.theater import ConflictTheater, ControlPoint
|
||||
from qt_ui.uiconstants import AIRCRAFT_ICONS
|
||||
|
||||
from qt_ui.windows.SquadronConfigPopup import SquadronConfigPopup
|
||||
from qt_ui.uiconstants import AIRCRAFT_ICONS, ICONS
|
||||
|
||||
|
||||
class AllowedMissionTypeControls(QVBoxLayout):
|
||||
@@ -72,7 +72,6 @@ class AllowedMissionTypeControls(QVBoxLayout):
|
||||
self.allowed_mission_types.add(task)
|
||||
else:
|
||||
self.allowed_mission_types.remove(task)
|
||||
self.squadron.set_allowed_mission_types(self.allowed_mission_types)
|
||||
|
||||
|
||||
class SquadronBaseSelector(QComboBox):
|
||||
@@ -85,29 +84,39 @@ class SquadronBaseSelector(QComboBox):
|
||||
def __init__(
|
||||
self,
|
||||
bases: Iterable[ControlPoint],
|
||||
squadron: Squadron,
|
||||
selected_base: Optional[ControlPoint],
|
||||
aircraft_type: Optional[AircraftType],
|
||||
) -> None:
|
||||
super().__init__()
|
||||
self.bases = list(bases)
|
||||
self.squadron = squadron
|
||||
self.setSizeAdjustPolicy(self.AdjustToContents)
|
||||
self.bases = list(bases)
|
||||
self.set_aircraft_type(aircraft_type)
|
||||
|
||||
for base in self.bases:
|
||||
if not base.can_operate(self.squadron.aircraft):
|
||||
continue
|
||||
self.addItem(base.name, base)
|
||||
self.model().sort(0)
|
||||
self.setCurrentText(self.squadron.location.name)
|
||||
if selected_base:
|
||||
self.setCurrentText(selected_base.name)
|
||||
# TODO can we get a prefered base if none is selected?
|
||||
|
||||
def set_aircraft_type(self, aircraft_type: Optional[AircraftType]):
|
||||
self.clear()
|
||||
if aircraft_type:
|
||||
for base in self.bases:
|
||||
if not base.can_operate(aircraft_type):
|
||||
continue
|
||||
self.addItem(base.name, base)
|
||||
self.model().sort(0)
|
||||
self.setEnabled(True)
|
||||
else:
|
||||
self.addItem("Select aircraft type first", None)
|
||||
self.setEnabled(False)
|
||||
self.update()
|
||||
|
||||
|
||||
class SquadronConfigurationBox(QGroupBox):
|
||||
def __init__(
|
||||
self, squadron: Squadron, theater: ConflictTheater, air_wing: AirWing
|
||||
) -> None:
|
||||
remove_squadron_signal = Signal(Squadron)
|
||||
|
||||
def __init__(self, squadron: Squadron, theater: ConflictTheater) -> None:
|
||||
super().__init__()
|
||||
self.setCheckable(False)
|
||||
self.squadron = squadron
|
||||
self.air_wing = air_wing
|
||||
self.reset_title()
|
||||
|
||||
columns = QHBoxLayout()
|
||||
@@ -121,14 +130,24 @@ class SquadronConfigurationBox(QGroupBox):
|
||||
self.name_edit.textChanged.connect(self.on_name_changed)
|
||||
left_column.addWidget(self.name_edit)
|
||||
|
||||
left_column.addWidget(QLabel("Nickname:"))
|
||||
nickname_edit_layout = QGridLayout()
|
||||
left_column.addLayout(nickname_edit_layout)
|
||||
|
||||
nickname_edit_layout.addWidget(QLabel("Nickname:"), 0, 0, 1, 2)
|
||||
self.nickname_edit = QLineEdit(squadron.nickname)
|
||||
self.nickname_edit.textChanged.connect(self.on_nickname_changed)
|
||||
left_column.addWidget(self.nickname_edit)
|
||||
nickname_edit_layout.addWidget(self.nickname_edit, 1, 0, Qt.AlignTop)
|
||||
reroll_nickname_button = QToolButton()
|
||||
reroll_nickname_button.setIcon(QIcon(ICONS["Reload"]))
|
||||
reroll_nickname_button.setToolTip("Re-roll nickname")
|
||||
reroll_nickname_button.clicked.connect(self.reroll_nickname)
|
||||
nickname_edit_layout.addWidget(reroll_nickname_button, 1, 1, Qt.AlignTop)
|
||||
|
||||
left_column.addWidget(QLabel("Base:"))
|
||||
self.base_selector = SquadronBaseSelector(
|
||||
theater.control_points_for(squadron.player), squadron
|
||||
theater.control_points_for(squadron.player),
|
||||
squadron.location,
|
||||
squadron.aircraft,
|
||||
)
|
||||
self.base_selector.currentIndexChanged.connect(self.on_base_changed)
|
||||
left_column.addWidget(self.base_selector)
|
||||
@@ -150,20 +169,18 @@ class SquadronConfigurationBox(QGroupBox):
|
||||
self.player_list.setAcceptRichText(False)
|
||||
self.player_list.setEnabled(squadron.player)
|
||||
left_column.addWidget(self.player_list)
|
||||
self.player_list.textChanged.connect(self.on_pilots_changed)
|
||||
|
||||
delete_button = QPushButton("Remove")
|
||||
delete_button.setMaximumWidth(80)
|
||||
delete_button.clicked.connect(
|
||||
lambda state: self.air_wing.remove_squadron(self.squadron)
|
||||
)
|
||||
delete_button = QPushButton("Remove Squadron")
|
||||
delete_button.setMaximumWidth(140)
|
||||
delete_button.clicked.connect(self.remove_from_squadron_config)
|
||||
left_column.addWidget(delete_button)
|
||||
|
||||
left_column.addStretch()
|
||||
|
||||
self.allowed_missions = AllowedMissionTypeControls(squadron)
|
||||
columns.addLayout(self.allowed_missions)
|
||||
|
||||
def remove_from_squadron_config(self) -> None:
|
||||
self.remove_squadron_signal.emit(self.squadron)
|
||||
|
||||
def on_name_changed(self, text: str) -> None:
|
||||
self.squadron.name = text
|
||||
self.reset_title()
|
||||
@@ -180,56 +197,66 @@ class SquadronConfigurationBox(QGroupBox):
|
||||
def reset_title(self) -> None:
|
||||
self.setTitle(f"{self.squadron.name} - {self.squadron.aircraft}")
|
||||
|
||||
def on_pilots_changed(self) -> None:
|
||||
def reroll_nickname(self) -> None:
|
||||
self.nickname_edit.setText(
|
||||
self.squadron.coalition.air_wing.squadron_def_generator.random_nickname()
|
||||
)
|
||||
|
||||
def apply(self) -> Squadron:
|
||||
player_names = self.player_list.toPlainText().splitlines()
|
||||
# Prepend player pilots so they get set active first.
|
||||
self.squadron.pilot_pool = [
|
||||
Pilot(n, player=True) for n in player_names
|
||||
] + self.squadron.pilot_pool
|
||||
self.squadron.set_allowed_mission_types(
|
||||
self.allowed_missions.allowed_mission_types
|
||||
)
|
||||
return self.squadron
|
||||
|
||||
|
||||
class SquadronConfigurationLayout(QVBoxLayout):
|
||||
def __init__(
|
||||
self, squadrons: list[Squadron], theater: ConflictTheater, air_wing: AirWing
|
||||
) -> None:
|
||||
config_changed = Signal(AircraftType)
|
||||
|
||||
def __init__(self, squadrons: list[Squadron], theater: ConflictTheater) -> None:
|
||||
super().__init__()
|
||||
self.squadron_configs = []
|
||||
self.theater = theater
|
||||
self.air_wing = air_wing
|
||||
self.squadron_configs: dict[Squadron, SquadronConfigurationBox] = {}
|
||||
for squadron in squadrons:
|
||||
squadron_config = SquadronConfigurationBox(
|
||||
squadron, self.theater, self.air_wing
|
||||
)
|
||||
self.squadron_configs[squadron] = squadron_config
|
||||
self.addWidget(squadron_config)
|
||||
self.add_squadron(squadron)
|
||||
|
||||
def addSquadron(self, squadron: Squadron) -> None:
|
||||
if squadron not in self.squadron_configs:
|
||||
squadron_config = SquadronConfigurationBox(
|
||||
squadron, self.theater, self.air_wing
|
||||
)
|
||||
self.squadron_configs[squadron] = squadron_config
|
||||
self.addWidget(squadron_config)
|
||||
self.update()
|
||||
def apply(self) -> list[Squadron]:
|
||||
keep_squadrons = []
|
||||
for squadron_config in self.squadron_configs:
|
||||
keep_squadrons.append(squadron_config.apply())
|
||||
return keep_squadrons
|
||||
|
||||
def removeSquadron(self, squadron: Squadron) -> None:
|
||||
if squadron in self.squadron_configs:
|
||||
self.removeWidget(self.squadron_configs[squadron])
|
||||
self.squadron_configs.pop(squadron)
|
||||
self.update()
|
||||
def remove_squadron(self, squadron: Squadron) -> None:
|
||||
for squadron_config in self.squadron_configs:
|
||||
if squadron_config.squadron == squadron:
|
||||
squadron_config.deleteLater()
|
||||
self.squadron_configs.remove(squadron_config)
|
||||
squadron.coalition.air_wing.unclaim_squadron_def(squadron)
|
||||
self.update()
|
||||
self.config_changed.emit(squadron.aircraft)
|
||||
return
|
||||
|
||||
def add_squadron(self, squadron: Squadron) -> None:
|
||||
squadron_config = SquadronConfigurationBox(squadron, self.theater)
|
||||
squadron_config.remove_squadron_signal.connect(self.remove_squadron)
|
||||
self.squadron_configs.append(squadron_config)
|
||||
self.addWidget(squadron_config)
|
||||
|
||||
|
||||
class AircraftSquadronsPage(QWidget):
|
||||
def __init__(
|
||||
self, squadrons: list[Squadron], theater: ConflictTheater, air_wing: AirWing
|
||||
) -> None:
|
||||
remove_squadron_page = Signal(AircraftType)
|
||||
|
||||
def __init__(self, squadrons: list[Squadron], theater: ConflictTheater) -> None:
|
||||
super().__init__()
|
||||
layout = QVBoxLayout()
|
||||
self.setLayout(layout)
|
||||
|
||||
self.squadrons_config = SquadronConfigurationLayout(
|
||||
squadrons, theater, air_wing
|
||||
)
|
||||
self.squadrons_config = SquadronConfigurationLayout(squadrons, theater)
|
||||
self.squadrons_config.config_changed.connect(self.on_squadron_config_changed)
|
||||
|
||||
scrolling_widget = QWidget()
|
||||
scrolling_widget.setLayout(self.squadrons_config)
|
||||
@@ -242,51 +269,59 @@ class AircraftSquadronsPage(QWidget):
|
||||
|
||||
layout.addWidget(scrolling_area)
|
||||
|
||||
def addSquadron(self, squadron: Squadron) -> None:
|
||||
self.squadrons_config.addSquadron(squadron)
|
||||
def on_squadron_config_changed(self, aircraft_type: AircraftType):
|
||||
if len(self.squadrons_config.squadron_configs) == 0:
|
||||
self.remove_squadron_page.emit(aircraft_type)
|
||||
|
||||
def removeSquadron(self, squadron: Squadron) -> None:
|
||||
self.squadrons_config.removeSquadron(squadron)
|
||||
def add_squadron_to_page(self, squadron: Squadron):
|
||||
self.squadrons_config.add_squadron(squadron)
|
||||
|
||||
def apply(self) -> list[Squadron]:
|
||||
return self.squadrons_config.apply()
|
||||
|
||||
|
||||
class AircraftSquadronsPanel(QStackedLayout):
|
||||
page_removed = Signal(AircraftType)
|
||||
|
||||
def __init__(self, air_wing: AirWing, theater: ConflictTheater) -> None:
|
||||
super().__init__()
|
||||
self.air_wing = air_wing
|
||||
self.theater = theater
|
||||
self.air_wing.subscribe(self.handleChanges)
|
||||
|
||||
self.squadrons_pages: dict[AircraftType, AircraftSquadronsPage] = {}
|
||||
for aircraft, squadrons in self.air_wing.squadrons.items():
|
||||
page = AircraftSquadronsPage(squadrons, self.theater, self.air_wing)
|
||||
self.addWidget(page)
|
||||
self.squadrons_pages[aircraft] = page
|
||||
self.new_page_for_type(aircraft, squadrons)
|
||||
|
||||
def __del__(self) -> None:
|
||||
self.air_wing.unsubscribe(self.handleChanges)
|
||||
|
||||
def handleChanges(self, event) -> None:
|
||||
if event.type == "add_aircraft_type":
|
||||
aircraft_type = event.obj
|
||||
if aircraft_type not in self.squadrons_pages:
|
||||
page = AircraftSquadronsPage(
|
||||
self.air_wing.squadrons[aircraft_type], self.theater, self.air_wing
|
||||
)
|
||||
self.addWidget(page)
|
||||
self.squadrons_pages[aircraft_type] = page
|
||||
elif event.type == "remove_aircraft_type":
|
||||
aircraft_type = event.obj
|
||||
if aircraft_type in self.squadrons_pages:
|
||||
self.removeWidget(self.squadrons_pages[aircraft_type])
|
||||
self.squadrons_pages.pop(aircraft_type)
|
||||
elif event.type == "add_squadron":
|
||||
squadron = event.obj
|
||||
self.squadrons_pages[squadron.aircraft].addSquadron(squadron)
|
||||
elif event.type == "remove_squadron":
|
||||
squadron = event.obj
|
||||
self.squadrons_pages[squadron.aircraft].removeSquadron(squadron)
|
||||
def remove_page_for_type(self, aircraft_type: AircraftType):
|
||||
page = self.squadrons_pages[aircraft_type]
|
||||
self.removeWidget(page)
|
||||
page.deleteLater()
|
||||
self.squadrons_pages.pop(aircraft_type)
|
||||
self.page_removed.emit(aircraft_type)
|
||||
self.update()
|
||||
|
||||
def new_page_for_type(
|
||||
self, aircraft_type: AircraftType, squadrons: list[Squadron]
|
||||
) -> None:
|
||||
page = AircraftSquadronsPage(squadrons, self.theater)
|
||||
page.remove_squadron_page.connect(self.remove_page_for_type)
|
||||
self.addWidget(page)
|
||||
self.squadrons_pages[aircraft_type] = page
|
||||
|
||||
def add_squadron_to_panel(self, squadron: Squadron):
|
||||
# Find existing page or add new one
|
||||
if squadron.aircraft in self.squadrons_pages:
|
||||
page = self.squadrons_pages[squadron.aircraft]
|
||||
page.add_squadron_to_page(squadron)
|
||||
else:
|
||||
self.new_page_for_type(squadron.aircraft, [squadron])
|
||||
|
||||
self.update()
|
||||
|
||||
def apply(self) -> None:
|
||||
self.air_wing.squadrons = {}
|
||||
for aircraft, page in self.squadrons_pages.items():
|
||||
self.air_wing.squadrons[aircraft] = page.apply()
|
||||
|
||||
|
||||
class AircraftTypeList(QListView):
|
||||
page_index_changed = Signal(int)
|
||||
@@ -296,47 +331,29 @@ class AircraftTypeList(QListView):
|
||||
self.setIconSize(QSize(91, 24))
|
||||
self.setMinimumWidth(300)
|
||||
|
||||
self.air_wing = air_wing
|
||||
|
||||
self.item_model = QStandardItemModel(self)
|
||||
self.setModel(self.item_model)
|
||||
|
||||
for aircraft in self.air_wing.squadrons:
|
||||
aircraft_item = QStandardItem(aircraft.name)
|
||||
icon = self.icon_for(aircraft)
|
||||
if icon is not None:
|
||||
aircraft_item.setIcon(icon)
|
||||
aircraft_item.setEditable(False)
|
||||
aircraft_item.setSelectable(True)
|
||||
self.item_model.appendRow(aircraft_item)
|
||||
|
||||
self.selectionModel().setCurrentIndex(
|
||||
self.item_model.index(0, 0), QItemSelectionModel.Select
|
||||
)
|
||||
self.selectionModel().selectionChanged.connect(self.on_selection_changed)
|
||||
for aircraft in air_wing.squadrons:
|
||||
self.add_aircraft_type(aircraft)
|
||||
|
||||
self.air_wing.subscribe(self.handleChanges)
|
||||
def remove_aircraft_type(self, aircraft: AircraftType):
|
||||
for item in self.item_model.findItems(aircraft.name):
|
||||
self.item_model.removeRow(item.row())
|
||||
self.page_index_changed.emit(self.selectionModel().currentIndex().row())
|
||||
|
||||
def __del__(self) -> None:
|
||||
self.air_wing.unsubscribe(self.handleChanges)
|
||||
|
||||
def handleChanges(self, event) -> None:
|
||||
if event.type == "remove_aircraft_type":
|
||||
aircraft_type = event.obj
|
||||
items = self.item_model.findItems(aircraft_type.name)
|
||||
if len(items) == 1:
|
||||
for item in items:
|
||||
self.item_model.takeRow(item.row())
|
||||
elif event.type == "add_aircraft_type":
|
||||
aircraft_type = event.obj
|
||||
aircraft_item = QStandardItem(aircraft_type.name)
|
||||
icon = self.icon_for(aircraft_type)
|
||||
if icon is not None:
|
||||
aircraft_item.setIcon(icon)
|
||||
aircraft_item.setEditable(False)
|
||||
aircraft_item.setSelectable(True)
|
||||
self.item_model.appendRow(aircraft_item)
|
||||
self.update()
|
||||
def add_aircraft_type(self, aircraft: AircraftType):
|
||||
aircraft_item = QStandardItem(aircraft.name)
|
||||
icon = self.icon_for(aircraft)
|
||||
if icon is not None:
|
||||
aircraft_item.setIcon(icon)
|
||||
aircraft_item.setEditable(False)
|
||||
aircraft_item.setSelectable(True)
|
||||
self.item_model.appendRow(aircraft_item)
|
||||
|
||||
def on_selection_changed(
|
||||
self, selected: QItemSelection, _deselected: QItemSelection
|
||||
@@ -348,18 +365,6 @@ class AircraftTypeList(QListView):
|
||||
return
|
||||
self.page_index_changed.emit(indexes[0].row())
|
||||
|
||||
def deleteSelectedType(self) -> None:
|
||||
if self.selectionModel().currentIndex().isValid():
|
||||
aircraftName = str(self.selectionModel().currentIndex().data())
|
||||
to_remove = None
|
||||
for type in self.air_wing.squadrons:
|
||||
if str(type) == aircraftName:
|
||||
to_remove = type
|
||||
if to_remove != None:
|
||||
self.air_wing.remove_aircraft_type(to_remove)
|
||||
else:
|
||||
raise RuntimeError("No aircraft was selected for removal")
|
||||
|
||||
@staticmethod
|
||||
def icon_for(aircraft: AircraftType) -> Optional[QIcon]:
|
||||
name = aircraft.dcs_id
|
||||
@@ -369,37 +374,69 @@ class AircraftTypeList(QListView):
|
||||
|
||||
|
||||
class AirWingConfigurationTab(QWidget):
|
||||
def __init__(
|
||||
self, coalition: Coalition, theater: ConflictTheater, game: Game
|
||||
) -> None:
|
||||
def __init__(self, coalition: Coalition, game: Game) -> None:
|
||||
super().__init__()
|
||||
self.game = game
|
||||
self.theater = theater
|
||||
self.coalition = coalition
|
||||
self.air_wing = coalition.air_wing
|
||||
|
||||
layout = QGridLayout()
|
||||
self.setLayout(layout)
|
||||
self.game = game
|
||||
self.coalition = coalition
|
||||
|
||||
self.type_list = AircraftTypeList(self.air_wing)
|
||||
self.type_list = AircraftTypeList(coalition.air_wing)
|
||||
|
||||
layout.addWidget(self.type_list, 1, 1, 1, 2)
|
||||
|
||||
add_button = QPushButton("Add Aircraft/Squadron")
|
||||
add_button.clicked.connect(lambda state: self.addAircraftType())
|
||||
add_button = QPushButton("Add Squadron")
|
||||
add_button.clicked.connect(lambda state: self.add_squadron())
|
||||
layout.addWidget(add_button, 2, 1, 1, 1)
|
||||
|
||||
remove_button = QPushButton("Remove Aircraft")
|
||||
remove_button.clicked.connect(lambda state: self.type_list.deleteSelectedType())
|
||||
layout.addWidget(remove_button, 2, 2, 1, 1)
|
||||
|
||||
self.squadrons_panel = AircraftSquadronsPanel(self.air_wing, self.theater)
|
||||
self.squadrons_panel = AircraftSquadronsPanel(coalition.air_wing, game.theater)
|
||||
self.squadrons_panel.page_removed.connect(self.type_list.remove_aircraft_type)
|
||||
layout.addLayout(self.squadrons_panel, 1, 3, 2, 1)
|
||||
|
||||
self.type_list.page_index_changed.connect(self.squadrons_panel.setCurrentIndex)
|
||||
|
||||
def addAircraftType(self) -> None:
|
||||
SquadronConfigPopup(self.coalition, self.theater, self.game).exec_()
|
||||
def add_squadron(self) -> None:
|
||||
selected_aircraft = None
|
||||
if self.type_list.selectionModel().currentIndex().row() >= 0:
|
||||
selected_aircraft = self.type_list.item_model.item(
|
||||
self.type_list.selectionModel().currentIndex().row()
|
||||
).text()
|
||||
|
||||
popup = SquadronConfigPopup(
|
||||
selected_aircraft,
|
||||
self.coalition.faction.aircrafts,
|
||||
list(self.game.theater.control_points_for(self.coalition.player)),
|
||||
self.coalition.air_wing.squadron_defs,
|
||||
)
|
||||
if popup.exec_() != QDialog.Accepted:
|
||||
return
|
||||
|
||||
selected_type = popup.aircraft_type_selector.currentData()
|
||||
selected_base = popup.squadron_base_selector.currentData()
|
||||
selected_def = popup.squadron_def_selector.currentData()
|
||||
|
||||
# Let user choose the preset or generate one
|
||||
squadron_def = (
|
||||
selected_def
|
||||
or self.coalition.air_wing.squadron_def_generator.generate_for_aircraft(
|
||||
selected_type
|
||||
)
|
||||
)
|
||||
|
||||
squadron = Squadron.create_from(
|
||||
squadron_def, selected_base, self.coalition, self.game
|
||||
)
|
||||
|
||||
# Add Squadron
|
||||
if not self.type_list.item_model.findItems(selected_type.name):
|
||||
self.type_list.add_aircraft_type(selected_type)
|
||||
# TODO Select the newly added type
|
||||
self.squadrons_panel.add_squadron_to_panel(squadron)
|
||||
self.update()
|
||||
|
||||
def apply(self) -> None:
|
||||
self.squadrons_panel.apply()
|
||||
|
||||
|
||||
class AirWingConfigurationDialog(QDialog):
|
||||
@@ -414,22 +451,13 @@ class AirWingConfigurationDialog(QDialog):
|
||||
layout = QVBoxLayout()
|
||||
self.setLayout(layout)
|
||||
|
||||
doc_url = (
|
||||
"https://github.com/dcs-liberation/dcs_liberation/wiki/Squadrons-and-pilots"
|
||||
)
|
||||
doc_label = QLabel(
|
||||
"Use this opportunity to customize the squadrons available to your "
|
||||
"coalition. <strong>This is your only opportunity to make changes.</strong>"
|
||||
"<br /><br />"
|
||||
"To accept your changes and continue, close this window.<br />"
|
||||
"<br />"
|
||||
"To remove a squadron from the game, uncheck the box in the title. New "
|
||||
"squadrons cannot be added via the UI at this time. To add a custom "
|
||||
"squadron,<br />"
|
||||
f'see <a style="color:#ffffff" href="{doc_url}">the wiki</a>.'
|
||||
"To accept your changes and continue, close this window."
|
||||
)
|
||||
|
||||
doc_label.setOpenExternalLinks(True)
|
||||
layout.addWidget(doc_label)
|
||||
|
||||
tab_widget = QTabWidget()
|
||||
@@ -437,10 +465,113 @@ class AirWingConfigurationDialog(QDialog):
|
||||
|
||||
self.tabs = []
|
||||
for coalition in game.coalitions:
|
||||
coalition_tab = AirWingConfigurationTab(coalition, game.theater, game)
|
||||
coalition_tab = AirWingConfigurationTab(coalition, game)
|
||||
name = "Blue" if coalition.player else "Red"
|
||||
tab_widget.addTab(coalition_tab, name)
|
||||
self.tabs.append(coalition_tab)
|
||||
|
||||
def reject(self) -> None:
|
||||
for tab in self.tabs:
|
||||
tab.apply()
|
||||
super().reject()
|
||||
|
||||
|
||||
class SquadronAircraftTypeSelector(QComboBox):
|
||||
def __init__(
|
||||
self, types: list[AircraftType], selected_aircraft: Optional[str]
|
||||
) -> None:
|
||||
super().__init__()
|
||||
self.setSizeAdjustPolicy(self.AdjustToContents)
|
||||
|
||||
for type in sorted(types, key=lambda type: type.name):
|
||||
self.addItem(type.name, type)
|
||||
|
||||
if selected_aircraft:
|
||||
self.setCurrentText(selected_aircraft)
|
||||
|
||||
|
||||
class SquadronDefSelector(QComboBox):
|
||||
def __init__(
|
||||
self,
|
||||
squadron_defs: dict[AircraftType, list[SquadronDef]],
|
||||
aircraft: Optional[AircraftType],
|
||||
) -> None:
|
||||
super().__init__()
|
||||
self.setSizeAdjustPolicy(self.AdjustToContents)
|
||||
self.squadron_defs = squadron_defs
|
||||
self.set_aircraft_type(aircraft)
|
||||
|
||||
def set_aircraft_type(self, aircraft: Optional[AircraftType]):
|
||||
self.clear()
|
||||
self.addItem("None (Random)", None)
|
||||
if aircraft and aircraft in self.squadron_defs:
|
||||
for squadron_def in sorted(
|
||||
self.squadron_defs[aircraft], key=lambda squadron_def: squadron_def.name
|
||||
):
|
||||
if not squadron_def.claimed:
|
||||
squadron_name = squadron_def.name
|
||||
if squadron_def.nickname:
|
||||
squadron_name += " (" + squadron_def.nickname + ")"
|
||||
self.addItem(squadron_name, squadron_def)
|
||||
self.setCurrentText("None (Random)")
|
||||
|
||||
|
||||
class SquadronConfigPopup(QDialog):
|
||||
def __init__(
|
||||
self,
|
||||
selected_aircraft: Optional[str],
|
||||
types: list[AircraftType],
|
||||
bases: list[ControlPoint],
|
||||
squadron_defs: dict[AircraftType, list[SquadronDef]],
|
||||
) -> None:
|
||||
super().__init__()
|
||||
|
||||
self.setWindowTitle(f"Add new Squadron")
|
||||
|
||||
self.column = QVBoxLayout()
|
||||
self.setLayout(self.column)
|
||||
|
||||
self.bases = bases
|
||||
|
||||
self.column.addWidget(QLabel("Aircraft:"))
|
||||
self.aircraft_type_selector = SquadronAircraftTypeSelector(
|
||||
types, selected_aircraft
|
||||
)
|
||||
self.aircraft_type_selector.currentIndexChanged.connect(
|
||||
self.on_aircraft_selection
|
||||
)
|
||||
self.column.addWidget(self.aircraft_type_selector)
|
||||
|
||||
self.column.addWidget(QLabel("Base:"))
|
||||
self.squadron_base_selector = SquadronBaseSelector(
|
||||
bases, None, self.aircraft_type_selector.currentData()
|
||||
)
|
||||
self.column.addWidget(self.squadron_base_selector)
|
||||
|
||||
self.column.addWidget(QLabel("Preset:"))
|
||||
self.squadron_def_selector = SquadronDefSelector(
|
||||
squadron_defs, self.aircraft_type_selector.currentData()
|
||||
)
|
||||
self.column.addWidget(self.squadron_def_selector)
|
||||
|
||||
self.column.addStretch()
|
||||
|
||||
self.button_layout = QHBoxLayout()
|
||||
self.column.addLayout(self.button_layout)
|
||||
|
||||
self.accept_button = QPushButton("Accept")
|
||||
self.accept_button.clicked.connect(lambda state: self.accept())
|
||||
self.button_layout.addWidget(self.accept_button)
|
||||
|
||||
self.cancel_button = QPushButton("Cancel")
|
||||
self.cancel_button.clicked.connect(lambda state: self.reject())
|
||||
self.button_layout.addWidget(self.cancel_button)
|
||||
|
||||
def on_aircraft_selection(self) -> None:
|
||||
self.squadron_base_selector.set_aircraft_type(
|
||||
self.aircraft_type_selector.currentData()
|
||||
)
|
||||
self.squadron_def_selector.set_aircraft_type(
|
||||
self.aircraft_type_selector.currentData()
|
||||
)
|
||||
self.update()
|
||||
|
||||
Reference in New Issue
Block a user