X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7bc4a59528ab13f3062dc1520e76f9ecedd87400..086ff739f866d621a9fcaca513dc2fe13464ed83:/lib/python/Screens/Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index c3809318..34c534b5 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,95 +1,34 @@
-from Screen import *
-from Components.MenuList import MenuList
+from Screen import Screen
+from Components.Sources.List import List
 from Components.ActionMap import ActionMap
 from Components.Header import Header
-
-# hack ... must be made dynamic
-from ServiceScan import ServiceScan
-from ScartLoopThrough import ScartLoopThrough
 from Components.Button import Button
 from Components.Label import Label
 from Components.ProgressBar import ProgressBar
-from ConfigMenu import *
-
-from TimerEdit import *
+from Components.config import configfile
+from Components.Sources.Clock import Clock
+from Components.PluginComponent import plugins
 
-from enigma import quitMainloop
+from Tools.Directories import resolveFilename, SCOPE_SKIN
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 from skin import elementsWithTag
 
-# some screens
-def doGlobal(screen):
-	screen["clock"] = Clock()
-
-
-mdom = xml.dom.minidom.parseString(
-        """
-	<menu text="Mainmenu" title="the real Mainmenu">
-		<item text="Standby debug">quitMainloop()</item>
-		<item text="Automatic Scan">self.openDialog(ServiceScan)</item>
-
-		<item text="TV-Mode">self.setModeTV()</item>
-		<item text="Radio-Mode">self.setModeRadio()</item>
-		<item text="File-Mode">self.setModeFile()</item>
-		<item text="Scart">self.openDialog(ScartLoopThrough)</item>
-		<item text="Timer">self.openDialog(TimerEditList)</item>
-		<menu text="Setup">
-			<menu text="Service Organising">
-				<item text="New Bouquets"></item>
-				<item text="Add to Bouquets"></item>
-				<item text="Edit Bouquets"></item>
-			</menu>
-			<menu text="Service Searching">
-				<item text="Satelliteconfig"></item>
-				<item text="Satfinder"></item>
-				<item text="Rotor Control"></item>
-				<item text="Edit Transponder"></item>
-				<item text="Automatic Scan">self.openDialog(ServiceScan)</item>
-				<item text="Automatic 'Multisat' Scan"></item>
-				<item text="Manual Scan"></item>
-			</menu>
-			<menu text="System">
-				<item text="Time Date"></item>
-				<item text="Video Audio"></item>
-				<item text="UHF Modulator"></item>
-				<item text="Harddisk"></item>
-				<item text="Keyboard"></item>
-				<item text="OSD">self.openDialog(configOSD)</item>
-				<item text="Language"></item>
-				<item text="LCD"></item>
-			</menu>
-			<item text="Common Interface"></item>
-			<item text="Parental Control"></item>
-			<item text="Expert"></item>
-		</menu>
-		<item text="Games"></item>
-		<item text="Information"></item>
-		<menu text="Standby">
-			<item text="PowerOff"></item>
-			<item text="Restart"></item>
-			<item text="Standby"></item>
-			<item text="Sleep Timer">self.goSetup()</item>
-		</menu>
-	</menu>""")
-
-def getText(nodelist):
-	rc = ""
-	for node in nodelist:
-		if node.nodeType == node.TEXT_NODE:
-			rc = rc + node.data
-	return rc
-
-def getValbyAttr(x, attr):
-	for p in range(x.attributes.length):
-		a = x.attributes.item(p)
-		attrib = str(a.name)
-		value = str(a.value)
-		if attrib == attr:
-			return value
-			
-	return ""
+from Screens.Setup import Setup, getSetupTitle
+
+from Tools import XMLTools
+
+#		<item text="TV-Mode">self.setModeTV()</item>
+#		<item text="Radio-Mode">self.setModeRadio()</item>
+#		<item text="File-Mode">self.setModeFile()</item>
+#			<item text="Sleep Timer"></item>
+
+
+# read the menu
+menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r')
+mdom = xml.dom.minidom.parseString(menufile.read())
+menufile.close()
 
 class boundFunction:
 	def __init__(self, fnc, *args):
@@ -97,116 +36,206 @@ class boundFunction:
 		self.args = args
 	def __call__(self):
 		self.fnc(*self.args)
-
-class configOSD(Screen):
-	#this needs focus handling - so not useable
-
-	def okbuttonClick(self):
-		self.close
- 
-	def __init__(self, session):
+		
+class MenuUpdater:
+	def __init__(self):
+		self.updatedMenuItems = {}
+	
+	def addMenuItem(self, id, pos, text, module, screen):
+		if not self.updatedMenuAvailable(id):
+			self.updatedMenuItems[id] = []
+		self.updatedMenuItems[id].append([text, pos, module, screen])
+	
+	def delMenuItem(self, id, pos, text, module, screen):
+		self.updatedMenuItems[id].remove([text, pos, module, screen])
+	
+	def updatedMenuAvailable(self, id):
+		return self.updatedMenuItems.has_key(id)
+	
+	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" >
+			<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)
 
-		self["actions"] = ActionMap(["OkCancelActions"], 
-			{
-				"ok": self.okbuttonClick,
-				"cancel": self.close
-			})
-
-		self["okbutton"] = Button("Save")
-
-		self["txt_alpha"] = Label("Alpha:")
-		self["sld_alpha"] = ProgressBar()
-		self["sld_alpha"].setValue(50)
-
-		self["txt_brightness"] = Label("Brightness:")
-		self["sld_brightness"] = ProgressBar()
-		self["sld_brightness"].setValue(50)
-
-		self["txt_gamma"] = Label("Contrast:")
-		self["sld_gamma"] = ProgressBar()
-		self["sld_gamma"].setValue(50)
+	def selectionChanged(self):
+		self["MenuEntry"].setText(self.parent["menu"].getCurrent()[0])
 
+class Menu(Screen):
 
+	ALLOW_SUSPEND = True
 
+	def okbuttonClick(self):
+		print "okbuttonClick"
+		selection = self["menu"].getCurrent()
+		selection[1]()
 
-class Menu(Screen):
-	#add file load functions for the xml-file
-	#remove old code (i.e. goScan / goClock...)
+	def execText(self, text):
+		exec text
 
-	def openDialog(self, dialog):
-		self.session.open(dialog)
+	def runScreen(self, arg):
+		# arg[0] is the module (as string)
+		# arg[1] is Screen inside this module 
+		#        plus possible arguments, as 
+		#        string (as we want to reference 
+		#        stuff which is just imported)
+		# FIXME. somehow
+		if arg[0] != "":
+			exec "from " + arg[0] + " import *"
 
-	def goSetup(self):
-		self.session.open(configTest)
-	
-	def setModeTV(self):
-		print "set Mode to TV"
-		pass
+		self.openDialog(*eval(arg[1]))
 
-	def setModeRadio(self):
-		print "set Mode to Radio"
+	def nothing(self): #dummy
 		pass
 
-	def setModeFile(self):
-		print "set Mode to File"
-		pass
+	def openDialog(self, *dialog):				# in every layer needed
+		self.session.openWithCallback(self.menuClosed, *dialog)
 
-	def goScan(self):
-		self.session.open(ServiceScan)
-	
-	def goClock(self):
-		self.session.open(clockDisplay, Clock())
+	def openSetup(self, dialog):
+		self.session.openWithCallback(self.menuClosed, Setup, dialog)
 
-	def okbuttonClick(self):
-		selection = self["menu"].getCurrent()
-		selection[1]()
+	def addMenu(self, destList, node):
+		MenuTitle = _(node.getAttribute("text").encode("UTF-8") or "??")
+		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))
+
+	def menuClosedWithConfigFlush(self, *res):
+		configfile.save()
+		self.menuClosed(*res)
+
+	def menuClosed(self, *res):
+		if len(res) and res[0]:
+			self.close(True)
 
-	def evalText(self, text):
-		eval(text)
+	def addItem(self, destList, node):
+		item_text = node.getAttribute("text").encode("UTF-8")
+		for x in node.childNodes:
+			if x.nodeType != xml.dom.minidom.Element.nodeType:
+				continue
+			elif x.tagName == 'screen':
+				module = x.getAttribute("module") or None
+				screen = x.getAttribute("screen") or None
+
+				if screen is None:
+					screen = module
+
+				print module, screen
+				if module:
+					module = "Screens." + module
+				else:
+					module = ""
+				
+				# 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))))
+				return
+			elif x.tagName == 'code':
+				destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes))))
+				return
+			elif x.tagName == 'setup':
+				id = x.getAttribute("id")
+				if item_text == "":
+					item_text = _(getSetupTitle(id)) + "..."
+				else:
+					item_text = _(item_text)
+				destList.append((item_text, boundFunction(self.openSetup, id)))
+				return
 		
-	def nothing(self):																	#dummy
-		pass
+		destList.append((item_text,self.nothing))
 
-	def addMenu(self, destList, node):
-		MenuTitle = getValbyAttr(node, "text")
-		if MenuTitle != "":																	#check for title
-			a = boundFunction(self.session.open, Menu, node, node.childNodes)
-			#TODO add check if !empty(node.childNodes)
-			destList.append((MenuTitle, a))
-		
-	def addItem(self, destList, node):
-		ItemText = getValbyAttr(node, "text")
-		if ItemText != "":																	#check for name
-			b = getText(node.childNodes)
-			if b != "":																				#check for function
-				destList.append((ItemText,boundFunction(self.evalText,b)))
-			else:
-				destList.append((ItemText,self.nothing))				#use dummy as function
 
 	def __init__(self, session, parent, childNode):
 		Screen.__init__(self, session)
 		
 		list = []
-
-		for x in childNode:							#walk through the actual nodelist
+		
+		menuID = None
+		for x in childNode:						#walk through the actual nodelist
 			if x.nodeType != xml.dom.minidom.Element.nodeType:
 			    continue
 			elif x.tagName == 'item':
 				self.addItem(list, x)
+				count += 1
 			elif x.tagName == 'menu':
 				self.addMenu(list, x)
-
-		self["menu"] = MenuList(list)	
+				count += 1
+			elif x.tagName == "id":
+				menuID = x.getAttribute("val")
+				count = 0
+
+			if menuID is not None:
+				# menuupdater?
+				if menuupdater.updatedMenuAvailable(menuID):
+					for x in menuupdater.getUpdatedMenu(menuID):
+						if x[1] == count:
+							list.append((x[0], boundFunction(self.runScreen, (x[2], x[3] + ", "))))
+							count += 1
+
+		if menuID is not None:
+			# plugins
+			for l in plugins.getPluginsForMenu(menuID):
+				list.append((l[0], boundFunction(l[1], self.session)))
+
+		self["menu"] = List(list)	
 							
-		self["actions"] = ActionMap(["OkCancelActions"], 
+		self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
 			{
 				"ok": self.okbuttonClick,
-				"cancel": self.close
+				"cancel": self.closeNonRecursive,
+				"menu": self.closeRecursive
 			})
 		
-		a = getValbyAttr(parent, "title")
-		if a == "":														#if empty use name
-			a = getValbyAttr(parent, "text")
+		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.menu_title = a
+
+	def closeNonRecursive(self):
+		self.close(False)
+
+	def closeRecursive(self):
+		self.close(True)
 
+	def createSummary(self):
+		return MenuSummary
+
+class MainMenu(Menu):
+	#add file load functions for the xml-file
+	
+	def __init__(self, *x):
+		Menu.__init__(self, *x)
+		self.skinName = "Menu"