X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5561f5ec4f0a55d9256c3eab0ce121ae82ee5c90..5c471ed8362098ad535177010c7b15957a586234:/keymap.xml

diff --git a/keymap.xml b/keymap.xml
index fa7cd6e8..225cee86 100644
--- a/keymap.xml
+++ b/keymap.xml
@@ -15,12 +15,6 @@
 	</map>
 	
 	<map context="InputActions">
-		<key id="1" mapto="moveLeft" flags="mr" />
-		<key id="2" mapto="moveRight" flags="mr" />
-		<key id="3" mapto="moveHome" flags="mr" />
-		<key id="4" mapto="moveEnd" flags="mr" />
-		<key id="5" mapto="deleteChar" flags="mr" />
-		
 		<key id="KEY_LEFT" mapto="moveLeft" flags="mr" />
 		<key id="KEY_RIGHT" mapto="moveRight" flags="mr" />
 		<key id="KEY_HOME" mapto="moveHome" flags="mr" />
@@ -29,6 +23,14 @@
 		<key id="KEY_BACKSPACE" mapto="deleteBackward" flags="mr" />
 		
 		<key id="KEY_INSERT" mapto="toggleOverwrite" flags="m" />
+		<key id="KEY_ENTER" mapto="accept" flags="m" />
+	</map>
+
+	<map context="SetupActions">
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_LEFT" mapto="left" flags="mr" />
+		<key id="KEY_RIGHT" mapto="right" flags="mr" />
 	</map>
 
 	<map context="InfobarActions">
@@ -45,8 +47,13 @@
 		<key id="KEY_UP" mapto="switchChannelUp" flags="mr" />
 		<key id="KEY_DOWN" mapto="switchChannelDown" flags="mr" />
 		<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
-		<key id="KEY_OK" mapto="toggleShow" flags="mr" />
-		<key id="KEY_EXIT" mapto="hide" flags="mr" />
+		<key id="KEY_OK" mapto="toggleShow" flags="m" />
+		<key id="KEY_EXIT" mapto="hide" flags="m" />
+		<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
+		<key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
+		<key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />
+		<key id="KEY_MUTE" mapto="volumeMute" flags="mr" />
+		<key id="KEY_POWER" mapto="quit" flags="m" />
 	</map>
 	
 	<map context="ChannelSelectActions">
@@ -55,7 +62,8 @@
 		<key id="p" mapto="bouquet:(provider == PREMIERE)" flags="m" />
 		<key id="d" mapto="bouquet:(provider == ARD)" flags="m" />
 		<key id="a" mapto="bouquet:" flags="m" />
-
+		
+		<key id="KEY_C" mapto="contextMenu" flags="m" />
 		<key id="KEY_M" mapto="mark" flags="m" />
 		<!-- yes, this is flexible as hell. -->
 		<key id="KEY_P" mapto="bouquet:(provider == PREMIERE)" flags="m" />
@@ -63,15 +71,15 @@
 		<key id="KEY_A" mapto="bouquet:" flags="m" />
 	</map>
 	<map context="OkCancelActions">
-		<key id="\x0a" mapto="ok" flags="mr" />
-		<key id="\x1b" mapto="cancel" flags="mr" />
+		<key id="\x0a" mapto="ok" flags="m" />
+		<key id="\x1b" mapto="cancel" flags="m" />
 
 		<!-- use this on rcu, ok? -->
-		<key id="KEY_OK" mapto="ok" flags="mr" />
-		<key id="KEY_EXIT" mapto="cancel" flags="mr" />
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_EXIT" mapto="cancel" flags="m" />
 
-		<key id="KEY_ENTER" mapto="ok" flags="mr" />
-		<key id="KEY_ESC" mapto="cancel" flags="mr" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
 	</map>
 	<map context="WindowActions">