diff options
| -rw-r--r-- | data/skin.xml | 2 | ||||
| -rw-r--r-- | lib/python/Components/Renderer/Picon.py | 25 |
2 files changed, 9 insertions, 18 deletions
diff --git a/data/skin.xml b/data/skin.xml index df8e3270..3e98dc54 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -103,7 +103,7 @@ </widget> <!-- Channellogo (Picon) --> <widget source="CurrentService" render="Picon" position="47,2" zPosition="2" size="74,57" > - <convert type="ServiceName">Name</convert> + <convert type="ServiceName">Reference</convert> </widget> <!-- Service name --> <widget source="CurrentService" render="Label" position="130,30" size="360,27" font="Regular;21" valign="center" halign="right" noWrap="1" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" > diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py index 32c777f5..060337af 100644 --- a/lib/python/Components/Renderer/Picon.py +++ b/lib/python/Components/Renderer/Picon.py @@ -23,12 +23,14 @@ 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(':') pngname = self.nameCache.get(sname, "") if pngname == "": pngname = self.findPicon(self.source.text) - if pngname == "": - self.nameCache[sname] = pngname - else: + if pngname != "": self.nameCache[sname] = pngname if pngname == "": # no picon for service found pngname = self.nameCache.get("default", "") @@ -44,18 +46,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 "" |