configurable text font size per page

diff --git a/ChangeLog b/ChangeLog
index d89e8f7132ea84ac3a0090865250acafb5d1cfab..b240dfd93616e6a60e5bb8c7750cf1d35b7ebdc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        * hide color buttons when no/only one page configured
        * hide default page config option when no page defined
        * show current page when multiple ones are defined: "2/6"
+       * configurable text font size per page
 
 2011-11-18  Christian Weiske  <cweiske@cweiske.de>
 

diff --git a/README.rst b/README.rst
index f01642da072f75d8e734c1bb76ddf4f78f7affa9..c783ef88d6e10cc654239814282c37a5f2b1c3ac 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,6 @@ Open issues
 ===========
 - page import via atom feed/opml
 - move mode to re-order pages
-- configurable text size per page
 - how to show clock in lcd?
 
 

diff --git a/src/CurlyTx.py b/src/CurlyTx.py
index ae31a335ff7b4e48b5c2e2f1c462c4e570f4945d..2fc9535ba3e538e337ca2f2a86388aa5bf5c8c1f 100644 (file)
--- a/src/CurlyTx.py
+++ b/src/CurlyTx.py
@@ -8,6 +8,7 @@ from Components.ScrollLabel import ScrollLabel
 from Components.ActionMap import ActionMap
 from Components.Sources.StaticText import StaticText
 from twisted.web import client
+from enigma import gFont
 
 from . import config
 from Components.config import config
@@ -28,6 +29,7 @@ class CurlyTx(Screen,HelpableScreen):
 
     currentUrl = None
     currentPage = None
+    currentFontSize = 20
 
     def __init__(self, session, args = None):
         #self.skin = CurlyTx.skin
@@ -59,6 +61,7 @@ class CurlyTx(Screen,HelpableScreen):
         self.loadHelp()
         self.loadButtons()
         self.loadUrl(config.plugins.CurlyTx.defaultPage.value)
+        self.onLayoutFinish.append(self.setTextFont)
 
     def loadHelp(self):
         self.helpList.append((
@@ -156,12 +159,18 @@ class CurlyTx(Screen,HelpableScreen):
 
         self.currentPage = pageId
         self.currentUrl = url
+        self.currentFontSize = config.plugins.CurlyTx.pages[pageId].fontSize.value
 
         self.setTitle(title)
+        self.setTextFont()
         self["text"].setText("Loading ...\n" + url);
 
         client.getPage(url).addCallback(self.urlLoaded).addErrback(self.urlFailed, url)
 
+    def setTextFont(self):
+        if self["text"].long_text is not None:
+            self["text"].long_text.setFont(gFont("Console", self.currentFontSize))
+
     def urlLoaded(self, html):
         self["text"].setText(html)
 

diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py
index 154bf3786b848cdcd96fc7744220d132f2797842..14e1242afe258cf32e258681a08cc6c8f38b919f 100644 (file)
--- a/src/CurlyTxSettings.py
+++ b/src/CurlyTxSettings.py
@@ -163,6 +163,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)
 

diff --git a/src/config.py b/src/config.py
index bea80aa1037f96d3d56b699b1332519e5b9b0139..5f4c5ebad219f8c22c7b39a740f74063812761bd 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -1,4 +1,4 @@
-from Components.config import config, ConfigYesNo, ConfigSelection, ConfigNumber, ConfigText, ConfigSubsection, ConfigSubList
+from Components.config import config, ConfigYesNo, ConfigSelection, ConfigNumber, ConfigText, ConfigSubsection, ConfigSubList, ConfigInteger
 
 def createPage():
     s = ConfigSubsection()
@@ -7,6 +7,7 @@ def createPage():
         default = "Page #" + str(len(config.plugins.CurlyTx.pages) + 1),
         fixed_size = False
         )
+    s.fontSize = ConfigInteger(20, (1, 100))
     return s
 
 def loadDefaultPageOptions():