X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/67b53c1cb06988394c35a6e965c99b72b67fe1be..408fdd74d146a53faa9bd63bede7ebf64643ced8:/skin.py diff --git a/skin.py b/skin.py old mode 100644 new mode 100755 index 07213915..064fd219 --- a/skin.py +++ b/skin.py @@ -1,15 +1,17 @@ -import xml.dom.minidom +from Tools.Profile import profile +profile("LOAD:ElementTree") +import xml.etree.cElementTree from os import path +profile("LOAD:enigma_skin") from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleManager, \ - loadPNG, addFont, gRGB, eWindowStyleSkinned - + addFont, gRGB, eWindowStyleSkinned from Components.config import ConfigSubsection, ConfigText, config from Components.Converter.Converter import Converter -from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS +from Components.Sources.Source import Source, ObsoleteSource +from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN, SCOPE_CONFIG, fileExists from Tools.Import import my_import - -from Tools.XMLTools import elementsWithTag, mergeText +from Tools.LoadPixmap import LoadPixmap colorNames = dict() @@ -23,18 +25,18 @@ def dump(x, i=0): class SkinError(Exception): def __init__(self, message): - self.message = message + self.msg = message def __str__(self): - return self.message + return "{%s}: %s" % (config.skin.primary_skin.value, self.msg) dom_skins = [ ] -def loadSkin(name): +def loadSkin(name, scope = SCOPE_SKIN): # read the skin - filename = resolveFilename(SCOPE_SKIN, name) + filename = resolveFilename(scope, name) mpath = path.dirname(filename) + "/" - dom_skins.append((mpath, xml.dom.minidom.parse(filename))) + dom_skins.append((mpath, xml.etree.cElementTree.parse(filename).getroot())) # we do our best to always select the "right" value # skins are loaded in order of priority: skin with @@ -50,86 +52,130 @@ def loadSkin(name): config.skin = ConfigSubsection() config.skin.primary_skin = ConfigText(default = "skin.xml") +profile("LoadSkin") +try: + loadSkin('skin_user.xml', SCOPE_CONFIG) +except (SkinError, IOError, AssertionError), err: + print "not loading user skin: ", err + try: loadSkin(config.skin.primary_skin.value) except (SkinError, IOError, AssertionError), err: print "SKIN ERROR:", err print "defaulting to standard skin..." + config.skin.primary_skin.value = 'skin.xml' loadSkin('skin.xml') + +profile("LoadSkinDefault") loadSkin('skin_default.xml') +profile("LoadSkinDefaultDone") + +def evalPos(pos, wsize, ssize, scale): + if pos == "center": + pos = (ssize - wsize) / 2 + else: + pos = int(pos) * scale[0] / scale[1] + return int(pos) -def parsePosition(str): +def parsePosition(str, scale, desktop = None, size = None): x, y = str.split(',') - return ePoint(int(x), int(y)) + + wsize = 1, 1 + ssize = 1, 1 + if desktop is not None: + ssize = desktop.size().width(), desktop.size().height() + if size is not None: + wsize = size.width(), size.height() + + x = evalPos(x, wsize[0], ssize[0], scale[0]) + y = evalPos(y, wsize[1], ssize[1], scale[1]) + + return ePoint(x, y) -def parseSize(str): +def parseSize(str, scale): x, y = str.split(',') - return eSize(int(x), int(y)) + return eSize(int(x) * scale[0][0] / scale[0][1], int(y) * scale[1][0] / scale[1][1]) -def parseFont(str): +def parseFont(str, scale): name, size = str.split(';') - return gFont(name, int(size)) + return gFont(name, int(size) * scale[0][0] / scale[0][1]) def parseColor(str): if str[0] != '#': try: return colorNames[str] except: - raise ("color '%s' must be #aarrggbb or valid named color" % (str)) + raise SkinError("color '%s' must be #aarrggbb or valid named color" % (str)) return gRGB(int(str[1:], 0x10)) def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]): # 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: localization? as in e1? - value = a.value.encode("utf-8") - - if attrib in ["pixmap", "pointer", "seek_pointer"]: + for a in node.items(): + #print a + attrib = a[0] + value = a[1] + + if attrib in ("pixmap", "pointer", "seek_pointer", "backgroundPixmap", "selectionPixmap"): value = resolveFilename(SCOPE_SKIN_IMAGE, value, path_prefix=skin_path_prefix) - - if attrib not in ignore: - skinAttributes.append((attrib, value)) -def loadPixmap(path): - ptr = loadPNG(path) + if attrib not in ignore: + skinAttributes.append((attrib, value.encode("utf-8"))) + +def loadPixmap(path, desktop): + cached = False + option = path.find("#") + if option != -1: + options = path[option+1:].split(',') + path = path[:option] + cached = "cached" in options + ptr = LoadPixmap(path, desktop, cached) if ptr is None: - raise "pixmap file %s not found!" % (path) + raise SkinError("pixmap file %s not found!" % (path)) return ptr -def applySingleAttribute(guiObject, desktop, attrib, value): +def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1))): # and set attributes try: if attrib == 'position': - guiObject.move(parsePosition(value)) + guiObject.move(parsePosition(value, scale, desktop, guiObject.csize())) elif attrib == 'size': - guiObject.resize(parseSize(value)) + guiObject.resize(parseSize(value, scale)) elif attrib == 'title': guiObject.setTitle(_(value)) elif attrib == 'text': guiObject.setText(_(value)) elif attrib == 'font': - guiObject.setFont(parseFont(value)) + guiObject.setFont(parseFont(value, scale)) elif attrib == 'zPosition': guiObject.setZPosition(int(value)) - elif attrib == "pixmap": - ptr = loadPixmap(value) # this should already have been filename-resolved. - desktop.makeCompatiblePixmap(ptr) - guiObject.setPixmap(ptr) + 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": + guiObject.setPixmap(ptr) + elif attrib == "backgroundPixmap": + guiObject.setBackgroundPicture(ptr) + elif attrib == "selectionPixmap": + guiObject.setSelectionPicture(ptr) # guiObject.setPixmapFromFile(value) elif attrib == "alphatest": # used by ePixmap guiObject.setAlphatest( - { "on": True, - "off": False + { "on": 1, + "off": 0, + "blend": 2, }[value]) + elif attrib == "scale": + guiObject.setScale(1) elif attrib == "orientation": # used by eSlider try: - guiObject.setOrientation( - { "orVertical": guiObject.orVertical, - "orHorizontal": guiObject.orHorizontal + guiObject.setOrientation(* + { "orVertical": (guiObject.orVertical, False), + "orTopToBottom": (guiObject.orVertical, False), + "orBottomToTop": (guiObject.orVertical, True), + "orHorizontal": (guiObject.orHorizontal, False), + "orLeftToRight": (guiObject.orHorizontal, False), + "orRightToLeft": (guiObject.orHorizontal, True), }[value]) except KeyError: print "oprientation must be either orVertical or orHorizontal!" @@ -162,8 +208,12 @@ def applySingleAttribute(guiObject, desktop, attrib, value): print "illegal flag %s!" % f elif attrib == "backgroundColor": guiObject.setBackgroundColor(parseColor(value)) + elif attrib == "backgroundColorSelected": + guiObject.setBackgroundColorSelected(parseColor(value)) elif attrib == "foregroundColor": guiObject.setForegroundColor(parseColor(value)) + elif attrib == "foregroundColorSelected": + guiObject.setForegroundColorSelected(parseColor(value)) elif attrib == "shadowColor": guiObject.setShadowColor(parseColor(value)) elif attrib == "selectionDisabled": @@ -184,84 +234,158 @@ def applySingleAttribute(guiObject, desktop, attrib, value): guiObject.setWrapAround(True) elif attrib == "pointer" or attrib == "seek_pointer": (name, pos) = value.split(':') - pos = parsePosition(pos) - ptr = loadPixmap(name) - desktop.makeCompatiblePixmap(ptr) + pos = parsePosition(pos, scale) + ptr = loadPixmap(name, desktop) guiObject.setPointer({"pointer": 0, "seek_pointer": 1}[attrib], ptr, pos) elif attrib == 'shadowOffset': - guiObject.setShadowOffset(parsePosition(value)) + guiObject.setShadowOffset(parsePosition(value, scale)) elif attrib == 'noWrap': guiObject.setNoWrap(1) else: - raise "unsupported attribute " + attrib + "=" + value + raise SkinError("unsupported attribute " + attrib + "=" + value) except int: # AttributeError: print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib) -def applyAllAttributes(guiObject, desktop, attributes): +def applyAllAttributes(guiObject, desktop, attributes, scale): for (attrib, value) in attributes: - applySingleAttribute(guiObject, desktop, attrib, value) + applySingleAttribute(guiObject, desktop, attrib, value, scale) -def loadSingleSkinData(desktop, dom_skin, path_prefix): +def loadSingleSkinData(desktop, skin, path_prefix): """loads skin data like colors, windowstyle etc.""" - - skin = dom_skin.childNodes[0] - assert skin.tagName == "skin", "root element in skin must be 'skin'!" - - for c in elementsWithTag(skin.childNodes, "colors"): - for color in elementsWithTag(c.childNodes, "color"): - name = str(color.getAttribute("name")) - color = str(color.getAttribute("value")) - - if not len(color): - raise ("need color and name, got %s %s" % (name, color)) - - colorNames[name] = parseColor(color) - - for c in elementsWithTag(skin.childNodes, "fonts"): - for font in elementsWithTag(c.childNodes, "font"): - filename = str(font.getAttribute("filename") or "") - name = str(font.getAttribute("name") or "Regular") - scale = int(font.getAttribute("scale") or "100") - is_replacement = font.getAttribute("replacement") != "" - addFont(resolveFilename(SCOPE_FONTS, filename, path_prefix=path_prefix), name, scale, is_replacement) - - for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"): + assert skin.tag == "skin", "root element in skin must be 'skin'!" + + #print "***SKIN: ", path_prefix + + for c in skin.findall("output"): + id = c.attrib.get('id') + if id: + id = int(id) + else: + id = 0 + if id == 0: # framebuffer + for res in c.findall("resolution"): + get_attr = res.attrib.get + xres = get_attr("xres") + if xres: + xres = int(xres) + else: + xres = 720 + yres = get_attr("yres") + if yres: + yres = int(yres) + else: + yres = 576 + bpp = get_attr("bpp") + if bpp: + bpp = int(bpp) + else: + bpp = 32 + #print "Resolution:", xres,yres,bpp + from enigma import gFBDC + gFBDC.getInstance().setResolution(xres, yres) + desktop.resize(eSize(xres, yres)) + if bpp != 32: + # load palette (not yet implemented) + pass + + for c in skin.findall("colors"): + for color in c.findall("color"): + get_attr = color.attrib.get + name = get_attr("name") + color = get_attr("value") + if name and color: + colorNames[name] = parseColor(color) + #print "Color:", name, color + else: + raise SkinError("need color and name, got %s %s" % (name, color)) + + for c in skin.findall("fonts"): + for font in c.findall("font"): + get_attr = font.attrib.get + filename = get_attr("filename", "") + name = get_attr("name", "Regular") + scale = get_attr("scale") + if scale: + scale = int(scale) + else: + scale = 100 + is_replacement = get_attr("replacement") and True or False + resolved_font = resolveFilename(SCOPE_FONTS, filename, path_prefix=path_prefix) + if not fileExists(resolved_font): #when font is not available look at current skin path + skin_path = resolveFilename(SCOPE_CURRENT_SKIN, filename) + if fileExists(skin_path): + resolved_font = skin_path + addFont(resolved_font, name, scale, is_replacement) + #print "Font: ", resolved_font, name, scale, is_replacement + + for c in skin.findall("subtitles"): + from enigma import eWidget, eSubtitleWidget + scale = ((1,1),(1,1)) + for substyle in c.findall("sub"): + get_attr = substyle.attrib.get + font = parseFont(get_attr("font"), scale) + col = get_attr("foregroundColor") + if col: + foregroundColor = parseColor(col) + haveColor = 1 + else: + foregroundColor = gRGB(0xFFFFFF) + haveColor = 0 + col = get_attr("shadowColor") + if col: + shadowColor = parseColor(col) + else: + shadowColor = gRGB(0) + shadowOffset = parsePosition(get_attr("shadowOffset"), scale) + face = eSubtitleWidget.__dict__[get_attr("name")] + eSubtitleWidget.setFontStyle(face, font, haveColor, foregroundColor, shadowColor, shadowOffset) + + for windowstyle in skin.findall("windowstyle"): style = eWindowStyleSkinned() - id = int(windowstyle.getAttribute("id") or "0") - + id = windowstyle.attrib.get("id") + if id: + id = int(id) + else: + id = 0 + #print "windowstyle:", id + # 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"))) + + for title in windowstyle.findall("title"): + get_attr = title.attrib.get + offset = parseSize(get_attr("offset"), ((1,1),(1,1))) + font = parseFont(get_attr("font"), ((1,1),(1,1))) style.setTitleFont(font); style.setTitleOffset(offset) - - for borderset in elementsWithTag(windowstyle.childNodes, "borderset"): - bsName = str(borderset.getAttribute("name")) - for pixmap in elementsWithTag(borderset.childNodes, "pixmap"): - bpName = str(pixmap.getAttribute("pos")) - filename = str(pixmap.getAttribute("filename")) - - png = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, filename, path_prefix=path_prefix)) - - # adapt palette - desktop.makeCompatiblePixmap(png) - style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png) - - for color in elementsWithTag(windowstyle.childNodes, "color"): - type = str(color.getAttribute("name")) - color = parseColor(color.getAttribute("color")) - + #print " ", font, offset + + for borderset in windowstyle.findall("borderset"): + bsName = str(borderset.attrib.get("name")) + for pixmap in borderset.findall("pixmap"): + get_attr = pixmap.attrib.get + bpName = get_attr("pos") + filename = get_attr("filename") + if filename and bpName: + png = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, filename, path_prefix=path_prefix), desktop) + style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png) + #print " borderset:", bpName, filename + + for color in windowstyle.findall("color"): + get_attr = color.attrib.get + colorType = get_attr("name") + color = parseColor(get_attr("color")) try: - style.setColor(eWindowStyleSkinned.__dict__["col" + type], color) + style.setColor(eWindowStyleSkinned.__dict__["col" + colorType], color) except: - raise ("Unknown color %s" % (type)) - + raise SkinError("Unknown color %s" % (colorType)) + #pass + + #print " color:", type, color + x = eWindowStyleManager.getInstance() x.setStyle(id, style) @@ -272,52 +396,71 @@ def loadSkinData(desktop): loadSingleSkinData(desktop, dom_skin, path) def lookupScreen(name): - for (path, dom_skin) in dom_skins: + for (path, 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: + for x in skin.findall("screen"): + if x.attrib.get('name', '') == name: return x, path return None, None -def readSkin(screen, skin, name, desktop): - - myscreen, path = lookupScreen(name) - +class additionalWidget: + pass + +def readSkin(screen, skin, names, desktop): + if not isinstance(names, list): + names = [names] + + name = "" % screen.__class__.__name__ + + # try all skins, first existing one have priority + for n in names: + myscreen, path = lookupScreen(n) + if myscreen is not None: + # use this name for debug output + name = n + break + # otherwise try embedded skin - myscreen = myscreen or getattr(screen, "parsedSkin", None) - + if myscreen is None: + myscreen = getattr(screen, "parsedSkin", None) + # try uncompiled embedded skin if myscreen is None and getattr(screen, "skin", None): - myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0] - - assert myscreen is not None, "no skin for screen '" + name + "' found!" + print "Looking for embedded skin" + myscreen = screen.parsedSkin = xml.etree.cElementTree.fromstring(screen.skin) + + #assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!" + if myscreen is None: + print "No skin to read..." + emptySkin = "" + myscreen = screen.parsedSkin = xml.etree.cElementTree.fromstring(emptySkin) screen.skinAttributes = [ ] - + skin_path_prefix = getattr(screen, "skin_path", path) collectAttributes(screen.skinAttributes, myscreen, skin_path_prefix, ignore=["name"]) - + screen.additionalWidgets = [ ] screen.renderer = [ ] - + visited_components = set() - + # now walk all widgets - for widget in elementsWithTag(myscreen.childNodes, "widget"): - # ok, we either have 1:1-mapped widgets ('old style'), or 1:n-mapped + for widget in myscreen.findall("widget"): + get_attr = widget.attrib.get + # ok, we either have 1:1-mapped widgets ('old style'), or 1:n-mapped # widgets (source->renderer). - wname = widget.getAttribute('name') - wsource = widget.getAttribute('source') - + wname = get_attr('name') + wsource = get_attr('source') if wname is None and wsource is None: print "widget has no name and no source!" continue - + if wname: + #print "Widget name=", wname visited_components.add(wname) # get corresponding 'gui' object @@ -325,6 +468,7 @@ def readSkin(screen, skin, name, desktop): attributes = screen[wname].skinAttributes = [ ] except: raise SkinError("component with name '" + wname + "' was not found in skin of screen '" + name + "'!") + #print "WARNING: component with name '" + wname + "' was not found in skin of screen '" + name + "'!" # assert screen[wname] is not Source @@ -332,23 +476,59 @@ def readSkin(screen, skin, name, desktop): collectAttributes(attributes, widget, skin_path_prefix, ignore=['name']) elif wsource: # get corresponding source - source = screen.get(wsource) + #print "Widget source=", wsource + + while True: # until we found a non-obsolete source + + # parse our current "wsource", which might specifiy a "related screen" before the dot, + # for example to reference a parent, global or session-global screen. + scr = screen + + # resolve all path components + path = wsource.split('.') + while len(path) > 1: + scr = screen.getRelatedScreen(path[0]) + if scr is None: + #print wsource + #print name + raise SkinError("specified related screen '" + wsource + "' was not found in screen '" + name + "'!") + path = path[1:] + + # resolve the source. + source = scr.get(path[0]) + if isinstance(source, ObsoleteSource): + # however, if we found an "obsolete source", issue warning, and resolve the real source. + print "WARNING: SKIN '%s' USES OBSOLETE SOURCE '%s', USE '%s' INSTEAD!" % (name, wsource, source.new_source) + print "OBSOLETE SOURCE WILL BE REMOVED %s, PLEASE UPDATE!" % (source.removal_date) + if source.description: + print source.description + + wsource = source.new_source + else: + # otherwise, use that source. + break + if source is None: raise SkinError("source '" + wsource + "' was not found in screen '" + name + "'!") - - wrender = widget.getAttribute('render') - + + wrender = get_attr('render') + if not wrender: raise SkinError("you must define a renderer with render= for source '%s'" % (wsource)) - - for converter in elementsWithTag(widget.childNodes, "convert"): - ctype = converter.getAttribute('type') + + for converter in widget.findall("convert"): + ctype = converter.get('type') assert ctype, "'convert'-tag needs a 'type'-attribute" - parms = mergeText(converter.childNodes).strip() - converter_class = my_import('.'.join(["Components", "Converter", ctype])).__dict__.get(ctype) - + #print "Converter:", ctype + try: + parms = converter.text.strip() + except: + parms = "" + #print "Params:", parms + converter_class = my_import('.'.join(("Components", "Converter", ctype))).__dict__.get(ctype) + c = None - + for i in source.downstream_elements: if isinstance(i, converter_class) and i.converter_arguments == parms: c = i @@ -358,55 +538,65 @@ def readSkin(screen, skin, name, desktop): c = converter_class(parms) c.connect(source) else: - print "reused conveter!" - + print "reused converter!" + source = c - - renderer_class = my_import('.'.join(["Components", "Renderer", wrender])).__dict__.get(wrender) - + + renderer_class = my_import('.'.join(("Components", "Renderer", wrender))).__dict__.get(wrender) + renderer = renderer_class() # instantiate renderer - + renderer.connect(source) # connect to source attributes = renderer.skinAttributes = [ ] collectAttributes(attributes, widget, skin_path_prefix, ignore=['render', 'source']) - + screen.renderer.append(renderer) from Components.GUIComponent import GUIComponent nonvisited_components = [x for x in set(screen.keys()) - visited_components if isinstance(x, GUIComponent)] - assert not nonvisited_components, "the following components in %s don't have a skin entry: %s" % (name, ', '.join(nonvisited_components)) # now walk additional objects - for widget in elementsWithTag(myscreen.childNodes, lambda x: x != "widget"): - if widget.tagName == "applet": - codeText = mergeText(widget.childNodes).strip() - type = widget.getAttribute('type') + for widget in myscreen.getchildren(): + w_tag = widget.tag + + if w_tag == "widget": + continue + + if w_tag == "applet": + try: + codeText = widget.text.strip() + except: + codeText = "" + + #print "Found code:" + #print codeText + widgetType = widget.attrib.get('type') code = compile(codeText, "skin applet", "exec") - - if type == "onLayoutFinish": + + if widgetType == "onLayoutFinish": screen.onLayoutFinish.append(code) + #print "onLayoutFinish = ", codeText else: - raise SkinError("applet type '%s' unknown!" % type) - + raise SkinError("applet type '%s' unknown!" % widgetType) + #print "applet type '%s' unknown!" % type + continue - - class additionalWidget: - pass - + w = additionalWidget() - - if widget.tagName == "eLabel": + + if w_tag == "eLabel": w.widget = eLabel - elif widget.tagName == "ePixmap": + elif w_tag == "ePixmap": w.widget = ePixmap else: - raise SkinError("unsupported stuff : %s" % widget.tagName) - + raise SkinError("unsupported stuff : %s" % w_tag) + #print "unsupported stuff : %s" % widget.tag + w.skinAttributes = [ ] collectAttributes(w.skinAttributes, widget, skin_path_prefix, ignore=['name']) - + # applyAttributes(guiObject, widget, desktop) # guiObject.thisown = 0 screen.additionalWidgets.append(w)