X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d26dbdee8fb2a5ca6fa87878d9daffaf7d3575a8..3c3f41b61d54bae81e0f6ccea40e9d8dbe3a4337:/skin.py diff --git a/skin.py b/skin.py index a4d43f24..c16d998c 100644 --- 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(',') @@ -40,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': @@ -69,9 +82,9 @@ def applySingleAttribute(guiObject, desktop, attrib, value): elif attrib == 'zPosition': guiObject.setZPosition(int(value)) elif attrib == "pixmap": - ptr = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, value)) + 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 @@ -118,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": @@ -137,11 +152,13 @@ def applySingleAttribute(guiObject, desktop, attrib, value): elif attrib == "pointer": (name, pos) = value.split(':') pos = parsePosition(pos) - ptr = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, name)) + ptr = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, name)) desktop.makeCompatiblePixmap(ptr.__deref__()) 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) @@ -150,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'!" @@ -169,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")) @@ -178,7 +203,7 @@ def loadSkin(desktop): bpName = str(pixmap.getAttribute("pos")) filename = str(pixmap.getAttribute("filename")) - png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, filename)) + png = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, filename)) # adapt palette desktop.makeCompatiblePixmap(png.__deref__()) @@ -197,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) @@ -228,7 +248,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 = [ ] @@ -245,7 +268,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"): @@ -275,7 +298,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