From d6870b4dce0ee1167d4cd1a952b7a1cdfadeb5a4 Mon Sep 17 00:00:00 2001 From: WanWizard Date: Tue, 4 Nov 2025 15:47:26 +0000 Subject: [PATCH 1/2] remove menu key definition; screens don't have a menu --- lib/python/Screens/NetworkSetup.py | 1 - lib/python/Screens/TimerEdit.py | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index acaa0f1aa10..91970a1d239 100644 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -35,7 +35,6 @@ def __init__(self, session): self["key_green"] = StaticText(_("Select")) self["key_yellow"] = StaticText("") self["key_blue"] = StaticText("") - self["key_menu"] = StaticText(_("MENU")) self["introduction"] = StaticText(self.edittext) self["OkCancelActions"] = HelpableActionMap(self, ["OkCancelActions"], diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index 62fced90af5..8541b085226 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -47,7 +47,6 @@ def __init__(self, session): self["key_green"] = StaticText(_("Add")) self["key_yellow"] = StaticText("") self["key_blue"] = StaticText("") - self["key_menu"] = StaticText(_("MENU")) self["key_info"] = StaticText(_("INFO")) self["description"] = Label("") From 144715639b83c258b35b0f1ec0c52c819f9d95bd Mon Sep 17 00:00:00 2001 From: WanWizard Date: Tue, 4 Nov 2025 16:27:55 +0000 Subject: [PATCH 2/2] [fallback] remove the port component from the import URL displayed --- lib/python/Screens/SetupFallbacktuner.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/python/Screens/SetupFallbacktuner.py b/lib/python/Screens/SetupFallbacktuner.py index f77661edbe0..c74696ad6d7 100644 --- a/lib/python/Screens/SetupFallbacktuner.py +++ b/lib/python/Screens/SetupFallbacktuner.py @@ -15,11 +15,21 @@ def __init__(self, session): def createConfig(self): def set_avahiselect_seperate(configElement): - self.seperateBoxes = [("same", _("Same as stream"))] + self.peerStreamingBoxes + self.seperateBoxes = self.peerStreamingBoxes if configElement.value not in ("url", "ip") and configElement.value in self.seperateBoxes: self.seperateBoxes.remove(configElement.value) + self.seperateBoxes = [("same", _("Same as stream"))] + self.seperateBoxes + # import URL's don't need a port, so strip them + webifBoxes = [] + for el in self.seperateBoxes: + if isinstance(el, str) and el.count(":") > 1: + webifBoxes.append(el.rsplit(":", 1)[0]) + else: + webifBoxes.append(el) default = config.usage.remote_fallback_import_url.value if config.usage.remote_fallback_import_url.value and config.usage.remote_fallback_import_url.value != config.usage.remote_fallback.value else "same" - self.avahiselect_seperate = ConfigSelection(default=default, choices=self.seperateBoxes) + if default.count(":") > 1: + default = default.rsplit(":", 1)[0] + self.avahiselect_seperate = ConfigSelection(default=default, choices=webifBoxes) default = config.usage.remote_fallback_dvb_t.value if config.usage.remote_fallback_dvb_t.value and config.usage.remote_fallback_dvb_t.value != config.usage.remote_fallback.value else "same" self.avahi_dvb_t = ConfigSelection(default=default, choices=self.seperateBoxes) default = config.usage.remote_fallback_dvb_c.value if config.usage.remote_fallback_dvb_c.value and config.usage.remote_fallback_dvb_c.value != config.usage.remote_fallback.value else "same" @@ -185,7 +195,7 @@ def keySave(self): elif self.avahiselect.value != "url": config.usage.remote_fallback.value = self.avahiselect.value if self.avahiselect_seperate.value == "ip": - config.usage.remote_fallback_import_url.value = "http://%d.%d.%d.%d:%d" % (tuple(self.ip_seperate.value) + (80,)) + config.usage.remote_fallback_import_url.value = "http://%d.%d.%d.%d" % (tuple(self.ip_seperate.value)) elif self.avahiselect_seperate.value == "same": config.usage.remote_fallback_import_url.value = "" elif self.avahiselect_seperate.value != "url":