diff options
| author | acid-burn <acidburn@opendreambox.org> | 2009-11-11 10:56:30 +0100 |
|---|---|---|
| committer | acid-burn <acidburn@opendreambox.org> | 2009-11-11 10:56:30 +0100 |
| commit | 39f3d5a554528bcbdc79cc0f2bdd2d59c92b0a4e (patch) | |
| tree | 26eb3798f34956754bef6c9f4a2c1a285601876a /lib/python/Components/FileList.py | |
| parent | 383faf2da1a60442431dce44760a0392c5829dc8 (diff) | |
| parent | d64e82b37efdf77b557234809d0c81857818bfac (diff) | |
| download | enigma2-39f3d5a554528bcbdc79cc0f2bdd2d59c92b0a4e.tar.gz enigma2-39f3d5a554528bcbdc79cc0f2bdd2d59c92b0a4e.zip | |
Merge branch 'bug_249_current_skin_fallback' into experimental
Conflicts:
lib/python/Components/FileList.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
Diffstat (limited to 'lib/python/Components/FileList.py')
| -rwxr-xr-x | lib/python/Components/FileList.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index b187ee3e..222512ea 100755 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -3,7 +3,7 @@ from os import path as os_path, listdir from MenuList import MenuList from Components.Harddisk import harddiskmanager -from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename, fileExists +from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename, fileExists from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \ eServiceReference, eServiceCenter, gFont @@ -23,7 +23,6 @@ EXTENSIONS = { "ts": "movie", "avi": "movie", "divx": "movie", - "m4v": "movie", "mpg": "movie", "mpeg": "movie", "mkv": "movie", @@ -35,12 +34,12 @@ def FileEntryComponent(name, absolute = None, isDir = False): res = [ (absolute, isDir) ] res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 470, 20, 0, RT_HALIGN_LEFT, name)) if isDir: - png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/directory.png")) + png = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "extensions/directory.png")) else: extension = name.split('.') extension = extension[-1].lower() if EXTENSIONS.has_key(extension): - png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/" + EXTENSIONS[extension] + ".png")) + png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "extensions/" + EXTENSIONS[extension] + ".png")) else: png = None if png is not None: @@ -259,12 +258,12 @@ def MultiFileSelectEntryComponent(name, absolute = None, isDir = False, selected res = [ (absolute, isDir, selected, name) ] res.append((eListboxPythonMultiContent.TYPE_TEXT, 55, 1, 470, 20, 0, RT_HALIGN_LEFT, name)) if isDir: - png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/directory.png")) + png = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "extensions/directory.png")) else: extension = name.split('.') extension = extension[-1].lower() if EXTENSIONS.has_key(extension): - png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/" + EXTENSIONS[extension] + ".png")) + png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "extensions/" + EXTENSIONS[extension] + ".png")) else: png = None if png is not None: @@ -272,10 +271,10 @@ def MultiFileSelectEntryComponent(name, absolute = None, isDir = False, selected if not name.startswith('<'): if selected is False: - icon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/lock_off.png")) + icon = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/lock_off.png")) res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 2, 0, 25, 25, icon)) else: - icon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/lock_on.png")) + icon = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/lock_on.png")) res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 2, 0, 25, 25, icon)) return res |