X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/561106bf1068ed021a9a45f124ec1a65464a1f1a..2358a00bf1af727de47cfd6d8710969748b27725:/skin.py diff --git a/skin.py b/skin.py index 608e8a91..9eb5d4f5 100644 --- a/skin.py +++ b/skin.py @@ -68,17 +68,17 @@ profile("LoadSkinDefault") loadSkin('skin_default.xml') profile("LoadSkinDefaultDone") -def parsePosition(str): +def parsePosition(str, scale): x, y = str.split(',') - return ePoint(int(x), int(y)) + return ePoint(int(x) * scale[0][0] / scale[0][1], int(y) * scale[1][0] / scale[1][1]) -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] != '#': @@ -113,19 +113,19 @@ 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)) 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"]: @@ -206,11 +206,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 +219,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,8 +229,8 @@ 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: @@ -255,25 +255,23 @@ 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) 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)) - 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 +290,7 @@ 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 windowstyle in skin.findall("windowstyle"): style = eWindowStyleSkinned() id = windowstyle.attrib.get("id") if id: @@ -307,15 +305,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") @@ -354,6 +352,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 +370,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 +384,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 +396,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,12 +460,12 @@ 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 @@ -504,16 +504,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,7 +521,7 @@ def readSkin(screen, skin, names, desktop): #print "Found code:" #print codeText - type = widget.get('type') + type = widget.attrib.get('type') code = compile(codeText, "skin applet", "exec") @@ -534,17 +534,14 @@ def readSkin(screen, skin, names, desktop): 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 = [ ]