aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2006-01-04 22:28:36 +0000
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2006-01-04 22:28:36 +0000
commit3ed2a2a7ae8652da1b60f0cb080037ac38699544 (patch)
tree3e1af0d0f502941ffeca6fbb258a918abcc87c4a
parentd731c3f593fc10252efee0ea0940f6a94f32a056 (diff)
downloadenigma2-3ed2a2a7ae8652da1b60f0cb080037ac38699544.tar.gz
enigma2-3ed2a2a7ae8652da1b60f0cb080037ac38699544.zip
leave menu with menu button
-rw-r--r--data/keymap.xml4
-rw-r--r--lib/python/Screens/Menu.py5
2 files changed, 7 insertions, 2 deletions
diff --git a/data/keymap.xml b/data/keymap.xml
index 221f1552..fa8293ea 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -86,6 +86,10 @@
<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
</map>
+ <map context="MenuActions">
+ <key id="KEY_MENU" mapto="menu" flags="mr" />
+ </map>
+
<map context="InfobarShowHideActions">
<key id="KEY_OK" mapto="toggleShow" flags="m" />
<key id="KEY_EXIT" mapto="hide" flags="m" />
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 7554d814..0abc1735 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -139,10 +139,11 @@ class Menu(Screen):
self["menu"] = MenuList(list)
- self["actions"] = ActionMap(["OkCancelActions"],
+ self["actions"] = ActionMap(["OkCancelActions", "MenuActions"],
{
"ok": self.okbuttonClick,
- "cancel": self.close
+ "cancel": self.close,
+ "menu": self.close
})
a = getValbyAttr(parent, "title")