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

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 4ad36d18..9c41c165 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -6,6 +6,8 @@ from Components.Button import Button
 from Components.Label import Label
 from Components.ProgressBar import ProgressBar
 
+from Tools.Directories import resolveFilename, SCOPE_SKIN
+
 from enigma import quitMainloop
 
 import xml.dom.minidom
@@ -29,12 +31,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 +57,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 +88,8 @@ class Menu(Screen):
 		#        plus possible arguments, as 
 		#        string (as we want to reference 
 		#        stuff which is just imported)
-		# FIXME. somehow.
+		# FIXME. somehow
+		print arg
 		if arg[0] != "":
 			exec "from " + arg[0] + " import *"
 			
@@ -120,11 +118,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,19 +151,26 @@ 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)