X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/285290ffcdf531d2481b199541a402560b1e129d..4f46a90d789f28eb0ca156caeb2bb55136d8ac85:/lib/python/Screens/EventView.py

diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index 6dfb3894..d96be6d6 100644
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -2,12 +2,17 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Label import Label
 from Components.ScrollLabel import ScrollLabel
-from enigma import eWidget, eServiceEventPtr, eLabel
+from enigma import eServiceEventPtr
+from ServiceReference import ServiceReference
+from RecordTimer import RecordTimerEntry, parseEvent
+from TimerEntry import TimerEntry
 
 class EventView(Screen):
-	def __init__(self, session, Event, callback=None):
+	def __init__(self, session, Event, Ref, callback=None):
 		Screen.__init__(self, session)
 		self.cbFunc = callback
+		self.currentService=Ref
+		self.event = Event
 		self["epg_description"] = ScrollLabel()
 		self["datetime"] = Label()
 		self["channel"] = Label()
@@ -19,27 +24,56 @@ class EventView(Screen):
 				"pageUp": self.pageUp,
 				"pageDown": self.pageDown,
 				"prevEvent": self.prevEvent,
-				"nextEvent": self.nextEvent
+				"nextEvent": self.nextEvent,
+				"timerAdd": self.timerAdd
 			})
-		self.setEvent(Event)
+		self.onShown.append(self.onCreate)
+
+	def onCreate(self):
+		self.setEvent(self.event)
+		self.setService(self.currentService)
 
 	def prevEvent(self):
 		if self.cbFunc is not None:
-			self.cbFunc(self.setEvent, -1)
+			self.cbFunc(self.setEvent, self.setService, -1)
 
 	def nextEvent(self):
 		if self.cbFunc is not None:
-			self.cbFunc(self.setEvent, +1)
+			self.cbFunc(self.setEvent, self.setService, +1)
+
+	def timerAdd(self):
+		newEntry = RecordTimerEntry(self.currentService, *parseEvent(self.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 setService(self, service):
+		self.currentService=service
+		name = self.currentService.getServiceName()
+		if name is not None:
+			self["channel"].setText(name)
+		else:
+			self["channel"].setText(_("unknown service"))
 
 	def setEvent(self, event):
-		text = event.getShortDescription()
-		if len(text) > 0:
-			text = text + '\n\n'
-		text = text + event.getExtendedDescription()
+		self.event = event
+		text = event.getEventName()
+		short = event.getShortDescription()
+		ext = event.getExtendedDescription()
+		if len(short) > 0 and short != text:
+			text = text + '\n\n' + short
+		if len(ext) > 0:
+			if len(text) > 0:
+				text = text + '\n\n'
+			text = text + ext
+		self.session.currentDialog.instance.setTitle(event.getEventName())
 		self["epg_description"].setText(text)
 		self["datetime"].setText(event.getBeginTimeString())
-		self["channel"].setText("Unknown Service")
-		self["duration"].setText("%d min"%(event.getDuration()/60))
+		self["duration"].setText(_("%d min")%(event.getDuration()/60))
 
 	def pageUp(self):
 		self["epg_description"].pageUp()