From 7085b71b6b98c178b4e8e22e6b88f9a58907c11c Mon Sep 17 00:00:00 2001 From: jbleyel Date: Sat, 31 Aug 2024 10:43:11 +0200 Subject: [PATCH] [ChannelSelection] * remove forceLegacy attribute because some plugins do overwrite the init --- lib/python/Screens/ChannelSelection.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index fdc52ed1ee9..6c0c353bec2 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -127,7 +127,7 @@ def parseNextEvent(list, isZapTimer=False): # IanSav: This is only used in once class ChannelSelectionBase(Screen): - def __init__(self, session, forceLegacy=False): + def __init__(self, session): def digitHelp(): return _("LCN style QuickSelect entry selection") if config.usage.show_channel_jump_in_servicelist.value == "quick" else _("SMS style QuickSelect entry selection") @@ -142,7 +142,7 @@ def rightHelp(): self["key_green"] = StaticText(_("Reception Lists")) self["key_yellow"] = StaticText(_("Providers")) self["key_blue"] = StaticText(_("Bouquets")) - self["list"] = ServiceListLegacy(self) if config.channelSelection.screenStyle.value == "" or config.channelSelection.widgetStyle.value == "" or forceLegacy else ServiceList(self) + self["list"] = ServiceListLegacy(self) if config.channelSelection.screenStyle.value == "" or config.channelSelection.widgetStyle.value == "" else ServiceList(self) self.servicelist = self["list"] self.numericalTextInput = NumericalTextInput(handleTimeout=False) self.servicePath = [] @@ -2321,9 +2321,9 @@ def updateEventInfo(self): class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelectionEPG, SelectionEventInfo): instance = None - def __init__(self, session, forceLegacy=False): - ChannelSelectionBase.__init__(self, session, forceLegacy) - if config.channelSelection.screenStyle.value and not forceLegacy: + def __init__(self, session): + ChannelSelectionBase.__init__(self, session) + if config.channelSelection.screenStyle.value: self.skinName = [config.channelSelection.screenStyle.value] elif config.usage.use_pig.value: self.skinName = ["ChannelSelection_PIG", "ChannelSelection"] @@ -3017,8 +3017,10 @@ def walk(serviceHandler, bouquet, level=0): class PiPZapSelection(ChannelSelection): def __init__(self, session): - ChannelSelection.__init__(self, session, forceLegacy=True) + ChannelSelection.__init__(self, session) self.skinName = ["SlimChannelSelection", "SimpleChannelSelection", "ChannelSelection"] + self["list"] = ServiceListLegacy(self) # Force legacy list + self.servicelist = self["list"] self.startservice = None self.pipzapfailed = None if plugin_PiPServiceRelation_installed: @@ -3106,7 +3108,9 @@ def __init__(self, session): class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelectionEPG, InfoBarBase, SelectionEventInfo): def __init__(self, session, infobar): - ChannelSelectionBase.__init__(self, session, forceLegacy=True) + ChannelSelectionBase.__init__(self, session) + self["list"] = ServiceListLegacy(self) # Force legacy list + self.servicelist = self["list"] InfoBarBase.__init__(self) SelectionEventInfo.__init__(self) self.infobar = infobar @@ -3253,6 +3257,8 @@ def zapBack(self): class SimpleChannelSelection(ChannelSelectionBase): def __init__(self, session, title, currentBouquet=False): ChannelSelectionBase.__init__(self, session) + self["list"] = ServiceListLegacy(self) # Force legacy list + self.servicelist = self["list"] self["actions"] = HelpableActionMap(self, ["OkCancelActions", "TvRadioActions"], { "ok": (self.channelSelected, _("Play the selected service")), "cancel": (self.close, _("Cancel the selection and exit")),