X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6c2d3fc303542b7f77f4350974acf781a1b91c30..79cab0403882bf14a34828b75f50a34d445851a6:/lib/python/Components/GUISkin.py

diff --git a/lib/python/Components/GUISkin.py b/lib/python/Components/GUISkin.py
index 3aa9c851..0cf4d027 100644
--- a/lib/python/Components/GUISkin.py
+++ b/lib/python/Components/GUISkin.py
@@ -1,24 +1,33 @@
-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 = [ ]
-		self.summaries = [ ]
+		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)
+				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 +35,14 @@ class GUISkin:
 				f()
 
 	def deleteGUIScreen(self):
+		seenFakeSource = False
 		for (name, val) in self.items():
+			if name == "fake":
+				seenFakeSource = True
 			if isinstance(val, GUIComponent):
 				val.GUIdelete()
+		if seenFakeSource:
+			del self["fake"]
 
 	def close(self):
 		self.deleteGUIScreen()
@@ -45,6 +59,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)