From 60172d0e52f3b334c2911d50eac66b25b7d1902e Mon Sep 17 00:00:00 2001 From: Raffson Date: Sat, 7 Oct 2023 15:23:29 +0200 Subject: [PATCH] Streamlining --- .../windows/mission/flight/payload/ownlasercodeinfo.py | 8 +++++--- .../mission/flight/payload/weaponlasercodeselector.py | 2 +- .../flight/settings/QGeneralFlightSettingsTab.py | 10 +++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/qt_ui/windows/mission/flight/payload/ownlasercodeinfo.py b/qt_ui/windows/mission/flight/payload/ownlasercodeinfo.py index a28b04f3..50a09c89 100644 --- a/qt_ui/windows/mission/flight/payload/ownlasercodeinfo.py +++ b/qt_ui/windows/mission/flight/payload/ownlasercodeinfo.py @@ -1,5 +1,7 @@ -from PySide6.QtCore import Signal -from PySide6.QtWidgets import QWidget, QHBoxLayout, QLabel, QPushButton +from typing import Optional + +from PySide2.QtCore import Signal +from PySide2.QtWidgets import QWidget, QHBoxLayout, QLabel, QPushButton from game import Game from game.ato.flightmember import FlightMember @@ -9,7 +11,7 @@ class OwnLaserCodeInfo(QHBoxLayout): assigned_laser_code_changed = Signal() def __init__( - self, game: Game, flight_member: FlightMember, parent: QWidget | None = None + self, game: Game, flight_member: FlightMember, parent: Optional[QWidget] = None ) -> None: super().__init__(parent) self.game = game diff --git a/qt_ui/windows/mission/flight/payload/weaponlasercodeselector.py b/qt_ui/windows/mission/flight/payload/weaponlasercodeselector.py index 6b3b3f59..31bc14db 100644 --- a/qt_ui/windows/mission/flight/payload/weaponlasercodeselector.py +++ b/qt_ui/windows/mission/flight/payload/weaponlasercodeselector.py @@ -1,4 +1,4 @@ -from PySide6.QtWidgets import QComboBox, QWidget +from PySide2.QtWidgets import QComboBox, QWidget from game import Game from game.ato.flightmember import FlightMember diff --git a/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py b/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py index 24eb2b61..1c0187da 100644 --- a/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py +++ b/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py @@ -31,13 +31,13 @@ class QGeneralFlightSettingsTab(QFrame): payload_tab: QFlightPayloadTab, ): super().__init__() + self.flight = flight + self.payload_tab = payload_tab self.flight_slot_editor = QFlightSlotEditor(package_model, flight, game.game) self.flight_slot_editor.flight_resized.connect(self.flight_size_changed) for pc in self.flight_slot_editor.roster_editor.pilot_controls: - pc.player_toggled.connect( - lambda: payload_tab.property_editor.build_props(flight) - ) + pc.player_toggled.connect(self.on_player_toggle) widgets = [ QFlightTypeTaskInfo(flight), @@ -59,3 +59,7 @@ class QGeneralFlightSettingsTab(QFrame): vstretch.addStretch() layout.addLayout(vstretch, row, 0) self.setLayout(layout) + + def on_player_toggle(self) -> None: + self.payload_tab.property_editor.build_props(self.flight) + self.payload_tab.own_laser_code_info.bind_to_selected_member()