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 'translations' into experimental
[enigma2.git]
/
lib
/
python
/
Components
/
ChoiceList.py
diff --git
a/lib/python/Components/ChoiceList.py
b/lib/python/Components/ChoiceList.py
old mode 100644
(file)
new mode 100755
(executable)
index
fe505c2
..
4700e9e
--- a/
lib/python/Components/ChoiceList.py
+++ b/
lib/python/Components/ChoiceList.py
@@
-1,5
+1,5
@@
from MenuList import MenuList
from MenuList import MenuList
-from Tools.Directories import SCOPE_
SKIN_IMAGE
, resolveFilename
+from Tools.Directories import SCOPE_
CURRENT_SKIN
, resolveFilename
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, gFont
from Tools.LoadPixmap import LoadPixmap
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, gFont
from Tools.LoadPixmap import LoadPixmap
@@
-10,7
+10,7
@@
def ChoiceEntryComponent(key, text):
else:
res.append((eListboxPythonMultiContent.TYPE_TEXT, 45, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
else:
res.append((eListboxPythonMultiContent.TYPE_TEXT, 45, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
- png = LoadPixmap(resolveFilename(SCOPE_
SKIN_IMAGE
, "skin_default/buttons/key_" + key + ".png"))
+ png = LoadPixmap(resolveFilename(SCOPE_
CURRENT_SKIN
, "skin_default/buttons/key_" + key + ".png"))
if png is not None:
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 5, 0, 35, 25, png))
if png is not None:
res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 5, 0, 35, 25, png))