X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=skin.py;h=a0190f1c2dfbdc1f2f58700ce6ed38d18f0797ae;hp=a269b4f166e4d22e6eeaf3525f62fb94beb26d17;hb=2f69db82dd516d3f710abc6d7e7acb34efbd2d52;hpb=c8724d0d7b016371309f189636b0992ea413bd96

diff --git a/skin.py b/skin.py
index a269b4f..a0190f1 100755
--- a/skin.py
+++ b/skin.py
@@ -140,6 +140,17 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1)
 			guiObject.move(parsePosition(value, scale, desktop, guiObject.csize()))
 		elif attrib == 'size':
 			guiObject.resize(parseSize(value, scale))
+		elif attrib == 'animationPaused':
+			pass
+		elif attrib == 'animationMode':
+			guiObject.setAnimationMode(
+				{ "disable": 0x00,
+					"off": 0x00,
+					"offshow": 0x10,
+					"offhide": 0x01,
+					"onshow": 0x01,
+					"onhide": 0x10,
+				}[value])
 		elif attrib == 'title':
 			guiObject.setTitle(_(value))
 		elif attrib == 'text':
@@ -284,8 +295,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)
@@ -397,13 +408,15 @@ def loadSkinData(desktop):
 	for (path, dom_skin) in skins:
 		loadSingleSkinData(desktop, dom_skin, path)
 
-def lookupScreen(name, style_id = None):
+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:
-				screen_style_id = int(x.attrib.get('id', None) or '0')
-				if style_id is None or screen_style_id == style_id:
+				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
 
@@ -438,8 +451,10 @@ def readSkin(screen, skin, names, desktop):
 			skin_tuple = (skin_tuple,)
 		for sskin in skin_tuple:
 			parsedSkin = xml.etree.cElementTree.fromstring(sskin)
-			if style_id != 2 or parsedSkin.attrib.get('id', 0) == 2:
+			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: