update readme with build instructions

[enigma2-curlytx.git] / src / CurlyTxSettings.py

diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py
index 583d9cd7669f1b4867e72aadeb2436bfbb9bf5c8..18e43c9c2f85efbbda967603d72e5f9e84b94b9a 100644 (file)
--- a/src/CurlyTxSettings.py
+++ b/src/CurlyTxSettings.py
@@ -1,13 +1,16 @@
+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 . import config
-from config import createPage
+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 = """
        <screen name="Setup" position="center,center" size="560,430" title="Setup">
          <ePixmap pixmap="skin_default/buttons/red.png"    position="0,0"   size="140,40" transparent="1" alphatest="on" />
@@ -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,24 +46,47 @@ 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
-        config.plugins.CurlyTx.defaultPage = ConfigSelection(
-            [
-                (x, x.title.value) for x in config.plugins.CurlyTx.pages]
-            )
+        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"], "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)
 
@@ -67,6 +94,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,
@@ -96,6 +127,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:
@@ -106,6 +140,19 @@ class CurlyTxSettings(ConfigListScreen, Screen):
 
         self["config"].setList(self.getConfigList())
 
+    def feedPagesReceived(self, pages):
+        if len(pages) == 0:
+            return
+
+        del config.plugins.CurlyTx.pages[:]
+
+        for pageData in pages:
+            page = createPage()
+            config.plugins.CurlyTx.pages.append(page)
+            page.title.setValue(pageData["title"])
+            page.uri.setValue(pageData["url"])
+
+        self["config"].setList(self.getConfigList())
 
     def keySave(self):
         for i in range(0, len(config.plugins.CurlyTx.pages)):
@@ -115,7 +162,11 @@ class CurlyTxSettings(ConfigListScreen, Screen):
         ConfigListScreen.keySave(self)
 
     def abort(self):
-        pass
+        #restore old page configuration
+        cfg = config.plugins.CurlyTx
+        del cfg.pages[:]
+        for i in cfg.pages.stored_values:
+            cfg.pages.append(createPage())
 
 
 
@@ -138,12 +189,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)