X-Git-Url: https://git.cweiske.de/enigma2-curlytx.git/blobdiff_plain/728b0ee7036ca15d0e22573827b4330b6a91f36a..ada05210cbf0150ba25ac82338eff3827c2eaeba:/src/CurlyTxSettings.py diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py index 2fc7d4a..5d39725 100644 --- a/src/CurlyTxSettings.py +++ b/src/CurlyTxSettings.py @@ -1,15 +1,24 @@ +# -*- coding: utf-8 -*- +# CurlyTx configuration window +# Copyright (C) 2011 Christian Weiske +# License: GPLv3 or later + +from . import _ + from Screens.Screen import Screen +from Screens.HelpMenu import HelpableScreen from Components.ActionMap import ActionMap, NumberActionMap from Components.Sources.StaticText import StaticText +from Screens.MessageBox import MessageBox from . import config -from config import createPage -from Components.config import config, getConfigListEntry +from config import createPage, loadDefaultPageOptions, feedPagesToConfig, feedSettingsToConfig, savePageConfig +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 +33,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") @@ -31,9 +41,9 @@ class CurlyTxSettings(ConfigListScreen, Screen): { "cancel": self.keyCancel, "save": self.keySave, - #"ok": self.ok, - "blue": self.deletePage, - "yellow": self.newPage + "ok": self.editPage, + "yellow": self.newPage, + "blue": self.deletePage }, -2) self["key_red"] = StaticText(_("Cancel")) @@ -43,15 +53,45 @@ class CurlyTxSettings(ConfigListScreen, Screen): ConfigListScreen.__init__(self, self.getConfigList(), session = self.session) + self.loadHelp() + def getConfigList(self): + #reload titles + loadDefaultPageOptions() + cfg = config.plugins.CurlyTx + list = [ - getConfigListEntry(_("Page"), x.uri) - for x in config.plugins.CurlyTx.pages + getConfigListEntry(_("Page:") + " " + x.title.value, x.uri) + for x in cfg.pages ] - 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"], "SetupActions", + [("ok", _("Load pages from feed"))])) + 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) @@ -59,12 +99,16 @@ 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, MessageBox, _("Really delete this page?\nIt cannot be recovered!") - ) + ) def deletePageConfirm(self, result): if not result: @@ -73,25 +117,76 @@ class CurlyTxSettings(ConfigListScreen, Screen): id = self["config"].getCurrentIndex() del config.plugins.CurlyTx.pages[id] + config.plugins.CurlyTx.pages.save() + self["config"].setList(self.getConfigList()) def newPage(self): from CurlyTxSettings import CurlyTxSettings - self.session.openWithCallback(self.newPageCreated, CurlyTxPageEdit, createPage(), True) + self.session.openWithCallback(self.pageEdited, CurlyTxPageEdit, createPage(), True) - def newPageCreated(self, page, new): + def editPage(self): + id = self["config"].getCurrentIndex() + if id < len(config.plugins.CurlyTx.pages): + self.session.openWithCallback( + self.pageEdited, CurlyTxPageEdit, + config.plugins.CurlyTx.pages[id], False + ) + elif config.plugins.CurlyTx.feedUrl.value: + from AtomFeed import AtomFeed + AtomFeed( + config.plugins.CurlyTx.feedUrl.value, + self.feedPagesReceived, self.feedPagesFail + ) + else: + self.session.open( + MessageBox, _("No page feed URL defined"), MessageBox.TYPE_ERROR + ) + + def pageEdited(self, page, new): if not page: return if new: - num = len(config.plugins.CurlyTx.pages) config.plugins.CurlyTx.pages.append(page) - config.plugins.CurlyTx.pages[num].save() - config.plugins.CurlyTx.pages.save() + self["config"].setList(self.getConfigList()) + def feedPagesReceived(self, pages, settings): + feedPagesToConfig(pages) + feedSettingsToConfig(settings) self["config"].setList(self.getConfigList()) + def feedPagesFail(self, errorMessage): + """ Downloading the page url feed failed somehow """ + self.session.open( + MessageBox, + _("Error loading page feed:") + "\n\n" + str(errorMessage), + MessageBox.TYPE_ERROR + ) + + def keySave(self): + savePageConfig() + ConfigListScreen.keySave(self) + + def cancelConfirm(self, result): + """Overwriting ConfigListScreen.cancelConfirm to call cancelAll method""" + if not result: + return + + self.cancelAll() + self.close() + + def cancelAll(self): + for x in self["config"].list: + x[1].cancel() + + #restore old page configuration + cfg = config.plugins.CurlyTx + del cfg.pages[:] + for i in cfg.pages.stored_values: + cfg.pages.append(createPage()) + class CurlyTxPageEdit(Screen, ConfigListScreen): @@ -113,12 +208,12 @@ 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) def save(self): self.close(self.page, self.new) - #FIXME: pass page to parent def keyCancel(self): self.close(None, self.new)