From 04cb53a9c81bad04e5e44b458280361bc335dfcd Mon Sep 17 00:00:00 2001 From: Raffson Date: Sat, 11 Jun 2022 00:04:26 +0200 Subject: [PATCH] Replace 'Arrival combo box' with a label. Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2243 --- .../flight/settings/FlightAirfieldDisplay.py | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py b/qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py index eec845c9..3a88bebc 100644 --- a/qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py +++ b/qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py @@ -37,15 +37,8 @@ class FlightAirfieldDisplay(QGroupBox): ) ) - self.arrival = QArrivalAirfieldSelector( - [cp for cp in game.theater.controlpoints if cp.captured], - flight.unit_type, - "Same as departure", - ) - self.arrival.currentIndexChanged.connect(self.set_arrival) - if flight.arrival != flight.departure: - self.arrival.setCurrentText(flight.arrival.name) - layout.addLayout(QLabeledWidget("Arrival:", self.arrival)) + arrival_label = QLabel(f"{flight.arrival.name}") + layout.addLayout(QLabeledWidget("Arrival:", arrival_label)) self.divert = QArrivalAirfieldSelector( [cp for cp in game.theater.controlpoints if cp.captured], @@ -64,25 +57,6 @@ class FlightAirfieldDisplay(QGroupBox): delay = estimator.mission_start_time(self.flight) self.departure_time.setText(f"At T+{delay}") - def set_arrival(self, index: int) -> None: - old_arrival = self.flight.arrival - arrival = self.arrival.itemData(index) - if arrival == old_arrival: - return - - if arrival is None: - arrival = self.flight.departure - - self.flight.arrival = arrival - try: - self.update_flight_plan() - except PlanningError as ex: - self.flight.arrival = old_arrival - logging.exception("Could not change arrival airfield") - QMessageBox.critical( - self, "Could not update flight plan", str(ex), QMessageBox.Ok - ) - def set_divert(self, index: int) -> None: old_divert = self.flight.divert divert = self.divert.itemData(index)