From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 24 Feb 2006 22:37:30 +0000 (+0000)
Subject: use MultiContent wraps in plugin list
X-Git-Tag: 2.6.0~3999
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/4c6226bbf4d32d3abdc640a63581d963dd94937b

use MultiContent wraps in plugin list
---

diff --git a/lib/python/Components/MultiContent.py b/lib/python/Components/MultiContent.py
index a7283419..dab096d3 100644
--- a/lib/python/Components/MultiContent.py
+++ b/lib/python/Components/MultiContent.py
@@ -11,5 +11,8 @@ RT_WRAP = 32
 
 from enigma import eListboxPythonMultiContent
 
-def MultiContentEntryText(pos = (0, 0), size = (0, 0), font = 0, flags = 0, text = "", private = ()):
-	return (eListboxPythonMultiContent.TYPE_TEXT, pos[0], pos[1], size[0], size[1], font, flags, text) + private
+def MultiContentEntryText(pos = (0, 0), size = (0, 0), font = 0, flags = RT_HALIGN_LEFT | RT_VALIGN_TOP, text = ""):
+	return (eListboxPythonMultiContent.TYPE_TEXT, pos[0], pos[1], size[0], size[1], font, flags, text)
+
+def MultiContentEntryPixmap(pos = (0, 0), size = (0, 0), png = None):
+	return (eListboxPythonMultiContent.TYPE_PIXMAP, pos[0], pos[1], size[0], size[1], png)
diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index b9b5bcc7..22682033 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -3,30 +3,22 @@ from GUIComponent import *
 
 from MenuList import MenuList
 
-from Tools.Directories import *
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
+from Components.MultiContent import RT_HALIGN_LEFT, MultiContentEntryText, MultiContentEntryPixmap
 
 from enigma import *
 
-RT_HALIGN_LEFT = 0
-RT_HALIGN_RIGHT = 1
-RT_HALIGN_CENTER = 2
-RT_HALIGN_BLOCK = 4
-
-RT_VALIGN_TOP = 0
-RT_VALIGN_CENTER = 8
-RT_VALIGN_BOTTOM = 16
-
 def PluginEntryComponent(plugin):
 	res = [ plugin ]
 	
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 5, 300, 25, 0, RT_HALIGN_LEFT, plugin.name))
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 26, 300, 17, 1, RT_HALIGN_LEFT, plugin.description))
+	res.append(MultiContentEntryText(pos=(80, 5), size=(300, 25), font=0, text=plugin.name))
+	res.append(MultiContentEntryText(pos=(80, 26), size=(300, 17), font=1, text=plugin.description))
 
 	if plugin.icon is None:
 		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/plugin.png"))
 	else:
 		png = plugin.icon
-	res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 10, 5, 60, 40, png))
+	res.append(MultiContentEntryPixmap(pos=(10, 5), size=(60, 40), png = png))
 	
 	return res