X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/39681b432491fd1ef05a3ed7ef87162d73510af3..e57ab5a059a173470f6be66ae06f186029af902d:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 8f055e67..693f9330 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -48,28 +48,79 @@
 		<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" />
+	<map context="InfobarEPGActions">
+		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
+	</map>
+	
+	<map context="InfobarInstantRecord">
 		<key id="KEY_RED" mapto="instantRecord" flags="m" />
-		<key id="1" mapto="zapUp" flags="mr" />
-		<key id="2" mapto="zapDown" flags="mr" />
-		<key id="KEY_M" mapto="mainMenu" flags="mr" />
-		<key id="KEY_C" mapto="switchChannelDown" flags="mr" />
-		<key id="KEY_R" mapto="instantRecord" 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="BTN_0" mapto="zapUp" flags="mr" />
+		<key id="BTN_1" mapto="zapDown" 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>
+	
+	<map context="InfobarShowHideActions">
 		<key id="KEY_OK" mapto="toggleShow" flags="m" />
 		<key id="KEY_EXIT" mapto="hide" flags="m" />
+	</map>
+
+	<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" />
 		<key id="KEY_MUTE" mapto="volumeMute" flags="mr" />
-		<key id="KEY_POWER" mapto="quit" flags="m" />
+	</map>
+	
+	<map context="PowerKeyActions">
+		<key id="KEY_POWER" mapto="powerdown" flags="m" />
+		<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" />
 		<key id="KEY_3" mapto="3" flags="m" />
@@ -82,36 +133,96 @@
 		<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_BLUE" mapto="seekFwd" flags="m" />
+
+		<key id="KEY_LEFT" mapto="seekBack" flags="m" />
+		<key id="KEY_RIGHT" mapto="seekFwd" 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_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_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" />
+	</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" />
+		<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
+	</map>
+
 	<map context="OkCancelActions">
 		<key id="\x0a" mapto="ok" flags="m" />
 		<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="ok" 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" />
@@ -123,4 +234,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>