X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5b9623240f6e04e7b6946a0a03a9805b8ea8e5b5..aceb62aeebc259a4da520b303a31a6a174d9400a:/skin.py

diff --git a/skin.py b/skin.py
index bf8de72a..b8ec2124 100644
--- a/skin.py
+++ b/skin.py
@@ -16,11 +16,14 @@ def dump(x, i=0):
 
 # read the skin
 try:
-	skinfile = file('/usr/share/enigma2/skin.xml', 'r')
-	dom = xml.dom.minidom.parseString(skinfile.read())
-	skinfile.close()
+	# first we search in the current path
+	skinfile = file('data/skin.xml', 'r')
 except:
-	print "Error opening skin.xml"
+	# 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()
+
 
 def parsePosition(str):
 	x, y = str.split(',')
@@ -77,6 +80,14 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 			desktop.makeCompatiblePixmap(ptr)
 			guiObject.setPixmap(ptr)
 			# guiObject.setPixmapFromFile(value)
+		elif attrib == "orientation": # used by eSlider
+			try:
+				guiObject.setOrientation(
+					{ "orVertical": guiObject.orVertical,
+						"orHorizontal": guiObject.orHorizontal
+					}[value])
+			except KeyError:
+				print "oprientation must be either orVertical or orHorizontal!"
 		elif attrib == "valign":
 			try:
 				guiObject.setVAlign(
@@ -143,6 +154,9 @@ def loadSkin(desktop):
 	for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
 		style = eWindowStyleSkinned()
 		
+		style.setTitleFont(gFont("Arial", 20));
+		style.setTitleOffset(eSize(20, 5));
+		
 		for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):
 			bsName = str(borderset.getAttribute("name"))
 			for pixmap in elementsWithTag(borderset.childNodes, "pixmap"):
@@ -233,5 +247,4 @@ def readSkin(screen, skin, name, desktop):
 		
 		# applyAttributes(guiObject, widget, desktop)
 		# guiObject.thisown = 0
-		print screen.additionalWidgets
 		screen.additionalWidgets.append(w)