Skip to content

[pull] develop from OpenPLi:develop #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Nov 4, 2025
Merged

[pull] develop from OpenPLi:develop #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6870b4
remove menu key definition; screens don't have a menu
WanWizard Nov 4, 2025
1447156
[fallback] remove the port component from the import URL displayed
WanWizard Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/python/Screens/NetworkSetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
16 changes: 13 additions & 3 deletions lib/python/Screens/SetupFallbacktuner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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":
Expand Down
1 change: 0 additions & 1 deletion lib/python/Screens/TimerEdit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand Down