move SYNC_PAINT define to right place

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 3497cc115f12d517a4c68857ea06c14e5f25bd72..da97b88a2949b4c520981aec506ca6bc33070181 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -14,13 +14,16 @@ def dump(x, i=0):
        except:
                None
 
-from Tools.Directories import resolveFilename, SCOPE_SKIN
+from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE
 
-# read the skin
-skinfile = file(resolveFilename(SCOPE_SKIN, 'skin.xml'), 'r')
-dom = xml.dom.minidom.parseString(skinfile.read())
-skinfile.close()
+dom_skins = [ ]
 
+def loadSkin(name):
+       # read the skin
+       dom_skins.append(xml.dom.minidom.parse(resolveFilename(SCOPE_SKIN, name)))
+
+loadSkin('skin.xml')
+loadSkin('skin_default.xml')
 
 def parsePosition(str):
        x, y = str.split(',')
@@ -42,20 +45,28 @@ def parseColor(str):
                        raise ("color '%s' must be #aarrggbb or valid named color" % (str))
        return gRGB(int(str[1:], 0x10))
 
-def collectAttributes(skinAttributes, node):
+def collectAttributes(skinAttributes, node, skin_path_prefix=None):
        # walk all attributes
        for p in range(node.attributes.length):
                a = node.attributes.item(p)
                
                # convert to string (was: unicode)
                attrib = str(a.name)
-               # TODO: proper UTF8 translation?! (for value)
                # TODO: localization? as in e1?
-               value = str(a.value)
+               value = a.value.encode("utf-8")
+               
+               if skin_path_prefix and attrib in ["pixmap", "pointer"] and len(value) and value[0:2] == "~/":
+                       value = skin_path_prefix + value[1:]
                
                skinAttributes.append((attrib, value))
 
-def applySingleAttribute(guiObject, desktop, attrib, value):           
+def loadPixmap(path):
+       ptr = loadPNG(path)
+       if ptr is None:
+               raise "pixmap file %s not found!" % (path)
+       return ptr
+
+def applySingleAttribute(guiObject, desktop, attrib, value):
        # and set attributes
        try:
                if attrib == 'position':
@@ -71,7 +82,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                elif attrib == 'zPosition':
                        guiObject.setZPosition(int(value))
                elif attrib == "pixmap":
-                       ptr = loadPNG(value)
+                       ptr = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, value))
                        # that __deref__ still scares me!
                        desktop.makeCompatiblePixmap(ptr.__deref__())
                        guiObject.setPixmap(ptr.__deref__())
@@ -139,7 +150,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                elif attrib == "pointer":
                        (name, pos) = value.split(':')
                        pos = parsePosition(pos)
-                       ptr = loadPNG(name)
+                       ptr = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, name))
                        desktop.makeCompatiblePixmap(ptr.__deref__())
                        guiObject.setPointer(ptr.__deref__(), pos)
                elif attrib != 'name':
@@ -152,10 +163,10 @@ def applyAllAttributes(guiObject, desktop, attributes):
        for (attrib, value) in attributes:
                applySingleAttribute(guiObject, desktop, attrib, value)
 
-def loadSkin(desktop):
-       print "loading skin..."
+def loadSingleSkinData(desktop, dom_skin):
+       """loads skin data like colors, windowstyle etc."""
        
-       skin = dom.childNodes[0]
+       skin = dom_skin.childNodes[0]
        assert skin.tagName == "skin", "root element in skin must be 'skin'!"
        
        for c in elementsWithTag(skin.childNodes, "colors"):
@@ -180,7 +191,7 @@ def loadSkin(desktop):
                                bpName = str(pixmap.getAttribute("pos"))
                                filename = str(pixmap.getAttribute("filename"))
                                
-                               png = loadPNG(filename)
+                               png = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, filename))
                                
                                # adapt palette
                                desktop.makeCompatiblePixmap(png.__deref__())
@@ -199,18 +210,23 @@ def loadSkin(desktop):
                eWindowStyleManager.getInstance(x)
                x.setStyle(style)
 
+def loadSkinData(desktop):
+       for dom_skin in dom_skins:
+               loadSingleSkinData(desktop, dom_skin)
+
+def lookupScreen(name):
+       for dom_skin in dom_skins:
+               # first, find the corresponding screen element
+               skin = dom_skin.childNodes[0] 
+               for x in elementsWithTag(skin.childNodes, "screen"):
+                       if x.getAttribute('name') == name:
+                               return x
+       return None
+
 def readSkin(screen, skin, name, desktop):
-       myscreen = None
+       myscreen = lookupScreen(name)
        
-       # first, find the corresponding screen element
-       skin = dom.childNodes[0]
-       
-       for x in elementsWithTag(skin.childNodes, "screen"):
-               if x.getAttribute('name') == name:
-                       myscreen = x
-       del skin
-       
-       # try embedded skin
+       # otherwise try embedded skin
        myscreen = myscreen or getattr(screen, "parsedSkin", None)
        
        # try uncompiled embedded skin
@@ -220,7 +236,10 @@ def readSkin(screen, skin, name, desktop):
        assert myscreen is not None, "no skin for screen '" + name + "' found!"
 
        screen.skinAttributes = [ ]
-       collectAttributes(screen.skinAttributes, myscreen)
+       
+       skin_path_prefix = getattr(screen, "skin_path", None)
+
+       collectAttributes(screen.skinAttributes, myscreen, skin_path_prefix)
        
        screen.additionalWidgets = [ ]
        
@@ -237,7 +256,7 @@ def readSkin(screen, skin, name, desktop):
                except:
                        raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
                
-               collectAttributes(attributes, widget)
+               collectAttributes(attributes, widget, skin_path_prefix)
 
        # now walk additional objects
        for widget in elementsWithTag(myscreen.childNodes, lambda x: x != "widget"):
@@ -267,7 +286,7 @@ def readSkin(screen, skin, name, desktop):
                        raise str("unsupported stuff : %s" % widget.tagName)
                
                w.skinAttributes = [ ]
-               collectAttributes(w.skinAttributes, widget)
+               collectAttributes(w.skinAttributes, widget, skin_path_prefix)
                
                # applyAttributes(guiObject, widget, desktop)
                # guiObject.thisown = 0