X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FConverter%2FTemplatedMultiContent.py;h=b5a9844931378cb950ac3e7a35f86ec62b9d8bb4;hp=cc00455c23beff4518a8bc937b12fd21dae40480;hb=6249914820d4028175d86237fdac9b155d1834fa;hpb=2c9a0e18d4ad0b5a73abb5466ea2f70b61daf7fa

diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py
index cc00455..b5a9844 100644
--- a/lib/python/Components/Converter/TemplatedMultiContent.py
+++ b/lib/python/Components/Converter/TemplatedMultiContent.py
@@ -4,28 +4,27 @@ class TemplatedMultiContent(StringList):
 	"""Turns a python tuple list into a multi-content list which can be used in a listbox renderer."""
 	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
-		from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest
+		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, MultiContentEntryPixmapAlphaBlend, MultiContentTemplateColor, MultiContentEntryProgress
 		l = locals()
 		del l["self"] # cleanup locals a bit
 		del l["args"]
 
-		self.template = eval(args, {}, l)
 		self.active_style = None
+		self.template = eval(args, {}, l)
 		assert "fonts" in self.template
 		assert "itemHeight" 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"]
+			self.template["template"] = self.template["templates"]["default"][1]
+			self.template["itemHeight"] = self.template["template"][0]
 
 	def changed(self, what):
 		if not self.content:
 			from enigma import eListboxPythonMultiContent
 			self.content = eListboxPythonMultiContent()
-			self.content.setItemHeight(self.template["itemHeight"])
-			self.setTemplate()
 
 			# also setup fonts (also given by source)
 			index = 0
@@ -35,26 +34,33 @@ class TemplatedMultiContent(StringList):
 
 		# if only template changed, don't reload list
 		if what[0] == self.CHANGED_SPECIFIC and what[1] == "style":
-			self.setTemplate()
-			return
-			
-		if self.source:
+			pass
+		elif self.source:
 			self.content.setList(self.source.list)
-			self.setTemplate()
 
+		self.setTemplate()
 		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
+				return
 
-			# 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")
+			itemheight = self.template["itemHeight"]
+			selectionEnabled = self.template.get("selectionEnabled", True)
 
-			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
+			if templates and style and style in templates: # if we have a custom style defined in the source, and different templates in the skin, look it up
+				template = templates[style][1]
+				itemheight = templates[style][0]
+				if len(templates[style]) > 2:
+					selectionEnabled = templates[style][2]
 
 			self.content.setTemplate(template)
+			self.content.setItemHeight(itemheight)
+			self.selectionEnabled = selectionEnabled
+			self.active_style = style