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 afe95266aa8f9f5a20b887248df9ccc201b77656..401a004da350b9f5bd1fc1988b2cb827d2573850 100644 (file)
--- a/lib/python/Components/GUIComponent.py
+++ b/lib/python/Components/GUIComponent.py
@@ -5,12 +5,10 @@ from enigma import ePoint
 class GUIComponent(object):
        """ GUI component """
        
-       SHOWN = 0
-       HIDDEN = 1
-       
        def __init__(self):
                self.instance = None
-               self.state = self.SHOWN
+               self.visible = 1
+               self.skinAttributes = None
        
        def execBegin(self):
                pass
@@ -25,37 +23,52 @@ class GUIComponent(object):
                pass
        
        def destroy(self):
-               pass
+               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 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)))