X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=skin.py;h=19da2036cebe63550b59db545901b0bf3bea9cc1;hp=d44e5033606301dc306a4024cabec78823661022;hb=ed545659e30ea7796e2e7acd06e766cc82efb486;hpb=ae59e9cff74f8b5c36203b43ab5be0ead370b096 diff --git a/skin.py b/skin.py old mode 100644 new mode 100755 index d44e503..19da203 --- a/skin.py +++ b/skin.py @@ -28,7 +28,7 @@ class SkinError(Exception): self.msg = message def __str__(self): - return "{%s}: %s" % (config.skin.primary_skin, self.msg) + return "{%s}: %s" % (config.skin.primary_skin.value, self.msg) dom_skins = [ ] @@ -70,9 +70,27 @@ profile("LoadSkinDefault") loadSkin('skin_default.xml') profile("LoadSkinDefaultDone") -def parsePosition(str, scale): +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) * scale[0][0] / scale[0][1], int(y) * scale[1][0] / scale[1][1]) + + 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, scale): x, y = str.split(',') @@ -101,7 +119,7 @@ def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]): value = resolveFilename(SCOPE_SKIN_IMAGE, value, path_prefix=skin_path_prefix) if attrib not in ignore: - skinAttributes.append((attrib, value)) + skinAttributes.append((attrib, value.encode("utf-8"))) def loadPixmap(path, desktop): cached = False @@ -119,7 +137,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1) # and set attributes try: if attrib == 'position': - guiObject.move(parsePosition(value, scale)) + guiObject.move(parsePosition(value, scale, desktop, guiObject.csize())) elif attrib == 'size': guiObject.resize(parseSize(value, scale)) elif attrib == 'title': @@ -130,6 +148,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1) guiObject.setFont(parseFont(value, scale)) elif attrib == 'zPosition': guiObject.setZPosition(int(value)) + 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": @@ -145,6 +165,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1) "off": 0, "blend": 2, }[value]) + elif attrib == "scale": + guiObject.setScale(1) elif attrib == "orientation": # used by eSlider try: guiObject.setOrientation(* @@ -219,6 +241,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1) guiObject.setShadowOffset(parsePosition(value, scale)) elif attrib == 'noWrap': guiObject.setNoWrap(1) + elif attrib == 'id': + pass else: raise SkinError("unsupported attribute " + attrib + "=" + value) except int: @@ -260,8 +284,8 @@ def loadSingleSkinData(desktop, skin, path_prefix): else: bpp = 32 #print "Resolution:", xres,yres,bpp - from enigma import gFBDC - gFBDC.getInstance().setResolution(xres, yres) + from enigma import gMainDC + gMainDC.getInstance().setResolution(xres, yres) desktop.resize(eSize(xres, yres)) if bpp != 32: # load palette (not yet implemented) @@ -316,7 +340,7 @@ def loadSingleSkinData(desktop, skin, path_prefix): else: shadowColor = gRGB(0) shadowOffset = parsePosition(get_attr("shadowOffset"), scale) - face = eval("eSubtitleWidget.%s" % get_attr("name")) + face = eSubtitleWidget.__dict__[get_attr("name")] eSubtitleWidget.setFontStyle(face, font, haveColor, foregroundColor, shadowColor, shadowOffset) for windowstyle in skin.findall("windowstyle"): @@ -373,12 +397,16 @@ def loadSkinData(desktop): for (path, dom_skin) in skins: loadSingleSkinData(desktop, dom_skin, path) -def lookupScreen(name): +def lookupScreen(name, style_id): for (path, skin) in dom_skins: # first, find the corresponding screen element for x in skin.findall("screen"): if x.attrib.get('name', '') == name: - return x, path + screen_style_id = x.attrib.get('id', '-1') + if screen_style_id == '-1' and name.find('ummary') > 0: + screen_style_id = '1' + if (style_id != 2 and int(screen_style_id) == -1) or int(screen_style_id) == style_id: + return x, path return None, None class additionalWidget: @@ -390,9 +418,11 @@ def readSkin(screen, skin, names, desktop): name = "" % screen.__class__.__name__ + style_id = desktop.getStyleID(); + # try all skins, first existing one have priority for n in names: - myscreen, path = lookupScreen(n) + myscreen, path = lookupScreen(n, style_id) if myscreen is not None: # use this name for debug output name = n @@ -405,7 +435,15 @@ def readSkin(screen, skin, names, desktop): # try uncompiled embedded skin if myscreen is None and getattr(screen, "skin", None): print "Looking for embedded skin" - myscreen = screen.parsedSkin = xml.etree.cElementTree.fromstring(screen.skin) + skin_tuple = screen.skin + if not isinstance(skin_tuple, tuple): + skin_tuple = (skin_tuple,) + for sskin in skin_tuple: + parsedSkin = xml.etree.cElementTree.fromstring(sskin) + screen_style_id = parsedSkin.attrib.get('id', '-1') + if (style_id != 2 and int(screen_style_id) == -1) or int(screen_style_id) == style_id: + myscreen = screen.parsedSkin = parsedSkin + break #assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!" if myscreen is None: