X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/601d6f20152532574b5d60aed5ba862afa21ba1c..3d5dd14f2ea5cd28d4e21f763db7dd528d23f55a:/lib/python/Screens/Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index bba64040..7ae50cd0 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,9 +1,10 @@
 from Screen import Screen
 from Components.Sources.List import List
-from Components.ActionMap import ActionMap
+from Components.ActionMap import NumberActionMap
 from Components.Sources.StaticText import StaticText
 from Components.config import configfile
 from Components.PluginComponent import plugins
+from Components.config import config
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 
@@ -170,8 +171,10 @@ class Menu(Screen):
 			if x.nodeType != xml.dom.minidom.Element.nodeType:
 			    continue
 			elif x.tagName == 'item':
-				self.addItem(list, x)
-				count += 1
+				item_level = int(x.getAttribute("level") or "0")
+				if item_level <= config.usage.setup_level.index:
+					self.addItem(list, x)
+					count += 1
 			elif x.tagName == 'menu':
 				self.addMenu(list, x)
 				count += 1
@@ -204,19 +207,37 @@ class Menu(Screen):
 
 		self["menu"] = List(list)
 
-		self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
+		self["actions"] = NumberActionMap(["OkCancelActions", "MenuActions", "NumberActions"],
 			{
 				"ok": self.okbuttonClick,
 				"cancel": self.closeNonRecursive,
-				"menu": self.closeRecursive
+				"menu": self.closeRecursive,
+				"1": self.keyNumberGlobal,
+				"2": self.keyNumberGlobal,
+				"3": self.keyNumberGlobal,
+				"4": self.keyNumberGlobal,
+				"5": self.keyNumberGlobal,
+				"6": self.keyNumberGlobal,
+				"7": self.keyNumberGlobal,
+				"8": self.keyNumberGlobal,
+				"9": self.keyNumberGlobal
 			})
-		
+
 		a = parent.getAttribute("title").encode("UTF-8") or None
 		if a is None:
 			a = _(parent.getAttribute("text").encode("UTF-8"))
 		self["title"] = StaticText(a)
 		self.menu_title = a
 
+	def keyNumberGlobal(self, number):
+		print "menu keyNumber:", number
+		# Calculate index
+		number -= 1
+
+ 		if len(self["menu"].list) > number:
+			self["menu"].setIndex(number)
+			self.okbuttonClick()
+
 	def closeNonRecursive(self):
 		self.close(False)