X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FPluginList.py;h=fee11ef9dc58aadbf17edfa637958224dabe9599;hb=1d557af556c71a9c658deea9cec783a66903c136;hp=22db1ad2a69f27132f334b77c456e725d17d19b5;hpb=d1df9c9abf767fff6cfb073ef560d5b89b93610c;p=vuplus_dvbapp

diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 22db1ad..fee11ef 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -1,43 +1,59 @@
-from HTMLComponent import *
-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, 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:
-		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 eListboxPythonMultiContent, gFont
+from Tools.LoadPixmap import LoadPixmap
+import skin
+
+def PluginEntryComponent(plugin, width=440):
+	if plugin.icon is None:
+		png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/plugin.png"))
+	else:
+		png = plugin.icon
+
+	nx, ny, nh = skin.parameters.get("PluginBrowserName",(120, 5, 25))
+	dx, dy, dh = skin.parameters.get("PluginBrowserDescr",(120, 26, 17))
+	ix, iy, iw, ih = skin.parameters.get("PluginBrowserIcon",(10, 5, 100, 40))
+	return [
+		plugin,
+		MultiContentEntryText(pos=(nx, ny), size=(width-nx, nh), font=0, text=plugin.name),
+		MultiContentEntryText(pos=(dx, dy), size=(width-dx, dh), font=1, text=plugin.description),
+		MultiContentEntryPixmapAlphaTest(pos=(ix, iy), size=(iw, ih), png = png)
+	]
+
+def PluginCategoryComponent(name, png, width=440):
+	x, y, h = skin.parameters.get("PluginBrowserDownloadName",(120, 5, 25))
+	ix, iy, iw, ih = skin.parameters.get("PluginBrowserDownloadIcon",(10, 0, 100, 50))
+	return [
+		name,
+		MultiContentEntryText(pos=(x, y), size=(width-x, h), font=0, text=name),
+		MultiContentEntryPixmapAlphaTest(pos=(ix, iy), size=(iw, ih), png = png)
+	]
+
+def PluginDownloadComponent(plugin, name, width=440):
+	if plugin.icon is None:
+		png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/plugin.png"))
+	else:
+		png = plugin.icon
+
+	x, y, h = skin.parameters.get("PluginBrowserDownloadName",(120, 5, 25))
+	dx, dy, dh = skin.parameters.get("PluginBrowserDownloadDescr",(120, 26, 17))
+	ix, iy, iw, ih = skin.parameters.get("PluginBrowserDownloadIcon",(10, 0, 100, 50))
+	return [
+		plugin,
+		MultiContentEntryText(pos=(x, y), size=(width-x, h), font=0, text=name),
+		MultiContentEntryText(pos=(dx, dy), size=(width-dx, dh), font=1, text=plugin.description),
+		MultiContentEntryPixmapAlphaTest(pos=(ix, iy), size=(iw, ih), png = png)
+	]
 	
-	return res
-
 
-class PluginList(HTMLComponent, GUIComponent, MenuList):
-	def __init__(self, list):
-		GUIComponent.__init__(self)
-		self.l = eListboxPythonMultiContent()
-		self.list = list
-		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
+class PluginList(MenuList):
+	def __init__(self, list, enableWrapAround=False):
+		MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
+		font = skin.fonts.get("PluginBrowser0", ("Regular", 20, 50))
+		self.l.setFont(0, gFont(font[0], font[1]))
+		self.l.setItemHeight(font[2])
+		font = skin.fonts.get("PluginBrowser1", ("Regular", 14))
+		self.l.setFont(1, gFont(font[0], font[1]))