X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/574f425cc1ebece0aa5f09fb77a8cb7ad0310a1f..b7f07b6052ac2ca6b5e2a2c9e322b26e2c506109:/skin.py

diff --git a/skin.py b/skin.py
index a37716f1..a76f7942 100644
--- a/skin.py
+++ b/skin.py
@@ -6,7 +6,6 @@ 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
@@ -146,6 +145,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1)
 				  "off": 0,
 				  "blend": 2,
 				}[value])
+		elif attrib == "scale":
+			guiObject.setScale(1)
 		elif attrib == "orientation": # used by eSlider
 			try:
 				guiObject.setOrientation(*
@@ -298,6 +299,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")
@@ -333,12 +356,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
@@ -528,15 +551,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