X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54adc39b6d67358842acda8f56d911a3b5f0edd9..fd898a58a585848b5dda5dad738db1f638eebccd:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index a1206010..ffcfa95d 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -64,7 +64,7 @@
 	</map>
 
 	<map context="InfobarEPGActions">
-		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
+		<key id="KEY_INFO" mapto="showEventInfo" flags="m" />
 	</map>
 	
 	<map context="InfobarInstantRecord">
@@ -76,7 +76,8 @@
 		<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 +88,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">
@@ -161,13 +173,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">
@@ -180,6 +199,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" />
@@ -189,12 +212,20 @@
 	<map context="MoviePlayerActions">
 		<key id="KEY_TV" mapto="leavePlayer" flags="m" />
 	</map>
+	
+	<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="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">
@@ -210,10 +241,14 @@
 		<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_INFO" mapto="info" flags="m" />
 	</map>
 
@@ -223,6 +258,12 @@
 		<key id="KEY_LEFT" mapto="prevEvent" flags="mr" />
 		<key id="KEY_RIGHT" mapto="nextEvent" flags="mr" />
 		<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">
@@ -237,6 +278,20 @@
 		<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" />
+	</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" />
@@ -267,4 +322,13 @@
 	<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>
 </keymap>