X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/44433f650cd3e5f9f66253b74d194fcb01578595..2e74b767faf7548c6f6aae3a12506d46d3edd6c0:/skin.py?ds=sidebyside

diff --git a/skin.py b/skin.py
index 73d4b02d..72cef1a9 100644
--- a/skin.py
+++ b/skin.py
@@ -2,6 +2,10 @@ from enigma import *
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 
+from Tools.XMLTools import elementsWithTag
+
+colorNames = dict()
+
 def dump(x, i=0):
 	print " " * i + str(x)
 	try:
@@ -12,8 +16,26 @@ def dump(x, i=0):
 
 dom = xml.dom.minidom.parseString(
 	"""<skin>
+	
+		<colors>
+			<color name="white" 	value="#ffffff" />
+			<color name="black" 	value="#000000" />
+			<color name="dark"  	value="#294a6b" />
+			
+			<color name="red" 		value="#ff0000" />
+			<color name="green" 	value="#00ff00" />
+			<color name="blue" 		value="#0000ff" />
+			<color name="yellow"	value="#c0c000" />
+		</colors>
 		<windowstyle type="skinned">
-			<color name="defaultBackground" color="#4075a7" />
+			<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"  />
@@ -25,53 +47,72 @@ dom = xml.dom.minidom.parseString(
 				<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" />
+		<screen name="Menu" 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="title" position="10,10" size="280,20" />
-			<widget name="menu" position="10,30" size="280,140" />
+			<widget name="menu" position="10,30" size="280,200" />
+		</screen>
+		<screen name="ScartLoopThrough" position="0,0" size="720,576">
+		</screen>
+		<screen name="ConfigMenu" position="300,100" size="300,300" title="real main menu">
+			<widget name="txt_var_1" position="20,20" size="100,20" />
+			<widget name="btn_var_1" position="110,20" size="200,20" />
+			<widget name="txt_var_2" position="20,60" size="100,20" />
+			<widget name="btn_var_2" position="110,60" size="200,20" />
+		</screen>
+		<screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
+			<widget name="okbutton" position="20,245" size="205,40" />
+			<widget name="txt_alpha" position="20,20" size="110,20" />
+			<widget name="sld_alpha" position="150,20" size="290,20" />
+			<widget name="txt_brightness" position="20,60" size="120,20" />
+			<widget name="sld_brightness" position="150,20" size="290,20" />
+			<widget name="txt_gamma" position="20,100" size="120,20" />
+			<widget name="sld_gamma" position="150,100" size="290,20" />
+		</screen>
+		<screen name="configTest" position="300,100" size="300,300" title="config menu">
+			<widget name="config" position="10,30" size="280,140" />
+		</screen>
+		<screen name="TimerEditList" position="160,100" size="420,430" title="Timer Editor">
+			<widget name="timerlist" position="10,30" size="400,300" />
 		</screen>
 		<screen name="clockDisplay" position="300,100" size="300,300">
 			<widget name="okbutton" position="10,10" size="280,40" />
 			<widget name="title" position="10,120" size="280,50" />
 			<widget name="theClock" position="10,60" size="280,50" />
 		</screen>
-		<screen name="infoBar" position="0,380" size="720,151" title="InfoBar" flags="wfNoBorder">
-			<ePixmap position="0,0" size="720,151" 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" />
-			<widget name="CurrentTime" position="575,10" size="66,30" />
-			<widget name="Event_Now" position="273,68" size="282,30" font="Arial;29" backgroundColor="#586D88" />
-			<widget name="Event_Next" position="273,98" size="282,30" font="Arial;29" />
-			<widget name="Event_Now_Duration" position="555,68" size="70,26" font="Arial;26" />
-			<widget name="Event_Next_Duration" position="555,98" size="70,26" font="Arial;26" />
+			<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" />
-			<widget name="okbutton" position="340,50" size="140,30" />
+		<screen name="ChannelSelection" position="90,100" size="560,420" title="Channel Selection">
+			<widget name="list" position="0,50" size="560,340" />
+<!--			<widget name="okbutton" position="340,50" size="140,30" />-->
+			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" />
+			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" />
+			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" />
+			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" />
 		</screen>
-		<screen name="serviceScan" position="150,100" size="300,200" title="Service Scan">
+		<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>
+		<screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
+			<widget name="description" position="10,10" size="580,40" />
+			<widget name="lbegin" position="405,102" size="103,30" />
+			<widget name="lend" position="405,158" size="103,30" />
+			<widget name="begin" position="508,105" size="72,35" font="Arial;30" />
+			<widget name="end" position="508,150" size="72,35" font="Arial;30" />
+			<widget name="apply" position="10,240" size="250,35" />
 		</screen>
 	</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
-		if tag(x.tagName):
-			yield x
-
 def parsePosition(str):
 	x, y = str.split(',')
 	return ePoint(int(x), int(y))
@@ -86,7 +127,10 @@ def parseFont(str):
 
 def parseColor(str):
 	if str[0] != '#':
-		raise "color must be #aarrggbb"
+		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):
@@ -168,6 +212,16 @@ def loadSkin():
 	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()
 		
@@ -183,10 +237,10 @@ def loadSkin():
 			type = str(color.getAttribute("name"))
 			color = parseColor(color.getAttribute("color"))
 			
-			if type == "defaultBackground":
-				style.setDefaultBackgroundColor(color)
-			else:
-				raise "unknown color %s" % (type)
+			try:
+				style.setColor(eWindowStyleSkinned.__dict__["col" + type], color)
+			except:
+				raise ("Unknown color %s" % (type))
 			
 		x = eWindowStyleManagerPtr()
 		eWindowStyleManager.getInstance(x)