X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d1df9c9abf767fff6cfb073ef560d5b89b93610c..4c6226bbf4d32d3abdc640a63581d963dd94937b:/lib/python/Components/PluginList.py

diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 22db1ad2..22682033 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -3,31 +3,25 @@ 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(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))
 
-def PluginEntryComponent(picture, name, desc = "Plugin"):
-	res = [ None ]
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 5, 300, 25, 0, RT_HALIGN_LEFT , name))
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 26, 300, 17, 1, RT_HALIGN_LEFT , desc))
-	png = loadPNG(picture)
-	if png == None:
+	if plugin.icon is None:
 		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/plugin.png"))
-	res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 10, 5, 60, 40, png))
+	else:
+		png = plugin.icon
+	res.append(MultiContentEntryPixmap(pos=(10, 5), size=(60, 40), png = png))
 	
 	return res
 
-
 class PluginList(HTMLComponent, GUIComponent, MenuList):
 	def __init__(self, list):
 		GUIComponent.__init__(self)
@@ -40,4 +34,4 @@ class PluginList(HTMLComponent, GUIComponent, MenuList):
 	def GUIcreate(self, parent):
 		self.instance = eListbox(parent)
 		self.instance.setContent(self.l)
-		self.instance.setItemHeight(50)
\ No newline at end of file
+		self.instance.setItemHeight(50)