git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_140_move_WirelessLan_and__NetworkWizard_to_Enigma2' into experimental
[enigma2.git]
/
lib
/
python
/
Components
/
ChoiceList.py
diff --git
a/lib/python/Components/ChoiceList.py
b/lib/python/Components/ChoiceList.py
index af9f950e940b8cf6f5c60f5af1f916a8623ada30..fe505c2a56e6f84177976f462c851400faf4b902 100644
(file)
--- a/
lib/python/Components/ChoiceList.py
+++ b/
lib/python/Components/ChoiceList.py
@@
-1,6
+1,6
@@
from MenuList import MenuList
from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
from MenuList import MenuList
from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
-from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent,
eListbox,
gFont
+from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, gFont
from Tools.LoadPixmap import LoadPixmap
def ChoiceEntryComponent(key, text):
from Tools.LoadPixmap import LoadPixmap
def ChoiceEntryComponent(key, text):
@@
-8,17
+8,17
@@
def ChoiceEntryComponent(key, text):
if text[0] == "--":
res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 00, 800, 25, 0, RT_HALIGN_LEFT, "-"*200))
else:
if text[0] == "--":
res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 00, 800, 25, 0, RT_HALIGN_LEFT, "-"*200))
else:
- res.append((eListboxPythonMultiContent.TYPE_TEXT,
32
, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
+ res.append((eListboxPythonMultiContent.TYPE_TEXT,
45
, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
- png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "
key_" + key + "-fs8
.png"))
+ png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "
skin_default/buttons/key_" + key + "
.png"))
if png is not None:
if png is not None:
- res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST,
0, 0, 30, 20
, png))
+ res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST,
5, 0, 35, 25
, png))
return res
class ChoiceList(MenuList):
def __init__(self, list, selection = 0, enableWrapAround=False):
return res
class ChoiceList(MenuList):
def __init__(self, list, selection = 0, enableWrapAround=False):
- MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent
()
)
+ MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
self.l.setFont(0, gFont("Regular", 20))
self.l.setItemHeight(25)
self.selection = selection
self.l.setFont(0, gFont("Regular", 20))
self.l.setItemHeight(25)
self.selection = selection