X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e3f30d7502421d19d5ecf421bbc107ae1d316587..c900a62b068cf1f583b8936aa0dae18c9683b461:/lib/python/Components/ServiceList.py

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 6145adef..059b8906 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -1,11 +1,13 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
+from skin import parseColor
 
-from enigma import *
+from enigma import eListboxServiceContent, eListbox, eServiceCenter, eServiceReference, gFont, eRect
+from Tools.LoadPixmap import LoadPixmap
 
 from string import upper
 
-from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 
 class ServiceList(HTMLComponent, GUIComponent):
 	MODE_NORMAL = 0
@@ -15,28 +17,65 @@ class ServiceList(HTMLComponent, GUIComponent):
 		GUIComponent.__init__(self)
 		self.l = eListboxServiceContent()
 
-		pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "folder.png"))
+		pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/folder.png"))
 		if pic:
 			self.l.setPixmap(self.l.picFolder, pic)
 
-		pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "marker-fs8.png"))
+		pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/marker.png"))
 		if pic:
 			self.l.setPixmap(self.l.picMarker, pic)
 
-		pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_s-fs8.png"))
+		pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_s-fs8.png"))
 		if pic:
 			self.l.setPixmap(self.l.picDVB_S, pic)
 
-		pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_c-fs8.png"))
+		pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_c-fs8.png"))
 		if pic:
 			self.l.setPixmap(self.l.picDVB_C, pic)
 
-		pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_t-fs8.png"))
+		pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_t-fs8.png"))
 		if pic:
 			self.l.setPixmap(self.l.picDVB_T, pic)
 
+		pic = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "ico_service_group-fs8.png"))
+		if pic:
+			self.l.setPixmap(self.l.picServiceGroup, pic)
+
 		self.root = None
 		self.mode = self.MODE_NORMAL
+		self.onSelectionChanged = [ ]
+
+	def applySkin(self, desktop, parent):
+		attribs = [ ]
+		if self.skinAttributes is not None:
+			attribs = [ ]
+			for (attrib, value) in self.skinAttributes:
+				if attrib == "foregroundColorMarked":
+					self.l.setColor(eListboxServiceContent.markedForeground, parseColor(value))
+				elif attrib == "foregroundColorMarkedSelected":
+					self.l.setColor(eListboxServiceContent.markedForegroundSelected, parseColor(value))
+				elif attrib == "backgroundColorMarked":
+					self.l.setColor(eListboxServiceContent.markedBackground, parseColor(value))
+				elif attrib == "backgroundColorMarkedSelected":
+					self.l.setColor(eListboxServiceContent.markedBackgroundSelected, parseColor(value))
+				elif attrib == "foregroundColorServiceNotAvail":
+					self.l.setColor(eListboxServiceContent.serviceNotAvail, parseColor(value))
+				else:
+					attribs.append((attrib, value))
+		self.skinAttributes = attribs
+		return GUIComponent.applySkin(self, desktop, parent)
+
+	def connectSelChanged(self, fnc):
+		if not fnc in self.onSelectionChanged:
+			self.onSelectionChanged.append(fnc)
+
+	def disconnectSelChanged(self, fnc):
+		if fnc in self.onSelectionChanged:
+			self.onSelectionChanged.remove(fnc)
+
+	def selectionChanged(self):
+		for x in self.onSelectionChanged:
+			x()
 
 	def setCurrent(self, ref):
 		self.l.setCurrent(ref)
@@ -89,8 +128,13 @@ class ServiceList(HTMLComponent, GUIComponent):
 	def postWidgetCreate(self, instance):
 		instance.setWrapAround(True)
 		instance.setContent(self.l)
+		instance.selectionChanged.get().append(self.selectionChanged)
 		self.setMode(self.mode)
 
+	def preWidgetRemove(self, instance):
+		instance.setContent(None)
+		instance.selectionChanged.get().remove(self.selectionChanged)
+
 	def getRoot(self):
 		return self.root
 
@@ -118,6 +162,7 @@ class ServiceList(HTMLComponent, GUIComponent):
 		self.l.setRoot(root, justSet)
 		if not justSet:
 			self.l.sort()
+		self.selectionChanged()
 
 	def removeCurrent(self):
 		self.l.removeCurrent()
@@ -160,15 +205,16 @@ class ServiceList(HTMLComponent, GUIComponent):
 		self.mode = mode
 
 		if mode == self.MODE_NORMAL:
-			self.instance.setItemHeight(28)
-			self.l.setVisualMode(eListboxServiceContent.visModeSimple)
+			self.l.setItemHeight(28)
+			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
 			self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
 			self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
+			self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
 		else:
-			self.instance.setItemHeight(28)
+			self.l.setItemHeight(28)
+			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
 			self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
 			self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 50, 28))
 			self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
 			self.l.setElementPosition(self.l.celServiceName, eRect(60, 0, self.instance.size().width()-60, 28))
 			self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
-			self.l.setVisualMode(eListboxServiceContent.visModeComplex)