X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/494169d25068e3d3dd2dcc8b37b42d32df6935e7..d73219bf587818d7648531da574beb45f6e3c000:/lib/python/Components/ServiceList.py

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index e04594ee..85f004c0 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -6,7 +6,6 @@ from enigma import *
 from string import upper
 
 class ServiceList(HTMLComponent, GUIComponent):
-
 	MODE_NORMAL = 0
 	MODE_FAVOURITES = 1
 
@@ -14,7 +13,6 @@ class ServiceList(HTMLComponent, GUIComponent):
 		GUIComponent.__init__(self)
 		self.l = eListboxServiceContent()
 		self.root = None
-		
 		self.mode = self.MODE_NORMAL
 
 	def setCurrent(self, ref):
@@ -25,29 +23,42 @@ class ServiceList(HTMLComponent, GUIComponent):
 		self.l.getCurrent(r)
 		return r
 
+	def atBegin(self):
+		return self.instance.atBegin()
+
+	def atEnd(self):
+		return self.instance.atEnd()
+
 	def moveUp(self):
 		self.instance.moveSelection(self.instance.moveUp)
 
 	def moveDown(self):
 		self.instance.moveSelection(self.instance.moveDown)
-		
+
 	def moveToChar(self, char):
 		# TODO fill with life
 		print "Next char: "
 		index = self.l.getNextBeginningWithChar(char)
 		indexup = self.l.getNextBeginningWithChar(upper(char))
-		if (index > indexup):
-			index = indexup
+		if indexup != 0:
+			if (index > indexup or index == 0):
+				index = indexup
+
 		self.instance.moveSelectionTo(index)
 		print "Moving to character " + str(char)
 
-	def GUIcreate(self, parent):
-		self.instance = eListbox(parent)
-		self.instance.setContent(self.l)
-		self.setMode(self.mode)
+	def moveToIndex(self, index):
+		self.instance.moveSelectionTo(index)
+
+	def getCurrentIndex(self):
+		return self.instance.getCurrentIndex()
+
+	GUI_WIDGET = eListbox
 	
-	def GUIdelete(self):
-		self.instance = None
+	def postWidgetCreate(self, instance):
+		instance.setWrapAround(True)
+		instance.setContent(self.l)
+		self.setMode(self.mode)
 
 	def getRoot(self):
 		return self.root
@@ -68,9 +79,20 @@ class ServiceList(HTMLComponent, GUIComponent):
 	def setNumberOffset(self, offset):
 		self.l.setNumberOffset(offset)
 
-	def setRoot(self, root):
+	def setPlayableIgnoreService(self, ref):
+		self.l.setIgnoreService(ref)
+
+	def setRoot(self, root, justSet=False):
 		self.root = root
-		self.l.setRoot(root)
+		self.l.setRoot(root, justSet)
+		if not justSet:
+			self.l.sort()
+
+	def addService(self, service):
+		self.l.addService(service)
+
+	def finishFill(self):
+		self.l.FillFinished()
 		self.l.sort()
 
 # stuff for multiple marks (edit mode / later multiepg)
@@ -103,21 +125,16 @@ class ServiceList(HTMLComponent, GUIComponent):
 	def setMode(self, mode):
 		self.mode = mode
 
-		try:
-			self.instance
-		except:
-			return
-		
 		if mode == self.MODE_NORMAL:
 			self.instance.setItemHeight(28)
 			self.l.setVisualMode(eListboxServiceContent.visModeSimple)
-			self.l.setElementFont(self.l.celServiceName, gFont("Arial", 22))
+			self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
 			self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
 		else:
 			self.instance.setItemHeight(28)
-			self.l.setElementFont(self.l.celServiceNumber, gFont("Arial", 20))
+			self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
 			self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 40, 28))
-			self.l.setElementFont(self.l.celServiceName, gFont("Arial", 22))
+			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.setElementFont(self.l.celServiceInfo, gFont("Arial", 18))
+			self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
 			self.l.setVisualMode(eListboxServiceContent.visModeComplex)