git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'layers' (in buffered mode, which is not working at the moment).
[enigma2.git]
/
lib
/
python
/
Components
/
ChoiceList.py
diff --git
a/lib/python/Components/ChoiceList.py
b/lib/python/Components/ChoiceList.py
index a0fbde542ac5f44263c1680c515c278a8a4e8bce..07bb56d085dd53aa5f3bbcb4005f0530aa91d5e2 100644
(file)
--- a/
lib/python/Components/ChoiceList.py
+++ b/
lib/python/Components/ChoiceList.py
@@
-1,20
+1,9
@@
-from HTMLComponent import *
-from GUIComponent import *
-
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
from MenuList import MenuList
from MenuList import MenuList
-
-from Tools.Directories import *
-
-from enigma import *
-
-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
+from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
+from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, eListbox, gFont
+from Tools.LoadPixmap import LoadPixmap
def ChoiceEntryComponent(key, text):
res = [ text ]
def ChoiceEntryComponent(key, text):
res = [ text ]
@@
-23,7
+12,7
@@
def ChoiceEntryComponent(key, text):
else:
res.append((eListboxPythonMultiContent.TYPE_TEXT, 32, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
else:
res.append((eListboxPythonMultiContent.TYPE_TEXT, 32, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
- png =
loadPNG
(resolveFilename(SCOPE_SKIN_IMAGE, "key_" + key + "-fs8.png"))
+ png =
LoadPixmap
(resolveFilename(SCOPE_SKIN_IMAGE, "key_" + key + "-fs8.png"))
if png is not None:
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 30, 20, png))
if png is not None:
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 30, 20, png))
@@
-36,11
+25,11
@@
class ChoiceList(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(25)
self.selection = selection
GUI_WIDGET = eListbox
def postWidgetCreate(self, instance):
instance.setContent(self.l)
self.selection = selection
GUI_WIDGET = eListbox
def postWidgetCreate(self, instance):
instance.setContent(self.l)
- instance.setItemHeight(25)
self.moveToIndex(self.selection)
self.moveToIndex(self.selection)