X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/502fcfc68a0634e5d5bd586c9a89fe93dc0cbcc4..cae001777c7b32bdb4f6f4199e9f49058946fe9f:/lib/python/Screens/EventView.py

diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index 48d85bf7..275b8952 100644
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -1,32 +1,30 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Label import Label
-from Components.ProgressBar import ProgressBar
-from enigma import eWidget, eServiceEventPtr, eLabel
+from Components.ScrollLabel import ScrollLabel
+from enigma import eServiceEventPtr
+from ServiceReference import ServiceReference
 
 class EventView(Screen):
-	def __init__(self, session, Event, callback):
+	def __init__(self, session, Event, Ref, callback=None):
 		Screen.__init__(self, session)
-
 		self.cbFunc = callback
-		print self.cbFunc
-
-		self["epg_description"] = Label()
+		self.currentService=None
+		self["epg_description"] = ScrollLabel()
 		self["datetime"] = Label()
 		self["channel"] = Label()
-		self["scrollbar"] = ProgressBar()
 		self["duration"] = Label()
-
 		self["actions"] = ActionMap(["OkCancelActions", "EventViewActions"],
 			{
 				"cancel": self.close,
 				"ok": self.close,
-				"scrollUp": self.scrollUp,
-				"scrollDown": self.scrollDown,
+				"pageUp": self.pageUp,
+				"pageDown": self.pageDown,
 				"prevEvent": self.prevEvent,
 				"nextEvent": self.nextEvent
 			})
 		self.setEvent(Event)
+		self.setService(Ref)
 
 	def prevEvent(self):
 		if self.cbFunc is not None:
@@ -36,18 +34,27 @@ 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):
+#		FIXME .. how to set eWindow titlebar?
+#		self.instance.setTitle(event.getEventName())
 		text = event.getShortDescription()
 		if len(text) > 0:
 			text = text + '\n\n'
 		text = text + event.getExtendedDescription()
 		self["epg_description"].setText(text)
 		self["datetime"].setText(event.getBeginTimeString())
-		self["channel"].setText("Unknown Service")
 		self["duration"].setText("%d min"%(event.getDuration()/60))
 
-	def scrollUp(self):
-		print "scrollUp"
-
-	def scrollDown(self):
-		print "scrollDown"
+	def pageUp(self):
+		self["epg_description"].pageUp()
+	
+	def pageDown(self):
+		self["epg_description"].pageDown()