diff --git a/qt_ui/dialogs.py b/qt_ui/dialogs.py index f88aa4b0..f8cb6afc 100644 --- a/qt_ui/dialogs.py +++ b/qt_ui/dialogs.py @@ -37,7 +37,7 @@ class Dialog: def open_new_package_dialog(cls, mission_target: MissionTarget): """Opens the dialog to create a new package with the given target.""" cls.new_package_dialog = QNewPackageDialog( - cls.game_model.game, + cls.game_model, cls.game_model.ato_model, mission_target ) @@ -47,7 +47,7 @@ class Dialog: 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.game, + cls.game_model, cls.game_model.ato_model, package_model ) diff --git a/qt_ui/windows/mission/QPackageDialog.py b/qt_ui/windows/mission/QPackageDialog.py index b2733a40..a3bb5f80 100644 --- a/qt_ui/windows/mission/QPackageDialog.py +++ b/qt_ui/windows/mission/QPackageDialog.py @@ -187,9 +187,9 @@ class QNewPackageDialog(QPackageDialog): New packages do not affect the ATO model until they are saved. """ - def __init__(self, game: Game, model: AtoModel, + def __init__(self, game_model: GameModel, model: AtoModel, target: MissionTarget) -> None: - super().__init__(game, PackageModel(Package(target))) + super().__init__(game_model, PackageModel(Package(target))) self.ato_model = model self.save_button = QPushButton("Save") @@ -218,9 +218,9 @@ class QEditPackageDialog(QPackageDialog): Changes to existing packages occur immediately. """ - def __init__(self, game: Game, model: AtoModel, + def __init__(self, game_model: GameModel, model: AtoModel, package: PackageModel) -> None: - super().__init__(game, package) + super().__init__(game_model, package) self.ato_model = model self.delete_button = QPushButton("Delete package")