X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FRenderer%2FPicon.py;h=6d97341d08f02f981540fe889a21a4897e848003;hb=bd2e4390946cda853f8d295b76d491d2d60bbe4a;hp=117e08dddcef08dd4bb3f6d65f8675b792223ae5;hpb=811afbd21fa83b4000e85a6b2b9f180356ac78ee;p=vuplus_dvbapp

diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py
index 117e08d..6d97341 100644
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -5,67 +5,59 @@ from Renderer import Renderer
 from enigma import ePixmap
 from Tools.Directories import pathExists, fileExists, SCOPE_SKIN_IMAGE, resolveFilename
 
-from time import time
-
 class Picon(Renderer):
-	visible = True
-	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)
+		self.path = "picon"
+		self.nameCache = { }
+		self.pngname = ""
+
+	def applySkin(self, desktop):
+		print "-> Picon, applySkin:", self.skinAttributes
+		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)
 
 	GUI_WIDGET = ePixmap
 
 	def changed(self, what):
+		print "PICON: path=%s" % self.path
 		if self.instance:
 			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
-			if pngname != "":
-				if self.pngname != pngname:
-					self.instance.setPixmapFromFile(pngname)
-					if not self.visible:
-						self.instance.show()
-						self.visible=True
-			elif self.visible:
-				self.instance.hide()
-				self.visible = False
-			self.pngname = pngname
+			if self.pngname != pngname:
+				self.instance.setPixmapFromFile(pngname)
+				self.pngname = pngname
 
 	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 ""
-
-	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 ""