From 8562c48753757e8d5a99cdfa95a61dda6974e02a Mon Sep 17 00:00:00 2001 From: Raffson Date: Sat, 25 May 2024 23:05:35 +0200 Subject: [PATCH] Account for 'is_ownfor' in package dialog --- qt_ui/dialogs.py | 4 +--- qt_ui/windows/mission/QPackageDialog.py | 10 ++++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/qt_ui/dialogs.py b/qt_ui/dialogs.py index 8b13b954..6c715b0f 100644 --- a/qt_ui/dialogs.py +++ b/qt_ui/dialogs.py @@ -44,9 +44,7 @@ class Dialog: @classmethod def open_edit_package_dialog(cls, package_model: PackageModel): """Opens the dialog to edit the given package.""" - cls.edit_package_dialog = QEditPackageDialog( - cls.game_model, cls.game_model.ato_model, package_model - ) + cls.edit_package_dialog = QEditPackageDialog(cls.game_model, package_model) cls.edit_package_dialog.show() @classmethod diff --git a/qt_ui/windows/mission/QPackageDialog.py b/qt_ui/windows/mission/QPackageDialog.py index 30d430a8..26d8a3c6 100644 --- a/qt_ui/windows/mission/QPackageDialog.py +++ b/qt_ui/windows/mission/QPackageDialog.py @@ -23,7 +23,7 @@ from game.radio.radios import RadioFrequency from game.server import EventStream from game.sim import GameUpdateEvents from game.theater.missiontarget import MissionTarget -from qt_ui.models import AtoModel, GameModel, PackageModel +from qt_ui.models import GameModel, PackageModel from qt_ui.uiconstants import EVENT_ICONS from qt_ui.widgets.QFrequencyWidget import QFrequencyWidget from qt_ui.widgets.ato import QFlightList @@ -333,11 +333,9 @@ class QEditPackageDialog(QPackageDialog): Changes to existing packages occur immediately. """ - def __init__( - self, game_model: GameModel, model: AtoModel, package: PackageModel - ) -> None: - super().__init__(game_model, package) - self.ato_model = model + def __init__(self, gm: GameModel, package: PackageModel) -> None: + super().__init__(gm, package) + self.ato_model = gm.ato_model if gm.is_ownfor else gm.red_ato_model self.delete_button = QPushButton("Delete package") self.delete_button.setProperty("style", "btn-danger")