X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FPluginList.py;h=39c60ff7f5845c41b2ccabf7b7e7fb9f9cf2a7d0;hb=62398546079455cab5f63f5988a1f2a6bc7e3e07;hp=7b995fa5c81f0a2105fa90e9f132889e2469f3c7;hpb=94508f85d46155eb05868cada7b34bb2b4a667a5;p=vuplus_dvbapp

diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 7b995fa..39c60ff 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -3,48 +3,46 @@ from MenuList import MenuList
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
 
-from enigma import eListboxPythonMultiContent, eListbox, gFont
+from enigma import eListboxPythonMultiContent, gFont
 from Tools.LoadPixmap import LoadPixmap
 
 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 = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png"))
+		png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/plugin.png"))
 	else:
 		png = plugin.icon
-	res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 5), size=(100, 40), png = png))
-	
-	return res
+
+	return [
+		plugin,
+		MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=plugin.name),
+		MultiContentEntryText(pos=(120, 26), size=(320, 17), font=1, text=plugin.description),
+		MultiContentEntryPixmapAlphaTest(pos=(10, 5), size=(100, 40), png = png)
+	]
 
 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
+	return [
+		name,
+		MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=name),
+		MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png)
+	]
 
 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 = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png"))
+		png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/plugin.png"))
 	else:
 		png = plugin.icon
-	res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png))
+
+	return [
+		plugin,
+		MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=name),
+		MultiContentEntryText(pos=(120, 26), size=(320, 17), font=1, text=plugin.description),
+		MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png)
+	]
 	
-	return res
 
 class PluginList(MenuList):
 	def __init__(self, list, enableWrapAround=False):
-		MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent())
+		MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
 		self.l.setFont(0, gFont("Regular", 20))
 		self.l.setFont(1, gFont("Regular", 14))
 		self.l.setItemHeight(50)