cleanup eConsoleAppContainer code.. execute is now only possible to call with

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

diff --git a/lib/python/Components/GUISkin.py b/lib/python/Components/GUISkin.py
index ce4d397d07df59f8808498f45ee5eed8b6808c2b..9eb4a80b3b80321f480763b4c9357a81192a523e 100644 (file)
--- a/lib/python/Components/GUISkin.py
+++ b/lib/python/Components/GUISkin.py
@@ -8,20 +8,24 @@ class GUISkin:
        def __init__(self):
                self.onLayoutFinish = [ ]
                self.summaries = CList()
        def __init__(self):
                self.onLayoutFinish = [ ]
                self.summaries = CList()

+               self.instance = None
+               self.desktop = None

 
 

-       def createGUIScreen(self, parent, desktop):
+       def createGUIScreen(self, parent, desktop, updateonly = False):

                for val in self.renderer:
                        if isinstance(val, GUIComponent):
                for val in self.renderer:
                        if isinstance(val, GUIComponent):

-                               val.GUIcreate(parent)
-                               if not val.applySkin(desktop):
+                               if not updateonly:
+                                       val.GUIcreate(parent)
+                               if not val.applySkin(desktop, self):

                                        print "warning, skin is missing renderer", val, "in", self
 
                for key in self:
                        val = self[key]
                        if isinstance(val, GUIComponent):
                                        print "warning, skin is missing renderer", val, "in", self
 
                for key in self:
                        val = self[key]
                        if isinstance(val, GUIComponent):

-                               val.GUIcreate(parent)
+                               if not updateonly:
+                                       val.GUIcreate(parent)

                                depr = val.deprecationInfo
                                depr = val.deprecationInfo

-                               if val.applySkin(desktop):
+                               if val.applySkin(desktop, self):

                                        if depr:
                                                print "WARNING: OBSOLETE COMPONENT '%s' USED IN SKIN. USE '%s' INSTEAD!" % (key, depr[0])
                                                print "OBSOLETE COMPONENT WILL BE REMOVED %s, PLEASE UPDATE!" % (depr[1])
                                        if depr:
                                                print "WARNING: OBSOLETE COMPONENT '%s' USED IN SKIN. USE '%s' INSTEAD!" % (key, depr[0])
                                                print "OBSOLETE COMPONENT WILL BE REMOVED %s, PLEASE UPDATE!" % (depr[1])


@@ -29,9 +33,10 @@ class GUISkin:
                                        print "warning, skin is missing element", key, "in", self
 
                for w in self.additionalWidgets:
                                        print "warning, skin is missing element", key, "in", self
 
                for w in self.additionalWidgets:

-                       w.instance = w.widget(parent)
-                       # w.instance.thisown = 0
-                       applyAllAttributes(w.instance, desktop, w.skinAttributes)
+                       if not updateonly:
+                               w.instance = w.widget(parent)
+                               # w.instance.thisown = 0
+                       applyAllAttributes(w.instance, desktop, w.skinAttributes, self.scale)

 
                for f in self.onLayoutFinish:
                        if type(f) is not type(self.close): # is this the best way to do this?
 
                for f in self.onLayoutFinish:
                        if type(f) is not type(self.close): # is this the best way to do this?


@@ -60,3 +65,26 @@ class GUISkin:
                self.instance.setTitle(title)
                self.title = title
                self.summaries.setTitle(title)
                self.instance.setTitle(title)
                self.title = title
                self.summaries.setTitle(title)

+
+       def setDesktop(self, desktop):
+               self.desktop = desktop
+
+       def applySkin(self):
+               z = 0
+               title = ""
+               baseres = (720, 576) # FIXME: a skin might have set another resolution, which should be the base res
+               for (key, value) in self.skinAttributes:
+                       if key == "zPosition":
+                               z = int(value)
+                       elif key == "title":
+                               title = value
+                       elif key == "baseResolution":
+                               baseres = tuple([int(x) for x in value.split(',')])
+               self.scale = ((baseres[0], baseres[0]), (baseres[1], baseres[1]))
+
+               if not self.instance:
+                       from enigma import eWindow
+                       self.instance = eWindow(self.desktop, z)
+               self.title = title
+               applyAllAttributes(self.instance, self.desktop, self.skinAttributes, self.scale)
+               self.createGUIScreen(self.instance, self.desktop)