parsing for /etc/timezone.xml added

[enigma2.git] / lib / python / Screens / EventView.py

diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index 48d85bf733df6c9e51545e5f14965c94cab471e6..b8ad1e0efca00a422639c8a7de6490af41c26f05 100644 (file)
--- 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,31 @@ 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))
 
-       def scrollUp(self):
-               print "scrollUp"
-
-       def scrollDown(self):
-               print "scrollDown"
+       def pageUp(self):
+               self["epg_description"].pageUp()
+       
+       def pageDown(self):
+               self["epg_description"].pageDown()