add possibility to use ValueRange as ValueEqual Converter

[enigma2.git] / lib / python / Components / Converter / EventTime.py

diff --git a/lib/python/Components/Converter/EventTime.py b/lib/python/Components/Converter/EventTime.py
index d2b695d29be235bccbd4bde8fb9123ea30a4c664..966f2ca85617acb7a1b2f0e77fd45937db8f97d9 100644 (file)
--- a/lib/python/Components/Converter/EventTime.py
+++ b/lib/python/Components/Converter/EventTime.py
@@ -28,7 +28,7 @@ class EventTime(Poll, Converter, object):
                        self.poll_interval = 30*1000
                        self.poll_enabled = True
                else:
                        self.poll_interval = 30*1000
                        self.poll_enabled = True
                else:

-                       raise str("'%s' is not <StartTime|EndTime|Remaining|Duration> for EventTime converter" % type)
+                       raise str("'%s' is not <StartTime|EndTime|Remaining|Duration|Progress> for EventTime converter" % type)

 
        @cached
        def getTime(self):
 
        @cached
        def getTime(self):


@@ -60,13 +60,8 @@ class EventTime(Poll, Converter, object):
 
                event = self.source.event
                if event is None:
 
                event = self.source.event
                if event is None:

-                       if len(self.downstream_elements) and self.downstream_elements[0].visible:
-                               self.downstream_elements[0].visible = False

                        return None
 
                        return None
 

-               if len(self.downstream_elements) and not self.downstream_elements[0].visible:
-                       self.downstream_elements[0].visible = True
-

                now = int(time())
                start_time = event.getBeginTime()
                duration = event.getDuration()
                now = int(time())
                start_time = event.getBeginTime()
                duration = event.getDuration()


@@ -78,3 +73,11 @@ class EventTime(Poll, Converter, object):
        time = property(getTime)
        value = property(getValue)
        range = 1000
        time = property(getTime)
        value = property(getValue)
        range = 1000

+
+       def changed(self, what):
+               Converter.changed(self, what)
+               if self.type == self.PROGRESS and len(self.downstream_elements):
+                       if not self.source.event and self.downstream_elements[0].visible:
+                               self.downstream_elements[0].visible = False
+                       elif self.source.event and not self.downstream_elements[0].visible:
+                               self.downstream_elements[0].visible = True