fix LoadPixmap

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

diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py
index 9791e1b02691fb0503d0a13b1985a07f66cd4f80..489cb130b5d2e033f711ed5e49a75471427fc4b8 100644 (file)
--- a/lib/python/Components/ParentalControlList.py
+++ b/lib/python/Components/ParentalControlList.py
@@ -1,22 +1,14 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 
 from MenuList import MenuList
 from Components.ParentalControl import parentalControl
-from Tools.Directories import *
+from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 
-from enigma import *
+from enigma import eListbox, eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
+from Tools.LoadPixmap import LoadPixmap
 
-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
-
-lockPicture = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "lock-fs8.png"))
+lockPicture = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "lock-fs8.png"))
 
 def ParentalControlEntryComponent(service, name, locked = True):
        res = [ (service, name, locked) ]
@@ -32,6 +24,7 @@ class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
                self.list = list
                self.l.setList(list)
                self.l.setFont(0, gFont("Regular", 20))
+               self.l.setItemHeight(32)
 
        GUI_WIDGET = eListbox
        
@@ -41,7 +34,6 @@ class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
                
        def postWidgetCreate(self, instance):
                instance.setContent(self.l)
-               instance.setItemHeight(32)
 
        def toggleSelectedLock(self):
                print "self.l.getCurrentSelection():", self.l.getCurrentSelection()