fix inverted setting (meaning was inverted too)

[enigma2.git] / lib / python / Components / EventInfo.py

diff --git a/lib/python/Components/EventInfo.py b/lib/python/Components/EventInfo.py
index 83f2a0b27dea5e11abda077ddeb30b413465603e..36a5aa4d55285d6d5f1f8a01be61b231898049f7 100644 (file)
--- a/lib/python/Components/EventInfo.py
+++ b/lib/python/Components/EventInfo.py
@@ -1,6 +1,6 @@
 from PerServiceDisplay import *
 from time import strftime
 from PerServiceDisplay import *
 from time import strftime

-from time import localtime
+from time import localtime, time

 
 from enigma import iServiceInformationPtr, eServiceEventPtr
 
 
 from enigma import iServiceInformationPtr, eServiceEventPtr
 


@@ -31,14 +31,37 @@ class EventInfo(PerServiceDisplay):
                        if info is not None: 
                                ev = info.getEvent(self.now_or_next & 1)
                                if ev is not None:
                        if info is not None: 
                                ev = info.getEvent(self.now_or_next & 1)
                                if ev is not None:

-                                       if (self.Now_Duration <= self.now_or_next <= self.Next_Duration):
-                                               self.setText("%d min" % (ev.getDuration() / 60))
-                                       if (self.Now_StartTime <= self.now_or_next <= self.Next_StartTime):
-                                               self.setText(strftime("%H:%M", localtime(ev.getBeginTime())))
-                                       if (self.Now <= self.now_or_next <= self.Next):
-                                               self.setText(ev.getEventName())
+                                       self.update(ev)
+
+
+       def update(self, ev):
+               if (self.Now_Duration <= self.now_or_next <= self.Next_Duration):
+                       self.setText("%d min" % (ev.getDuration() / 60))
+               if (self.Now_StartTime <= self.now_or_next <= self.Next_StartTime):
+                       self.setText(strftime("%H:%M", localtime(ev.getBeginTime())))
+               if (self.Now <= self.now_or_next <= self.Next):
+                       self.setText(ev.getEventName())         

 
        def stopEvent(self):
                self.setText(
 
        def stopEvent(self):
                self.setText(

-                       (_("waiting for event data..."), "", "--:--",  "--:--", "--:--", "--:--")[self.now_or_next]);
+                       #(_("waiting for event data..."), "", "--:--",  "--:--", "--:--", "--:--")[self.now_or_next]);
+                       ("", "", "--:--",  "--:--", "--:--", "--:--")[self.now_or_next]);

 
 

+
+class EventInfoProgress(PerServiceDisplayProgress, EventInfo):
+       def __init__(self, navcore, now_or_next):
+               self.now_or_next = now_or_next
+               PerServiceDisplayProgress.__init__(self, navcore, 
+                       { 
+                               pNavigation.evUpdatedEventInfo: self.ourEvent, 
+                               pNavigation.evStopService: self.stopEvent 
+                       })
+
+       def update(self, ev):
+               self.g.setRange(0, ev.getDuration())
+               progress = int(time() - ev.getBeginTime())
+
+               self.setValue(progress)
+               
+       def stopEvent(self):
+               self.setValue(0)