git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.opendreambox.org/git/enigma2
[enigma2.git]
/
lib
/
python
/
Components
/
Converter
/
ConditionalShowHide.py
diff --git
a/lib/python/Components/Converter/ConditionalShowHide.py
b/lib/python/Components/Converter/ConditionalShowHide.py
index d2e89ba44dabd270b8b64d91d49f6dacd3ce2fd1..4860e17fc5400791db4160893bd248ca057ea39d 100644
(file)
--- a/
lib/python/Components/Converter/ConditionalShowHide.py
+++ b/
lib/python/Components/Converter/ConditionalShowHide.py
@@
-3,14
+3,16
@@
from Converter import Converter
class ConditionalShowHide(Converter, object):
def __init__(self, argstr):
class ConditionalShowHide(Converter, object):
def __init__(self, argstr):
- Converter.__init__(self,
type
)
+ Converter.__init__(self,
argstr
)
args = argstr.split(',')
self.invert = "Invert" in args
self.blink = "Blink" in args
if self.blink:
self.blinktime = 500
self.timer = eTimer()
args = argstr.split(',')
self.invert = "Invert" in args
self.blink = "Blink" in args
if self.blink:
self.blinktime = 500
self.timer = eTimer()
- self.timer.timeout.get().append(self.blinkFunc)
+ self.timer.callback.append(self.blinkFunc)
+ else:
+ self.timer = None
def blinkFunc(self):
if self.blinking == True:
def blinkFunc(self):
if self.blinking == True:
@@
-56,3
+58,7
@@
class ConditionalShowHide(Converter, object):
self.stopBlinking()
else:
downstream.visible = self.calcVisibility()
self.stopBlinking()
else:
downstream.visible = self.calcVisibility()
+
+ def destroy(self):
+ if self.timer:
+ self.timer.callback.remove(self.blinkFunc)