refs bug #429

[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 4faf4e40fc816f2e08b74730effd91f75d1fe448..5ae43ed8b80fab4c3aa70e3cb00381e5166ba25a 100644 (file)
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -3,12 +3,12 @@
 ##
 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):
 
 class Picon(Renderer):

-       searchPaths = ['/usr/share/enigma2/%s/',
+       searchPaths = ('/usr/share/enigma2/%s/',

                                '/media/cf/%s/',
                                '/media/cf/%s/',

-                               '/media/usb/%s/']
+                               '/media/usb/%s/')

 
        def __init__(self):
                Renderer.__init__(self)
 
        def __init__(self):
                Renderer.__init__(self)


@@ -16,7 +16,7 @@ class Picon(Renderer):
                self.nameCache = { }
                self.pngname = ""
 
                self.nameCache = { }
                self.pngname = ""
 

-       def applySkin(self, desktop):
+       def applySkin(self, desktop, parent):

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


@@ -24,7 +24,7 @@ class Picon(Renderer):
                        else:
                                attribs.append((attrib,value))
                self.skinAttributes = attribs
                        else:
                                attribs.append((attrib,value))
                self.skinAttributes = attribs

-               return Renderer.applySkin(self, desktop)
+               return Renderer.applySkin(self, desktop, parent)

 
        GUI_WIDGET = ePixmap
 
 
        GUI_WIDGET = ePixmap
 


@@ -46,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)