X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/98c4b5bb004e9297bffa8e1c3572572741fda933..aceb62aeebc259a4da520b303a31a6a174d9400a:/skin.py diff --git a/skin.py b/skin.py index 57065076..b8ec2124 100644 --- a/skin.py +++ b/skin.py @@ -14,130 +14,16 @@ 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() - -# y size still must be fixed in font stuff... -textsize = (textsize[0], textsize[1] + 20) -wsize = (textsize[0] + 20, textsize[1] + 20) +# read the skin +try: + # first we search in the current path + skinfile = file('data/skin.xml', 'r') +except: + # if not found in the current path, we use the global datadir-path + skinfile = file('/usr/share/enigma2/skin.xml', 'r') +dom = xml.dom.minidom.parseString(skinfile.read()) +skinfile.close() -# 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())) - - - """) def parsePosition(str): x, y = str.split(',') @@ -170,7 +56,7 @@ def collectAttributes(skinAttributes, node): # TODO: localization? as in e1? value = str(a.value) - skinAttributes[attrib] = value + skinAttributes.append((attrib, value)) def applySingleAttribute(guiObject, desktop, attrib, value): # and set attributes @@ -194,6 +80,14 @@ def applySingleAttribute(guiObject, desktop, attrib, value): desktop.makeCompatiblePixmap(ptr) guiObject.setPixmap(ptr) # guiObject.setPixmapFromFile(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,7 +126,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value): print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib) def applyAllAttributes(guiObject, desktop, attributes): - for (attrib, value) in attributes.items(): + for (attrib, value) in attributes: applySingleAttribute(guiObject, desktop, attrib, value) def loadSkin(desktop): @@ -260,6 +154,9 @@ def loadSkin(desktop): for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"): style = eWindowStyleSkinned() + style.setTitleFont(gFont("Arial", 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"): @@ -298,7 +195,7 @@ def readSkin(screen, skin, name, desktop): assert myscreen != None, "no skin for screen '" + name + "' found!" - screen.skinAttributes = { } + screen.skinAttributes = [ ] collectAttributes(screen.skinAttributes, myscreen) screen.additionalWidgets = [ ] @@ -312,7 +209,7 @@ def readSkin(screen, skin, name, desktop): # get corresponding gui object try: - attributes = screen[wname].skinAttributes = { } + attributes = screen[wname].skinAttributes = [ ] except: raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!") @@ -345,10 +242,9 @@ def readSkin(screen, skin, name, desktop): else: raise str("unsupported stuff : %s" % widget.tagName) - w.skinAttributes = { } + w.skinAttributes = [ ] collectAttributes(w.skinAttributes, widget) # applyAttributes(guiObject, widget, desktop) # guiObject.thisown = 0 - print screen.additionalWidgets screen.additionalWidgets.append(w)