X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f01049eaf5c70d53a3c8f3309486bec771b321f4..cf630f0cd1366036ae201702b177bfe95de3d03f:/skin.py

diff --git a/skin.py b/skin.py
index e7c84c42..3497cc11 100644
--- a/skin.py
+++ b/skin.py
@@ -72,6 +72,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 			guiObject.setZPosition(int(value))
 		elif attrib == "pixmap":
 			ptr = loadPNG(value)
+			# that __deref__ still scares me!
 			desktop.makeCompatiblePixmap(ptr.__deref__())
 			guiObject.setPixmap(ptr.__deref__())
 			# guiObject.setPixmapFromFile(value)
@@ -135,6 +136,12 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 				}[value])
 		elif attrib == "enableWrapAround":
 			guiObject.setWrapAround(True)
+		elif attrib == "pointer":
+			(name, pos) = value.split(':')
+			pos = parsePosition(pos)
+			ptr = loadPNG(name)
+			desktop.makeCompatiblePixmap(ptr.__deref__())
+			guiObject.setPointer(ptr.__deref__(), pos)
 		elif attrib != 'name':
 			print "unsupported attribute " + attrib + "=" + value
 	except int:
@@ -203,13 +210,12 @@ def readSkin(screen, skin, name, desktop):
 			myscreen = x
 	del skin
 	
-	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]
+	# 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 is not None, "no skin for screen '" + name + "' found!"