allow progress in TemplatedMultiContent lists - patch by courtesy of nightman

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 081bde706a7f6694d27efd3593910ef517314c89..3c9457e1b5916751f652502bd1f1386dbb4f5f55 100644 (file)
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -909,6 +909,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 
                                if ((filled < 0) && data) /* if the string is in a negative number, it refers to the 'data' list. */
                                        filled = PyInt_AsLong(PyTuple_GetItem(data, -filled));
 
                                if ((filled < 0) && data) /* if the string is in a negative number, it refers to the 'data' list. */
                                        filled = PyInt_AsLong(PyTuple_GetItem(data, -filled));

+                                       
+                                                       /* don't do anything if percent out of range */
+                               if ((filled < 0) || (filled > 100))
+                                       continue;

 
                                int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 2;
 
 
                                int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 2;
 

diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py
index 203af23d4a84d97d0e941c33f429c4d5e50abf1c..25c4b1a4a4a9161e464e32eaa72a8423d0782c33 100644 (file)
--- a/lib/python/Components/Converter/TemplatedMultiContent.py
+++ b/lib/python/Components/Converter/TemplatedMultiContent.py
@@ -5,7 +5,7 @@ class TemplatedMultiContent(StringList):
        def __init__(self, args):
                StringList.__init__(self, args)
                from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_HALIGN_RIGHT, RT_VALIGN_TOP, RT_VALIGN_CENTER, RT_VALIGN_BOTTOM, RT_WRAP
        def __init__(self, args):
                StringList.__init__(self, args)
                from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_HALIGN_RIGHT, RT_VALIGN_TOP, RT_VALIGN_CENTER, RT_VALIGN_BOTTOM, RT_WRAP

-               from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest, MultiContentTemplateColor
+               from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest, MultiContentTemplateColor, MultiContentEntryProgress

                l = locals()
                del l["self"] # cleanup locals a bit
                del l["args"]
                l = locals()
                del l["self"] # cleanup locals a bit
                del l["args"]


@@ -37,7 +37,7 @@ class TemplatedMultiContent(StringList):
                if what[0] == self.CHANGED_SPECIFIC and what[1] == "style":
                        self.setTemplate()
                        return
                if what[0] == self.CHANGED_SPECIFIC and what[1] == "style":
                        self.setTemplate()
                        return

-                       
+

                if self.source:
                        self.content.setList(self.source.list)
                        self.setTemplate()
                if self.source:
                        self.content.setList(self.source.list)
                        self.setTemplate()


@@ -50,7 +50,7 @@ class TemplatedMultiContent(StringList):
                        if style == self.active_style:
                                return # style did not change
 
                        if style == self.active_style:
                                return # style did not change
 

-                       # if skin defined "templates", that means that it defines multiple styles in a dict. template should still be a default 
+                       # if skin defined "templates", that means that it defines multiple styles in a dict. template should still be a default

                        templates = self.template.get("templates")
                        template = self.template.get("template")
 
                        templates = self.template.get("templates")
                        template = self.template.get("template")
 

diff --git a/lib/python/Components/MultiContent.py b/lib/python/Components/MultiContent.py
index ff0219ffc3d5aeb4646fc1afa1aedfa7da3774aa..6afd0941c081fe5878482d8d2fc922ee08be9a9d 100644 (file)
--- a/lib/python/Components/MultiContent.py
+++ b/lib/python/Components/MultiContent.py
@@ -10,3 +10,7 @@ def MultiContentEntryPixmap(pos = (0, 0), size = (0, 0), png = None, backcolor =
 
 def MultiContentEntryPixmapAlphaTest(pos = (0, 0), size = (0, 0), png = None, backcolor = None, backcolor_sel = None):
        return (eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, pos[0], pos[1], size[0], size[1], png, backcolor, backcolor_sel)
 
 def MultiContentEntryPixmapAlphaTest(pos = (0, 0), size = (0, 0), png = None, backcolor = None, backcolor_sel = None):
        return (eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, pos[0], pos[1], size[0], size[1], png, backcolor, backcolor_sel)

+
+def MultiContentEntryProgress(pos = (0, 0), size = (0, 0), percent = None, borderWidth = None, foreColor = None, backColor = None, backColorSelected = None):
+       return (eListboxPythonMultiContent.TYPE_PROGRESS, pos[0], pos[1], size[0], size[1], percent, borderWidth, foreColor, backColor, backColorSelected)
+