X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ff3e20702fe0458bdefbb42f851ba29c64c6da69..1109344c9409572f9829e46971b71a7fe1d3c8cc:/lib/python/Components/ServiceList.py

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 8525ade3..4a27c768 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -1,11 +1,11 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 
-from enigma import *
+from enigma import loadPNG, eListboxServiceContent, eListbox, eServiceCenter, eServiceReference, gFont, eRect
 
 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
@@ -19,6 +19,10 @@ class ServiceList(HTMLComponent, GUIComponent):
 		if pic:
 			self.l.setPixmap(self.l.picFolder, pic)
 
+		pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "marker-fs8.png"))
+		if pic:
+			self.l.setPixmap(self.l.picMarker, pic)
+
 		pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_s-fs8.png"))
 		if pic:
 			self.l.setPixmap(self.l.picDVB_S, pic)
@@ -31,8 +35,25 @@ class ServiceList(HTMLComponent, GUIComponent):
 		if pic:
 			self.l.setPixmap(self.l.picDVB_T, pic)
 
+		pic = loadPNG(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 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)
@@ -66,6 +87,14 @@ class ServiceList(HTMLComponent, GUIComponent):
 		self.instance.moveSelectionTo(index)
 		print "Moving to character " + str(char)
 
+	def moveToNextMarker(self):
+		idx = self.l.getNextMarkerPos()
+		self.instance.moveSelectionTo(idx)
+
+	def moveToPrevMarker(self):
+		idx = self.l.getPrevMarkerPos()
+		self.instance.moveSelectionTo(idx)
+
 	def moveToIndex(self, index):
 		self.instance.moveSelectionTo(index)
 
@@ -77,6 +106,7 @@ 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 getRoot(self):
@@ -106,9 +136,13 @@ class ServiceList(HTMLComponent, GUIComponent):
 		self.l.setRoot(root, justSet)
 		if not justSet:
 			self.l.sort()
+		self.selectionChanged()
 
-	def addService(self, service):
-		self.l.addService(service)
+	def removeCurrent(self):
+		self.l.removeCurrent()
+
+	def addService(self, service, beforeCurrent=False):
+		self.l.addService(service, beforeCurrent)
 
 	def finishFill(self):
 		self.l.FillFinished()
@@ -145,15 +179,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, 40, 28))
+			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(50, 0, self.instance.size().width()-50, 28))
+			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)