X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/df7d9f3578c68b22c95ab9daa23bd0fa168f6d11..911466bd5e018b80dfbbd5e12c4923e89a980792:/lib/python/Components/ConditionalWidget.py

diff --git a/lib/python/Components/ConditionalWidget.py b/lib/python/Components/ConditionalWidget.py
index 07d59e02..391b8871 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)
 		
@@ -37,12 +18,10 @@ class ConditionalWidget(Widget):
 		self.conditionalFunction = conditionalFunction
 		
 	def activateCondition(self, condition):
-		if (condition):
-			if self.state == self.HIDDEN:
-				self.show()
+		if condition:
+			self.visible = 1
 		else:
-			if self.state == self.SHOWN:
-				self.hide()
+			self.visible = 0
 
 	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
 		
@@ -71,10 +50,7 @@ class BlinkingWidget(Widget):
 		
 	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
@@ -82,7 +58,7 @@ class BlinkingWidget(Widget):
 		
 	def stopBlinking(self):
 		self.blinking = False
-		if self.state == self.SHOWN:
+		if self.visible:
 			self.hide()
 		self.timer.stop()