X-Git-Url: https://git.cweiske.de/enigma2-curlytx.git/blobdiff_plain/8d210ea194aee84dfc4c1ab0ac3cc99137e9da35..d8683e34bef971a36bb56e81af8f13d19c53ebf2:/src/CurlyTxSettings.py diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py index 87aeb62..bd6dc1c 100644 --- a/src/CurlyTxSettings.py +++ b/src/CurlyTxSettings.py @@ -1,4 +1,7 @@ +from . import _ + from Screens.Screen import Screen +from Screens.HelpMenu import HelpableScreen from Components.ActionMap import ActionMap, NumberActionMap from Components.Sources.StaticText import StaticText @@ -7,7 +10,7 @@ from config import createPage, loadDefaultPageOptions from Components.config import config, getConfigListEntry, ConfigSelection from Components.ConfigList import ConfigList, ConfigListScreen -class CurlyTxSettings(ConfigListScreen, Screen): +class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen): skin = """ @@ -24,6 +27,7 @@ class CurlyTxSettings(ConfigListScreen, Screen): def __init__(self, session): self.skin = CurlyTxSettings.skin Screen.__init__(self, session) + HelpableScreen.__init__(self) #self.skinName = [ "CurlyTxSettings", "Setup" ] self.setup_title = _("Settings") @@ -32,8 +36,8 @@ class CurlyTxSettings(ConfigListScreen, Screen): "cancel": self.keyCancel, "save": self.keySave, "ok": self.editPage, - "blue": self.deletePage, - "yellow": self.newPage + "yellow": self.newPage, + "blue": self.deletePage }, -2) self["key_red"] = StaticText(_("Cancel")) @@ -42,21 +46,44 @@ class CurlyTxSettings(ConfigListScreen, Screen): self["key_blue"] = StaticText(_("Delete")) ConfigListScreen.__init__(self, self.getConfigList(), session = self.session) + + self.loadHelp() self.onClose.append(self.abort) def getConfigList(self): #reload titles loadDefaultPageOptions() + cfg = config.plugins.CurlyTx list = [ getConfigListEntry(_("Page:") + " " + x.title.value, x.uri) - for x in config.plugins.CurlyTx.pages + for x in cfg.pages ] - list.append(getConfigListEntry(_("Default page"), config.plugins.CurlyTx.defaultPage)) - list.append(getConfigListEntry(_("Show in main menu"), config.plugins.CurlyTx.menuMain)) - list.append(getConfigListEntry(_("Menu title"), config.plugins.CurlyTx.menuTitle)) + if len(cfg.pages): + list.append(getConfigListEntry(_("Default page"), cfg.defaultPage)) + list.append(getConfigListEntry(_("Show in main menu"), cfg.menuMain)) + list.append(getConfigListEntry(_("Show in extensions menu"), cfg.menuExtensions)) + list.append(getConfigListEntry(_("Menu title"), cfg.menuTitle)) + list.append(getConfigListEntry(_("Page feed URL"), cfg.feedUrl)) return list + def loadHelp(self): + self.helpList.append(( + self["actions"], "SetupActions", + [("cancel", _("Dismiss all setting changes"))])) + self.helpList.append(( + self["actions"], "SetupActions", + [("save", _("Save settings and close screen"))])) + self.helpList.append(( + self["actions"], "SetupActions", + [("ok", _("Edit selected page"))])) + self.helpList.append(( + self["actions"], "ColorActions", + [("yellow", _("Add new page"))])) + self.helpList.append(( + self["actions"], "ColorActions", + [("blue", _("Delete selected page"))])) + def keyLeft(self): ConfigListScreen.keyLeft(self) @@ -64,6 +91,10 @@ class CurlyTxSettings(ConfigListScreen, Screen): ConfigListScreen.keyRight(self) def deletePage(self): + pageCount = len(config.plugins.CurlyTx.pages) + if pageCount == 0 or self["config"].getCurrentIndex() >= pageCount: + return + from Screens.MessageBox import MessageBox self.session.openWithCallback( self.deletePageConfirm, @@ -93,6 +124,9 @@ class CurlyTxSettings(ConfigListScreen, Screen): self.pageEdited, CurlyTxPageEdit, config.plugins.CurlyTx.pages[id], False ) + else: + from AtomFeed import AtomFeed + AtomFeed(config.plugins.CurlyTx.feedUrl.value, self.feedPagesReceived) def pageEdited(self, page, new): if not page: @@ -103,6 +137,19 @@ class CurlyTxSettings(ConfigListScreen, Screen): self["config"].setList(self.getConfigList()) + def feedPagesReceived(self, pages): + if len(pages) == 0: + return + + del config.plugins.CurlyTx.pages[:] + config.plugins.CurlyTx.pages.save() + print("CurlyTx", len(config.plugins.CurlyTx.pages)) + for pageData in pages: + page = createPage() + page.title.value = pageData["title"] + page.uri.value = pageData["url"] + config.plugins.CurlyTx.pages.append(page) + self["config"].setList(self.getConfigList()) def keySave(self): for i in range(0, len(config.plugins.CurlyTx.pages)): @@ -135,6 +182,7 @@ class CurlyTxPageEdit(Screen, ConfigListScreen): list = [ getConfigListEntry(_("Page URL"), page.uri), getConfigListEntry(_("Title"), page.title), + getConfigListEntry(_("Font size"), page.fontSize), ] ConfigListScreen.__init__(self, list, session = self.session)