From 0cbfa65b2c9e28aa8b065f578f132844c4c4c32d Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Tue, 25 Sep 2007 21:44:51 +0000
Subject: [PATCH] add EntryForegroundColor, EntryBorderColor,
 EntryBackgroundColor and EntryBackgroundColorSelected attributes to
 GraphMultiEPG EPGList.. instead of use queryColor... remove unneeded
 queryColor function

---
 .../Extensions/GraphMultiEPG/GraphMultiEpg.py      | 40 ++++++++++++----------
 skin.py                                            |  3 --
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
index 648d4f1..594aea4 100644
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
@@ -1,4 +1,4 @@
-from skin import queryColor
+from skin import parseColor
 from Components.config import config, ConfigClock, ConfigInteger
 from Components.Pixmap import Pixmap
 from Components.Button import Button
@@ -43,24 +43,26 @@ class EPGList(HTMLComponent, GUIComponent):
 		self.list = None
 		self.event_rect = None
 
-		#query skin colors
-		col = queryColor("GraphEpg.Foreground")
-		self.foreColor = col and col.argb()
-
-		col = queryColor("GraphEpg.Border")
-		self.borderColor = col and col.argb()
-
-		col = queryColor("GraphEpg.Background")
-		if col is None:
-			self.backColor = 0x586d88
-		else:
-			self.backColor = col.argb()
-
-		col = queryColor("GraphEpg.BackgroundSelected")
-		if col is None:
-			self.backColorSelected = 0x808080
-		else:
-			self.backColorSelected = col.argb()
+		self.foreColor = None
+		self.borderColor = None
+		self.backColor = 0x586d88
+		self.backColorSelected = 0x808080
+
+	def applySkin(self, desktop):
+		attribs = [ ]
+		for (attrib, value) in self.skinAttributes:
+			if attrib == "EntryForegroundColor":
+				self.foreColor = parseColor(value).argb()
+			elif attrib == "EntryBorderColor":
+				self.borderColor = parseColor(value).argb()
+			elif attrib == "EntryBackgroundColor":
+				self.backColor = parseColor(value).argb()
+			elif attrib == "EntryBackgroundColorSelected":
+				self.backColorSelected = parseColor(value).argb()
+			else:
+				attribs.append((attrib,value))
+		self.skinAttributes = attribs
+		return GUIComponent.applySkin(self, desktop)
 
 	def isSelectable(self, service, sname, event_list):
 		return (event_list and len(event_list) and True) or False
diff --git a/skin.py b/skin.py
index b0b4505..fc0360c 100644
--- a/skin.py
+++ b/skin.py
@@ -14,9 +14,6 @@ from Tools.XMLTools import elementsWithTag, mergeText
 
 colorNames = dict()
 
-def queryColor(colorName):
-	return colorNames.get(colorName)
-
 def dump(x, i=0):
 	print " " * i + str(x)
 	try:
-- 
2.7.4