X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dba614edd2aad3c17e244914eaef3809d8300cb1..6dd17f0045b07567301222527fcc3c9161e866cb:/keymap.xml

diff --git a/keymap.xml b/keymap.xml
index 82b8a507..493c63b1 100644
--- a/keymap.xml
+++ b/keymap.xml
@@ -12,17 +12,19 @@
 	<map context="InfobarActions">
 		<key id="m" mapto="mainMenu" flags="mr" />
 		<key id="c" mapto="switchChannel" flags="mr" />
-	</map>
-	<map context="MainMenuActions">
-		<key id=" " mapto="selected" flags="mr" />
+		<key id="1" mapto="zapUp" flags="mr" />
+		<key id="2" mapto="zapDown" flags="mr" />
 	</map>
 	
 	<map context="ChannelSelectActions">
-		<key id=" " mapto="selectChannel" flags="mr" />
-		
+		<key id="m" mapto="mark" flags="m" />
 		<!-- yes, this is flexible as hell. -->
-		<key id="p" mapto="bouquet:PREMIERE" flags="m" />
-		<key id="d" mapto="bouquet:Das Erste" flags="m" />
+		<key id="p" mapto="bouquet:(provider == PREMIERE)" flags="m" />
+		<key id="d" mapto="bouquet:(provider == ARD)" flags="m" />
+	</map>
+	<map context="OkCancelActions">
+		<key id="\x0a" mapto="ok" flags="mr" />
+		<key id="\x1b" mapto="cancel" flags="mr" />
 	</map>
 	<map context="WindowActions">