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

diff --git a/data/keymap.xml b/data/keymap.xml
index 8eaa10ee..221f1552 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -52,11 +52,11 @@
 		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
 	</map>
 	
-	<map context="InfoBarInstantRecord">
-		<key id="KEY_R" mapto="instantRecord" flags="m" />
+	<map context="InfobarInstantRecord">
+		<key id="KEY_RED" mapto="instantRecord" flags="m" />
 	</map>
 
-	<map context="InfoBarChannelSelection">
+	<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" />
@@ -66,7 +66,23 @@
 		<key id="BTN_1" mapto="zapDown" flags="mr" />
 	</map>
 	
-	<map context="InfoBarMenuActions">
+	<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" />
+		<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>
 	
@@ -77,9 +93,16 @@
 
 	<map context="InfobarActions">
 		<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
+	</map>
+
+	<map context="InfobarAudioSelectionActions">
 		<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" />
@@ -91,6 +114,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" />
@@ -104,33 +140,66 @@
 		<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" />
 		<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" />
+
+		<key id="KEY_UP" mapto="up" flags="m" />
+		<key id="KEY_DOWN" mapto="down" flags="m" />
+	</map>
+
+	<map context="MoviePlayerActions">
+		<key id="KEY_VIDEO" mapto="leavePlayer" flags="m" />
+		<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="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)" 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="bouquet:(type == 1) FROM BOUQUET &quot;bouquets.tv&quot; ORDER BY 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" /-->
+
+		<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">
 		<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">
@@ -138,6 +207,7 @@
 		<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_GREEN" mapto="timerAdd" flags="m" />
 	</map>
 
 	<map context="OkCancelActions">
@@ -145,17 +215,29 @@
 		<key id="\x1b" mapto="cancel" flags="m" />
 
 		<!-- use this on rcu, ok? -->
-		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_OK" mapto="ok" flags="m" />		
 		<key id="KEY_EXIT" mapto="cancel" flags="m" />
 
+
 		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_ESC" mapto="cancel" flags="m" />
 	</map>
 
+	<map context="MsgBoxActions">
+		<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" />
+	</map>
+
 	<map context="WindowActions">
 		
 	</map>
 	
+	<map context="HelpActions">
+		<key id="KEY_HELP" mapto="displayHelp" flags="m" />
+	</map>
+
 	<map context="ShortcutActions">
 		<key id="KEY_F1" mapto="red" flags="mr" />
 		<key id="KEY_F2" mapto="yellow" flags="mr" />