use MultiContent wraps in plugin list

[enigma2.git] / lib / python / Components / PluginList.py

diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index a84934978184d2709342f278574eaf5e7b84f365..226820334d25e7d8d74e681850973648c0cd2b90 100644 (file)
--- 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))
-
-#      png = loadPNG(picture)
-#      if png == None:
-
-       png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/plugin.png"))
-       res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 10, 5, 60, 40, png))
+       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(MultiContentEntryPixmap(pos=(10, 5), size=(60, 40), png = png))
        
        return res