weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix breakage in package list UI.

Browse Source
This commit is contained in:
Dan Albert 2020-10-22 00:44:54 -07:00
parent 8c70d1ab79
commit 69f15824ca
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qt_ui/windows/mission/QPackageDialog.py
View File

@ -17,7 +17,7 @@ from gen.ato import Package
from gen.flights.flight import Flight from gen.flights.flight import Flight
from gen.flights.flightplan import FlightPlanBuilder from gen.flights.flightplan import FlightPlanBuilder
from gen.flights.traveltime import TotEstimator from gen.flights.traveltime import TotEstimator
from qt_ui.models import AtoModel, PackageModel from qt_ui.models import AtoModel, GameModel, PackageModel
from qt_ui.uiconstants import EVENT_ICONS from qt_ui.uiconstants import EVENT_ICONS
from qt_ui.widgets.ato import QFlightList from qt_ui.widgets.ato import QFlightList
from qt_ui.windows.GameUpdateSignal import GameUpdateSignal from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
@ -35,9 +35,9 @@ class QPackageDialog(QDialog):
#: Emitted when a change is made to the package. #: Emitted when a change is made to the package.
package_changed = Signal() package_changed = Signal()
def __init__(self, game: Game, model: PackageModel) -> None: def __init__(self, game_model: GameModel, model: PackageModel) -> None:
super().__init__() super().__init__()
self.game = game self.game_model = game_model
self.package_model = model self.package_model = model
self.add_flight_dialog: Optional[QFlightCreator] = None self.add_flight_dialog: Optional[QFlightCreator] = None
@ -86,7 +86,7 @@ class QPackageDialog(QDialog):
self.reset_tot_button.clicked.connect(self.reset_tot) self.reset_tot_button.clicked.connect(self.reset_tot)
self.tot_column.addWidget(self.reset_tot_button) self.tot_column.addWidget(self.reset_tot_button)
self.package_view = QFlightList(self.package_model) self.package_view = QFlightList(self.game_model, self.package_model)
self.package_view.selectionModel().selectionChanged.connect( self.package_view.selectionModel().selectionChanged.connect(
self.on_selection_changed self.on_selection_changed
) )
@ -113,6 +113,10 @@ class QPackageDialog(QDialog):
self.finished.connect(self.on_close) self.finished.connect(self.on_close)
self.rejected.connect(self.on_cancel) self.rejected.connect(self.on_cancel)
@property
def game(self) -> Game:
return self.game_model.game
def tot_qtime(self) -> QTime: def tot_qtime(self) -> QTime:
delay = self.package_model.package.time_over_target delay = self.package_model.package.time_over_target
hours = delay // 3600 hours = delay // 3600