X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1b1a1efbe9a61b6f05d46821b4d22f8e5c84a931..a60706d6e68355f37a404872e5f91f4c827bdb2a:/data/keymap.xml?ds=sidebyside

diff --git a/data/keymap.xml b/data/keymap.xml
index a60935f5..b7ea52b2 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -66,6 +66,13 @@
 		<key id="BTN_1" mapto="zapDown" flags="mr" />
 	</map>
 	
+	<map context="MinuteInputActions">
+		<key id="KEY_UP" mapto="up" flags="mr" />
+		<key id="KEY_DOWN" mapto="down" flags="mr" />
+		<key id="KEY_OK" mapto="ok" flags="mr" />
+		<key id="KEY_EXIT" mapto="cancel" flags="mr" />
+	</map>
+	
 	<map context="WizardActions">
 		<key id="KEY_LEFT" mapto="left" flags="mr" />
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
@@ -79,6 +86,10 @@
 		<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
 	</map>
 	
+	<map context="MenuActions">
+		<key id="KEY_MENU" mapto="menu" flags="mr" />
+	</map>
+	
 	<map context="InfobarShowHideActions">
 		<key id="KEY_OK" mapto="toggleShow" flags="m" />
 		<key id="KEY_EXIT" mapto="hide" flags="m" />
@@ -86,6 +97,7 @@
 
 	<map context="InfobarActions">
 		<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
+		<key id="KEY_RADIO" mapto="showRadio" flags="m" />
 	</map>
 
 	<map context="InfobarAudioSelectionActions">
@@ -137,21 +149,30 @@
 		<key id="KEY_MUTE" mapto="delete" flags="mr" />
 	</map>	
 
-	<map context="InfobarPVRActions">
+	<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="seekBackUp" flags="b" />
 		<key id="KEY_BLUE" mapto="seekFwd" 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" />
+	</map>
 
+	<map context="InfobarTimeshiftActions">
+		<key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
+		<key id="KEY_TV" mapto="timeshiftStop" flags="m" />
+	</map>
+
+	<map context="InfobarMovieListActions">
 		<key id="KEY_UP" mapto="up" flags="m" />
 		<key id="KEY_DOWN" mapto="down" flags="m" />
+		<key id="KEY_VIDEO" mapto="movieList" flags="m" />
 	</map>
 
 	<map context="MoviePlayerActions">
-		<key id="KEY_VIDEO" mapto="leavePlayer" flags="m" />
 		<key id="KEY_TV" mapto="leavePlayer" flags="m" />
 	</map>
 	
@@ -186,8 +207,20 @@
 		<key id="KEY_0" mapto="0" flags="m" />
 	</map>
 
+	<map context="ContextMenuActions">
+		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
+	</map>
+
+	<map context="TvRadioActions">
+		<key id="KEY_TV" mapto="keyTV" flags="m" />
+		<key id="KEY_RADIO" mapto="keyRadio" 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_INFO" mapto="info" flags="m" />
 	</map>
 
 	<map context="EventViewActions">
@@ -212,7 +245,7 @@
 	</map>
 
 	<map context="MsgBoxActions">
-		<key id="KEY_GREEN" mapto="ok" flags="m" />
+		<key id="KEY_GREEN" mapto="alwaysOK" flags="m" />
 		<key id="KEY_OK" mapto="ok" flags="m" />		
 		<key id="KEY_RED" mapto="cancel" flags="m" />
 		<key id="KEY_EXIT" mapto="cancel" flags="m" />
@@ -240,7 +273,4 @@
 	<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>