X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5d4117d8e413629c17fee5c13589375a3f1cc2bd..4abd28c8904cc0858fa811e8d9438304624f888b:/skin.py?ds=sidebyside

diff --git a/skin.py b/skin.py
index a4095204..a4d43f24 100644
--- a/skin.py
+++ b/skin.py
@@ -14,16 +14,11 @@ def dump(x, i=0):
 	except:
 		None
 
-# 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')
-dom = xml.dom.minidom.parseString(skinfile.read())
-skinfile.close()
+from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE
 
+# read the skin
+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(',')
@@ -74,13 +69,10 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 		elif attrib == 'zPosition':
 			guiObject.setZPosition(int(value))
 		elif attrib == "pixmap":
-			ptr = gPixmapPtr()
-			if loadPNG(ptr, value):
-				raise "loading PNG failed!"
-			x = ptr
-			ptr = ptr.__deref__()
-			desktop.makeCompatiblePixmap(ptr)
-			guiObject.setPixmap(ptr)
+			ptr = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, value))
+			# that __deref__ still scares me!
+			desktop.makeCompatiblePixmap(ptr.__deref__())
+			guiObject.setPixmap(ptr.__deref__())
 			# guiObject.setPixmapFromFile(value)
 		elif attrib == "alphatest": # used by ePixmap
 			guiObject.setAlphatest(
@@ -128,6 +120,26 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 			guiObject.setForegroundColor(parseColor(value))
 		elif attrib == "selectionDisabled":
 			guiObject.setSelectionEnable(0)
+		elif attrib == "transparent":
+			guiObject.setTransparent(int(value))
+		elif attrib == "borderColor":
+			guiObject.setBorderColor(parseColor(value))
+		elif attrib == "borderWidth":
+			guiObject.setBorderWidth(int(value))
+		elif attrib == "scrollbarMode":
+			guiObject.setScrollbarMode(
+				{ "showOnDemand": guiObject.showOnDemand,
+					"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(resolveFilename(SCOPE_SKIN_IMAGE, name))
+			desktop.makeCompatiblePixmap(ptr.__deref__())
+			guiObject.setPointer(ptr.__deref__(), pos)
 		elif attrib != 'name':
 			print "unsupported attribute " + attrib + "=" + value
 	except int:
@@ -141,13 +153,7 @@ def applyAllAttributes(guiObject, desktop, attributes):
 def loadSkin(desktop):
 	print "loading skin..."
 	
-	def getPNG(x):
-		g = gPixmapPtr()
-		loadPNG(g, x)
-		g = g.grabRef()
-		return g
-	
-	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"):
@@ -163,7 +169,7 @@ def loadSkin(desktop):
 	for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
 		style = eWindowStyleSkinned()
 		
-		style.setTitleFont(gFont("Arial", 20));
+		style.setTitleFont(gFont("Regular", 20));
 		style.setTitleOffset(eSize(20, 5));
 		
 		for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):
@@ -172,11 +178,11 @@ def loadSkin(desktop):
 				bpName = str(pixmap.getAttribute("pos"))
 				filename = str(pixmap.getAttribute("filename"))
 				
-				png = getPNG(filename)
+				png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, filename))
 				
 				# adapt palette
-				desktop.makeCompatiblePixmap(png)
-				style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png)
+				desktop.makeCompatiblePixmap(png.__deref__())
+				style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png.__deref__())
 
 		for color in elementsWithTag(windowstyle.childNodes, "color"):
 			type = str(color.getAttribute("name"))
@@ -195,20 +201,29 @@ 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:
-		# 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]
+		for x in elementsWithTag(skin_default.childNodes, "screen"):
+			if x.getAttribute('name') == name:
+				myscreen = x
+				break
+
+	del skin, skin_default
+	
+	# otherwise 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!"