X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/68a0e8a6af4fce4f9873ce7c5c9ac93baffd7af2..01f6932815a6a21ab46bb420be093685378b43dd:/lib/python/Components/Pixmap.py

diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index 8f59880b..211b772c 100644
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -1,26 +1,11 @@
-import skin
-from GUIComponent import *
+from ConditionalWidget import *
 
 from enigma import *
 
-class Pixmap(GUIComponent):
-	"""Pixmap can be used for components which diplay a pixmap"""
-	
-	SHOWN = 0
-	HIDDEN = 1
-	
+class Pixmap(Widget):
 	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
-	
+		Widget.__init__(self)
+
 	def getePixmap(self, parent):
 		#pixmap = ePixmap(parent)
 		#pixmap.setPixmapFromFile(self.filename)
@@ -31,46 +16,74 @@ class Pixmap(GUIComponent):
 
 	def removeWidget(self, w):
 		pass
-	
-	def showPixmap(self):
-		self.state = self.SHOWN
-		self.instance.show()
-
-	def hidePixmap(self):
-		self.state = self.HIDDEN
-		self.instance.hide()
-	
-	def removeWidget(self, instance):
-		pass
 
-class PixmapConditional(Pixmap):
+class PixmapConditional(ConditionalWidget, Pixmap):
 	def __init__(self, withTimer = True):
+		ConditionalWidget.__init__(self)
 		Pixmap.__init__(self)
+
+class MovingPixmap(Pixmap):
+	def __init__(self):
+		Pixmap.__init__(self)
+		
+		self.moving = False
+		
+		# TODO: get real values
+		self.x = 0.0
+		self.y = 0.0
 		
-		self.setConnect(None)
+		self.clearPath()
 		
-		if (withTimer):
-			self.conditionCheckTimer = eTimer()
-			self.conditionCheckTimer.timeout.get().append(self.update)
-			self.conditionCheckTimer.start(1000)
+		self.moveTimer = eTimer()
+		self.moveTimer.timeout.get().append(self.doMove)
 		
-	def setConnect(self, conditionalFunction):
-		self.conditionalFunction = conditionalFunction
+	def clearPath(self, repeated = False):
+		if (self.moving):
+			self.moving = False
+			self.moveTimer.stop()
+			
+		self.path = []
+		self.currDest = 0
+		self.repeated = repeated
+		
+	def addMovePoint(self, x, y, time = 20):
+		self.path.append((x, y, time))
+	
+	def moveTo(self, x, y, time = 20):
+		self.clearPath()
+		self.addMovePoint(x, y, time)
 		
-	def activateCondition(self, condition):
-		if (condition):
-			if (self.state == self.HIDDEN):
-				self.showPixmap()
-		else:
-			if (self.state == self.SHOWN):
-				self.hidePixmap()
+	def startMoving(self):
+		if not self.moving:
+			self.time = self.path[self.currDest][2]
+			self.stepX = (self.path[self.currDest][0] - self.x) / float(self.time)
+			self.stepY = (self.path[self.currDest][1] - self.y) / float(self.time)
 
-	def update(self):
-		if (self.conditionalFunction != None):
-			try:
-				self.conditionalFunction() # check, if the conditionalfunction is still valid
-			except:
-				self.conditionalFunction = None
-				self.activateCondition(False)
+			self.moving = True
+			self.moveTimer.start(100)
+			
+	def stopMoving(self):
+		self.moving = False
+		self.moveTimer.stop()
+		
+	def doMove(self):
+		self.x += self.stepX
+		self.y += self.stepY
+		self.time -= 1
+		try:
+			self.move(int(self.x), int(self.y))
+		except: # moving not possible... widget not there any more... stop moving
+			self.stopMoving()
 			
-			self.activateCondition(self.conditionalFunction())
+		if (self.time == 0):
+			self.currDest += 1
+			self.moveTimer.stop()
+			self.moving = False
+			if (self.currDest >= len(self.path)): # end of path
+				if (self.repeated):
+					self.currDest = 0
+					self.moving = False
+					self.startMoving()
+			else:
+				self.moving = False
+				self.startMoving()