X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/42b992dd93729c8dc687f45439e1819f1cb58d43..7bee809a45d982abe2bb7376f1e4420103ffc907:/skin.py?ds=sidebyside

diff --git a/skin.py b/skin.py
index b8ec2124..dc78c198 100644
--- a/skin.py
+++ b/skin.py
@@ -66,11 +66,13 @@ 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):
@@ -193,7 +195,15 @@ def readSkin(screen, skin, name, desktop):
 			myscreen = x
 	del skin
 	
-	assert myscreen != None, "no skin for screen '" + name + "' found!"
+	if myscreen is None:
+		# try embedded skin
+		print screen.__dict__
+		if "parsedSkin" in screen.__dict__:
+			myscreen = screen.parsedSkin
+		elif "skin" in screen.__dict__:
+			myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0]
+	
+	assert myscreen is not None, "no skin for screen '" + name + "' found!"
 
 	screen.skinAttributes = [ ]
 	collectAttributes(screen.skinAttributes, myscreen)