make main window as large as settings window, remove shadow from text

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

diff --git a/src/CurlyTx.py b/src/CurlyTx.py
index 85970ca1846d8051f14b5dbdcbb7a282987fd3f4..50b55b049a3cb8135cfb8f82325ccf58550bd995 100644 (file)
--- a/src/CurlyTx.py
+++ b/src/CurlyTx.py
@@ -1,3 +1,8 @@
+# -*- coding: utf-8 -*-
+# CurlyTx main window
+# Copyright (C) 2011 Christian Weiske <cweiske@cweiske.de>
+# License: GPLv3 or later
+

 from . import _
 
 from Screens.Screen import Screen
 from . import _
 
 from Screens.Screen import Screen


@@ -8,26 +13,31 @@ from Components.ScrollLabel import ScrollLabel
 from Components.ActionMap import ActionMap
 from Components.Sources.StaticText import StaticText
 from twisted.web import client
 from Components.ActionMap import ActionMap
 from Components.Sources.StaticText import StaticText
 from twisted.web import client

+from twisted.web.client import _makeGetterFactory, HTTPClientFactory
+from enigma import gFont

 
 from . import config
 from Components.config import config
 
 class CurlyTx(Screen,HelpableScreen):
     skin = """
 
 from . import config
 from Components.config import config
 
 class CurlyTx(Screen,HelpableScreen):
     skin = """

-        <screen name="CurlyTx" position="center,center" size="560,400" title="CurlyTx" >
+        <screen name="CurlyTx" position="center,center" size="560,430" title="CurlyTx" >

          <ePixmap position="0,0" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
          <ePixmap position="140,0" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
          <ePixmap position="280,0" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
          <ePixmap position="420,0" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
          <ePixmap position="0,0" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
          <ePixmap position="140,0" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
          <ePixmap position="280,0" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
          <ePixmap position="420,0" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />

-         <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
-         <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
-         <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
-         <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
-         <widget name="text" position="5,45" size="550,350" font="Console;20" />
+         <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" />
+         <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" />
+         <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" />
+         <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" />
+         <widget name="text" position="5,45" size="550,380" font="Console;20" />

         </screen>"""
 
     currentUrl = None
     currentPage = None
         </screen>"""
 
     currentUrl = None
     currentPage = None

+    currentFontSize = 20
+    httpGetterFactory = None
+    showingHeaders = False

 
     def __init__(self, session, args = None):
         #self.skin = CurlyTx.skin
 
     def __init__(self, session, args = None):
         #self.skin = CurlyTx.skin


@@ -44,7 +54,7 @@ class CurlyTx(Screen,HelpableScreen):
 
 
         self["actions"] = ActionMap(
 
 
         self["actions"] = ActionMap(

-            ["WizardActions", "ColorActions", "InputActions"], {
+            ["WizardActions", "ColorActions", "InputActions", "InfobarEPGActions"], {

                 "ok":   self.close,
                 "back": self.close,
                 "up":   self.pageUp,
                 "ok":   self.close,
                 "back": self.close,
                 "up":   self.pageUp,


@@ -53,12 +63,15 @@ class CurlyTx(Screen,HelpableScreen):
                 "red":    self.showSettings,
                 "green":  self.reload,
                 "yellow": self.prevPage,
                 "red":    self.showSettings,
                 "green":  self.reload,
                 "yellow": self.prevPage,

-                "blue":   self.nextPage
+                "blue":   self.nextPage,
+
+                "showEventInfo": self.showHeader

             }, -1)
 
         self.loadHelp()
         self.loadButtons()
         self.loadUrl(config.plugins.CurlyTx.defaultPage.value)
             }, -1)
 
         self.loadHelp()
         self.loadButtons()
         self.loadUrl(config.plugins.CurlyTx.defaultPage.value)

+        self.onLayoutFinish.append(self.setTextFont)

 
     def loadHelp(self):
         self.helpList.append((
 
     def loadHelp(self):
         self.helpList.append((


@@ -67,6 +80,9 @@ class CurlyTx(Screen,HelpableScreen):
         self.helpList.append((
                 self["actions"], "WizardActions",
                 [("down", _("Scroll page contents down"))]))
         self.helpList.append((
                 self["actions"], "WizardActions",
                 [("down", _("Scroll page contents down"))]))

+        self.helpList.append((
+                self["actions"], "InfobarEPGActions",
+                [("showEventInfo", _("Show HTTP response headers"))]))

         self.helpList.append((
                 self["actions"], "ColorActions",
                 [("red", _("Show program settings"))]))
         self.helpList.append((
                 self["actions"], "ColorActions",
                 [("red", _("Show program settings"))]))


@@ -139,35 +155,60 @@ class CurlyTx(Screen,HelpableScreen):
             self.loadNoPage()
             return
 
             self.loadNoPage()
             return
 

+        cfg = config.plugins.CurlyTx
+        pageCount = len(cfg.pages)

         pageId = int(pageId)
         pageId = int(pageId)

-        if pageId > (len(config.plugins.CurlyTx.pages) - 1):
-            if len(config.plugins.CurlyTx.pages) == 0:
+        if pageId > (pageCount - 1):
+            if len(cfg.pages) == 0:

                 self.loadNoPage()
             else:
                 self.loadNoPage()
             else:

-                self["text"].setText("Invalid page " + pageId);
+                self["text"].setText(_("Invalid page") + " " + pageId);

             return
 
             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.currentPage = pageId
         self.currentUrl = url

+        self.currentFontSize = cfg.pages[pageId].fontSize.value

 
         self.setTitle(title)
 
         self.setTitle(title)

-        self["text"].setText("Loading ...\n" + url);
+        self.setTextFont()
+        self["text"].setText(_("Loading ...") + "\n" + url);
+
+        self.getPageWebClient(url).addCallback(self.urlLoaded).addErrback(self.urlFailed, 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)
 
     def urlFailed(self, error, url):
         self["text"].setText(
 
     def urlLoaded(self, html):
         self["text"].setText(html)
 
     def urlFailed(self, error, url):
         self["text"].setText(

-            "Error fetching URL:\n " + error.getErrorMessage()
+            _("Error fetching URL:") + "\n " + error.getErrorMessage()

             + "\n\nURL: " + url
             )
 
     def loadNoPage(self):
             + "\n\nURL: " + url
             )
 
     def loadNoPage(self):

-        self["text"].setText("Go and add a page in the settings");
+        self["text"].setText(_("Go and add a page in the settings"));
+
+    def showHeader(self):
+        if self.showingHeaders:
+            self["text"].setText(self.pageContent)
+            self.pageContent    = None
+            self.showingHeaders = False
+        else:
+            headers = _("HTTP response headers for") + "\n" + self.currentUrl + "\n\n"
+            for (k, v) in self.httpGetterFactory.response_headers.items():
+                headers += k + ": " + ("\n" + k + ": ").join(v) + "\n"
+            self.pageContent = self["text"].getText()
+            self["text"].setText(headers)
+            self.showingHeaders = True

 
     def showSettings(self):
         from CurlyTxSettings import CurlyTxSettings
 
     def showSettings(self):
         from CurlyTxSettings import CurlyTxSettings


@@ -181,3 +222,22 @@ class CurlyTx(Screen,HelpableScreen):
         elif self.currentPage == None:
             self.currentPage = 0
             self.loadUrl(self.currentPage)
         elif self.currentPage == None:
             self.currentPage = 0
             self.loadUrl(self.currentPage)

+
+
+    def getPageWebClient(self, url, contextFactory=None, *args, **kwargs):
+        """
+        Download a web page as a string.
+
+        COPY OF twisted.web.client.getPage to store the factory
+
+        Download a page. Return a deferred, which will callback with a
+        page (as a string) or errback with a description of the error.
+
+        See L{HTTPClientFactory} to see what extra arguments can be passed.
+        """
+        self.httpGetterFactory = _makeGetterFactory(
+            url,
+            HTTPClientFactory,
+            contextFactory=contextFactory,
+            *args, **kwargs)
+        return self.httpGetterFactory.deferred