diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-04-17 23:00:45 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-04-17 23:00:45 +0000 |
| commit | 1d85cc2be11283f9b08ec2172c13d1f5628d987b (patch) | |
| tree | 39b1accf3417f941a69f467af581d4ad5ed10598 /lib/python/Components/Renderer | |
| parent | 8b7069d739e2c5f61277c5fd45f80fa7792cb96a (diff) | |
| download | enigma2-1d85cc2be11283f9b08ec2172c13d1f5628d987b.tar.gz enigma2-1d85cc2be11283f9b08ec2172c13d1f5628d987b.zip | |
search default picon png first in currently used skin directory before
fallback to default skin directory
Diffstat (limited to 'lib/python/Components/Renderer')
| -rw-r--r-- | lib/python/Components/Renderer/Picon.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py index 27741d69..ca934c8e 100644 --- a/lib/python/Components/Renderer/Picon.py +++ b/lib/python/Components/Renderer/Picon.py @@ -3,8 +3,7 @@ ## from Renderer import Renderer from enigma import ePixmap -from Components.config import config -from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, resolveFilename +from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, SCOPE_CURRENT_SKIN, resolveFilename class Picon(Renderer): searchPaths = ['/usr/share/enigma2/%s/', @@ -48,13 +47,10 @@ class Picon(Renderer): if pngname == "": # no default yet in cache.. pngname = self.findPicon("picon_default") if pngname == "": - pos = config.skin.primary_skin.value.rfind('/') - if pos != -1: - str = config.skin.primary_skin.value[:pos+1] - str += 'picon_default.png' - if fileExists(str): - pngname = str - if pngname == "": # Fallback to enigma2 logo + tmp = resolveFilename(SCOPE_CURRENT_SKIN, "picon_default.png") + if fileExists(tmp): + pngname = tmp + else: pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/picon_default.png") self.nameCache["default"] = pngname if self.pngname != pngname: |