X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4283696371a06f44605f9d005957bc8837c66e0d..4abd28c8904cc0858fa811e8d9438304624f888b:/skin.py?ds=inline diff --git a/skin.py b/skin.py index 2c1778e4..a4d43f24 100644 --- a/skin.py +++ b/skin.py @@ -14,137 +14,11 @@ def dump(x, i=0): except: None -dom = xml.dom.minidom.parseString( - """ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - """ """ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# this should be factored out into some helper code, but currently demonstrated applets. -from enigma import eSize, ePoint - -orgwidth = self.instance.size().width() -orgpos = self.instance.position() -textsize = self["text"].getSize() +from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE -# y size still must be fixed in font stuff... -textsize = (textsize[0], textsize[1] + 20) -wsize = (textsize[0] + 20, textsize[1] + 20) - -# resize -self.instance.resize(eSize(*wsize)) - -# resize label -self["text"].instance.resize(eSize(*textsize)) - -# center window -newwidth = wsize[0] -self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - - - """) +# 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')) def parsePosition(str): x, y = str.split(',') @@ -187,20 +61,32 @@ def applySingleAttribute(guiObject, desktop, attrib, value): elif attrib == 'size': guiObject.resize(parseSize(value)) elif attrib == 'title': - guiObject.setTitle(value) + guiObject.setTitle(_(value)) elif attrib == 'text': guiObject.setText(value) elif attrib == 'font': guiObject.setFont(parseFont(value)) + elif attrib == 'zPosition': + guiObject.setZPosition(int(value)) elif attrib == "pixmap": - ptr = gPixmapPtr() - if loadPNG(ptr, value): - raise "loading PNG failed!" - x = ptr - ptr = ptr.__deref__() - desktop.makeCompatiblePixmap(ptr) - guiObject.setPixmap(ptr) + ptr = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, value)) + # that __deref__ still scares me! + desktop.makeCompatiblePixmap(ptr.__deref__()) + guiObject.setPixmap(ptr.__deref__()) # guiObject.setPixmapFromFile(value) + elif attrib == "alphatest": # used by ePixmap + guiObject.setAlphatest( + { "on": True, + "off": False + }[value]) + elif attrib == "orientation": # used by eSlider + try: + guiObject.setOrientation( + { "orVertical": guiObject.orVertical, + "orHorizontal": guiObject.orHorizontal + }[value]) + except KeyError: + print "oprientation must be either orVertical or orHorizontal!" elif attrib == "valign": try: guiObject.setVAlign( @@ -232,6 +118,28 @@ def applySingleAttribute(guiObject, desktop, attrib, value): guiObject.setBackgroundColor(parseColor(value)) elif attrib == "foregroundColor": guiObject.setForegroundColor(parseColor(value)) + elif attrib == "selectionDisabled": + guiObject.setSelectionEnable(0) + elif attrib == "transparent": + guiObject.setTransparent(int(value)) + elif attrib == "borderColor": + guiObject.setBorderColor(parseColor(value)) + elif attrib == "borderWidth": + guiObject.setBorderWidth(int(value)) + elif attrib == "scrollbarMode": + guiObject.setScrollbarMode( + { "showOnDemand": guiObject.showOnDemand, + "showAlways": guiObject.showAlways, + "showNever": guiObject.showNever + }[value]) + elif attrib == "enableWrapAround": + guiObject.setWrapAround(True) + elif attrib == "pointer": + (name, pos) = value.split(':') + pos = parsePosition(pos) + ptr = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, name)) + desktop.makeCompatiblePixmap(ptr.__deref__()) + guiObject.setPointer(ptr.__deref__(), pos) elif attrib != 'name': print "unsupported attribute " + attrib + "=" + value except int: @@ -245,13 +153,7 @@ def applyAllAttributes(guiObject, desktop, attributes): def loadSkin(desktop): print "loading skin..." - def getPNG(x): - g = gPixmapPtr() - loadPNG(g, x) - g = g.grabRef() - return g - - skin = dom.childNodes[0] + skin = dom_skin.childNodes[0] assert skin.tagName == "skin", "root element in skin must be 'skin'!" for c in elementsWithTag(skin.childNodes, "colors"): @@ -267,17 +169,20 @@ def loadSkin(desktop): for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"): style = eWindowStyleSkinned() + style.setTitleFont(gFont("Regular", 20)); + style.setTitleOffset(eSize(20, 5)); + 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 = getPNG(filename) + png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, filename)) # adapt palette - desktop.makeCompatiblePixmap(png) - style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png) + desktop.makeCompatiblePixmap(png.__deref__()) + style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png.__deref__()) for color in elementsWithTag(windowstyle.childNodes, "color"): type = str(color.getAttribute("name")) @@ -296,14 +201,31 @@ def readSkin(screen, skin, name, desktop): myscreen = None # first, find the corresponding screen element - skin = dom.childNodes[0] + 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 - del skin + break + + # if not found, check default skin + if myscreen is None: + for x in elementsWithTag(skin_default.childNodes, "screen"): + if x.getAttribute('name') == name: + myscreen = x + break + + del skin, skin_default + + # otherwise try embedded skin + myscreen = myscreen or 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 != None, "no skin for screen '" + name + "' found!" + assert myscreen is not None, "no skin for screen '" + name + "' found!" screen.skinAttributes = [ ] collectAttributes(screen.skinAttributes, myscreen) @@ -357,5 +279,4 @@ def readSkin(screen, skin, name, desktop): # applyAttributes(guiObject, widget, desktop) # guiObject.thisown = 0 - print screen.additionalWidgets screen.additionalWidgets.append(w)