git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use _ as separator instead of : for picon filenames
[enigma2.git]
/
lib
/
python
/
Components
/
ConditionalWidget.py
diff --git
a/lib/python/Components/ConditionalWidget.py
b/lib/python/Components/ConditionalWidget.py
index 7e4304aec7d463eb08c100bc0da3fdd545565a85..c1baceb25400a1c98d0c85c9e499a296e9a5579d 100644
(file)
--- a/
lib/python/Components/ConditionalWidget.py
+++ b/
lib/python/Components/ConditionalWidget.py
@@
-1,7
+1,5
@@
-import skin
-from GUIComponent import *
-
-from enigma import *
+from GUIComponent import GUIComponent
+from enigma import eTimer
class ConditionalWidget(GUIComponent):
def __init__(self, withTimer = True):
class ConditionalWidget(GUIComponent):
def __init__(self, withTimer = True):
@@
-19,20
+17,17
@@
class ConditionalWidget(GUIComponent):
def activateCondition(self, condition):
if condition:
def activateCondition(self, condition):
if condition:
- self.
state = self.SHOWN
+ self.
visible = 1
else:
else:
- self.
state = self.HIDDEN
+ self.
visible = 0
def update(self):
if (self.conditionalFunction != None):
try:
def update(self):
if (self.conditionalFunction != None):
try:
- self.conditionalFunction() # check, if the conditionalfunction is still valid
self.activateCondition(self.conditionalFunction())
except:
self.conditionalFunction = None
self.activateCondition(False)
self.activateCondition(self.conditionalFunction())
except:
self.conditionalFunction = None
self.activateCondition(False)
-
-import time
class BlinkingWidget(GUIComponent):
def __init__(self):
class BlinkingWidget(GUIComponent):
def __init__(self):
@@
-50,10
+45,7
@@
class BlinkingWidget(GUIComponent):
def blink(self):
if self.blinking == True:
def blink(self):
if self.blinking == True:
- if self.state == self.SHOWN:
- self.hide()
- elif self.state == self.HIDDEN:
- self.show()
+ self.visible = not self.visible
def startBlinking(self):
self.blinking = True
def startBlinking(self):
self.blinking = True
@@
-61,10
+53,10
@@
class BlinkingWidget(GUIComponent):
def stopBlinking(self):
self.blinking = False
def stopBlinking(self):
self.blinking = False
- if self.
state == self.SHOWN
:
+ if self.
visible
:
self.hide()
self.timer.stop()
self.hide()
self.timer.stop()
-
+
class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
def __init__(self):
BlinkingWidget.__init__(self)
class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
def __init__(self):
BlinkingWidget.__init__(self)