add type to python multi content entrys

5 files changed, 15 insertions, 15 deletions

diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
index 8905944a..c7035cb9 100644
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -37,8 +37,8 @@ class HelpMenuList(GUIComponent):
 				if not first:
 					buttonstring = "You can also press " + buttonstring + "."
 
-				entry.append( (0, 0, 200, 36, 0, 0, help) )
-				entry.append( (0, 40, 200, 20, 1, 0, buttonstring) )
+				entry.append( (eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 200, 36, 0, 0, help) )
+				entry.append( (eListboxPythonMultiContent.TYPE_TEXT, 0, 40, 200, 20, 1, 0, buttonstring) )
 				
 				l.append(entry)
 		
diff --git a/lib/python/Components/LanguageList.py b/lib/python/Components/LanguageList.py
index 09423741..3d74cb14 100644
--- a/lib/python/Components/LanguageList.py
+++ b/lib/python/Components/LanguageList.py
@@ -18,11 +18,11 @@ RT_VALIGN_BOTTOM = 16
 
 def LanguageEntryComponent(file, name):
 	res = [ None ]
-	res.append((80, 10, 200, 50, 0, RT_HALIGN_LEFT , name))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 10, 200, 50, 0, RT_HALIGN_LEFT ,name))
 	png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/countries/" + file + ".png"))
 	if png == None:
 		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/countries/missing.png"))
-	res.append((10, 5, 60, 40, png))
+	res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 10, 5, 60, 40, png))
 	
 	return res
 
diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 0f3a3fd2..7ec8a9ff 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -39,7 +39,7 @@ def MovieListEntry(serviceref, serviceHandler):
 	else:
 		len = "?:??"
 	
-	res.append((0, 0, 560, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
+	res.append((0, 0, 0, 560, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
 	
 	description = info.getInfoString(serviceref, iServiceInformation.sDescription)
 	begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
@@ -49,9 +49,9 @@ def MovieListEntry(serviceref, serviceHandler):
 		t = FuzzyTime(begin)
 		begin_string = t[0] + ", " + t[1]
 	
-	res.append((0, 30, 560, 20, 1, RT_HALIGN_LEFT, description))
-	res.append((0, 50, 270, 20, 1, RT_HALIGN_LEFT, begin_string))
-	res.append((290, 50, 270, 20, 1, RT_HALIGN_RIGHT, len))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 560, 20, 1, RT_HALIGN_LEFT, description))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 270, 20, 1, RT_HALIGN_LEFT, begin_string))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 290, 50, 270, 20, 1, RT_HALIGN_RIGHT, len))
 	
 	return res
 
diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 9dec041b..17fe1476 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -18,11 +18,11 @@ RT_VALIGN_BOTTOM = 16
 
 def PluginEntryComponent(picture, name):
 	res = [ None ]
-	res.append((80, 10, 200, 50, 0, RT_HALIGN_LEFT , name))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 10, 200, 50, 0, RT_HALIGN_LEFT , name))
 	png = loadPNG(picture)
 	if png == None:
 		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/countries/missing.png"))
-	res.append((10, 5, 60, 40, png))
+	res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 10, 5, 60, 40, png))
 	
 	return res
 
diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index da2ff949..e48b7a0d 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -26,7 +26,7 @@ RT_WRAP = 32
 def TimerEntryComponent(timer, processed):
 	res = [ timer ]
 	
-	res.append((0, 0, 220, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 220, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
 	repeatedtext = ""
 	days = [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]
 	if (timer.repeated != 0):
@@ -39,11 +39,11 @@ def TimerEntryComponent(timer, processed):
 					repeatedtext += days[x]
 					count += 1
 				flags = flags >> 1
-		res.append((0, 30, 300, 20, 1, RT_HALIGN_LEFT, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
+		res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 300, 20, 1, RT_HALIGN_LEFT, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
 	else:
-		res.append((0, 30, 300, 20, 1, RT_HALIGN_LEFT, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
+		res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 300, 20, 1, RT_HALIGN_LEFT, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
 
-	res.append((240, 0, 320, 20, 1, RT_HALIGN_RIGHT, timer.name))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 240, 0, 320, 20, 1, RT_HALIGN_RIGHT, timer.name))
 	
 	if not processed:
 		if timer.state == TimerEntry.StateWait:
@@ -57,7 +57,7 @@ def TimerEntryComponent(timer, processed):
 	else:
 		state = "done!"
 	
-	res.append((320, 30, 240, 20, 1, RT_HALIGN_RIGHT, state))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 320, 30, 240, 20, 1, RT_HALIGN_RIGHT, state))
 	
 	return res