X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c46312d7f5ce4113ece4c33595b7192eccadcb1d..cd4edbfa0b16e19ca9cc108003d845502585318e:/skin.py

diff --git a/skin.py b/skin.py
index c8805f01..3ceb2b49 100644
--- a/skin.py
+++ b/skin.py
@@ -6,11 +6,10 @@ from os import path
 profile("LOAD:enigma_skin")
 from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleManager, \
 	addFont, gRGB, eWindowStyleSkinned
-
 from Components.config import ConfigSubsection, ConfigText, config
 from Components.Converter.Converter import Converter
 from Components.Sources.Source import Source, ObsoleteSource
-from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN, fileExists
+from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN, SCOPE_CONFIG, fileExists
 from Tools.Import import my_import
 from Tools.LoadPixmap import LoadPixmap
 
@@ -26,16 +25,16 @@ def dump(x, i=0):
 
 class SkinError(Exception):
 	def __init__(self, message):
-		self.message = message
+		self.msg = message
 
 	def __str__(self):
-		return "{%s}: %s" % (config.skin.primary_skin, self.message)
+		return "{%s}: %s" % (config.skin.primary_skin, self.msg)
 
 dom_skins = [ ]
 
-def loadSkin(name):
+def loadSkin(name, scope = SCOPE_SKIN):
 	# read the skin
-	filename = resolveFilename(SCOPE_SKIN, name)
+	filename = resolveFilename(scope, name)
 	mpath = path.dirname(filename) + "/"
 	dom_skins.append((mpath, xml.etree.cElementTree.parse(filename).getroot()))
 
@@ -54,6 +53,11 @@ config.skin = ConfigSubsection()
 config.skin.primary_skin = ConfigText(default = "skin.xml")
 
 profile("LoadSkin")
+try:
+	loadSkin('skin_user.xml', SCOPE_CONFIG)
+except (SkinError, IOError, AssertionError), err:
+	print "not loading user skin: ", err
+
 try:
 	loadSkin(config.skin.primary_skin.value)
 except (SkinError, IOError, AssertionError), err:
@@ -93,7 +97,7 @@ def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]):
 		attrib = a[0]
 		value = a[1]
 
-		if attrib in ["pixmap", "pointer", "seek_pointer", "backgroundPixmap", "selectionPixmap"]:
+		if attrib in ("pixmap", "pointer", "seek_pointer", "backgroundPixmap", "selectionPixmap"):
 			value = resolveFilename(SCOPE_SKIN_IMAGE, value, path_prefix=skin_path_prefix)
 
 		if attrib not in ignore:
@@ -126,7 +130,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1)
 			guiObject.setFont(parseFont(value, scale))
 		elif attrib == 'zPosition':
 			guiObject.setZPosition(int(value))
-		elif attrib in ["pixmap", "backgroundPixmap", "selectionPixmap"]:
+		elif attrib in ("pixmap", "backgroundPixmap", "selectionPixmap"):
 			ptr = loadPixmap(value, desktop) # this should already have been filename-resolved.
 			if attrib == "pixmap":
 				guiObject.setPixmap(ptr)
@@ -293,6 +297,28 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 			addFont(resolved_font, name, scale, is_replacement)
 			#print "Font: ", resolved_font, name, scale, is_replacement
 
+	for c in skin.findall("subtitles"):
+		from enigma import eWidget, eSubtitleWidget
+		scale = ((1,1),(1,1))
+		for substyle in c.findall("sub"):
+			get_attr = substyle.attrib.get
+			font = parseFont(get_attr("font"), scale)
+			col = get_attr("foregroundColor")
+			if col:
+				foregroundColor = parseColor(col)
+				haveColor = 1
+			else:
+				foregroundColor = gRGB(0xFFFFFF)
+				haveColor = 0
+			col = get_attr("shadowColor")
+			if col:
+				shadowColor = parseColor(col)
+			else:
+				shadowColor = gRGB(0)
+			shadowOffset = parsePosition(get_attr("shadowOffset"), scale)
+			face = eSubtitleWidget.__dict__[get_attr("name")]
+			eSubtitleWidget.setFontStyle(face, font, haveColor, foregroundColor, shadowColor, shadowOffset)
+
 	for windowstyle in skin.findall("windowstyle"):
 		style = eWindowStyleSkinned()
 		id = windowstyle.attrib.get("id")
@@ -328,12 +354,12 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 
 		for color in windowstyle.findall("color"):
 			get_attr = color.attrib.get
-			type = get_attr("name")
+			colorType = get_attr("name")
 			color = parseColor(get_attr("color"))
 			try:
-				style.setColor(eWindowStyleSkinned.__dict__["col" + type], color)
+				style.setColor(eWindowStyleSkinned.__dict__["col" + colorType], color)
 			except:
-				raise SkinError("Unknown color %s" % (type))
+				raise SkinError("Unknown color %s" % (colorType))
 				#pass
 
 			#print "  color:", type, color
@@ -523,15 +549,15 @@ def readSkin(screen, skin, names, desktop):
 
 			#print "Found code:"
 			#print codeText
-			type = widget.attrib.get('type')
+			widgetType = widget.attrib.get('type')
 
 			code = compile(codeText, "skin applet", "exec")
 
-			if type == "onLayoutFinish":
+			if widgetType == "onLayoutFinish":
 				screen.onLayoutFinish.append(code)
 				#print "onLayoutFinish = ", codeText
 			else:
-				raise SkinError("applet type '%s' unknown!" % type)
+				raise SkinError("applet type '%s' unknown!" % widgetType)
 				#print "applet type '%s' unknown!" % type
 
 			continue