X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FMenu.py;h=6ea0f647e1211ffc8bd56487c8f65993635e6f2f;hb=9b1a6555d346900d5255acd651902ce79b9c0951;hp=113eeb6d06c9634723ef88d89fbf2288cedf5c5a;hpb=674719294af7449c52d93b1969aeebbaa9117cbe;p=vuplus_dvbapp

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 113eeb6..6ea0f64 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,19 +1,13 @@
 from Screen import Screen
-from Components.Sources.MenuList import MenuList
+from Components.Sources.List import List
 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.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
 
 import xml.dom.minidom
-from xml.dom import EMPTY_NAMESPACE
-from skin import elementsWithTag
 
 from Screens.Setup import Setup, getSetupTitle
 
@@ -54,37 +48,23 @@ 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.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>
+		<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)
-		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])
+		Screen.__init__(self, session, parent)
 
 class Menu(Screen):
 
@@ -121,13 +101,14 @@ class Menu(Screen):
 
 	def addMenu(self, destList, node):
 		MenuTitle = _(node.getAttribute("text").encode("UTF-8") or "??")
+		entryID = node.getAttribute("entryID") or "undefined"
 		x = node.getAttribute("flushConfigOnClose")
 		if x:
 			a = boundFunction(self.session.openWithCallback, self.menuClosedWithConfigFlush, Menu, node, node.childNodes)
 		else:
 			a = boundFunction(self.session.openWithCallback, self.menuClosed, Menu, node, node.childNodes)
 		#TODO add check if !empty(node.childNodes)
-		destList.append((MenuTitle, a))
+		destList.append((MenuTitle, a, entryID))
 
 	def menuClosedWithConfigFlush(self, *res):
 		configfile.save()
@@ -139,6 +120,7 @@ class Menu(Screen):
 
 	def addItem(self, destList, node):
 		item_text = node.getAttribute("text").encode("UTF-8")
+		entryID = node.getAttribute("entryID") or "undefined"
 		for x in node.childNodes:
 			if x.nodeType != xml.dom.minidom.Element.nodeType:
 				continue
@@ -154,16 +136,16 @@ class Menu(Screen):
 					module = "Screens." + module
 				else:
 					module = ""
-				
-				# check for arguments. they will be appended to the 
+
+				# check for arguments. they will be appended to the
 				# openDialog call
 				args = XMLTools.mergeText(x.childNodes)
 				screen += ", " + args
-					
-				destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen))))
+
+				destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen)), entryID))
 				return
 			elif x.tagName == 'code':
-				destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes))))
+				destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes)), entryID))
 				return
 			elif x.tagName == 'setup':
 				id = x.getAttribute("id")
@@ -171,10 +153,9 @@ class Menu(Screen):
 					item_text = _(getSetupTitle(id)) + "..."
 				else:
 					item_text = _(item_text)
-				destList.append((item_text, boundFunction(self.openSetup, id)))
+				destList.append((item_text, boundFunction(self.openSetup, id), entryID))
 				return
-		
-		destList.append((item_text,self.nothing))
+		destList.append((item_text, self.nothing, entryID))
 
 
 	def __init__(self, session, parent, childNode):
@@ -209,8 +190,14 @@ class Menu(Screen):
 			for l in plugins.getPluginsForMenu(menuID):
 				list.append((l[0], boundFunction(l[1], self.session)))
 
-		self["menu"] = MenuList(list)	
-							
+		# for the skin: first try a menu_<menuID>, then Menu
+		self.skinName = [ ]
+		if menuID is not None:
+			self.skinName.append("menu_" + menuID)
+		self.skinName.append("Menu")
+
+		self["menu"] = List(list)
+
 		self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
 			{
 				"ok": self.okbuttonClick,
@@ -221,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):
@@ -237,5 +224,5 @@ class MainMenu(Menu):
 	#add file load functions for the xml-file
 	
 	def __init__(self, *x):
-		Menu.__init__(self, *x)
 		self.skinName = "Menu"
+		Menu.__init__(self, *x)