X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/77c45c9d2cabd3c1dc028c41d26573ac62147a34..8a7fd294aeb67932e1057bf967958bbe5a959cfb:/skin.py

diff --git a/skin.py b/skin.py
index 51433bd7..2e913a08 100644
--- a/skin.py
+++ b/skin.py
@@ -2,6 +2,9 @@ from enigma import *
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 
+
+colorNames = dict()
+
 def dump(x, i=0):
 	print " " * i + str(x)
 	try:
@@ -11,10 +14,35 @@ def dump(x, i=0):
 		None
 
 dom = xml.dom.minidom.parseString(
-	"""
-	<skin>
+	"""<skin>
+	
+		<colors>
+			<color name="white" value="#ffffff" />
+			<color name="black" value="#000000" />
+			<color name="dark"  value="#294a6b" />
+		</colors>
+		<windowstyle type="skinned">
+			<color name="Background" color="#4075a7" />
+			<color name="LabelForeground" color="#ffffff" />
+			<color name="ListboxBackground" color="#4075a7" />
+			<color name="ListboxForeground" color="#ffffff" />
+			<color name="ListboxSelectedBackground" color="#80ff80" />
+			<color name="ListboxSelectedForeground" color="#ffffff" />
+			<color name="ListboxMarkedBackground" color="#ff0000" />
+			<color name="ListboxMarkedForeground" color="#ffffff" />
+			<borderset name="bsWindow">
+				<pixmap pos="bpTopLeft"     filename="data/b_w_tl.png" />
+				<pixmap pos="bpTop"         filename="data/b_w_t.png"  />
+				<pixmap pos="bpTopRight"    filename="data/b_w_tr.png" />
+				<pixmap pos="bpLeft"        filename="data/b_w_l.png"  />
+				<pixmap pos="bpRight"       filename="data/b_w_r.png"  />
+				<pixmap pos="bpBottomLeft"  filename="data/b_w_bl.png" />
+				<pixmap pos="bpBottom"      filename="data/b_w_b.png"  />
+				<pixmap pos="bpBottomRight" filename="data/b_w_br.png" />
+			</borderset>
+		</windowstyle>
 		<screen name="mainMenu" position="300,100" size="300,300" title="real main menu">
-			<widget name="okbutton" position="10,190" size="280,50" font="Arial:20" valign="center" halign="center" />
+			<widget name="okbutton" position="10,190" size="280,50" font="Arial;20" valign="center" halign="center" />
 			<widget name="title" position="10,10" size="280,20" />
 			<widget name="menu" position="10,30" size="280,140" />
 		</screen>
@@ -23,15 +51,16 @@ dom = xml.dom.minidom.parseString(
 			<widget name="title" position="10,120" size="280,50" />
 			<widget name="theClock" position="10,60" size="280,50" />
 		</screen>
-		<screen name="infoBar" position="80,350" size="540,150" title="InfoBar">
-			<widget name="CurrentTime" position="10,10" size="40,30" />
-			<widget name="ServiceName" position="50,20" size="200,30" />
-			<widget name="Event_Now" position="100,40" size="300,30" valign="top" halign="left" />
-			<widget name="Event_Next" position="100,90" size="300,30" valign="top" halign="left" />
-			<widget name="Event_Now_Duration" position="440,40" size="80,30" valign="top" halign="left" />
-			<widget name="Event_Next_Duration" position="440,90" size="80,30" valign="top" halign="left" />
-			<eLabel position="70,0" size="300,30" text=".oO skin Oo." font="Arial:20" />
-<!--			<ePixmap position="70,0" size="300,30" pixmap="info-bg.png" /> -->
+		<screen name="infoBar" position="0,380" size="720,151" title="InfoBar" flags="wfNoBorder">
+			<ePixmap position="0,0" size="720,151" pixmap="data/info-bg.png" />
+			
+			<widget name="ServiceName" position="69,30" size="427,26" valign="center" font="Arial;32" backgroundColor="#101258" />
+			<widget name="CurrentTime" position="575,10" size="66,30" backgroundColor="dark" font="Arial;16" />
+			<widget name="Event_Now" position="273,68" size="282,30" font="Arial;29" backgroundColor="dark" />
+			<widget name="Event_Next" position="273,98" size="282,30" font="Arial;29" backgroundColor="dark" />
+			<widget name="Event_Now_Duration" position="555,68" size="70,26" font="Arial;26" backgroundColor="dark" />
+			<widget name="Event_Next_Duration" position="555,98" size="70,26" font="Arial;26" backgroundColor="dark" />
+<!--			<eLabel position="70,0" size="300,30" text=".oO skin Oo." font="Arial;20" /> -->
 		</screen>
 		<screen name="channelSelection" position="100,80" size="500,240" title="Channel Selection">
 			<widget name="list" position="20,50" size="300,150" />
@@ -40,14 +69,18 @@ dom = xml.dom.minidom.parseString(
 		<screen name="serviceScan" position="150,100" size="300,200" title="Service Scan">
 			<widget name="scan_progress" position="10,10" size="280,50" />
 			<widget name="scan_state" position="10,60" size="280,30" />
-			<widget name="okbutton" position="10,100" size="280,40" />
 		</screen>
-	</skin>
-""")
+	</skin>""")
 
 # filters all elements of childNode with the specified function
 # example: nodes = elementsWithTag(childNodes, lambda x: x == "bla")
 def elementsWithTag(el, tag):
+
+	# fiiixme! (works but isn't nice)
+	if tag.__class__ == "".__class__:
+		str = tag
+		tag = lambda x: x == str
+		
 	for x in el:
 		if x.nodeType != xml.dom.minidom.Element.nodeType:
 			continue
@@ -63,10 +96,18 @@ def parseSize(str):
 	return eSize(int(x), int(y))
 
 def parseFont(str):
-	name, size = str.split(':')
+	name, size = str.split(';')
 	return gFont(name, int(size))
 
-def applyAttributes(guiObject, node):
+def parseColor(str):
+	if str[0] != '#':
+		try:
+			return colorNames[str]
+		except:
+			raise ("color '%s' must be #aarrggbb or valid named color" % (str))
+	return gRGB(int(str[1:], 0x10))
+
+def applyAttributes(guiObject, node, desktop):
 	# walk all attributes
 	for p in range(node.attributes.length):
 		a = node.attributes.item(p)
@@ -93,7 +134,12 @@ def applyAttributes(guiObject, node):
 				ptr = gPixmapPtr()
 				if loadPNG(ptr, value):
 					raise "loading PNG failed!"
-				guiObject.setPixmap(ptr.__deref__())
+				x = ptr
+				ptr = ptr.__deref__()
+				print desktop
+				desktop.makeCompatiblePixmap(ptr)
+				guiObject.setPixmap(ptr)
+#				guiObject.setPixmapFromFile(value)
 			elif attrib == "valign":
 				try:
 					guiObject.setVAlign(
@@ -113,29 +159,84 @@ def applyAttributes(guiObject, node):
 						}[value])
 				except KeyError:
 					print "halign must be either left, center, right or block!"
+			elif attrib == "flags":
+				flags = value.split(',')
+				for f in flags:
+					try:
+						fv = eWindow.__dict__[f]
+						guiObject.setFlag(fv)
+					except KeyError:
+						print "illegal flag %s!" % f
+			elif attrib == "backgroundColor":
+				guiObject.setBackgroundColor(parseColor(value))
 			elif attrib != 'name':
 				print "unsupported attribute " + attrib + "=" + value
 		except AttributeError:
 			print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
 
-def applyGUIskin(screen, skin, name):
+def loadSkin():
+	print "loading skin..."
+	
+	def getPNG(x):
+		g = gPixmapPtr()
+		loadPNG(g, x)
+		g = g.grabRef()
+		return g
+	
+	skin = dom.childNodes[0]
+	assert skin.tagName == "skin", "root element in skin must be 'skin'!"
+	
+	for c in elementsWithTag(skin.childNodes, "colors"):
+		for color in elementsWithTag(c.childNodes, "color"):
+			name = str(color.getAttribute("name"))
+			color = str(color.getAttribute("value"))
+			
+			if not len(color):
+				raise ("need color and name, got %s %s" % (name, color))
+				
+			colorNames[name] = parseColor(color)
+	
+	for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
+		style = eWindowStyleSkinned()
+		
+		for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):
+			bsName = str(borderset.getAttribute("name"))
+			for pixmap in elementsWithTag(borderset.childNodes, "pixmap"):
+				bpName = str(pixmap.getAttribute("pos"))
+				filename = str(pixmap.getAttribute("filename"))
+				
+				style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], getPNG(filename))
+
+		for color in elementsWithTag(windowstyle.childNodes, "color"):
+			type = str(color.getAttribute("name"))
+			color = parseColor(color.getAttribute("color"))
+			
+			try:
+				style.setColor(eWindowStyleSkinned.__dict__["col" + type], color)
+			except:
+				raise ("Unknown color %s" % (type))
+			
+		x = eWindowStyleManagerPtr()
+		eWindowStyleManager.getInstance(x)
+		x.setStyle(style)
+
+def applyGUIskin(screen, skin, name, desktop):
 	myscreen = None
 	
 	# first, find the corresponding screen element
 	skin = dom.childNodes[0]
-	assert skin.tagName == "skin", "root element in skin must be 'skin'!"
 	
-	for x in elementsWithTag(skin.childNodes, lambda x: x == "screen"):
+	for x in elementsWithTag(skin.childNodes, "screen"):
 		if x.getAttribute('name') == name:
 			myscreen = x
 	del skin
 	
 	assert myscreen != None, "no skin for screen '" + name + "' found!"
 	
-	applyAttributes(screen.instance, myscreen)
+	applyAttributes(screen.instance, myscreen, desktop)
 	
 	# now walk all widgets
-	for widget in elementsWithTag(myscreen.childNodes, lambda x: x == "widget"):
+	for widget in elementsWithTag(myscreen.childNodes, "widget"):
 		wname = widget.getAttribute('name')
 		if wname == None:
 			print "widget has no name!"
@@ -147,7 +248,7 @@ def applyGUIskin(screen, skin, name):
 		except:
 			raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
 		
-		applyAttributes(guiObject, widget)
+		applyAttributes(guiObject, widget, desktop)
 
 	# now walk additional objects
 	for widget in elementsWithTag(myscreen.childNodes, lambda x: x != "widget"):
@@ -158,5 +259,5 @@ def applyGUIskin(screen, skin, name):
 		else:
 			raise str("unsupported stuff : %s" % widget.tagName)
 		
-		applyAttributes(guiObject, widget)
+		applyAttributes(guiObject, widget, desktop	)
 		guiObject.thisown = 0