allow styleable TemplatedMultiContent lists

[enigma2.git] / lib / python / Components / Converter / TemplatedMultiContent.py

diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py
index a1b601d66002b04ee4d8195f513d59a2a79692a0..cc00455c23beff4518a8bc937b12fd21dae40480 100644 (file)
--- a/lib/python/Components/Converter/TemplatedMultiContent.py
+++ b/lib/python/Components/Converter/TemplatedMultiContent.py
@@ -11,16 +11,21 @@ class TemplatedMultiContent(StringList):
                del l["args"]
 
                self.template = eval(args, {}, l)
                del l["args"]
 
                self.template = eval(args, {}, l)

+               self.active_style = None

                assert "fonts" in self.template
                assert "itemHeight" in self.template
                assert "fonts" in self.template
                assert "itemHeight" in self.template

-               assert "template" in self.template
+               assert "template" in self.template or "templates" in self.template
+               assert "template" in self.template or "default" in self.template["templates"] # we need to have a default template
+
+               if not "template" in self.template: # default template can be ["template"] or ["templates"]["default"]
+                       self.template["template"] = self.template["templates"]["default"]

 
        def changed(self, what):
                if not self.content:
                        from enigma import eListboxPythonMultiContent
                        self.content = eListboxPythonMultiContent()
                        self.content.setItemHeight(self.template["itemHeight"])
 
        def changed(self, what):
                if not self.content:
                        from enigma import eListboxPythonMultiContent
                        self.content = eListboxPythonMultiContent()
                        self.content.setItemHeight(self.template["itemHeight"])

-                       self.content.setTemplate(self.template["template"])
+                       self.setTemplate()

 
                        # also setup fonts (also given by source)
                        index = 0
 
                        # also setup fonts (also given by source)
                        index = 0


@@ -28,7 +33,28 @@ class TemplatedMultiContent(StringList):
                                self.content.setFont(index, f)
                                index += 1
 
                                self.content.setFont(index, f)
                                index += 1
 

+               # if only template changed, don't reload list
+               if what[0] == self.CHANGED_SPECIFIC and what[1] == "style":
+                       self.setTemplate()
+                       return
+                       

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

+                       self.setTemplate()

 
                self.downstream_elements.changed(what)
 
                self.downstream_elements.changed(what)

+
+       def setTemplate(self):
+               if self.source:
+                       style = self.source.style
+                       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 
+                       templates = self.template.get("templates")
+                       template = self.template.get("template")
+
+                       if templates and style: # if we have a custom style defined in the source, and different templates in the skin, look it up
+                               template = templates.get(self.source.style, template) # default to default template
+
+                       self.content.setTemplate(template)