ServiceName converter now can handle iPlayableService's and

[enigma2.git] / lib / python / Components / GUIComponent.py

diff --git a/lib/python/Components/GUIComponent.py b/lib/python/Components/GUIComponent.py
index 493df681482f4fd96c3acb4c625d2770dbbc511d..401a004da350b9f5bd1fc1988b2cb827d2573850 100644 (file)
--- a/lib/python/Components/GUIComponent.py
+++ b/lib/python/Components/GUIComponent.py
@@ -2,15 +2,13 @@ import skin
 
 from enigma import ePoint
 
-class GUIComponent:
+class GUIComponent(object):
        """ GUI component """
        
-       SHOWN = 0
-       HIDDEN = 1
-       
        def __init__(self):
-               self.state = self.SHOWN
                self.instance = None
+               self.visible = 1
+               self.skinAttributes = None
        
        def execBegin(self):
                pass
@@ -24,21 +22,79 @@ 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:
+               if not self.visible:
                        self.instance.hide()
+               
+               if self.skinAttributes is None:
+                       print "warning, skin is missing some elements."
+                       return
+
                skin.applyAllAttributes(self.instance, desktop, self.skinAttributes)
 
-       def move(self, x, y):
-               self.instance.move(ePoint(int(x), int(y)))
+       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, size):
+               self.instance.resize(size)
+               
+       def setZPosition(self, z):
+               self.instance.setZPosition(z)
 
        def show(self):
-               self.state = self.SHOWN
+               self.__visible = 1
                if self.instance is not None:
                        self.instance.show()
 
        def hide(self):
-               self.state = self.HIDDEN
+               self.__visible = 0
                if self.instance is not None:
                        self.instance.hide()
+
+       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())
+
+       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