X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bb438bec17665a907c28ca47d665766c7b26be79..9b1c4b296ae2f83c62cb83c5babfc35cbc3d52f7:/lib/python/Screens/Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 4ad36d18..bba36282 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -5,6 +5,9 @@ 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 Tools.Directories import resolveFilename, SCOPE_SKIN
 
 from enigma import quitMainloop
 
@@ -29,12 +32,7 @@ def doGlobal(screen):
 
 
 # read the menu
-try:
-	# first we search in the current path
-	menufile = file('data/menu.xml', 'r')
-except IOError:
-	# if not found in the current path, we use the global datadir-path
-	menufile = file('/usr/share/enigma2/menu.xml', 'r')
+menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r')
 mdom = xml.dom.minidom.parseString(menufile.read())
 menufile.close()
 
@@ -60,13 +58,13 @@ class MenuUpdater:
 	def __init__(self):
 		self.updatedMenuItems = {}
 	
-	def addMenuItem(self, id, text, module, screen):
+	def addMenuItem(self, id, pos, text, module, screen):
 		if not self.updatedMenuAvailable(id):
 			self.updatedMenuItems[id] = []
-		self.updatedMenuItems[id].append([text, module, screen])
+		self.updatedMenuItems[id].append([text, pos, module, screen])
 	
-	def delMenuItem(self, id, text, module, screen):
-		self.updatedMenuItems[id].remove([text, 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)
@@ -91,7 +89,7 @@ class Menu(Screen):
 		#        plus possible arguments, as 
 		#        string (as we want to reference 
 		#        stuff which is just imported)
-		# FIXME. somehow.
+		# FIXME. somehow
 		if arg[0] != "":
 			exec "from " + arg[0] + " import *"
 			
@@ -104,15 +102,27 @@ class Menu(Screen):
 		self.session.open(*dialog)
 
 	def openSetup(self, dialog):
-		self.session.open(Setup, dialog)
+		self.session.openWithCallback(self.menuClosed, Setup, dialog)
 
 	def addMenu(self, destList, node):
 		MenuTitle = _(getValbyAttr(node, "text"))
 		if MenuTitle != "":																	#check for title
-			a = boundFunction(self.session.open, Menu, node, node.childNodes)
+			x = getValbyAttr(node, "flushConfigOnClose")
+			if x == "1":
+				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 addItem(self, destList, node):
 		ItemText = _(getValbyAttr(node, "text"))
 		if ItemText != "":																	#check for name
@@ -120,11 +130,14 @@ class Menu(Screen):
 				if x.nodeType != xml.dom.minidom.Element.nodeType:
 					continue
 				elif x.tagName == 'screen':
-					module = "Screens." + getValbyAttr(x, "module")
+					module = getValbyAttr(x, "module")
 					screen = getValbyAttr(x, "screen")
 
 					if len(screen) == 0:
 						screen = module
+
+					if module != "":
+						module = "Screens." + module
 					
 					# check for arguments. they will be appended to the 
 					# openDialog call
@@ -150,27 +163,34 @@ class Menu(Screen):
 		list = []
 		menuID = ""
 
-		for x in childNode:							#walk through the actual nodelist
+		menuID = -1
+		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)
+				count += 1
 			elif x.tagName == "id":
 				menuID = getValbyAttr(x, "val")
+				count = 0
+			if menuID != -1:
+				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 menuupdater.updatedMenuAvailable(menuID):
-			for x in menuupdater.getUpdatedMenu(menuID):
-				list.append((x[0], boundFunction(self.runScreen, (x[1], x[2] + ", "))))
 
 		self["menu"] = MenuList(list)	
 							
 		self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
 			{
 				"ok": self.okbuttonClick,
-				"cancel": self.close,
-				"menu": self.close
+				"cancel": self.closeNonRecursive,
+				"menu": self.closeRecursive
 			})
 		
 		a = getValbyAttr(parent, "title")
@@ -178,6 +198,12 @@ class Menu(Screen):
 			a = _(getValbyAttr(parent, "text"))
 		self["title"] = Header(a)
 
+	def closeNonRecursive(self):
+		self.close(False)
+
+	def closeRecursive(self):
+		self.close(True)
+
 class MainMenu(Menu):
 	#add file load functions for the xml-file