X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fe0534f76b59b814caca3648933c45d3add31889..a302e0a778e1ea30b76956fd7469cf554eb0fc20:/lib/python/Components/GUISkin.py

diff --git a/lib/python/Components/GUISkin.py b/lib/python/Components/GUISkin.py
old mode 100644
new mode 100755
index 9eb4a80b..f26c8256
--- a/lib/python/Components/GUISkin.py
+++ b/lib/python/Components/GUISkin.py
@@ -1,11 +1,13 @@
 from GUIComponent import GUIComponent
 from skin import applyAllAttributes
 from Tools.CList import CList
+from Sources.StaticText import StaticText
 
 class GUISkin:
 	__module__ = __name__
 
 	def __init__(self):
+		self["Title"] = StaticText()
 		self.onLayoutFinish = [ ]
 		self.summaries = CList()
 		self.instance = None
@@ -62,29 +64,49 @@ class GUISkin:
 		self.summaries.remove(summary)
 
 	def setTitle(self, title):
-		self.instance.setTitle(title)
-		self.title = title
+		if self.instance:
+			self.instance.setTitle(title)
+		self["Title"].text = title
 		self.summaries.setTitle(title)
 
+	def getTitle(self):
+		return self["Title"].text
+
+	title = property(getTitle, setTitle)
+
 	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
+		idx = 0
+		skin_title_idx = -1
+		title = self.title
 		for (key, value) in self.skinAttributes:
 			if key == "zPosition":
 				z = int(value)
 			elif key == "title":
-				title = value
+				skin_title_idx = idx
+				if title:
+					self.skinAttributes[skin_title_idx] = ("title", title)
+				else:
+					self["Title"].text = value
+					self.summaries.setTitle(value)
 			elif key == "baseResolution":
 				baseres = tuple([int(x) for x in value.split(',')])
+			idx += 1
 		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
+
+		if skin_title_idx == -1 and title:
+			self.skinAttributes.append(("title", title))
+
+		# we need to make sure that certain attributes come last
+		self.skinAttributes.sort(key=lambda a: {"position": 1}.get(a[0], 0))
+
 		applyAllAttributes(self.instance, self.desktop, self.skinAttributes, self.scale)
 		self.createGUIScreen(self.instance, self.desktop)