aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2007-11-26 16:43:47 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2007-11-26 16:43:47 +0000
commit6c0ec8f6048840e6107b9453d36fbe3befd46817 (patch)
treed93b46deed28227f5934c1f838aa2b3233797c18 /lib/python
parentc535962003396cd1d7efe448ece3a5f0d3f2fc94 (diff)
downloadenigma2-6c0ec8f6048840e6107b9453d36fbe3befd46817.tar.gz
enigma2-6c0ec8f6048840e6107b9453d36fbe3befd46817.zip
try skindir/picon_default.png before use default enigma2.png
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Components/Renderer/Picon.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py
index d5212638..bf52454a 100644
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -3,6 +3,7 @@
##
from Renderer import Renderer
from enigma import ePixmap
+from Components.config import config
from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, resolveFilename
class Picon(Renderer):
@@ -46,8 +47,15 @@ class Picon(Renderer):
pngname = self.nameCache.get("default", "")
if pngname == "": # no default yet in cache..
pngname = self.findPicon("picon_default")
- if pngname == "": # Fallback to enigma2 logo
- pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/enigma2.png")
+ 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
+ pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/enigma2.png")
self.nameCache["default"] = pngname
if self.pngname != pngname:
self.instance.setPixmapFromFile(pngname)