small fixes for PIG

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

diff --git a/lib/python/Components/GUISkin.py b/lib/python/Components/GUISkin.py
index 406cd0977218ba505988662a73a45436f5c8eb19..9f65025deef3f1c236df5a0268a39337afb1b52f 100644 (file)
--- a/lib/python/Components/GUISkin.py
+++ b/lib/python/Components/GUISkin.py
@@ -1,24 +1,34 @@
-from GUIComponent import *
+from GUIComponent import GUIComponent
 from skin import applyAllAttributes
+from Tools.CList import CList
+from Sources.Source import Source
 
 class GUISkin:
        __module__ = __name__
 
        def __init__(self):
                self.onLayoutFinish = [ ]
-               self.summaries = [ ]
+               self.summaries = CList()
 
        def createGUIScreen(self, parent, desktop):
-               for val in self.values() + self.renderer:
+               for val in self.renderer:
                        if isinstance(val, GUIComponent):
                                val.GUIcreate(parent)
-                               val.applySkin(desktop)
+                               if not val.applySkin(desktop):
+                                       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 val.applySkin(desktop):
+                                       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)
-               
+
                for f in self.onLayoutFinish:
                        if type(f) is not type(self.close): # is this the best way to do this?
                                exec(f) in globals(), locals()
@@ -26,9 +36,15 @@ class GUISkin:
                                f()
 
        def deleteGUIScreen(self):
+               seenFakeSource = False
                for (name, val) in self.items():
+                       if name == "fake" and isinstance(val, Source):
+                               seenFakeSource = True
                        if isinstance(val, GUIComponent):
                                val.GUIdelete()
+               if seenFakeSource:
+                       print "DEL FAKE SOURCE"
+                       del self["fake"]
 
        def close(self):
                self.deleteGUIScreen()
@@ -45,6 +61,4 @@ class GUISkin:
        def setTitle(self, title):
                self.instance.setTitle(title)
                self.title = title
-               
-               for x in self.summaries:
-                       x.setTitle(title)
+               self.summaries.setTitle(title)