X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6c2d3fc303542b7f77f4350974acf781a1b91c30..4abd28c8904cc0858fa811e8d9438304624f888b:/skin.py

diff --git a/skin.py b/skin.py
index 3497cc11..a4d43f24 100644
--- a/skin.py
+++ b/skin.py
@@ -14,13 +14,11 @@ def dump(x, i=0):
 	except:
 		None
 
-from Tools.Directories import resolveFilename, SCOPE_SKIN
+from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE
 
 # read the skin
-skinfile = file(resolveFilename(SCOPE_SKIN, 'skin.xml'), 'r')
-dom = xml.dom.minidom.parseString(skinfile.read())
-skinfile.close()
-
+dom_skin = xml.dom.minidom.parse(resolveFilename(SCOPE_SKIN, 'skin.xml'))
+dom_skin_default = xml.dom.minidom.parse(resolveFilename(SCOPE_SKIN, 'skin_default.xml'))
 
 def parsePosition(str):
 	x, y = str.split(',')
@@ -71,7 +69,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 		elif attrib == 'zPosition':
 			guiObject.setZPosition(int(value))
 		elif attrib == "pixmap":
-			ptr = loadPNG(value)
+			ptr = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, value))
 			# that __deref__ still scares me!
 			desktop.makeCompatiblePixmap(ptr.__deref__())
 			guiObject.setPixmap(ptr.__deref__())
@@ -139,7 +137,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 		elif attrib == "pointer":
 			(name, pos) = value.split(':')
 			pos = parsePosition(pos)
-			ptr = loadPNG(name)
+			ptr = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, name))
 			desktop.makeCompatiblePixmap(ptr.__deref__())
 			guiObject.setPointer(ptr.__deref__(), pos)
 		elif attrib != 'name':
@@ -155,7 +153,7 @@ def applyAllAttributes(guiObject, desktop, attributes):
 def loadSkin(desktop):
 	print "loading skin..."
 	
-	skin = dom.childNodes[0]
+	skin = dom_skin.childNodes[0]
 	assert skin.tagName == "skin", "root element in skin must be 'skin'!"
 	
 	for c in elementsWithTag(skin.childNodes, "colors"):
@@ -180,7 +178,7 @@ def loadSkin(desktop):
 				bpName = str(pixmap.getAttribute("pos"))
 				filename = str(pixmap.getAttribute("filename"))
 				
-				png = loadPNG(filename)
+				png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, filename))
 				
 				# adapt palette
 				desktop.makeCompatiblePixmap(png.__deref__())
@@ -203,14 +201,24 @@ def readSkin(screen, skin, name, desktop):
 	myscreen = None
 	
 	# first, find the corresponding screen element
-	skin = dom.childNodes[0]
+	skin = dom_skin.childNodes[0] 
+	skin_default = dom_skin_default.childNodes[0]
 	
 	for x in elementsWithTag(skin.childNodes, "screen"):
 		if x.getAttribute('name') == name:
 			myscreen = x
-	del skin
+			break
+	
+	# if not found, check default skin	
+	if myscreen is None:
+		for x in elementsWithTag(skin_default.childNodes, "screen"):
+			if x.getAttribute('name') == name:
+				myscreen = x
+				break
+
+	del skin, skin_default
 	
-	# try embedded skin
+	# otherwise try embedded skin
 	myscreen = myscreen or getattr(screen, "parsedSkin", None)
 	
 	# try uncompiled embedded skin