From 9b1a6555d346900d5255acd651902ce79b9c0951 Mon Sep 17 00:00:00 2001
From: Felix Domke <tmbinc@elitedvb.net>
Date: Mon, 24 Sep 2007 00:52:49 +0000
Subject: [PATCH] use StaticText for MenuTitle to simplify summary code. this
 needs a skin change for menu-based screens, please also apply to your skins.

---
 data/skin.xml              | 2 +-
 data/skin_default.xml      | 2 +-
 lib/python/Screens/Menu.py | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/data/skin.xml b/data/skin.xml
index a26a2809..6c9861ad 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -213,7 +213,7 @@
 	</screen>
 	<!-- Main menu -->
 	<screen name="menu_mainmenu" position="150,150" size="420,285" title="Main menu" >
-		<widget name="title" position="170,10" size="280,35" font="Regular;23" />
+		<widget source="title" render="Label" position="170,10" size="280,35" font="Regular;23" />
 		<widget source="menu" render="Listbox" position="170,55" size="230,225" scrollbarMode="showOnDemand" >
 			<convert type="StringList" />
 		</widget>
diff --git a/data/skin_default.xml b/data/skin_default.xml
index 59cd85d6..135a4541 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -315,7 +315,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 	</screen>
 	<!-- Menu screens -->
 	<screen name="Menu" position="210,150" size="300,285" title="Main menu" >
-		<widget name="title" position="10,10" size="280,35" font="Regular;23" />
+		<widget source="title" render="Label" position="10,10" size="280,35" font="Regular;23" />
 		<widget source="menu" render="Listbox" position="10,55" size="290,225" scrollbarMode="showOnDemand" >
 			<convert type="StringList" />
 		</widget>
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index f9b77b93..6ea0f647 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,10 +1,8 @@
 from Screen import Screen
 from Components.Sources.List import List
 from Components.ActionMap import ActionMap
-from Components.Header import Header
-from Components.Label import Label
+from Components.Sources.StaticText import StaticText
 from Components.config import configfile
-from Components.Sources.Clock import Clock
 from Components.PluginComponent import plugins
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
@@ -56,7 +54,7 @@ menuupdater = MenuUpdater()
 class MenuSummary(Screen):
 	skin = """
 	<screen position="0,0" size="132,64">
-		<widget name="MenuTitle" position="6,4" size="120,21" font="Regular;18" />
+		<widget source="parent.title" render="Label" position="6,4" size="120,21" font="Regular;18" />
 		<widget source="parent.menu" render="Label" position="6,25" size="120,21" font="Regular;16">
 			<convert type="StringListSelection" />
 		</widget>
@@ -67,7 +65,6 @@ class MenuSummary(Screen):
 
 	def __init__(self, session, parent):
 		Screen.__init__(self, session, parent)
-		self["MenuTitle"] = Label(parent.menu_title)
 
 class Menu(Screen):
 
@@ -211,7 +208,7 @@ class Menu(Screen):
 		a = parent.getAttribute("title").encode("UTF-8") or None
 		if a is None:
 			a = _(parent.getAttribute("text").encode("UTF-8"))
-		self["title"] = Header(a)
+		self["title"] = StaticText(a)
 		self.menu_title = a
 
 	def closeNonRecursive(self):
-- 
2.30.2