X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b23e0f70b3b0e6815b784f29cbe7d09982116c41..52c869166f68d41750955ed2056dde1b642f0415:/skin.py

diff --git a/skin.py b/skin.py
old mode 100644
new mode 100755
index a76f7942..b490f739
--- a/skin.py
+++ b/skin.py
@@ -28,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 = [ ]
 
@@ -70,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(',')
@@ -101,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
@@ -119,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':
@@ -130,6 +148,8 @@ 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 == 'itemHeight':
+			guiObject.setItemHeight(int(value))
 		elif attrib in ("pixmap", "backgroundPixmap", "selectionPixmap"):
 			ptr = loadPixmap(value, desktop) # this should already have been filename-resolved.
 			if attrib == "pixmap":
@@ -221,6 +241,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1)
 			guiObject.setShadowOffset(parsePosition(value, scale))
 		elif attrib == 'noWrap':
 			guiObject.setNoWrap(1)
+		elif attrib == 'id':
+			pass
 		else:
 			raise SkinError("unsupported attribute " + attrib + "=" + value)
 	except int:
@@ -375,12 +397,16 @@ def loadSkinData(desktop):
 	for (path, dom_skin) in skins:
 		loadSingleSkinData(desktop, dom_skin, path)
 
-def lookupScreen(name):
+def lookupScreen(name, style_id):
 	for (path, skin) in dom_skins:
 		# first, find the corresponding screen element
 		for x in skin.findall("screen"):
 			if x.attrib.get('name', '') == name:
-				return x, path
+				screen_style_id = x.attrib.get('id', '-1')
+				if screen_style_id == '-1' and name.find('ummary') > 0:
+					screen_style_id = '1'
+				if (style_id != 2 and int(screen_style_id) == -1) or int(screen_style_id) == style_id:
+					return x, path
 	return None, None
 
 class additionalWidget:
@@ -392,9 +418,11 @@ def readSkin(screen, skin, names, desktop):
 
 	name = "<embedded-in-'%s'>" % screen.__class__.__name__
 
+	style_id = desktop.getStyleID();
+
 	# try all skins, first existing one have priority
 	for n in names:
-		myscreen, path = lookupScreen(n)
+		myscreen, path = lookupScreen(n, style_id)
 		if myscreen is not None:
 			# use this name for debug output
 			name = n
@@ -407,7 +435,15 @@ def readSkin(screen, skin, names, desktop):
 	# try uncompiled embedded skin
 	if myscreen is None and getattr(screen, "skin", None):
 		print "Looking for embedded skin"
-		myscreen = screen.parsedSkin = xml.etree.cElementTree.fromstring(screen.skin)
+		skin_tuple = screen.skin
+		if not isinstance(skin_tuple, tuple):
+			skin_tuple = (skin_tuple,)
+		for sskin in skin_tuple:
+			parsedSkin = xml.etree.cElementTree.fromstring(sskin)
+			screen_style_id = parsedSkin.attrib.get('id', '-1')
+			if (style_id != 2 and int(screen_style_id) == -1) or int(screen_style_id) == style_id:
+				myscreen = screen.parsedSkin = parsedSkin
+				break
 
 	#assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!"
 	if myscreen is None: