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

diff --git a/skin.py b/skin.py
index a37716f1..5b8ce650 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
@@ -29,7 +28,7 @@ class SkinError(Exception):
 		self.msg = message
 
 	def __str__(self):
-		return "{%s}: %s" % (config.skin.primary_skin, self.msg)
+		return "{%s}: %s" % (config.skin.primary_skin.value, self.msg)
 
 dom_skins = [ ]
 
@@ -71,9 +70,27 @@ profile("LoadSkinDefault")
 loadSkin('skin_default.xml')
 profile("LoadSkinDefaultDone")
 
-def parsePosition(str, scale):
+def evalPos(pos, wsize, ssize, scale):
+	if pos == "center":
+		pos = (ssize - wsize) / 2
+	else:
+		pos = int(pos) * scale[0] / scale[1]
+	return int(pos)
+
+def parsePosition(str, scale, desktop = None, size = None):
 	x, y = str.split(',')
-	return ePoint(int(x) * scale[0][0] / scale[0][1], int(y) * scale[1][0] / scale[1][1])
+	
+	wsize = 1, 1
+	ssize = 1, 1
+	if desktop is not None:
+		ssize = desktop.size().width(), desktop.size().height()
+	if size is not None:
+		wsize = size.width(), size.height()
+
+	x = evalPos(x, wsize[0], ssize[0], scale[0])
+	y = evalPos(y, wsize[1], ssize[1], scale[1])
+
+	return ePoint(x, y)
 
 def parseSize(str, scale):
 	x, y = str.split(',')
@@ -102,7 +119,7 @@ def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]):
 			value = resolveFilename(SCOPE_SKIN_IMAGE, value, path_prefix=skin_path_prefix)
 
 		if attrib not in ignore:
-			skinAttributes.append((attrib, value))
+			skinAttributes.append((attrib, value.encode("utf-8")))
 
 def loadPixmap(path, desktop):
 	cached = False
@@ -120,7 +137,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1)
 	# and set attributes
 	try:
 		if attrib == 'position':
-			guiObject.move(parsePosition(value, scale))
+			guiObject.move(parsePosition(value, scale, desktop, guiObject.csize()))
 		elif attrib == 'size':
 			guiObject.resize(parseSize(value, scale))
 		elif attrib == 'title':
@@ -146,6 +163,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 +317,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 +374,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 +569,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