X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6c2d3fc303542b7f77f4350974acf781a1b91c30..bea4946ae09bcab368696c50031e29c635017585:/lib/python/Components/GUIComponent.py

diff --git a/lib/python/Components/GUIComponent.py b/lib/python/Components/GUIComponent.py
index 493df681..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:
+class GUIComponent(object):
 	""" GUI component """
 	
-	SHOWN = 0
-	HIDDEN = 1
-	
 	def __init__(self):
-		self.state = self.SHOWN
 		self.instance = None
+		self.onVisibilityChange = [ ]
+		self.__visible = 0
+		self.visible = 1
+		self.skinAttributes = None
+		self.deprecationInfo = None
 	
 	def execBegin(self):
 		pass
@@ -24,21 +25,98 @@ class GUIComponent:
 	def onHide(self):
 		pass
 	
+	def destroy(self):
+		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 getVisible(self):
+		return self.__visible
+	
+	def setVisible(self, visible):
+		if visible:
+			self.show()
+		else:
+			self.hide()
+
+	visible = property(getVisible, setVisible)
+
+	def setPosition(self, x, y):
+		self.instance.move(ePoint(int(x), int(y)))
+
+	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)
+
+	# default implementation for only one widget per component
+	# feel free to override!
+	def GUIcreate(self, parent):
+		self.instance = self.createWidget(parent)
+		self.postWidgetCreate(self.instance)
+	
+	def GUIdelete(self):
+		self.preWidgetRemove(self.instance)
+		self.instance = None
+
+	# default for argumentless widget constructor
+	def createWidget(self, parent):
+		return self.GUI_WIDGET(parent)
+
+	def postWidgetCreate(self, instance):
+		pass
+	
+	def preWidgetRemove(self, instance):
+		pass