X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b62474db510d8ffea6d3501bdb6f96a0cb15d180..af5dfb0ec911f152f909530cf29c9e2ba74e2c1f:/lib/python/Components/MovieList.py

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index dfd419fb..a921b8df 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -2,6 +2,7 @@ from HTMLComponent import *
 from GUIComponent import *
 from Tools.FuzzyDate import FuzzyTime
 from ServiceReference import ServiceReference
+from Components.MultiContent import MultiContentEntryText, RT_HALIGN_LEFT, RT_HALIGN_RIGHT
 
 from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation
 
@@ -9,18 +10,6 @@ from enigma import eServiceReference, eServiceCenter, \
 	eServiceCenterPtr, iListableServicePtr, \
 	iStaticServiceInformationPtr
 
-RT_HALIGN_LEFT = 0
-RT_HALIGN_RIGHT = 1
-RT_HALIGN_CENTER = 2
-RT_HALIGN_BLOCK = 4
-
-RT_VALIGN_TOP = 0
-RT_VALIGN_CENTER = 8
-RT_VALIGN_BOTTOM = 16
-
-RT_WRAP = 32
-
-
 #
 # | name of movie              |
 #
@@ -43,7 +32,10 @@ def MovieListEntry(serviceref, serviceHandler):
 	begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
 	res = [ (serviceref, begin) ]
 
-	res.append((0, 0, 0, 560, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
+	res.append(MultiContentEntryText(pos=(0, 0), size=(420, 30), font = 0, flags = RT_HALIGN_LEFT, text = info.getName(serviceref)))
+	service = ServiceReference(info.getInfoString(serviceref, iServiceInformation.sServiceref))
+	if service is not None:
+		res.append(MultiContentEntryText(pos=(420, 0), size=(140, 30), font = 0, flags = RT_HALIGN_RIGHT, text = service.getServiceName()))
 	
 	description = info.getInfoString(serviceref, iServiceInformation.sDescription)
 
@@ -52,9 +44,9 @@ def MovieListEntry(serviceref, serviceHandler):
 		t = FuzzyTime(begin)
 		begin_string = t[0] + ", " + t[1]
 	
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 560, 20, 1, RT_HALIGN_LEFT, description))
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 270, 20, 1, RT_HALIGN_LEFT, begin_string))
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 290, 50, 270, 20, 1, RT_HALIGN_RIGHT, len))
+	res.append(MultiContentEntryText(pos=(0, 30), size=(560, 20), font=1, flags=RT_HALIGN_LEFT, text=description))
+	res.append(MultiContentEntryText(pos=(0, 50), size=(270, 20), font=1, flags=RT_HALIGN_LEFT, text=begin_string))
+	res.append(MultiContentEntryText(pos=(290, 50), size=(270, 20), font=1, flags=RT_HALIGN_RIGHT, text=len))
 	
 	return res
 
@@ -64,7 +56,7 @@ class MovieList(HTMLComponent, GUIComponent):
 		self.l = eListboxPythonMultiContent()
 		if root is not None:
 			self.reload(root)
-		self.l.setFont(0, gFont("Regular", 30))
+		self.l.setFont(0, gFont("Regular", 22))
 		self.l.setFont(1, gFont("Regular", 18))
 		
 	def moveToIndex(self, index):
@@ -74,7 +66,8 @@ class MovieList(HTMLComponent, GUIComponent):
 		return self.instance.getCurrentIndex()
 
 	def getCurrent(self):
-		return self.l.getCurrentSelection()[0]
+		l = self.l.getCurrentSelection()
+		return l and l[0]
 	
 	def GUIcreate(self, parent):
 		self.instance = eListbox(parent)
@@ -92,6 +85,12 @@ class MovieList(HTMLComponent, GUIComponent):
 			self.load(self.root)
 		self.l.setList(self.list)
 
+	def removeService(self, service):
+		for l in self.list[:]:
+			if l[0][0] == service:
+				self.list.remove(l)
+		self.l.setList(self.list)
+
 	def load(self, root):
 		# this lists our root service, then building a 
 		# nice list