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

diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index 6dfb3894..bbcf73cd 100644
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -2,12 +2,14 @@ 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
 
 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=None
 		self["epg_description"] = ScrollLabel()
 		self["datetime"] = Label()
 		self["channel"] = Label()
@@ -22,6 +24,7 @@ class EventView(Screen):
 				"nextEvent": self.nextEvent
 			})
 		self.setEvent(Event)
+		self.setService(Ref)
 
 	def prevEvent(self):
 		if self.cbFunc is not None:
@@ -31,15 +34,28 @@ class EventView(Screen):
 		if self.cbFunc is not None:
 			self.cbFunc(self.setEvent, +1)
 
+	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()
+		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()