From f94cd9f9cd9f8cb6ace109e58c060d820fc23f7d Mon Sep 17 00:00:00 2001
From: Felix Domke <tmbinc@elitedvb.net>
Date: Mon, 24 Sep 2007 00:07:11 +0000
Subject: [PATCH] simplify summary code by using
 parent.menu+stringListSelection to display current menu entry

---
 lib/python/Screens/Menu.py | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 00f16722..f9b77b93 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -50,37 +50,24 @@ class MenuUpdater:
 	
 	def getUpdatedMenu(self, id):
 		return self.updatedMenuItems[id]
-	
+
 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 name="MenuEntry" position="6,25" size="120,21" font="Regular;16" />
-		<widget source="CurrentTime" render="Label" position="56,46" size="82,18" font="Regular;16" >
+		<widget source="parent.menu" render="Label" position="6,25" size="120,21" font="Regular;16">
+			<convert type="StringListSelection" />
+		</widget>
+		<widget source="global.CurrentTime" render="Label" position="56,46" size="82,18" font="Regular;16" >
 			<convert type="ClockToText">WithSeconds</convert>
 		</widget>
 	</screen>"""
 
 	def __init__(self, session, parent):
-		Screen.__init__(self, session)
+		Screen.__init__(self, session, parent)
 		self["MenuTitle"] = Label(parent.menu_title)
-		self["MenuEntry"] = Label("")
-		self["CurrentTime"] = Clock()
-		self.parent = parent
-		self.onShow.append(self.addWatcher)
-		self.onHide.append(self.removeWatcher)
-	
-	def addWatcher(self):
-		self.parent["menu"].onSelectionChanged.append(self.selectionChanged)
-		self.selectionChanged()
-	
-	def removeWatcher(self):
-		self.parent["menu"].onSelectionChanged.remove(self.selectionChanged)
-
-	def selectionChanged(self):
-		self["MenuEntry"].setText(self.parent["menu"].getCurrent()[0])
 
 class Menu(Screen):
 
-- 
2.30.2