X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/549ed3c87c4d3fe093472aa199ca6742c1f3654f..77a115baa70d23d342a1b54aa5cedd57bc5d6282:/skin.py

diff --git a/skin.py b/skin.py
index c6d0678a..5f27acca 100644
--- a/skin.py
+++ b/skin.py
@@ -14,13 +14,10 @@ def dump(x, i=0):
 	except:
 		None
 
+from Tools.Directories import resolveFilename, SCOPE_SKIN
+
 # 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')
+skinfile = file(resolveFilename(SCOPE_SKIN, 'skin.xml'), 'r')
 dom = xml.dom.minidom.parseString(skinfile.read())
 skinfile.close()
 
@@ -75,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)
@@ -136,6 +134,14 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 					"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(name)
+			desktop.makeCompatiblePixmap(ptr.__deref__())
+			guiObject.setPointer(ptr.__deref__(), pos)
 		elif attrib != 'name':
 			print "unsupported attribute " + attrib + "=" + value
 	except int:
@@ -206,7 +212,6 @@ def readSkin(screen, skin, name, desktop):
 	
 	if myscreen is None:
 		# try embedded skin
-		print screen.__dict__
 		if "parsedSkin" in screen.__dict__:
 			myscreen = screen.parsedSkin
 		elif "skin" in screen.__dict__: