use _ as separator instead of : for picon filenames

[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..a9c36f2b124ae3730d0dcbc90d8b54f22ac6e288 100644 (file)
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -8,7 +8,7 @@ from Tools.Directories import pathExists, fileExists, SCOPE_SKIN_IMAGE, resolveF
 class Picon(Renderer):
        pngname = ""
        nameCache = { }
-       searchPaths = ['/etc/picon/',
+       searchPaths = ['/usr/share/enigma2/picon/',
                                '/media/cf/picon/',
                                '/media/usb/picon/',
                                '/media/hdd/picon/']
@@ -23,18 +23,19 @@ class Picon(Renderer):
                        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.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 == "": # Fallback to enigma2 logo
                                                pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/enigma2.png")
                                        self.nameCache["default"] = pngname
@@ -44,18 +45,7 @@ class Picon(Renderer):
 
        def findPicon(self, serviceName):
                for path in self.searchPaths:
-                       if pathExists(path):
-                               png = self.findFile(path, serviceName)
-                               if png != "":
-                                       return png
+                       pngname = path + serviceName + ".png"
+                       if fileExists(pngname):
+                               return pngname
                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 ""