add a global ActionMap

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index c67028574999703f2e5f12e84eb9da90d9fe0a11..39ded6a8dd3b5e78a1dbac04bab768cace832e90 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -86,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" />
@@ -93,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">
@@ -103,7 +108,7 @@
                <key id="KEY_GREEN" mapto="subserviceSelection" flags="m" />
        </map>
 
-       <map context="InfobarVolumeActions">
+       <map context="GlobalActions">
                <key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
                <key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />
                <key id="KEY_MUTE" mapto="volumeMute" flags="mr" />
@@ -144,7 +149,7 @@
                <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" />
@@ -154,13 +159,20 @@
                
                <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>
        
@@ -195,10 +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">
@@ -251,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>