aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens/Menu.py
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-12-22 16:01:07 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-12-22 16:01:07 +0100
commitc8ec3314997b357069372d7dc6746ffc7c21afa5 (patch)
treeef529ece821000d4639ff348dc1417792e2b492a /lib/python/Screens/Menu.py
parentf13490a1a66421b08cef893cb89e8f78c5873d05 (diff)
parent29aad534cf1c20a723fe8d736babad1be1e6e9fa (diff)
downloadenigma2-c8ec3314997b357069372d7dc6746ffc7c21afa5.tar.gz
enigma2-c8ec3314997b357069372d7dc6746ffc7c21afa5.zip
Merge branch 'bug_307_fix_deepstandby_texts'
Diffstat (limited to 'lib/python/Screens/Menu.py')
-rw-r--r--lib/python/Screens/Menu.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 5f2032f1..bb0709e5 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -97,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)
@@ -120,8 +124,12 @@ class Menu(Screen):
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)