git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix -T -C channellisting stuff
[enigma2.git]
/
lib
/
python
/
Components
/
ConditionalWidget.py
diff --git
a/lib/python/Components/ConditionalWidget.py
b/lib/python/Components/ConditionalWidget.py
index 43130fdcd89c906e8089fcae8f09152346f59c3a..07d59e02be63a658a259cc148197e0785015a751 100644
(file)
--- a/
lib/python/Components/ConditionalWidget.py
+++ b/
lib/python/Components/ConditionalWidget.py
@@
-4,17
+4,13
@@
from GUIComponent import *
from enigma import *
class Widget(GUIComponent):
from enigma import *
class Widget(GUIComponent):
-
- SHOWN = 0
- HIDDEN = 1
-
def __init__(self):
GUIComponent.__init__(self)
def __init__(self):
GUIComponent.__init__(self)
- self.instance = None
- self.state = self.SHOWN
def GUIcreate(self, parent):
self.instance = self.createWidget(parent)
def GUIcreate(self, parent):
self.instance = self.createWidget(parent)
+ if self.state == self.HIDDEN:
+ self.instance.hide()
def GUIdelete(self):
self.removeWidget(self.instance)
def GUIdelete(self):
self.removeWidget(self.instance)
@@
-23,14
+19,6
@@
class Widget(GUIComponent):
def removeWidget(self, w):
pass
def removeWidget(self, w):
pass
- def showWidget(self):
- self.state = self.SHOWN
- self.instance.show()
-
- def hideWidget(self):
- self.state = self.HIDDEN
- self.instance.hide()
-
def move(self, x, y):
self.instance.move(ePoint(int(x), int(y)))
def move(self, x, y):
self.instance.move(ePoint(int(x), int(y)))
@@
-50,11
+38,11
@@
class ConditionalWidget(Widget):
def activateCondition(self, condition):
if (condition):
def activateCondition(self, condition):
if (condition):
- if
(self.state == self.HIDDEN)
:
- self.show
Widget
()
+ if
self.state == self.HIDDEN
:
+ self.show()
else:
else:
- if
(self.state == self.SHOWN)
:
- self.hide
Widget
()
+ if
self.state == self.SHOWN
:
+ self.hide()
def update(self):
if (self.conditionalFunction != None):
def update(self):
if (self.conditionalFunction != None):
@@
-65,10
+53,6
@@
class ConditionalWidget(Widget):
self.conditionalFunction = None
self.activateCondition(False)
self.conditionalFunction = None
self.activateCondition(False)
-
-
-
-
import time
class BlinkingWidget(Widget):
import time
class BlinkingWidget(Widget):
@@
-87,10
+71,10
@@
class BlinkingWidget(Widget):
def blink(self):
if self.blinking == True:
def blink(self):
if self.blinking == True:
- if
(self.state == self.SHOWN)
:
- self.hide
Widget
()
- elif
(self.state == self.HIDDEN)
:
- self.show
Widget
()
+ if
self.state == self.SHOWN
:
+ self.hide()
+ elif
self.state == self.HIDDEN
:
+ self.show()
def startBlinking(self):
self.blinking = True
def startBlinking(self):
self.blinking = True
@@
-98,8
+82,8
@@
class BlinkingWidget(Widget):
def stopBlinking(self):
self.blinking = False
def stopBlinking(self):
self.blinking = False
- if
(self.state == self.SHOWN)
:
- self.hide
Widget
()
+ if
self.state == self.SHOWN
:
+ self.hide()
self.timer.stop()
class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
self.timer.stop()
class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
@@
-113,4
+97,4
@@
class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
self.startBlinking()
else:
if self.blinking: # we are blinking
self.startBlinking()
else:
if self.blinking: # we are blinking
- self.stopBlinking()
\ No newline at end of file
+ self.stopBlinking()