fix and simplify PluginList

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

diff --git a/lib/python/Components/GUISkin.py b/lib/python/Components/GUISkin.py
index 982cce317dbd74325727ceb8ad80b2e8db6df78d..ce4d397d07df59f8808498f45ee5eed8b6808c2b 100644 (file)
--- a/lib/python/Components/GUISkin.py
+++ b/lib/python/Components/GUISkin.py
@@ -1,26 +1,43 @@
-from GUIComponent import *
+from GUIComponent import GUIComponent
 from skin import applyAllAttributes
+from Tools.CList import CList
 
 class GUISkin:
        __module__ = __name__
 
        def __init__(self):
                self.onLayoutFinish = [ ]
-               pass
+               self.summaries = CList()
 
        def createGUIScreen(self, parent, desktop):
-               for (name, val) in self.items():
+               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)
+                               depr = val.deprecationInfo
+                               if val.applySkin(desktop):
+                                       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])
+                               elif not depr:
+                                       print "warning, skin is missing element", key, "in", self
 
                for w in self.additionalWidgets:
                        w.instance = w.widget(parent)
-                       w.instance.thisown = 0
+                       # w.instance.thisown = 0
                        applyAllAttributes(w.instance, desktop, w.skinAttributes)
-               
+
                for f in self.onLayoutFinish:
-                       exec(f) in globals(), locals()
+                       if type(f) is not type(self.close): # is this the best way to do this?
+                               exec(f) in globals(), locals()
+                       else:
+                               f()
 
        def deleteGUIScreen(self):
                for (name, val) in self.items():
@@ -29,3 +46,17 @@ class GUISkin:
 
        def close(self):
                self.deleteGUIScreen()
+
+       def createSummary(self):
+               return None
+
+       def addSummary(self, summary):
+               self.summaries.append(summary)
+
+       def removeSummary(self, summary):
+               self.summaries.remove(summary)
+
+       def setTitle(self, title):
+               self.instance.setTitle(title)
+               self.title = title
+               self.summaries.setTitle(title)