X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7bc4a59528ab13f3062dc1520e76f9ecedd87400..241e6d3da33580a6051a0ef4fa2590f2ae4fa9d0:/skin.py

diff --git a/skin.py b/skin.py
index 72cef1a9..bc4931fb 100644
--- a/skin.py
+++ b/skin.py
@@ -32,7 +32,7 @@ dom = xml.dom.minidom.parseString(
 			<color name="LabelForeground" color="#ffffff" />
 			<color name="ListboxBackground" color="#4075a7" />
 			<color name="ListboxForeground" color="#ffffff" />
-			<color name="ListboxSelectedBackground" color="#80ff80" />
+			<color name="ListboxSelectedBackground" color="#404080" />
 			<color name="ListboxSelectedForeground" color="#ffffff" />
 			<color name="ListboxMarkedBackground" color="#ff0000" />
 			<color name="ListboxMarkedForeground" color="#ffffff" />
@@ -104,11 +104,11 @@ dom = xml.dom.minidom.parseString(
 			<widget name="scan_state" position="10,60" size="280,30" />
 		</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="description" position="10,10" size="580,40" font="Arial;25"/>
+			<widget name="lbegin" position="405,102" size="103,30" font="Arial;25" />
+			<widget name="lend" position="405,158" size="103,30" font="Arial;25" />
+			<widget name="begin" position="508,105" size="72,35" font="Arial;25" />
+			<widget name="end" position="508,150" size="72,35" font="Arial;25" />
 			<widget name="apply" position="10,240" size="250,35" />
 		</screen>
 	</skin>""")
@@ -162,7 +162,6 @@ def applyAttributes(guiObject, node, desktop):
 					raise "loading PNG failed!"
 				x = ptr
 				ptr = ptr.__deref__()
-				print desktop
 				desktop.makeCompatiblePixmap(ptr)
 				guiObject.setPixmap(ptr)
 #				guiObject.setPixmapFromFile(value)
@@ -200,7 +199,7 @@ def applyAttributes(guiObject, node, desktop):
 		except AttributeError:
 			print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
 
-def loadSkin():
+def loadSkin(desktop):
 	print "loading skin..."
 	
 	def getPNG(x):
@@ -231,7 +230,11 @@ def loadSkin():
 				bpName = str(pixmap.getAttribute("pos"))
 				filename = str(pixmap.getAttribute("filename"))
 				
-				style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], getPNG(filename))
+				png = getPNG(filename)
+				
+				# adapt palette
+				desktop.makeCompatiblePixmap(png)
+				style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png)
 
 		for color in elementsWithTag(windowstyle.childNodes, "color"):
 			type = str(color.getAttribute("name"))