Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

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

diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py
index db8fd8e27dbdeb6de68bb0d64d95fc1801aa32fa..128e6d3e37844bd7e11f81b8ec885a9e1a0d0abd 100644 (file)
--- a/lib/python/Components/ParentalControlList.py
+++ b/lib/python/Components/ParentalControlList.py
@@ -1,39 +1,27 @@
-from HTMLComponent import *
-from GUIComponent import *
-
 from MenuList import MenuList
 from Components.ParentalControl import parentalControl
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 
-from enigma import loadPNG, eListbox, eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
+from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
+from Tools.LoadPixmap import LoadPixmap
 
-lockPicture = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "lock-fs8.png"))
+lockPicture = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/lock.png"))
 
 def ParentalControlEntryComponent(service, name, locked = True):
-       res = [ (service, name, locked) ]
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 5, 300, 50, 0, RT_HALIGN_LEFT, name))
+       res = [
+               (service, name, locked),
+               (eListboxPythonMultiContent.TYPE_TEXT, 80, 5, 300, 50, 0, RT_HALIGN_LEFT, name)
+       ]
        if locked:
                res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 32, 32, lockPicture))
        return res
 
-class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
-       def __init__(self, list):
-               GUIComponent.__init__(self)
-               self.l = eListboxPythonMultiContent()
-               self.list = list
-               self.l.setList(list)
+class ParentalControlList(MenuList):
+       def __init__(self, list, enableWrapAround = False):
+               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
                self.l.setFont(0, gFont("Regular", 20))
                self.l.setItemHeight(32)
 
-       GUI_WIDGET = eListbox
-       
-       def setList(self, list):
-               self.list = list
-               self.l.setList(list)
-               
-       def postWidgetCreate(self, instance):
-               instance.setContent(self.l)
-
        def toggleSelectedLock(self):
                print "self.l.getCurrentSelection():", self.l.getCurrentSelection()
                print "self.l.getCurrentSelectionIndex():", self.l.getCurrentSelectionIndex()