X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6c2d3fc303542b7f77f4350974acf781a1b91c30..0b3d548fcc6f9033c428b7c8dee84ac12ad8dee6:/lib/python/Screens/Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 2a7055cf..41818748 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,12 +1,12 @@
-from Screen import *
-from Components.MenuList import MenuList
+from Screen import Screen
+from Components.Sources.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Header import Header
 from Components.Button import Button
 from Components.Label import Label
 from Components.ProgressBar import ProgressBar
 from Components.config import configfile
-from Components.Clock import Clock
+from Components.Sources.Clock import Clock
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 
@@ -20,11 +20,6 @@ from Screens.Setup import *
 
 from Tools import XMLTools
 
-# some screens
-def doGlobal(screen):
-	screen["clock"] = Clock()
-
-
 #		<item text="TV-Mode">self.setModeTV()</item>
 #		<item text="Radio-Mode">self.setModeRadio()</item>
 #		<item text="File-Mode">self.setModeFile()</item>
@@ -78,19 +73,31 @@ menuupdater = MenuUpdater()
 class MenuSummary(Screen):
 	skin = """
 	<screen position="0,0" size="132,64">
-		<widget name="Clock" position="50,46" size="82,18" font="Regular;19" />
-		<widget name="MenuTitle" position="0,4" size="132,21" font="Regular;19" />
-		<widget name="MenuEntry" position="0,25" size="132,21" font="Regular;19" />
+		<widget name="MenuTitle" position="0,4" size="132,21" font="Regular;18" />
+		<widget name="MenuEntry" position="0,25" size="132,21" font="Regular;16" />
+		<widget source="CurrentTime" render="Label" position="50,46" size="82,18" font="Regular;16" >
+			<convert type="ClockToText">WithSeconds</convert>
+		</widget>
 	</screen>"""
 
 	def __init__(self, session, parent):
 		Screen.__init__(self, session)
 		self["MenuTitle"] = Label(parent.menu_title)
 		self["MenuEntry"] = Label("")
-		self["Clock"] = Clock()
+		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 setCurrentEntry(self, entry):
-		self["MenuEntry"].setText(entry)
+	def selectionChanged(self):
+		self["MenuEntry"].setText(self.parent["menu"].getCurrent()[0])
 
 class Menu(Screen):
 	def okbuttonClick(self):
@@ -203,7 +210,6 @@ class Menu(Screen):
 
 
 		self["menu"] = MenuList(list)	
-		self["menu"].onSelectionChanged.append(self.selectionChanged)
 							
 		self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
 			{
@@ -227,11 +233,6 @@ class Menu(Screen):
 	def createSummary(self):
 		return MenuSummary
 
-	def selectionChanged(self):
-		entry = self["menu"].getCurrent()[0]
-		for x in self.summaries:
-			x.setCurrentEntry(entry)
-
 class MainMenu(Menu):
 	#add file load functions for the xml-file