X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d529a2571260748de28937c2ee9b47c15ded32ce..4eff668d8019ed9255d72b4373f6b1053231f129:/data/keymap.xml?ds=sidebyside

diff --git a/data/keymap.xml b/data/keymap.xml
index 7a26f85d..a81d5efd 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -64,19 +64,24 @@
 	</map>
 
 	<map context="InfobarEPGActions">
-		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
+		<key id="KEY_INFO" mapto="showEventInfo" flags="m" />
 	</map>
 	
 	<map context="InfobarInstantRecord">
 		<key id="KEY_RED" mapto="instantRecord" flags="m" />
 	</map>
 
+	<map context="InfobarExtensions">
+		<key id="KEY_BLUE" mapto="extensions" flags="m" />
+	</map>
+	
 	<map context="InfobarChannelSelection">
 		<key id="KEY_LEFT" mapto="zapUp" flags="mr" />
 		<key id="KEY_RIGHT" mapto="zapDown" flags="mr" />
 		<key id="KEY_UP" mapto="switchChannelUp" flags="mr" />
 		<key id="KEY_DOWN" mapto="switchChannelDown" flags="mr" />
-
+		<key id="KEY_PREVIOUS" mapto="historyBack" flags="mr" />
+		<key id="KEY_NEXT" mapto="historyNext" flags="mr" />
 		<key id="BTN_0" mapto="zapUp" flags="mr" />
 		<key id="BTN_1" mapto="zapDown" flags="mr" />
 	</map>
@@ -87,21 +92,32 @@
 		<key id="KEY_OK" mapto="ok" flags="mr" />
 		<key id="KEY_EXIT" mapto="cancel" flags="mr" />
 	</map>
-	
-	<map context="WizardActions">
+
+	<map context="InputBoxActions">
 		<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" />
+		<key id="KEY_MUTE" mapto="delete" flags="mr" />
+		<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="MinuteInputActions">
+	
+	<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="cancel" flags="m" />
+		<key id="KEY_EXIT" mapto="back" flags="m" />
 	</map>
 	
 	<map context="InfobarMenuActions">
@@ -134,6 +150,8 @@
 		<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="powerdown" flags="m" />
+		<key id="KEY_POWER" mapto="powerup" flags="b" />
 	</map>
 	
 	<map context="PowerKeyActions">
@@ -153,22 +171,7 @@
 		<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" />
-		<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="TextEntryActions">
 		<key id="KEY_MUTE" mapto="delete" flags="mr" />
 	</map>	
@@ -176,13 +179,20 @@
 	<map context="InfobarSeekActions">
 		<key id="KEY_YELLOW" mapto="pauseService" flags="m" />
 		<key id="KEY_GREEN" mapto="unPauseService" flags="m" />
-		<key id="KEY_RED" mapto="seekBack" flags="m" />
+		<key id="KEY_RED" mapto="seekBackDown" flags="m" />
 		<key id="KEY_RED" mapto="seekBackUp" flags="b" />
-		<key id="KEY_BLUE" mapto="seekFwd" flags="m" />
+		<key id="KEY_BLUE" mapto="seekFwdDown" flags="m" />
 		<key id="KEY_BLUE" mapto="seekFwdUp" flags="b" />
 		
 		<key id="KEY_LEFT" mapto="seekBack" flags="m" />
 		<key id="KEY_RIGHT" mapto="seekFwd" flags="m" />
+		
+		<key id="KEY_1" mapto="seek:-30" flags="m" />
+		<key id="KEY_3" mapto="seek:30" flags="m" />
+		<key id="KEY_4" mapto="seek:-90" flags="m" />
+		<key id="KEY_6" mapto="seek:90" flags="m" />
+		<key id="KEY_7" mapto="seek:-270" flags="m" />
+		<key id="KEY_9" mapto="seek:270" flags="m" />
 	</map>
 
 	<map context="InfobarTimeshiftActions">
@@ -195,6 +205,10 @@
 		<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
 	</map>
 
+	<map context="MovieSelectionActions">
+		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
+	</map>
+
 	<map context="InfobarMovieListActions">
 		<key id="KEY_UP" mapto="up" flags="m" />
 		<key id="KEY_DOWN" mapto="down" flags="m" />
@@ -205,38 +219,30 @@
 		<key id="KEY_TV" mapto="leavePlayer" 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) &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) FROM SATELLITES ORDER BY satellitePosition" flags="m" />
-		<key id="KEY_YELLOW" mapto="bouquet:(type == 1) || (type == 17) FROM PROVIDERS ORDER BY name" flags="m" /-->
+	<map context="InfobarCueSheetActions">
+		<key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
+		<key id="KEY_PLAYPAUSE" mapto="toggleMark" flags="m" />
+		<key id="KEY_NEXTSONG" mapto="jumpNextMark" flags="m" />
+	</map>
+	
+	<map context="InfobarTeletextActions">
+		<key id="KEY_TEXT" mapto="startTeletext" flags="m" />
+	</map>
 
+	<map context="ChannelSelectBaseActions">
 		<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_CHANNELUP" mapto="nextBouquet" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
+	</map>
+
+	<map context="ChannelSelectEPGActions">
 		<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="ContextMenuActions">
+	<map context="ChannelSelectEditActions">
 		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
 	</map>
 
@@ -245,11 +251,19 @@
 		<key id="KEY_RADIO" mapto="keyRadio" flags="m" />
 	</map>
 
+	<map context="TimerEditActions">
+		<key id="KEY_INFO" mapto="log" flags="m" />
+	</map>
+	
 	<map context="EPGSelectActions">
 		<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
-		<key id="KEY_YELLOW" mapto="yellow" flags="m" />
-		<key id="KEY_BLUE" mapto="blue" flags="m" />
+		<key id="KEY_YELLOW" mapto="yellow" flags="mr" />
+		<key id="KEY_BLUE" mapto="blue" flags="mr" />
+		<key id="KEY_RED" mapto="red" flags="m" />
 		<key id="KEY_INFO" mapto="info" flags="m" />
+		<key id="KEY_MENU" mapto="input_date_time" flags="m" />
+		<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
 	</map>
 
 	<map context="EventViewActions">
@@ -257,7 +271,14 @@
 		<key id="KEY_DOWN" mapto="pageDown" flags="mr" />
 		<key id="KEY_LEFT" mapto="prevEvent" flags="mr" />
 		<key id="KEY_RIGHT" mapto="nextEvent" flags="mr" />
+		<key id="KEY_RED" mapto="openSimilarList" flags="m" />
 		<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
+		<key id="KEY_INFO" mapto="cancel" flags="m" />
+	</map>
+	
+	<map context="EventViewEPGActions">
+		<key id="KEY_YELLOW" mapto="openSingleServiceEPG" flags="m" />
+		<key id="KEY_BLUE" mapto="openMultiServiceEPG" flags="m" />
 	</map>
 
 	<map context="OkCancelActions">
@@ -272,6 +293,30 @@
 		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_ESC" mapto="cancel" flags="m" />
 	</map>
+	
+	<map context="DirectionActions">
+		<key id="KEY_UP" mapto="up" flags="m" />
+		<key id="KEY_DOWN" mapto="down" flags="m" />
+		<key id="KEY_LEFT" mapto="left" flags="m" />
+		<key id="KEY_RIGHT" mapto="right" flags="m" />
+
+		<key id="KEY_UP" mapto="upRepeated" flags="r" />
+		<key id="KEY_DOWN" mapto="downRepeated" flags="r" />
+		<key id="KEY_LEFT" mapto="leftRepeated" flags="r" />
+		<key id="KEY_RIGHT" mapto="rightRepeated" flags="r" />
+		
+		<key id="KEY_LEFT" mapto="leftUp" flags="b" />
+		<key id="KEY_RIGHT" mapto="rightUp" flags="b" />
+		<key id="KEY_UP" mapto="upUp" flags="b" />
+		<key id="KEY_DOWN" mapto="downUp" flags="b" />
+	</map>
+	
+	<map context="ColorActions">
+		<key id="KEY_RED" mapto="red" flags="m" />		
+		<key id="KEY_GREEN" mapto="green" flags="m" />
+		<key id="KEY_YELLOW" mapto="yellow" flags="m" />		
+		<key id="KEY_BLUE" mapto="blue" flags="m" />
+	</map>
 
 	<map context="MsgBoxActions">
 		<key id="KEY_GREEN" mapto="alwaysOK" flags="m" />
@@ -302,4 +347,35 @@
 	<map context="StandbyActions">
 		<key id="KEY_POWER" mapto="power" flags="m" />
 	</map>
+	<map context="CutListEditorActions">
+		<key id="KEY_NEXT" mapto="setIn" flags="m" />
+		<key id="KEY_PREVIOUS" mapto="setOut" flags="m" />
+		<key id="KEY_0" mapto="setMark" flags="m" />
+		<key id="KEY_CHANNELUP" mapto="addMark" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="removeMark" flags="m" />
+		<key id="KEY_EXIT" mapto="leave" flags="m" />
+		<key id="KEY_OK" mapto="showMenu" flags="m" />
+	</map>
+	
+	<map context="PiPSetupActions">
+		<key id="KEY_UP" mapto="up" flags="mr" />
+		<key id="KEY_DOWN" mapto="down" flags="mr" />
+		<key id="KEY_LEFT" mapto="left" flags="mr" />
+		<key id="KEY_RIGHT" mapto="right" flags="mr" />
+		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_OK" mapto="ok" flags="m" />		
+		<key id="KEY_CHANNELUP" mapto="size+" flags="mr" />
+		<key id="KEY_CHANNELDOWN" mapto="size-" flags="mr" />
+	</map>
+	
+	<map context="MediaPlayerSeekActions">
+		<key id="KEY_YELLOW" mapto="pause" flags="m" />
+		<key id="KEY_GREEN" mapto="play" flags="m" />
+		<key id="KEY_TV" mapto="stop" flags="m" />
+
+		<key id="KEY_PREVIOUS" mapto="previous" flags="mr" />
+		<key id="KEY_NEXT" mapto="next" flags="mr" />
+		
+		<key id="KEY_MENU" mapto="menu" flags="m" />
+	</map>
 </keymap>