make code more readable

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

diff --git a/src/CurlyTx.py b/src/CurlyTx.py
index ae31a335ff7b4e48b5c2e2f1c462c4e570f4945d..09d9ad13970782a172df481927ce3e42f1fdbfcd 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((
@@ -139,29 +142,36 @@ class CurlyTx(Screen,HelpableScreen):
             self.loadNoPage()
             return
 
-        pageCount = len(config.plugins.CurlyTx.pages)
+        cfg = config.plugins.CurlyTx
+        pageCount = len(cfg.pages)
         pageId = int(pageId)
         if pageId > (pageCount - 1):
-            if len(config.plugins.CurlyTx.pages) == 0:
+            if len(cfg.pages) == 0:
                 self.loadNoPage()
             else:
                 self["text"].setText("Invalid page " + pageId);
             return
 
-        url   = config.plugins.CurlyTx.pages[pageId].uri.value
-        title = config.plugins.CurlyTx.pages[pageId].title.value
+        url   = cfg.pages[pageId].uri.value
+        title = cfg.pages[pageId].title.value
 
         if pageCount > 1:
             title = "{0} [{1}/{2}]".format(title, pageId + 1, pageCount)
 
         self.currentPage = pageId
         self.currentUrl = url
+        self.currentFontSize = cfg.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)