X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=skin.py;h=19da2036cebe63550b59db545901b0bf3bea9cc1;hp=1c22d3d8ea821e026ea3e3e66b8cb4027250b52d;hb=ed545659e30ea7796e2e7acd06e766cc82efb486;hpb=cdaaee0da655f7d08c5cda38877ec798482c9706

diff --git a/skin.py b/skin.py
old mode 100644
new mode 100755
index 1c22d3d..19da203
--- a/skin.py
+++ b/skin.py
@@ -119,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
@@ -148,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":
@@ -239,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:
@@ -280,8 +284,8 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 				else:
 					bpp = 32
 				#print "Resolution:", xres,yres,bpp
-				from enigma import gFBDC
-				gFBDC.getInstance().setResolution(xres, yres)
+				from enigma import gMainDC
+				gMainDC.getInstance().setResolution(xres, yres)
 				desktop.resize(eSize(xres, yres))
 				if bpp != 32:
 					# load palette (not yet implemented)
@@ -393,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:
@@ -410,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
@@ -425,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: