get the file for the BlinkingPixmap from skin.xml

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index f31d637bb8a15ff43b31ccb54c2669f893f502bf..dc78c1980b952c8e83baa9ee2b0c53916eb12ace 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -66,11 +66,13 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                elif attrib == 'size':
                        guiObject.resize(parseSize(value))
                elif attrib == 'title':
-                       guiObject.setTitle(value)
+                       guiObject.setTitle(_(value))
                elif attrib == 'text':
                        guiObject.setText(value)
                elif attrib == 'font':
                        guiObject.setFont(parseFont(value))
+               elif attrib == 'zPosition':
+                       guiObject.setZPosition(int(value))
                elif attrib == "pixmap":
                        ptr = gPixmapPtr()
                        if loadPNG(ptr, value):
@@ -154,8 +156,8 @@ def loadSkin(desktop):
        for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
                style = eWindowStyleSkinned()
                
-               style.setTitleFont(gFont("Arial", 13));
-               style.setTitleOffset(eSize(3, 3));
+               style.setTitleFont(gFont("Arial", 20));
+               style.setTitleOffset(eSize(20, 5));
                
                for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):
                        bsName = str(borderset.getAttribute("name"))
@@ -193,7 +195,15 @@ def readSkin(screen, skin, name, desktop):
                        myscreen = x
        del skin
        
-       assert myscreen != None, "no skin for screen '" + name + "' found!"
+       if myscreen is None:
+               # try embedded skin
+               print screen.__dict__
+               if "parsedSkin" in screen.__dict__:
+                       myscreen = screen.parsedSkin
+               elif "skin" in screen.__dict__:
+                       myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0]
+       
+       assert myscreen is not None, "no skin for screen '" + name + "' found!"
 
        screen.skinAttributes = [ ]
        collectAttributes(screen.skinAttributes, myscreen)