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

diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 93edf5ba..07a71748 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -3,32 +3,48 @@ from GUIComponent import *
 
 from MenuList import MenuList
 
-from Tools.Directories import *
-
-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(picture, name, desc = "Plugin"):
-	res = [ None ]
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 5, 200, 25, 0, RT_HALIGN_LEFT , name))
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 26, 200, 17, 1, RT_HALIGN_LEFT , desc))
-	png = loadPNG(picture)
-	if png == None:
-		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/plugin.png"))
-	res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 10, 5, 60, 40, png))
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
+from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
+
+from enigma import loadPNG, eListboxPythonMultiContent, RT_HALIGN_LEFT, eListbox, gFont
+
+def PluginEntryComponent(plugin):
+	res = [ plugin ]
+	
+	res.append(MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=plugin.name))
+	res.append(MultiContentEntryText(pos=(120, 26), size=(320, 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(MultiContentEntryPixmapAlphaTest(pos=(10, 5), size=(100, 40), png = png))
 	
 	return res
 
+def PluginCategoryComponent(name, png):
+	res = [ name ]
+	
+	res.append(MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=name))
+	res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png))
+	
+	return res
 
-class PluginList(HTMLComponent, GUIComponent, MenuList):
+def PluginDownloadComponent(plugin, name):
+	res = [ plugin ]
+	
+	res.append(MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=name))
+	res.append(MultiContentEntryText(pos=(120, 26), size=(320, 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(MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png))
+	
+	return res
+
+class PluginList(MenuList, HTMLComponent, GUIComponent):
 	def __init__(self, list):
 		GUIComponent.__init__(self)
 		self.l = eListboxPythonMultiContent()
@@ -36,8 +52,9 @@ class PluginList(HTMLComponent, GUIComponent, MenuList):
 		self.l.setList(list)
 		self.l.setFont(0, gFont("Regular", 20))
 		self.l.setFont(1, gFont("Regular", 14))
-	
-	def GUIcreate(self, parent):
-		self.instance = eListbox(parent)
-		self.instance.setContent(self.l)
-		self.instance.setItemHeight(50)
\ No newline at end of file
+		self.l.setItemHeight(50)
+
+	GUI_WIDGET = eListbox
+
+	def postWidgetCreate(self, instance):
+		instance.setContent(self.l)