diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 06:47:59 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 06:47:59 +0100 |
| commit | 9c998a40679f9b630ccf8cc6fda7384ce94c30e5 (patch) | |
| tree | 6e31e148f6153232293b339ddf2e0c6328bf1e22 /lib/python/Components/ChoiceList.py | |
| parent | d6ad23c5be62bc24cc08a5c8db91f64ae2d8cf3b (diff) | |
| parent | d64e82b37efdf77b557234809d0c81857818bfac (diff) | |
| download | enigma2-9c998a40679f9b630ccf8cc6fda7384ce94c30e5.tar.gz enigma2-9c998a40679f9b630ccf8cc6fda7384ce94c30e5.zip | |
Merge branch 'bug_249_current_skin_fallback'
Conflicts:
lib/python/Components/FileList.py
Diffstat (limited to 'lib/python/Components/ChoiceList.py')
| -rwxr-xr-x[-rw-r--r--] | lib/python/Components/ChoiceList.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py index fe505c2a..4700e9e6 100644..100755 --- a/lib/python/Components/ChoiceList.py +++ b/lib/python/Components/ChoiceList.py @@ -1,5 +1,5 @@ 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 @@ -10,7 +10,7 @@ def ChoiceEntryComponent(key, text): 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)) |
