X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/561106bf1068ed021a9a45f124ec1a65464a1f1a..22a96623971e3634e7030b110f57315c21214a1d:/skin.py diff --git a/skin.py b/skin.py index 608e8a91..5fcaa110 100644 --- a/skin.py +++ b/skin.py @@ -1,4 +1,4 @@ -from Tools.Profile import profile, profile_final +from Tools.Profile import profile profile("LOAD:ElementTree") import xml.etree.cElementTree from os import path @@ -6,16 +6,13 @@ from os import path profile("LOAD:enigma_skin") from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleManager, \ addFont, gRGB, eWindowStyleSkinned - from Components.config import ConfigSubsection, ConfigText, config from Components.Converter.Converter import Converter from Components.Sources.Source import Source, ObsoleteSource -from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN, fileExists +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.LoadPixmap import LoadPixmap -from Tools.XMLTools import elementsWithTag, mergeText - colorNames = dict() def dump(x, i=0): @@ -28,16 +25,16 @@ 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, 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.etree.cElementTree.parse(filename).getroot())) @@ -56,6 +53,11 @@ 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: @@ -68,17 +70,35 @@ profile("LoadSkinDefault") loadSkin('skin_default.xml') profile("LoadSkinDefaultDone") -def parsePosition(str): +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, 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] != '#': @@ -95,7 +115,7 @@ def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]): attrib = a[0] value = a[1] - if attrib in ["pixmap", "pointer", "seek_pointer", "backgroundPixmap", "selectionPixmap"]: + 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: @@ -113,22 +133,22 @@ def loadPixmap(path, desktop): 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 in ["pixmap", "backgroundPixmap", "selectionPixmap"]: + elif attrib in ("pixmap", "backgroundPixmap", "selectionPixmap"): ptr = loadPixmap(value, desktop) # this should already have been filename-resolved. if attrib == "pixmap": guiObject.setPixmap(ptr) @@ -143,11 +163,17 @@ def applySingleAttribute(guiObject, desktop, attrib, value): "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!" @@ -206,11 +232,11 @@ def applySingleAttribute(guiObject, desktop, attrib, value): guiObject.setWrapAround(True) elif attrib == "pointer" or attrib == "seek_pointer": (name, pos) = value.split(':') - pos = parsePosition(pos) + 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: @@ -219,9 +245,9 @@ def applySingleAttribute(guiObject, desktop, attrib, value): # 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, skin, path_prefix): """loads skin data like colors, windowstyle etc.""" @@ -229,15 +255,15 @@ def loadSingleSkinData(desktop, skin, path_prefix): #print "***SKIN: ", path_prefix - for c in skin.getiterator("output"): - id = c.get('id') + 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 = c.attrib.get + get_attr = res.attrib.get xres = get_attr("xres") if xres: xres = int(xres) @@ -255,25 +281,24 @@ def loadSingleSkinData(desktop, skin, path_prefix): bpp = 32 #print "Resolution:", xres,yres,bpp from enigma import gFBDC - i = gFBDC.getInstance() - i.setResolution(xres, yres) + gFBDC.getInstance().setResolution(xres, yres) + desktop.resize(eSize(xres, yres)) if bpp != 32: # load palette (not yet implemented) pass - for c in skin.getiterator("colors"): + 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 ("need color and name, got %s %s" % (name, color)) + raise SkinError("need color and name, got %s %s" % (name, color)) - for c in skin.getiterator("fonts"): + for c in skin.findall("fonts"): for font in c.findall("font"): get_attr = font.attrib.get filename = get_attr("filename", "") @@ -292,7 +317,29 @@ def loadSingleSkinData(desktop, skin, path_prefix): addFont(resolved_font, name, scale, is_replacement) #print "Font: ", resolved_font, name, scale, is_replacement - for windowstyle in skin.getiterator("windowstyle"): + 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 = windowstyle.attrib.get("id") if id: @@ -307,15 +354,15 @@ def loadSingleSkinData(desktop, skin, path_prefix): for title in windowstyle.findall("title"): get_attr = title.attrib.get - offset = parseSize(get_attr("offset")) - font = parseFont(get_attr("font")) + offset = parseSize(get_attr("offset"), ((1,1),(1,1))) + font = parseFont(get_attr("font"), ((1,1),(1,1))) style.setTitleFont(font); style.setTitleOffset(offset) #print " ", font, offset - for borderset in windowstyle.getiterator("borderset"): - bsName = str(borderset.get("name")) + 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") @@ -327,12 +374,12 @@ def loadSingleSkinData(desktop, skin, path_prefix): for color in windowstyle.findall("color"): get_attr = color.attrib.get - type = get_attr("name") + 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 @@ -354,6 +401,9 @@ def lookupScreen(name): return x, path return None, None +class additionalWidget: + pass + def readSkin(screen, skin, names, desktop): if not isinstance(names, list): names = [names] @@ -369,7 +419,8 @@ def readSkin(screen, skin, names, desktop): 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): @@ -382,7 +433,6 @@ def readSkin(screen, skin, names, desktop): emptySkin = "" myscreen = screen.parsedSkin = xml.etree.cElementTree.fromstring(emptySkin) - screen.skinAttributes = [ ] skin_path_prefix = getattr(screen, "skin_path", path) @@ -395,20 +445,19 @@ def readSkin(screen, skin, names, desktop): visited_components = set() # now walk all widgets - for widget in myscreen.getiterator("widget"): + 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.get('name') - wsource = widget.get('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) @@ -460,22 +509,21 @@ def readSkin(screen, skin, names, desktop): if source is None: raise SkinError("source '" + wsource + "' was not found in screen '" + name + "'!") - wrender = widget.get('render') + wrender = get_attr('render') if not wrender: raise SkinError("you must define a renderer with render= for source '%s'" % (wsource)) - for converter in widget.getiterator("convert"): + for converter in widget.findall("convert"): ctype = converter.get('type') assert ctype, "'convert'-tag needs a 'type'-attribute" #print "Converter:", ctype - #parms = mergeText(converter.childNodes).strip() try: parms = converter.text.strip() except: parms = "" - #print "Params:", ctype - converter_class = my_import('.'.join(["Components", "Converter", ctype])).__dict__.get(ctype) + #print "Params:", parms + converter_class = my_import('.'.join(("Components", "Converter", ctype))).__dict__.get(ctype) c = None @@ -492,7 +540,7 @@ def readSkin(screen, skin, names, desktop): 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 @@ -504,16 +552,16 @@ def readSkin(screen, skin, names, desktop): 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 myscreen.getchildren(): + w_tag = widget.tag - if widget.tag == "widget": + if w_tag == "widget": continue - if widget.tag == "applet": + if w_tag == "applet": try: codeText = widget.text.strip() except: @@ -521,30 +569,27 @@ def readSkin(screen, skin, names, desktop): #print "Found code:" #print codeText - type = widget.get('type') + 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.tag == "eLabel": + if w_tag == "eLabel": w.widget = eLabel - elif widget.tag == "ePixmap": + elif w_tag == "ePixmap": w.widget = ePixmap else: - raise SkinError("unsupported stuff : %s" % widget.tag) + raise SkinError("unsupported stuff : %s" % w_tag) #print "unsupported stuff : %s" % widget.tag w.skinAttributes = [ ]