git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'rate' -> 'refresh rate'
[enigma2.git]
/
lib
/
python
/
Components
/
ParentalControlList.py
diff --git
a/lib/python/Components/ParentalControlList.py
b/lib/python/Components/ParentalControlList.py
index 6315963fb0a5231a71ba232da9ccbf96713db697..489cb130b5d2e033f711ed5e49a75471427fc4b8 100644
(file)
--- a/
lib/python/Components/ParentalControlList.py
+++ b/
lib/python/Components/ParentalControlList.py
@@
-1,29
+1,20
@@
-from HTMLComponent import
*
-from GUIComponent import
*
+from HTMLComponent import
HTMLComponent
+from GUIComponent import
GUIComponent
from MenuList import MenuList
from Components.ParentalControl import parentalControl
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) ]
def ParentalControlEntryComponent(service, name, locked = True):
res = [ (service, name, locked) ]
- res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 5,
2
00, 50, 0, RT_HALIGN_LEFT, name))
+ res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 5,
3
00, 50, 0, RT_HALIGN_LEFT, name))
if locked:
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 32, 32, lockPicture))
if locked:
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 32, 32, lockPicture))
-
return res
class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
return res
class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
@@
-33,6
+24,7
@@
class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
self.list = list
self.l.setList(list)
self.l.setFont(0, gFont("Regular", 20))
self.list = list
self.l.setList(list)
self.l.setFont(0, gFont("Regular", 20))
+ self.l.setItemHeight(32)
GUI_WIDGET = eListbox
GUI_WIDGET = eListbox
@@
-42,7
+34,6
@@
class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
def postWidgetCreate(self, instance):
instance.setContent(self.l)
def postWidgetCreate(self, instance):
instance.setContent(self.l)
- instance.setItemHeight(32)
def toggleSelectedLock(self):
print "self.l.getCurrentSelection():", self.l.getCurrentSelection()
def toggleSelectedLock(self):
print "self.l.getCurrentSelection():", self.l.getCurrentSelection()