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 AdjustToContents use for Qt6.

Browse Source 
This is no longer a property exposed directly on QComboBox.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2684.
This commit is contained in:
Dan Albert 2023-01-04 12:24:00 -08:00
parent 0be9e1985a
commit ac6cc39616
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qt_ui/widgets/combos/QAircraftTypeSelector.py
View File

@ -1,5 +1,6 @@
"""Combo box for selecting aircraft types.""" """Combo box for selecting aircraft types."""
from PySide6.QtWidgets import QComboBox from PySide6.QtWidgets import QComboBox
from game.dcs.aircrafttype import AircraftType from game.dcs.aircrafttype import AircraftType
@ -10,7 +11,7 @@ class QAircraftTypeSelector(QComboBox):
super().__init__() super().__init__()
self.model().sort(0) self.model().sort(0)
self.setSizeAdjustPolicy(self.AdjustToContents) self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
self.update_items(aircraft_types) self.update_items(aircraft_types)
def update_items(self, aircraft_types: list[AircraftType]): def update_items(self, aircraft_types: list[AircraftType]):

6
qt_ui/windows/AirWingConfigurationDialog.py
View File

@ -115,7 +115,7 @@ class SquadronBaseSelector(QComboBox):
aircraft_type: Optional[AircraftType], aircraft_type: Optional[AircraftType],
) -> None: ) -> None:
super().__init__() super().__init__()
self.setSizeAdjustPolicy(self.AdjustToContents) self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
self.bases = list(bases) self.bases = list(bases)
self.set_aircraft_type(aircraft_type) self.set_aircraft_type(aircraft_type)
@ -567,7 +567,7 @@ class SquadronAircraftTypeSelector(QComboBox):
self, types: list[AircraftType], selected_aircraft: Optional[str] self, types: list[AircraftType], selected_aircraft: Optional[str]
) -> None: ) -> None:
super().__init__() super().__init__()
self.setSizeAdjustPolicy(self.AdjustToContents) self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
for type in sorted(types, key=lambda type: type.name): for type in sorted(types, key=lambda type: type.name):
self.addItem(type.name, type) self.addItem(type.name, type)
@ -583,7 +583,7 @@ class SquadronDefSelector(QComboBox):
aircraft: Optional[AircraftType], aircraft: Optional[AircraftType],
) -> None: ) -> None:
super().__init__() super().__init__()
self.setSizeAdjustPolicy(self.AdjustToContents) self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
self.squadron_defs = squadron_defs self.squadron_defs = squadron_defs
self.set_aircraft_type(aircraft) self.set_aircraft_type(aircraft)

4
qt_ui/windows/mission/flight/SquadronSelector.py
View File

@ -3,9 +3,9 @@ from typing import Optional
from PySide6.QtWidgets import QComboBox from PySide6.QtWidgets import QComboBox
from game.ato.flighttype import FlightType
from game.dcs.aircrafttype import AircraftType from game.dcs.aircrafttype import AircraftType
from game.squadrons.airwing import AirWing from game.squadrons.airwing import AirWing
from game.ato.flighttype import FlightType
class SquadronSelector(QComboBox): class SquadronSelector(QComboBox):
@ -21,7 +21,7 @@ class SquadronSelector(QComboBox):
self.air_wing = air_wing self.air_wing = air_wing
self.model().sort(0) self.model().sort(0)
self.setSizeAdjustPolicy(self.AdjustToContents) self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
self.update_items(task, aircraft) self.update_items(task, aircraft)
@property @property