search default picon png first in currently used skin directory before

[enigma2.git] / lib / python / Components / Renderer / Picon.py

diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py
index 6d97341d08f02f981540fe889a21a4897e848003..ca934c8e8acaab098054e1300c3b6491395ce904 100644 (file)
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -3,7 +3,7 @@
 ##
 from Renderer import Renderer
 from enigma import ePixmap
 ##
 from Renderer import Renderer
 from enigma import ePixmap

-from Tools.Directories import pathExists, 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/',
 
 class Picon(Renderer):
        searchPaths = ['/usr/share/enigma2/%s/',


@@ -17,7 +17,6 @@ class Picon(Renderer):
                self.pngname = ""
 
        def applySkin(self, desktop):
                self.pngname = ""
 
        def applySkin(self, desktop):

-               print "-> Picon, applySkin:", self.skinAttributes

                attribs = [ ]
                for (attrib, value) in self.skinAttributes:
                        if attrib == "path":
                attribs = [ ]
                for (attrib, value) in self.skinAttributes:
                        if attrib == "path":


@@ -30,7 +29,6 @@ class Picon(Renderer):
        GUI_WIDGET = ePixmap
 
        def changed(self, what):
        GUI_WIDGET = ePixmap
 
        def changed(self, what):

-               print "PICON: path=%s" % self.path

                if self.instance:
                        pngname = ""
                        if what[0] != self.CHANGED_CLEAR:
                if self.instance:
                        pngname = ""
                        if what[0] != self.CHANGED_CLEAR:


@@ -48,8 +46,12 @@ class Picon(Renderer):
                                pngname = self.nameCache.get("default", "")
                                if pngname == "": # no default yet in cache..
                                        pngname = self.findPicon("picon_default")
                                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 == "":
+                                               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:
                                self.instance.setPixmapFromFile(pngname)
                                        self.nameCache["default"] = pngname
                        if self.pngname != pngname:
                                self.instance.setPixmapFromFile(pngname)