add two native python epg views

1 files changed, 74 insertions, 27 deletions

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index efdd0f1b..6f556003 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -1,6 +1,6 @@
 from Screen import Screen
 from Components.Button import Button
-from Components.EpgList import EPGList
+from Components.EpgList import *
 from Components.ActionMap import ActionMap
 from Screens.EventView import EventView
 from enigma import eServiceReference, eServiceEventPtr
@@ -13,60 +13,107 @@ from ServiceReference import ServiceReference
 import xml.dom.minidom
 
 class EPGSelection(Screen):
-	def __init__(self, session, root):
+	def __init__(self, session, service):
 		Screen.__init__(self, session)
 
-		self["list"] = EPGList()
+		self["key_red"] = Button("")
+		self["key_green"] = Button(_("Add timer"))
+
+		if isinstance(service, eServiceReference):
+			self.type = EPG_TYPE_SINGLE
+			self["key_yellow"] = Button()
+			self["key_blue"] = Button()
+			self.currentService=ServiceReference(service)
+		else:
+			self.type = EPG_TYPE_MULTI
+			self["key_yellow"] = Button(_("Prev"))
+			self["key_blue"] = Button(_("Next"))
+			self.services = service
+
+		self["list"] = EPGList(self.type)
 
 		class ChannelActionMap(ActionMap):
 			def action(self, contexts, action):
-					ActionMap.action(self, contexts, action)
-					
-		self["key_red"] = Button("")
-		self["key_green"] = Button(_("Add timer"))
-		self["key_yellow"] = Button("")
-		self["key_blue"] = Button("")
+				ActionMap.action(self, contexts, action)
 
-		self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"], 
+		self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"],
 			{
 				"cancel": self.close,
 				"ok": self.eventSelected,
-				"timerAdd": self.timerAdd
+				"timerAdd": self.timerAdd,
+				"yellow": self.yellowButtonPressed,
+				"blue": self.blueButtonPressed
 			})
 		self["actions"].csel = self
-		self.setRoot(root)
 
-	def eventViewCallback(self, setEvent, val):
+		self.onLayoutFinish.append(self.onCreate)
+
+	#just used in multipeg
+	def onCreate(self):
+		l = self["list"]
+		if self.type == EPG_TYPE_MULTI:
+			l.recalcEntrySize()
+			l.fillMultiEPG(self.services)
+		else:
+			if SINGLE_CPP == 0:
+				l.recalcEntrySize()
+			l.fillSingleEPG(self.currentService)
+
+	def eventViewCallback(self, setEvent, setService, val):
+		l = self["list"]
+		old = l.getCurrent()
 		if val == -1:
 			self.moveUp()
-			setEvent(self["list"].getCurrent())
 		elif val == +1:
 			self.moveDown()
-			setEvent(self["list"].getCurrent())
+		cur = l.getCurrent()
+		if self.type == EPG_TYPE_SINGLE:
+			setEvent(cur)
+		else:
+			if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref:
+				self.eventViewCallback(setEvent, setService, val)
+			else:
+				setEvent(cur[0])
+				setService(cur[1])
 
 	def eventSelected(self):
-		event = self["list"].getCurrent()
-		self.session.open(EventView, event, self.currentService, self.eventViewCallback)
-	
+		if self.type == EPG_TYPE_SINGLE:
+			event = self["list"].getCurrent()
+			service = self.currentService
+		else: # EPG_TYPE_MULTI
+			cur = self["list"].getCurrent()
+			event = cur[0]
+			service = cur[1]
+		if event is not None:
+			self.session.open(EventView, event, service, self.eventViewCallback)
+
+	def yellowButtonPressed(self):
+		if self.type == EPG_TYPE_MULTI:
+			self["list"].updateMultiEPG(-1)
+
+	def blueButtonPressed(self):
+		if self.type == EPG_TYPE_MULTI:
+			self["list"].updateMultiEPG(1)
+
 	def timerAdd(self):
-		event = self["list"].getCurrent()
-		
+		if self.type == EPG_TYPE_SINGLE:
+			event = self["list"].getCurrent()
+			serviceref = self.currentService
+		else:
+			cur = self["list"].getCurrent()
+			event = cur[0]
+			serviceref = cur[1]
 		if event is None:
 			return
-		
-		newEntry = RecordTimerEntry(self.currentService, *parseEvent(event))
+		newEntry = RecordTimerEntry(serviceref, *parseEvent(event))
 		self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
-	
+
 	def timerEditFinished(self, answer):
 		if (answer[0]):
 			self.session.nav.RecordTimer.record(answer[1])
 		else:
 			print "Timeredit aborted"	
 
-	def setRoot(self, root):
-		self.currentService=ServiceReference(root)
-		self["list"].setRoot(root)
-
 	def moveUp(self):
 		self["list"].moveUp()