X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2747602c8eab9c230ee28dff4766d341d971007a..32ffb34a91efdb0a89f36dd0172fe61eddbb41cf:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index d9e65ae6..59949962 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -36,12 +36,24 @@
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
 		<key id="KEY_RED" mapto="cancel" flags="m" />
 		<key id="KEY_GREEN" mapto="save" 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="InfobarActions">
 		<key id="m" mapto="mainMenu" flags="mr" />
 		<key id="c" mapto="switchChannelDown" flags="mr" />
-		<key id="r" mapto="instantRecord" flags="m" />
+<!--		<key id="r" mapto="instantRecord" flags="m" /> -->
+		<key id="r" mapto="showEPGList" flags="m" />
+		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
 		<key id="KEY_RED" mapto="instantRecord" flags="m" />
 		<key id="1" mapto="zapUp" flags="mr" />
 		<key id="2" mapto="zapDown" flags="mr" />
@@ -59,24 +71,46 @@
 		<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" />
+		<key id="KEY_POWER" mapto="powerdown" flags="m" />
+		<key id="KEY_POWER" mapto="powerup" flags="b" />
+		<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" />
+		
+		<key id="KEY_YELLOW" mapto="pauseService" flags="m" />
+		<key id="KEY_GREEN" mapto="unPauseService" flags="m" />
 	</map>
 	
 	<map context="ChannelSelectActions">
 		<key id="m" mapto="mark" flags="m" />
 		<!-- yes, this is flexible as hell. -->
-		<key id="p" mapto="bouquet:(provider == PREMIERE)" flags="m" />
-		<key id="d" mapto="bouquet:(provider == ARD)" 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_C" mapto="contextMenu" 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:" flags="m" />
+		<key id="KEY_RED" mapto="bouquet:(type == 1) || (type == 17)" flags="m" />
 		<key id="KEY_GREEN" mapto="bouquet:(provider == ARD) &amp;&amp; (type == 1)" flags="m" />
 		<key id="KEY_YELLOW" mapto="bouquet:(provider == ZDF) &amp;&amp; (type == 1)" flags="m" />
-		<key id="KEY_BLUE" mapto="showFavourites" flags="m" />
+		<key id="KEY_BLUE" mapto="bouquet:(type == 1) FROM BOUQUET &quot;bouquets.tv&quot; ORDER BY bouquet" flags="m" />
+		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
+	</map>
+	<map context="EPGSelectActions">
+		<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
+	</map>
+	<map context="EventViewActions">
+		<key id="KEY_UP" mapto="pageUp" flags="mr" />
+		<key id="KEY_DOWN" mapto="pageDown" flags="mr" />
+		<key id="KEY_LEFT" mapto="prevEvent" flags="mr" />
+		<key id="KEY_RIGHT" mapto="nextEvent" flags="mr" />
 	</map>
 	<map context="OkCancelActions">
 		<key id="\x0a" mapto="ok" flags="m" />
@@ -104,4 +138,10 @@
 		<key id="KEY_GREEN" mapto="green" flags="mr" />
 		<key id="KEY_BLUE" mapto="blue" flags="mr" />
 	</map>
+	<map context="StandbyActions">
+		<key id="KEY_POWER" mapto="power" flags="m" />
+	</map>
+	<map context="ContextMenuActions">
+ 		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
+	</map>
 </keymap>