X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FMenu.py;h=2a8801ca773afeb791c2c83c8c8143c85be83bdc;hb=529d27d845bdc567ded0c43fe040ed674276936a;hp=93f23dfb620e91b1484e7e6bac9c32a47625fb5c;hpb=c2bbed774d6e5c51b4af23a60a95aca74aa5d4e9;p=vuplus_dvbapp

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
old mode 100644
new mode 100755
index 93f23df..2a8801c
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -61,9 +61,6 @@ class MenuSummary(Screen):
 		</widget>
 	</screen>"""
 
-	def __init__(self, session, parent):
-		Screen.__init__(self, session, parent)
-
 class Menu(Screen):
 
 	ALLOW_SUSPEND = True
@@ -100,8 +97,12 @@ class Menu(Screen):
 
 	def addMenu(self, destList, node):
 		requires = node.get("requires")
-		if requires and not SystemInfo.get(requires, False):
-			return
+		if requires:
+			if requires[0] == '!':
+				if SystemInfo.get(requires[1:], False):
+					return
+			elif not SystemInfo.get(requires, False):
+				return
 		MenuTitle = _(node.get("text", "??").encode("UTF-8"))
 		entryID = node.get("entryID", "undefined")
 		weight = node.get("weight", 50)
@@ -118,13 +119,17 @@ class Menu(Screen):
 		self.menuClosed(*res)
 
 	def menuClosed(self, *res):
-		if len(res) and res[0]:
+		if res and res[0]:
 			self.close(True)
 
 	def addItem(self, destList, node):
 		requires = node.get("requires")
-		if requires and not SystemInfo.get(requires, False):
-			return
+		if requires:
+			if requires[0] == '!':
+				if SystemInfo.get(requires[1:], False):
+					return
+			elif not SystemInfo.get(requires, False):
+				return
 		item_text = node.get("text", "").encode("UTF-8")
 		entryID = node.get("entryID", "undefined")
 		weight = node.get("weight", 50)
@@ -155,7 +160,7 @@ class Menu(Screen):
 			elif x.tag == 'setup':
 				id = x.get("id")
 				if item_text == "":
-					item_text = _(getSetupTitle(id)) + "..."
+					item_text = _(getSetupTitle(id))
 				else:
 					item_text = _(item_text)
 				destList.append((item_text, boundFunction(self.openSetup, id), entryID, weight))
@@ -240,7 +245,7 @@ class Menu(Screen):
 		# Calculate index
 		number -= 1
 
- 		if len(self["menu"].list) > number:
+		if len(self["menu"].list) > number:
 			self["menu"].setIndex(number)
 			self.okbuttonClick()