WirelessLan/plugin.py: * use dict to store already found entries. This avoids increas...

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
old mode 100644 (file)
new mode 100755 (executable)
index 5fcaa11..064fd21
--- a/skin.py
+++ b/skin.py
@@ -28,7 +28,7 @@ class SkinError(Exception):
                self.msg = message
 
        def __str__(self):
-               return "{%s}: %s" % (config.skin.primary_skin, self.msg)
+               return "{%s}: %s" % (config.skin.primary_skin.value, self.msg)
 
 dom_skins = [ ]
 
@@ -119,7 +119,7 @@ def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]):
                        value = resolveFilename(SCOPE_SKIN_IMAGE, value, path_prefix=skin_path_prefix)
 
                if attrib not in ignore:
-                       skinAttributes.append((attrib, value))
+                       skinAttributes.append((attrib, value.encode("utf-8")))
 
 def loadPixmap(path, desktop):
        cached = False
@@ -148,6 +148,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1)
                        guiObject.setFont(parseFont(value, scale))
                elif attrib == 'zPosition':
                        guiObject.setZPosition(int(value))
+               elif attrib == 'itemHeight':
+                       guiObject.setItemHeight(int(value))
                elif attrib in ("pixmap", "backgroundPixmap", "selectionPixmap"):
                        ptr = loadPixmap(value, desktop) # this should already have been filename-resolved.
                        if attrib == "pixmap":