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 32c777f555256a1371766b25ad02642548e06f2b..5ae43ed8b80fab4c3aa70e3cb00381e5166ba25a 100644 (file)
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -3,18 +3,28 @@
 ##
 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):

-       pngname = ""
-       nameCache = { }
-       searchPaths = ['/etc/picon/',
-                               '/media/cf/picon/',
-                               '/media/usb/picon/',
-                               '/media/hdd/picon/']
+       searchPaths = ('/usr/share/enigma2/%s/',
+                               '/media/cf/%s/',
+                               '/media/usb/%s/')

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

+               self.path = "picon"
+               self.nameCache = { }
+               self.pngname = ""
+
+       def applySkin(self, desktop, parent):
+               attribs = [ ]
+               for (attrib, value) in self.skinAttributes:
+                       if attrib == "path":
+                               self.path = value
+                       else:
+                               attribs.append((attrib,value))
+               self.skinAttributes = attribs
+               return Renderer.applySkin(self, desktop, parent)

 
        GUI_WIDGET = ePixmap
 
 
        GUI_WIDGET = ePixmap
 


@@ -23,20 +33,25 @@ class Picon(Renderer):
                        pngname = ""
                        if what[0] != self.CHANGED_CLEAR:
                                sname = self.source.text
                        pngname = ""
                        if what[0] != self.CHANGED_CLEAR:
                                sname = self.source.text

+                               # strip all after last :
+                               pos = sname.rfind(':')
+                               if pos != -1:
+                                       sname = sname[:pos].rstrip(':').replace(':','_')

                                pngname = self.nameCache.get(sname, "")
                                if pngname == "":
                                pngname = self.nameCache.get(sname, "")
                                if pngname == "":

-                                       pngname = self.findPicon(self.source.text)
-                                       if pngname == "":
-                                               self.nameCache[sname] = pngname
-                                       else:
+                                       pngname = self.findPicon(sname)
+                                       if pngname != "":

                                                self.nameCache[sname] = pngname
                        if pngname == "": # no picon for service found
                                pngname = self.nameCache.get("default", "")
                                if pngname == "": # no default yet in cache..
                                        pngname = self.findPicon("picon_default")
                                                self.nameCache[sname] = pngname
                        if pngname == "": # no picon for service found
                                pngname = self.nameCache.get("default", "")
                                if pngname == "": # no default yet in cache..
                                        pngname = self.findPicon("picon_default")

-                                       self.nameCache[sname] = pngname
-                                       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)


@@ -44,18 +59,7 @@ class Picon(Renderer):
 
        def findPicon(self, serviceName):
                for path in self.searchPaths:
 
        def findPicon(self, serviceName):
                for path in self.searchPaths:

-                       if pathExists(path):
-                               png = self.findFile(path, serviceName)
-                               if png != "":
-                                       return png
+                       pngname = (path % self.path) + serviceName + ".png"
+                       if fileExists(pngname):
+                               return pngname

                return ""
                return ""

-
-       def findFile(self, path, serviceName):
-               pngname = path + serviceName + ".png"
-               if fileExists(pngname):
-                       return pngname
-               else:
-                       for i in range(len(serviceName), 1, -1):
-                               if fileExists(path + serviceName[0:i] + ".png"):
-                                       return path + serviceName[0:i] + ".png"
-                       return ""