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 9f65025deef3f1c236df5a0268a39337afb1b52f..ce4d397d07df59f8808498f45ee5eed8b6808c2b 100644 (file)
--- a/lib/python/Components/GUISkin.py
+++ b/lib/python/Components/GUISkin.py
@@ -1,7 +1,6 @@
 from GUIComponent import GUIComponent
 from skin import applyAllAttributes
 from Tools.CList import CList
-from Sources.Source import Source
 
 class GUISkin:
        __module__ = __name__
@@ -21,7 +20,12 @@ class GUISkin:
                        val = self[key]
                        if isinstance(val, GUIComponent):
                                val.GUIcreate(parent)
-                               if not val.applySkin(desktop):
+                               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:
@@ -36,15 +40,9 @@ 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()