Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions lib/python/Components/Renderer/Picon.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,24 +106,15 @@ def getPiconName(serviceRef):
class Picon(Renderer):
def __init__(self):
Renderer.__init__(self)
self.pngname = None
self.defaultpngname = resolveFilename(SCOPE_CURRENT_SKIN, "picon_default.png")
self.usePicLoad = False
self.PicLoad = ePicLoad()
self.PicLoad.PictureData.get().append(self.updatePicon)
self.piconsize = (0, 0)
self.pngname = ""
self.service_text = ""
self.lastPath = None
pngname = findPicon("picon_default")
self.defaultpngname = None
self.showPicon = True
if not pngname:
tmp = resolveFilename(SCOPE_CURRENT_SKIN, "picon_default.png")
if pathExists(tmp):
pngname = tmp
else:
pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/picon_default.png")
if os.path.getsize(pngname):
self.defaultpngname = pngname

def addPath(self, value):
if pathExists(value):
Expand Down Expand Up @@ -172,7 +163,7 @@ def changed(self, what):
if self.visible:
self.instance.hide()
return
if not pngname: # no picon for service found
if not pngname: # no picon for service found
pngname = self.defaultpngname
if self.pngname != pngname:
if pngname:
Expand Down