From aa7ffdabb0f1475a09c42ba5d90d5a445afd3f8b Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 23 Oct 2020 14:19:12 -0700 Subject: [PATCH] Fix planned flights view, stop hiding bugs. --- .../basemenu/airfield/QAirfieldCommand.py | 18 +++++++----------- qt_ui/windows/mission/QPlannedFlightsView.py | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py b/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py index 5274640d..9965115a 100644 --- a/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py +++ b/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py @@ -19,16 +19,12 @@ class QAirfieldCommand(QFrame): layout = QGridLayout() layout.addWidget(QAircraftRecruitmentMenu(self.cp, self.game_model), 0, 0) - try: - planned = QGroupBox("Planned Flights") - planned_layout = QVBoxLayout() - planned_layout.addWidget( - QPlannedFlightsView(self.game_model, self.cp) - ) - planned.setLayout(planned_layout) - layout.addWidget(planned, 0, 1) - except: - pass + planned = QGroupBox("Planned Flights") + planned_layout = QVBoxLayout() + planned_layout.addWidget( + QPlannedFlightsView(self.game_model, self.cp) + ) + planned.setLayout(planned_layout) + layout.addWidget(planned, 0, 1) - #layout.addWidget(QAirportInformation(self.cp, self.game.theater.terrain.airport_by_id(self.cp.id)), 0, 2) self.setLayout(layout) diff --git a/qt_ui/windows/mission/QPlannedFlightsView.py b/qt_ui/windows/mission/QPlannedFlightsView.py index a7c45e51..2c602d56 100644 --- a/qt_ui/windows/mission/QPlannedFlightsView.py +++ b/qt_ui/windows/mission/QPlannedFlightsView.py @@ -25,7 +25,7 @@ class QPlannedFlightsView(QListView): for package in self.game_model.ato_model.packages: for flight in package.flights: if flight.from_cp == self.cp: - item = QFlightItem(flight) + item = QFlightItem(package.package, flight) self.model.appendRow(item) self.flight_items.append(item) self.set_selected_flight(0)