## Picon renderer by Gruffy .. some speedups by Ghost
##
from Renderer import Renderer
-from enigma import ePixmap
-from Components.config import config
-from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, resolveFilename
+from enigma import ePixmap, eEnv
+from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, SCOPE_CURRENT_SKIN, resolveFilename
class Picon(Renderer):
- searchPaths = ['/usr/share/enigma2/%s/',
+ searchPaths = (eEnv.resolve('${datadir}/enigma2/%s/'),
'/media/cf/%s/',
- '/media/usb/%s/']
+ '/media/usb/%s/')
def __init__(self):
Renderer.__init__(self)
self.nameCache = { }
self.pngname = ""
- def applySkin(self, desktop):
+ def applySkin(self, desktop, parent):
attribs = [ ]
for (attrib, value) in self.skinAttributes:
if attrib == "path":
else:
attribs.append((attrib,value))
self.skinAttributes = attribs
- return Renderer.applySkin(self, desktop)
+ return Renderer.applySkin(self, desktop, parent)
GUI_WIDGET = ePixmap
if pngname == "": # no default yet in cache..
pngname = self.findPicon("picon_default")
if pngname == "":
- pos = config.skin.primary_skin.value.rfind('/')
- if pos != -1:
- str = config.skin.primary_skin.value[:pos+1]
- str += 'picon_default.png'
- if fileExists(str):
- pngname = str
- if pngname == "": # Fallback to enigma2 logo
- pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/enigma2.png")
+ 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)