X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/47d24e1d25002485f1cb90f1682b4bc3070cad0b..ab5aa90e1e05a89845c6e802ef1b2366d203aa45:/skin.py
diff --git a/skin.py b/skin.py
index 5d482fdb..6ef8f939 100644
--- a/skin.py
+++ b/skin.py
@@ -11,11 +11,45 @@ def dump(x, i=0):
None
dom = xml.dom.minidom.parseString(
- " \
- \
- \
- \
- ")
+ """
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+""")
+
+
+def elementsWithTag(el, tag):
+ for x in el:
+ if x.nodeType != xml.dom.minidom.Element.nodeType:
+ continue
+ if x.tagName == tag:
+ yield x
def parsePosition(str):
x, y = str.split(',')
@@ -25,40 +59,83 @@ def parseSize(str):
x, y = str.split(',')
return eSize(int(x), int(y))
+def parseFont(str):
+ name, size = str.split(':')
+ return gFont(name, int(size))
+
def applyAttributes(guiObject, node):
# walk all attributes
for p in range(node.attributes.length):
a = node.attributes.item(p)
+ # convert to string (was: unicode)
+ attrib = str(a.name)
+ # TODO: proper UTF8 translation?! (for value)
+ # TODO: localization? as in e1?
+ value = str(a.value)
+
# and set attributes
- if a.name == 'position':
- guiObject.move(parsePosition(a.value))
- elif a.name == 'size':
- guiObject.resize(parseSize(a.value))
- elif a.name != 'name':
- print "unsupported attribute " + a.name
+ try:
+ if attrib == 'position':
+ guiObject.move(parsePosition(value))
+ elif attrib == 'size':
+ guiObject.resize(parseSize(value))
+ elif attrib == 'title':
+ guiObject.setTitle(value)
+ elif attrib == 'font':
+ guiObject.setFont(parseFont(value))
+ elif attrib == "valign":
+ try:
+ guiObject.setVAlign(
+ { "top": guiObject.alignTop,
+ "center": guiObject.alignCenter,
+ "bottom": guiObject.alignBottom
+ }[value])
+ except KeyError:
+ print "valign must be either top, center or bottom!"
+ elif attrib == "halign":
+ try:
+ guiObject.setHAlign(
+ { "left": guiObject.alignLeft,
+ "center": guiObject.alignCenter,
+ "right": guiObject.alignRight,
+ "block": guiObject.alignBlock
+ }[value])
+ except KeyError:
+ print "halign must be either left, center, right or block!"
+ elif attrib != 'name':
+ print "unsupported attribute " + attrib + "=" + value
+ except AttributeError:
+ print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
-def applyGUIskin(screen, skin, name):
+def applyGUIskin(screen, parent, skin, name):
myscreen = None
# first, find the corresponding screen element
- screens = dom.getElementsByTagName("screen")
- for x in screens:
+ skin = dom.childNodes[0]
+ assert skin.tagName == "skin", "root element in skin must be 'skin'!"
+
+ for x in elementsWithTag(skin.childNodes, "screen"):
if x.getAttribute('name') == name:
myscreen = x
+ del skin
- if myscreen == None:
- print "no skin for screen " + name + " found!"
- return;
+ assert myscreen != None, "no skin for screen '" + name + "' found!"
+
+ applyAttributes(parent, myscreen)
# now walk all widgets
- for widget in myscreen.getElementsByTagName("widget"):
- name = widget.getAttribute('name')
- if name == None:
+ for widget in elementsWithTag(myscreen.childNodes, "widget"):
+ wname = widget.getAttribute('name')
+ if wname == None:
print "widget has no name!"
continue
# get corresponding gui object
- guiObject = screen.data[name]["instance"]
+ try:
+ guiObject = screen[wname].instance
+ except:
+ raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
+
applyAttributes(guiObject, widget)