Converter/ValueToPixmap.py, Renderer/Pixmap.py: use cache for LoadPixmap inside Value...

diff --git a/lib/python/Components/Converter/ValueToPixmap.py b/lib/python/Components/Converter/ValueToPixmap.py
index 2ab695adf56a8e67578a8cdecfdb0699f06b7a99..ed9f770029cb2821d2c64154688081b11d53f180 100644 (file)
--- a/lib/python/Components/Converter/ValueToPixmap.py
+++ b/lib/python/Components/Converter/ValueToPixmap.py
@@ -24,11 +24,11 @@ class ValueToPixmap(Converter, object):
                        if val in (None, ""):
                                return None
                if self.type == self.PATH:
-                       return LoadPixmap(val)
+                       return LoadPixmap(cached=True, path=val)
                if self.type == self.LANGUAGE_CODE:
-                       png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + val[3:].lower() + ".png"))
+                       png = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + val[3:].lower() + ".png"))
                        if png == None:
-                               png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png"))
+                               png = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png"))
                        return png
                return None                     
        

diff --git a/lib/python/Components/Renderer/Pixmap.py b/lib/python/Components/Renderer/Pixmap.py
index d67cd559712235e82373ceac1d6630385c619c66..7c6b57959b043b906bd964921889542e6c71a678 100644 (file)
--- a/lib/python/Components/Renderer/Pixmap.py
+++ b/lib/python/Components/Renderer/Pixmap.py
@@ -3,4 +3,17 @@ from Renderer import Renderer
 from enigma import ePixmap
 
 class Pixmap(Renderer):
+       def __init__(self):
+               Renderer.__init__(self)
+
        GUI_WIDGET = ePixmap
+
+       def postWidgetCreate(self, instance):
+               self.changed((self.CHANGED_DEFAULT,))
+
+       def changed(self, what):
+               if what[0] != self.CHANGED_CLEAR:
+                       if self.source and hasattr(self.source, "pixmap"):
+                               if self.instance:
+                                       self.instance.setPixmap(self.source.pixmap)
+