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

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 4c10c660..8525ade3 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -5,16 +5,33 @@ from enigma import *
 
 from string import upper
 
-class ServiceList(HTMLComponent, GUIComponent):
+from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS
 
+class ServiceList(HTMLComponent, GUIComponent):
 	MODE_NORMAL = 0
 	MODE_FAVOURITES = 1
 
 	def __init__(self):
 		GUIComponent.__init__(self)
 		self.l = eListboxServiceContent()
+
+		pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "folder.png"))
+		if pic:
+			self.l.setPixmap(self.l.picFolder, pic)
+
+		pic = loadPNG(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"))
+		if pic:
+			self.l.setPixmap(self.l.picDVB_C, pic)
+
+		pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_dvb_t-fs8.png"))
+		if pic:
+			self.l.setPixmap(self.l.picDVB_T, pic)
+
 		self.root = None
-		
 		self.mode = self.MODE_NORMAL
 
 	def setCurrent(self, ref):
@@ -25,12 +42,18 @@ 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: "
@@ -49,13 +72,12 @@ class ServiceList(HTMLComponent, GUIComponent):
 	def getCurrentIndex(self):
 		return self.instance.getCurrentIndex()
 
-	def GUIcreate(self, parent):
-		self.instance = eListbox(parent)
-		self.instance.setContent(self.l)
-		self.setMode(self.mode)
+	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
@@ -122,21 +144,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)