X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f2f787184a94e8e5adde7ccbf64e2d4961152e2a..d42c6cf196f659537b9da28049c90eccd9d7506e:/lib/python/Components/ConditionalWidget.py

diff --git a/lib/python/Components/ConditionalWidget.py b/lib/python/Components/ConditionalWidget.py
index 43130fdc..c1baceb2 100644
--- a/lib/python/Components/ConditionalWidget.py
+++ b/lib/python/Components/ConditionalWidget.py
@@ -1,42 +1,9 @@
-import skin
-from GUIComponent import *
+from GUIComponent import GUIComponent
+from enigma import eTimer
 
-from enigma import *
-
-class Widget(GUIComponent):
-	
-	SHOWN = 0
-	HIDDEN = 1
-	
-	def __init__(self):
-		GUIComponent.__init__(self)
-		self.instance = None
-		self.state = self.SHOWN
-	
-	def GUIcreate(self, parent):
-		self.instance = self.createWidget(parent)
-	
-	def GUIdelete(self):
-		self.removeWidget(self.instance)
-		self.instance = None
-	
-	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)))
-	
-class ConditionalWidget(Widget):
+class ConditionalWidget(GUIComponent):
 	def __init__(self, withTimer = True):
-		Widget.__init__(self)
+		GUIComponent.__init__(self)
 		
 		self.setConnect(None)
 		
@@ -49,31 +16,22 @@ class ConditionalWidget(Widget):
 		self.conditionalFunction = conditionalFunction
 		
 	def activateCondition(self, condition):
-		if (condition):
-			if (self.state == self.HIDDEN):
-				self.showWidget()
+		if condition:
+			self.visible = 1
 		else:
-			if (self.state == self.SHOWN):
-				self.hideWidget()
+			self.visible = 0
 
 	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)
-			
-
 
-			
-			
-import time
-
-class BlinkingWidget(Widget):
+class BlinkingWidget(GUIComponent):
 	def __init__(self):
-		Widget.__init__(self)
+		GUIComponent.__init__(self)
 		
 		self.blinking = True
 		
@@ -87,10 +45,7 @@ class BlinkingWidget(Widget):
 		
 	def blink(self):
 		if self.blinking == True:
-			if (self.state == self.SHOWN):
-				self.hideWidget()
-			elif (self.state == self.HIDDEN):
-				self.showWidget()
+			self.visible = not self.visible
 			
 	def startBlinking(self):
 		self.blinking = True
@@ -98,10 +53,10 @@ class BlinkingWidget(Widget):
 		
 	def stopBlinking(self):
 		self.blinking = False
-		if (self.state == self.SHOWN):
-			self.hideWidget()
+		if self.visible:
+			self.hide()
 		self.timer.stop()
-		
+
 class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
 	def __init__(self):
 		BlinkingWidget.__init__(self)
@@ -113,4 +68,4 @@ class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
 				self.startBlinking()
 		else:
 			if self.blinking: # we are blinking
-				self.stopBlinking()			
\ No newline at end of file
+				self.stopBlinking()