remove debug

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 5327d66c71f7d5edb729c54f58a96f7d7d08c518..c16d998c25e6772802ef083aea69c2cb117eba60 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -16,9 +16,14 @@ def dump(x, i=0):
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE
 
-# read the skin
-dom_skin = xml.dom.minidom.parse(resolveFilename(SCOPE_SKIN, 'skin.xml'))
-dom_skin_default = xml.dom.minidom.parse(resolveFilename(SCOPE_SKIN, 'skin_default.xml'))
+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(',')
@@ -79,7 +84,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                elif attrib == "pixmap":
                        ptr = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, value))
                        # that __deref__ still scares me!
-                       desktop.makeCompatiblePixmap(ptr.__deref__())
+#                      desktop.makeCompatiblePixmap(ptr.__deref__())
                        guiObject.setPixmap(ptr.__deref__())
                        # guiObject.setPixmapFromFile(value)
                elif attrib == "alphatest": # used by ePixmap
@@ -126,6 +131,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                        guiObject.setBackgroundColor(parseColor(value))
                elif attrib == "foregroundColor":
                        guiObject.setForegroundColor(parseColor(value))
+               elif attrib == "shadowColor":
+                       guiObject.setShadowColor(parseColor(value))
                elif attrib == "selectionDisabled":
                        guiObject.setSelectionEnable(0)
                elif attrib == "transparent":
@@ -150,6 +157,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                        guiObject.setPointer(ptr.__deref__(), pos)
                elif attrib != 'name':
                        print "unsupported attribute " + attrib + "=" + value
+               elif attrib == 'shadowOffset':
+                       guiObject.setShadowOffset(parsePosition(value))
        except int:
 # AttributeError:
                print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
@@ -158,8 +167,8 @@ 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_skin.childNodes[0]
        assert skin.tagName == "skin", "root element in skin must be 'skin'!"
@@ -177,8 +186,16 @@ def loadSkin(desktop):
        for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
                style = eWindowStyleSkinned()
                
-               style.setTitleFont(gFont("Regular", 20));
-               style.setTitleOffset(eSize(20, 5));
+               # defaults
+               font = gFont("Regular", 20)
+               offset = eSize(20, 5)
+               
+               for title in elementsWithTag(windowstyle.childNodes, "title"):
+                       offset = parseSize(title.getAttribute("offset"))
+                       font = parseFont(str(title.getAttribute("font")))
+
+               style.setTitleFont(font);
+               style.setTitleOffset(offset)
                
                for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):
                        bsName = str(borderset.getAttribute("name"))
@@ -205,26 +222,21 @@ def loadSkin(desktop):
                eWindowStyleManager.getInstance(x)
                x.setStyle(style)
 
-def readSkin(screen, skin, name, desktop):
-       myscreen = None
-       
-       # first, find the corresponding screen element
-       skin = dom_skin.childNodes[0] 
-       skin_default = dom_skin_default.childNodes[0]
-       
-       for x in elementsWithTag(skin.childNodes, "screen"):
-               if x.getAttribute('name') == name:
-                       myscreen = x
-                       break
-       
-       # if not found, check default skin      
-       if myscreen is None:
-               for x in elementsWithTag(skin_default.childNodes, "screen"):
+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:
-                               myscreen = x
-                               break
+                               return x
+       return None
 
-       del skin, skin_default
+def readSkin(screen, skin, name, desktop):
+       myscreen = lookupScreen(name)
        
        # otherwise try embedded skin
        myscreen = myscreen or getattr(screen, "parsedSkin", None)