X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/174f7b85cec9804931de3d432466e28b0da93fdb..d8bb70354594dddb6ef28f6d41ce733bd9caf4e6:/lib/python/Components/GUIComponent.py

diff --git a/lib/python/Components/GUIComponent.py b/lib/python/Components/GUIComponent.py
index c3edaa73..7e1bafb9 100644
--- a/lib/python/Components/GUIComponent.py
+++ b/lib/python/Components/GUIComponent.py
@@ -1,16 +1,17 @@
 import skin
 
-from enigma import ePoint
+from enigma import ePoint, eSize
 
 class GUIComponent(object):
 	""" GUI component """
 	
-	SHOWN = 0
-	HIDDEN = 1
-	
 	def __init__(self):
 		self.instance = None
-		self.state = self.SHOWN
+		self.onVisibilityChange = [ ]
+		self.__visible = 0
+		self.visible = 1
+		self.skinAttributes = None
+		self.deprecationInfo = None
 	
 	def execBegin(self):
 		pass
@@ -28,34 +29,62 @@ class GUIComponent(object):
 		self.__dict__.clear()
 	
 	# this works only with normal widgets - if you don't have self.instance, override this.
-	def applySkin(self, desktop):
-		if self.state == self.HIDDEN:
+	def applySkin(self, desktop, parent):
+		if not self.visible:
 			self.instance.hide()
-		skin.applyAllAttributes(self.instance, desktop, self.skinAttributes)
+		
+		if self.skinAttributes is None:
+			return False
 
-	def move(self, x, y):
-		self.instance.move(ePoint(int(x), int(y)))
+		skin.applyAllAttributes(self.instance, desktop, self.skinAttributes, parent.scale)
+		return True
+
+	def move(self, x, y = None):
+		# we assume, that x is already an ePoint
+		if y is None:
+			self.instance.move(x)
+		else:
+			self.instance.move(ePoint(int(x), int(y)))
+
+	def resize(self, x, y = None):
+		self.width = x
+		self.height = y
+		if y is None:
+			self.instance.resize(x)
+		else:
+			self.instance.resize(eSize(int(x), int(y)))
+
+	def setZPosition(self, z):
+		self.instance.setZPosition(z)
 
 	def show(self):
-		self.__state = self.SHOWN
+		old = self.__visible
+		self.__visible = 1
 		if self.instance is not None:
 			self.instance.show()
+		if old != self.__visible:
+			for fnc in self.onVisibilityChange:
+				fnc(True)
 
 	def hide(self):
-		self.__state = self.HIDDEN
+		old = self.__visible
+		self.__visible = 0
 		if self.instance is not None:
 			self.instance.hide()
+		if old != self.__visible:
+			for fnc in self.onVisibilityChange:
+				fnc(False)
 
-	def getState(self):
-		return self.__state
+	def getVisible(self):
+		return self.__visible
 	
-	def setState(self, state):
-		if state == self.SHOWN:
+	def setVisible(self, visible):
+		if visible:
 			self.show()
-		elif state == self.HIDDEN:
+		else:
 			self.hide()
 
-	state = property(getState, setState)
+	visible = property(getVisible, setVisible)
 
 	def setPosition(self, x, y):
 		self.instance.move(ePoint(int(x), int(y)))
@@ -63,6 +92,12 @@ class GUIComponent(object):
 	def getPosition(self):
 		p = self.instance.position()
 		return (p.x(), p.y())
+	
+	def getWidth(self):
+		return self.width
+	
+	def getHeight(self):
+		return self.height
 
 	position = property(getPosition, setPosition)