implement proper 'destroy' functions in Converter

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

diff --git a/lib/python/Components/SelectionList.py b/lib/python/Components/SelectionList.py
index 1500254a0fda0c230619f015d808b714cbfc1e00..10b1d531248ca9115da373d190cc5e7bbfb0cc5a 100644 (file)
--- a/lib/python/Components/SelectionList.py
+++ b/lib/python/Components/SelectionList.py
@@ -1,9 +1,10 @@
 from GUIComponent import GUIComponent
 from MenuList import MenuList
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
-from enigma import eListboxPythonMultiContent, loadPNG, eListbox, gFont, RT_HALIGN_LEFT
+from enigma import eListboxPythonMultiContent, eListbox, gFont, RT_HALIGN_LEFT
+from Tools.LoadPixmap import LoadPixmap
 
-selectionpng = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "selectioncross-fs8.png"))
+selectionpng = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "selectioncross-fs8.png"))
 
 def SelectionEntryComponent(description, value, index, selected):
        res = [ (description, value, index, selected) ]
@@ -13,18 +14,18 @@ def SelectionEntryComponent(description, value, index, selected):
        return res
 
 class SelectionList(MenuList, GUIComponent):
-       def __init__(self, list = []):
+       def __init__(self, list = None):
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
-               self.list = list
-               self.setList(list)
+               self.list = list or []
+               self.setList(self.list)
                self.l.setFont(0, gFont("Regular", 20))
+               self.l.setItemHeight(30)
 
        GUI_WIDGET = eListbox
                
        def postWidgetCreate(self, instance):
                instance.setContent(self.l)
-               instance.setItemHeight(30)
 
        def addSelection(self, description, value, index, selected = True):
                self.list.append(SelectionEntryComponent(description, value, index, selected))
@@ -40,4 +41,4 @@ class SelectionList(MenuList, GUIComponent):
                for item in self.list:
                        if item[0][3]:
                                list.append((item[0][0], item[0][1], item[0][2]))
-               return list
\ No newline at end of file
+               return list