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 commit 'origin/translations' into experimental
[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 f5ec7039a875ccfb27ee0f18abaea255c7de7ceb..4860e17fc5400791db4160893bd248ca057ea39d 100644
(file)
--- a/
lib/python/Components/Converter/ConditionalShowHide.py
+++ b/
lib/python/Components/Converter/ConditionalShowHide.py
@@
-3,7
+3,7
@@
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
args = argstr.split(',')
self.invert = "Invert" in args
self.blink = "Blink" in args
@@
-11,7
+11,7
@@
class ConditionalShowHide(Converter, object):
self.blinktime = 500
self.timer = eTimer()
self.timer.callback.append(self.blinkFunc)
self.blinktime = 500
self.timer = eTimer()
self.timer.callback.append(self.blinkFunc)
- else
+ else
:
self.timer = None
def blinkFunc(self):
self.timer = None
def blinkFunc(self):
@@
-61,4
+61,4
@@
class ConditionalShowHide(Converter, object):
def destroy(self):
if self.timer:
def destroy(self):
if self.timer:
- self.timer.
timeout.get()
.remove(self.blinkFunc)
+ self.timer.
callback
.remove(self.blinkFunc)