diff --git a/qt_ui/widgets/combos/QSquadronLiverySelector.py b/qt_ui/widgets/combos/QSquadronLiverySelector.py index 3dd67549..d354f70c 100644 --- a/qt_ui/widgets/combos/QSquadronLiverySelector.py +++ b/qt_ui/widgets/combos/QSquadronLiverySelector.py @@ -11,7 +11,9 @@ class SquadronLiverySelector(QComboBox): The combo box will automatically be populated with all available liveries. """ - def __init__(self, squadron: Squadron) -> None: + def __init__( + self, squadron: Squadron, full_list_view_override: bool = False + ) -> None: super().__init__() self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents) @@ -33,7 +35,11 @@ class SquadronLiverySelector(QComboBox): for x in faction.liveries_overrides.get(self.aircraft_type, []) if x in [y.id.lower() for y in liveries] ] - if selected_livery is None and squadron.livery_set: + if ( + selected_livery is None + and squadron.livery_set + and not full_list_view_override + ): self.addItem("Using livery-set from squadron's yaml", userData=None) self.setEnabled(False) return diff --git a/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py b/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py index e325e2ac..44b3e040 100644 --- a/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py +++ b/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py @@ -151,7 +151,9 @@ class QFlightPayloadTab(QFrame): ) self.same_livery_for_all_checkbox.toggled.connect(self.on_same_livery_toggled) hbox.addWidget(self.same_livery_for_all_checkbox) - self.livery_selector = SquadronLiverySelector(self.flight.squadron) + self.livery_selector = SquadronLiverySelector( + self.flight.squadron, full_list_view_override=True + ) self.livery_selector.insertItem(0, "Default", None) self.livery_selector.setCurrentIndex( self.livery_selector.findData(self.member_selector.selected_member.livery)