refs bug #429

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

diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index fd988065e5b141e498d1f9f5724a453d496fd220..39c60ff7f5845c41b2ccabf7b7e7fb9f9cf2a7d0 100644 (file)
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -1,60 +1,48 @@
-from HTMLComponent import *
-from GUIComponent import *
-

 from MenuList import MenuList
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
 
 from MenuList import MenuList
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
 

-from enigma import loadPNG, eListboxPythonMultiContent, RT_HALIGN_LEFT, eListbox, gFont
+from enigma import eListboxPythonMultiContent, gFont
+from Tools.LoadPixmap import LoadPixmap

 
 def PluginEntryComponent(plugin):
 
 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:
        if plugin.icon is None:

-               png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png"))
+               png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/plugin.png"))

        else:
                png = plugin.icon
        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):
 
 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):
 
 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:
        if plugin.icon is None:

-               png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png"))
+               png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/plugin.png"))

        else:
                png = plugin.icon
        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, HTMLComponent, GUIComponent):
-       def __init__(self, list):
-               GUIComponent.__init__(self)
-               self.l = eListboxPythonMultiContent()
-               self.list = list
-               self.l.setList(list)
+
+class PluginList(MenuList):
+       def __init__(self, list, enableWrapAround=False):
+               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)

                self.l.setFont(0, gFont("Regular", 20))
                self.l.setFont(1, gFont("Regular", 14))
                self.l.setFont(0, gFont("Regular", 20))
                self.l.setFont(1, gFont("Regular", 14))

-
-       GUI_WIDGET = eListbox
-
-       def postWidgetCreate(self, instance):
-               instance.setContent(self.l)
-               instance.setItemHeight(50)
+               self.l.setItemHeight(50)