X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54ef002317d169d6dafbe48735560676435ce53d..9095daa5b9033537978293224115019c6f68686c:/lib/python/Components/EpgList.py

diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index d995bb6b..5c6ed98c 100644
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -9,6 +9,7 @@ from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 
 EPG_TYPE_SINGLE = 0
 EPG_TYPE_MULTI = 1
+EPG_TYPE_SIMILAR = 2
 
 RT_HALIGN_LEFT = 0
 RT_HALIGN_RIGHT = 1
@@ -56,8 +57,11 @@ class EPGList(HTMLComponent, GUIComponent):
 			self.l = eListboxPythonMultiContent()
 			if type == EPG_TYPE_SINGLE:
 				self.l.setBuildFunc(self.buildSingleEntry)
-			else:
+			elif type == EPG_TYPE_MULTI:
 				self.l.setBuildFunc(self.buildMultiEntry)
+			else:
+				assert(type == EPG_TYPE_SIMILAR)
+				self.l.setBuildFunc(self.buildSimilarEntry)
 		self.epgcache = eEPGCache.getInstance()
 
 	def getEventFromId(self, service, eventid):
@@ -81,7 +85,7 @@ class EPGList(HTMLComponent, GUIComponent):
 					return cur
 				else:
 					evt = self.getEventFromId(self.service, cur[0])
-		else:
+		elif self.type == EPG_TYPE_MULTI:
 			tmp = self.l.getCurrentSelection()
 			if tmp is None:
 				return ( None, None )
@@ -89,6 +93,14 @@ class EPGList(HTMLComponent, GUIComponent):
 			service = ServiceReference(tmp[1])
 			event = self.getEventFromId(service, eventid)
 			evt = ( event, service )
+		else:
+			tmp = self.l.getCurrentSelection()
+			if tmp is None:
+				return ( None, None )
+			eventid = tmp[1]
+			service = ServiceReference(tmp[0])
+			event = self.getEventFromId(service, eventid)
+			evt = ( event, service )
 		return evt
 
 	def moveUp(self):
@@ -134,7 +146,7 @@ class EPGList(HTMLComponent, GUIComponent):
 				w = width/20*5
 				self.datetime_rect = Rect(0,0, w, height)
 				self.descr_rect = Rect(w, 0, width/20*15, height)
-			else:
+			elif self.type == EPG_TYPE_MULTI:
 				xpos = 0;
 				w = width/10*3;
 				self.service_rect = Rect(xpos, 0, w-10, height)
@@ -145,9 +157,16 @@ class EPGList(HTMLComponent, GUIComponent):
 				xpos += w
 				w = width/10*5;
 				self.descr_rect = Rect(xpos, 0, width, height)
+			else: # EPG_TYPE_SIMILAR
+				xpos = 0;
+				w = width/10*3;
+				self.datetime_rect = Rect(xpos, 0, w-10, height)
+				xpos += w
+				w = width/10*7;
+				self.service_rect = Rect(xpos, 0, w-10, height)
 
 	def buildSingleEntry(self, eventId, beginTime, duration, EventName):
-		rec=(self.timer.isInTimer(eventid=eventId, begin=beginTime, duration=duration, service=self.service) > ((duration/10)*8)) 
+		rec=(self.timer.isInTimer(eventId, beginTime, duration, self.service) > ((duration/10)*8)) 
 		r1=self.datetime_rect
 		r2=self.descr_rect
 		res = [ None ]  # no private data needed
@@ -160,7 +179,22 @@ class EPGList(HTMLComponent, GUIComponent):
 			res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, EventName))
 		return res
 
+	def buildSimilarEntry(self, service, eventId, beginTime, service_name, duration):
+		rec=(self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) 
+		r1=self.datetime_rect
+		r2=self.service_rect
+		res = [ None ]  # no private data needed
+		t = localtime(beginTime)
+		res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, "%02d.%02d, %02d:%02d"%(t[2],t[1],t[3],t[4])))
+		if rec:
+			res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r2.left(), r2.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))))
+			res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left() + 25, r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, service_name))
+		else:
+			res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, service_name))
+		return res
+
 	def buildMultiEntry(self, changecount, service, eventId, begTime, duration, EventName, nowTime, service_name):
+		rec=begTime and (self.timer.isInTimer(eventId, begTime, duration, service) > ((duration/10)*8))
 		sname = service_name
 		r1=self.service_rect
 		r2=self.progress_rect
@@ -175,7 +209,11 @@ class EPGList(HTMLComponent, GUIComponent):
 				sname+=substr[2:len(substr)-2]
 			if len(sname) == 0:
 				sname = service_name;
-		res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, sname))
+		if rec:
+			res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width()-21, r1.height(), 0, RT_HALIGN_LEFT, sname))
+			res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r1.left()+r1.width()-16, r1.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))))
+		else:
+			res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, sname))
 		if begTime is not None:
 			if nowTime < begTime:
 				begin = localtime(begTime)
@@ -241,3 +279,23 @@ class EPGList(HTMLComponent, GUIComponent):
 			self.l.setList(self.queryEPG(test))
 		print time() - t
 		self.selectionChanged()
+
+	def sort_func(self,x,y):
+		if x[2] < y[2]:
+			return -1
+		elif x[2] == y[2]:
+			return 0
+		else:
+			return 1
+
+	def fillSimilarList(self, refstr, event_id):
+		t = time()
+	 # search similar broadcastings
+		if event_id is None:
+			return
+		l = self.epgcache.search(('RIBND', 1024, eEPGCache.SIMILAR_BROADCASTINGS_SEARCH, refstr, event_id))
+		if l and len(l):
+			l.sort(self.sort_func)
+		self.l.setList(l)
+		self.selectionChanged()
+		print time() - t