Merge commit 'origin/bug_202_networkconfig_cleanup' into experimental

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
old mode 100644 (file)
new mode 100755 (executable)
index 96814b4..25538f8
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -78,7 +78,7 @@
 
        <map context="InfobarEPGActions">
                <key id="KEY_INFO" mapto="showEventInfo" flags="b" />
-               <key id="KEY_INFO" mapto="showSingleServiceEPG" flags="l" />
+               <key id="KEY_INFO" mapto="showEventInfoPlugin" flags="l" />
        </map>
        
        <map context="InfobarInstantRecord">
@@ -197,12 +197,12 @@
                        <key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
                </device>
                <device name="dreambox advanced remote control (native)">
-                       <key id="KEY_YELLOW" mapto="audioSelection" flags="m" />
+                       <key id="KEY_YELLOW" mapto="audioSelection" flags="b" />
                </device>
        </map>
 
        <map context="InfobarSubserviceSelectionActions">
-               <key id="KEY_GREEN" mapto="subserviceSelection" flags="m" />
+               <key id="KEY_GREEN" mapto="subserviceSelection" flags="b" />
        </map>
 
        <map context="InfobarSubserviceQuickzapActions">
@@ -265,8 +265,8 @@
 
        <map context="InfobarSeekActions">
                <device name="dreambox remote control (native)">
-                       <key id="KEY_YELLOW" mapto="pauseService" flags="m" />
-                       <key id="KEY_GREEN" mapto="unPauseService" flags="m" />
+                       <key id="KEY_YELLOW" mapto="pauseService" flags="b" />
+                       <key id="KEY_GREEN" mapto="unPauseService" flags="b" />
                        <key id="KEY_RED" mapto="seekBack" flags="b" />
                        <key id="KEY_BLUE" mapto="seekFwd" flags="b" />
                        <key id="KEY_RED" mapto="seekBackManual" flags="l" />
@@ -332,7 +332,7 @@
 
        <map context="InfobarTimeshiftActions">
                <device name="dreambox remote control (native)">
-                       <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
+                       <key id="KEY_YELLOW" mapto="timeshiftStart" flags="b" />
                        <key id="KEY_TV" mapto="timeshiftStop" flags="m" />
                </device>
                <device name="dreambox advanced remote control (native)">
@@ -351,7 +351,7 @@
        <map context="InfobarTimeshiftActivateActions">
                <device name="dreambox remote control (native)">
                        <key id="KEY_RED" mapto="timeshiftActivateEnd" flags="b" />
-                       <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
+                       <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="b" />
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_PREVIOUSSONG" mapto="timeshiftActivateEnd" flags="m" />
@@ -381,6 +381,7 @@
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_TV" mapto="leavePlayer" flags="m" />
+                       <key id="KEY_STOP" mapto="leavePlayer" flags="m" />
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_STOP" mapto="leavePlayer" flags="m" />
@@ -397,9 +398,6 @@
                        <key id="KEY_PREVIOUS" mapto="jumpPreviousMark" flags="m" />
                        <key id="KEY_0" mapto="toggleMark" flags="m" />
                        <key id="KEY_NEXT" mapto="jumpNextMark" flags="m" />
-                       <key id="KEY_RED" mapto="jumpPreviousMark" flags="m" />
-                       <key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
-                       <key id="KEY_BLUE" mapto="jumpNextMark" flags="m" />
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
@@ -414,12 +412,16 @@
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_0" mapto="toggleMark" flags="m" />
-                       <key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
+                       <key id="KEY_YELLOW" mapto="toggleMark" flags="b" />
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_TAB" mapto="toggleMark" flags="m" />
                </device>
        </map>
+
+       <map context="VirtualKeyboardActions">
+               <key id="KEY_TEXT" mapto="showVirtualKeyboard" flags="m" />
+       </map>
        
        <map context="InfobarTeletextActions">
                <key id="KEY_TEXT" mapto="startTeletext" flags="m" />
@@ -477,6 +479,8 @@
                <key id="KEY_MENU" mapto="input_date_time" flags="m" />
                <key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
                <key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
+               <key id="KEY_NEXT" mapto="nextService" flags="m" />
+               <key id="KEY_PREVIOUS" mapto="prevService" flags="m" />
        </map>
 
        <map context="EventViewActions">
@@ -582,7 +586,7 @@
                <key id="KEY_RED" mapto="disableTimer" flags="mr" />
                <key id="KEY_YELLOW" mapto="toggleAsk" flags="mr" />
                <key id="KEY_GREEN" mapto="toggleAction" flags="mr" />
-               <!--key id="KEY_BLUE" mapto="settings" flags="mr" /-->
+               <key id="KEY_BLUE" mapto="useServiceTime" flags="mr" />
        </map>  
        
        <map context="CiSelectionActions">
@@ -615,6 +619,7 @@
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_PLAYPAUSE" mapto="pause" flags="m" />
+                       <key id="KEY_PLAY" mapto="pause" flags="m" />
                        <key id="KEY_STOP" mapto="stop" flags="b" />
                        <key id="KEY_STOP" mapto="shift_stop" flags="l" />
                        <key id="KEY_RECORD" mapto="shift_record" flags="l" />
@@ -640,5 +645,6 @@
                <key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
                <key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
                <key id="KEY_VIDEO" mapto="delete" flags="m" />
+               <key id="KEY_TEXT" mapto="subtitles" flags="m" />
        </map>
 </keymap>