From c0d78035b8c76e719bf7c05ff3812eb5a6ce9fe3 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Mon, 1 May 2006 11:47:04 +0000 Subject: simplify GUIcreate/createWidget, fix base class order --- lib/python/Components/ConditionalWidget.py | 33 ++++++------------------------ 1 file changed, 6 insertions(+), 27 deletions(-) (limited to 'lib/python/Components/ConditionalWidget.py') diff --git a/lib/python/Components/ConditionalWidget.py b/lib/python/Components/ConditionalWidget.py index 07d59e02..62daf5e6 100644 --- a/lib/python/Components/ConditionalWidget.py +++ b/lib/python/Components/ConditionalWidget.py @@ -3,28 +3,9 @@ from GUIComponent import * from enigma import * -class Widget(GUIComponent): - def __init__(self): - GUIComponent.__init__(self) - - def GUIcreate(self, parent): - self.instance = self.createWidget(parent) - if self.state == self.HIDDEN: - self.instance.hide() - - def GUIdelete(self): - self.removeWidget(self.instance) - self.instance = None - - def removeWidget(self, w): - pass - - def move(self, x, y): - self.instance.move(ePoint(int(x), int(y))) - -class ConditionalWidget(Widget): +class ConditionalWidget(GUIComponent): def __init__(self, withTimer = True): - Widget.__init__(self) + GUIComponent.__init__(self) self.setConnect(None) @@ -38,11 +19,9 @@ class ConditionalWidget(Widget): def activateCondition(self, condition): if (condition): - if self.state == self.HIDDEN: - self.show() + self.state = self.HIDDEN else: - if self.state == self.SHOWN: - self.hide() + self.state = self.SHOWN def update(self): if (self.conditionalFunction != None): @@ -55,9 +34,9 @@ class ConditionalWidget(Widget): import time -class BlinkingWidget(Widget): +class BlinkingWidget(GUIComponent): def __init__(self): - Widget.__init__(self) + GUIComponent.__init__(self) self.blinking = True -- cgit v1.2.3