X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8d162c6432e74a8f2a2982a017b8af528223c8e7..663ae4876adf2ec53e4ffcb0b1d1fefa291c8b8b:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index f95a129f..693f9330 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -66,6 +66,15 @@
 		<key id="BTN_1" mapto="zapDown" flags="mr" />
 	</map>
 	
+	<map context="WizardActions">
+		<key id="KEY_LEFT" mapto="left" flags="mr" />
+		<key id="KEY_RIGHT" mapto="right" flags="mr" />
+		<key id="KEY_UP" mapto="up" flags="mr" />
+		<key id="KEY_DOWN" mapto="down" flags="mr" />
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_EXIT" mapto="back" flags="m" />
+	</map>
+	
 	<map context="InfobarMenuActions">
 		<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
 	</map>
@@ -83,6 +92,10 @@
 		<key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
 	</map>
 
+	<map context="InfobarSubserviceSelectionActions">
+		<key id="KEY_GREEN" mapto="subserviceSelection" flags="m" />
+	</map>
+
 	<map context="InfobarVolumeActions">
 		<key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
 		<key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />
@@ -94,6 +107,19 @@
 		<key id="KEY_POWER" mapto="powerup" flags="b" />
 	</map>
 	
+	<map context="NumberActions">
+		<key id="KEY_1" mapto="1" flags="m" />
+		<key id="KEY_2" mapto="2" flags="m" />
+		<key id="KEY_3" mapto="3" flags="m" />
+		<key id="KEY_4" mapto="4" flags="m" />
+		<key id="KEY_5" mapto="5" flags="m" />
+		<key id="KEY_6" mapto="6" flags="m" />
+		<key id="KEY_7" mapto="7" flags="m" />
+		<key id="KEY_8" mapto="8" flags="m" />
+		<key id="KEY_9" mapto="9" flags="m" />
+		<key id="KEY_0" mapto="0" flags="m" />
+	</map>
+	
 	<map context="NumberZapActions">
 		<key id="KEY_1" mapto="1" flags="m" />
 		<key id="KEY_2" mapto="2" flags="m" />
@@ -107,6 +133,9 @@
 		<key id="KEY_0" mapto="0" flags="m" />
 	</map>
 	
+	<map context="TextEntryActions">
+		<key id="KEY_MUTE" mapto="delete" flags="mr" />
+	</map>	
 
 	<map context="InfobarPVRActions">
 		<key id="KEY_YELLOW" mapto="pauseService" flags="m" />
@@ -126,18 +155,32 @@
 	<map context="ChannelSelectActions">
 		<key id="m" mapto="mark" flags="m" />
 		<!-- yes, this is flexible as hell. -->
-		<key id="p" mapto="bouquet:(provider == PREMIERE) &amp;&amp; (type == 1)" flags="m" />
+		<!--key id="p" mapto="bouquet:(provider == PREMIERE) &amp;&amp; (type == 1)" flags="m" />
 		<key id="d" mapto="bouquet:(provider == ARD) &amp;&amp; (type == 1)" flags="m" />
 		<key id="a" mapto="bouquet:" flags="m" />
 		<key id="KEY_M" mapto="mark" flags="m" />
 		<key id="KEY_D" mapto="bouquet:(provider == ARD)" flags="m" />
 		<key id="KEY_A" mapto="bouquet:" flags="m" />
 		<key id="KEY_RED" mapto="bouquet:(type == 1) || (type == 17) ORDER BY name" flags="m" />
-		<!--<key id="KEY_GREEN" mapto="bouquet:(type == 1) || (type == 17) ORDER BY provider" flags="m" />
-		<key id="KEY_YELLOW" mapto="bouquet:(type == 1) || (type == 17) ORDER BY satellitePosition" flags="m" />-->
-		<!--<key id="KEY_BLUE" mapto="bouquet:(type == 1) FROM BOUQUET &quot;bouquets.tv&quot; ORDER BY bouquet" flags="m" />-->
+		<key id="KEY_GREEN" mapto="bouquet:(type == 1) || (type == 17) FROM SATELLITES ORDER BY satellitePosition" flags="m" />
+		<key id="KEY_YELLOW" mapto="bouquet:(type == 1) || (type == 17) FROM PROVIDERS ORDER BY name" flags="m" /-->
+
+		<key id="KEY_RED" mapto="showAllServices" flags="m" />
+		<key id="KEY_GREEN" mapto="showSatellites" flags="m" />
+		<key id="KEY_YELLOW" mapto="showProviders" flags="m" />
 		<key id="KEY_BLUE" mapto="showFavourites" flags="m" />
 		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
+		
+		<key id="KEY_1" mapto="1" flags="m" />
+		<key id="KEY_2" mapto="2" flags="m" />
+		<key id="KEY_3" mapto="3" flags="m" />
+		<key id="KEY_4" mapto="4" flags="m" />
+		<key id="KEY_5" mapto="5" flags="m" />
+		<key id="KEY_6" mapto="6" flags="m" />
+		<key id="KEY_7" mapto="7" flags="m" />
+		<key id="KEY_8" mapto="8" flags="m" />
+		<key id="KEY_9" mapto="9" flags="m" />
+		<key id="KEY_0" mapto="0" flags="m" />
 	</map>
 
 	<map context="EPGSelectActions">