git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 6114520..25538f8
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -78,18 +78,20 @@
 
        <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">
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_RECORD" mapto="instantRecord" flags="m" />
-                       <key id="KEY_STOP" mapto="instantRecord" flags="m" />
+                       <!-- this breaks timeshift end!!! key id="KEY_STOP" mapto="instantRecord" flags="m" /-->
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_RECORD" mapto="instantRecord" flags="m" />
                </device>
-               <key id="KEY_RED" mapto="instantRecord" flags="b" />
+               <device name="dreambox remote control (native)">
+                       <key id="KEY_RED" mapto="instantRecord" flags="b" />
+               </device>
        </map>
 
        <map context="InfobarExtensions">
@@ -121,7 +123,7 @@
        </map>
 
        <map context="InputAsciiActions">
-               <device name="dreambox ir keyboard">
+               <device name="Console">
                        <key id="KEY_ASCII" mapto="gotAsciiCode" flags="mr" />
                </device>
        </map>
@@ -195,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">
@@ -263,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" />
@@ -292,14 +294,12 @@
 
                <key id="KEY_OK" mapto="unPauseService" flags="m" />
                
-               <key id="KEY_1" mapto="seek:-15" flags="b" />
-               <key id="KEY_3" mapto="seek:15" flags="b" />
-               <key id="KEY_1" mapto="seekBackDef" flags="l" />
-               <key id="KEY_3" mapto="seekFwdDef" flags="l" />
-               <key id="KEY_4" mapto="seek:-60" flags="m" />
-               <key id="KEY_6" mapto="seek:60" flags="m" />
-               <key id="KEY_7" mapto="seek:-300" flags="m" />
-               <key id="KEY_9" mapto="seek:300" flags="m" />
+               <key id="KEY_1" mapto="seekdef:1" flags="m" />
+               <key id="KEY_3" mapto="seekdef:3" flags="m" />
+               <key id="KEY_4" mapto="seekdef:4" flags="m" />
+               <key id="KEY_6" mapto="seekdef:6" flags="m" />
+               <key id="KEY_7" mapto="seekdef:7" flags="m" />
+               <key id="KEY_9" mapto="seekdef:9" flags="m" />
        </map>
 
        <map context="MediaPlayerSeekActions">
@@ -322,36 +322,36 @@
                        <key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
                </device>
                
-               <key id="KEY_1" mapto="seek:-15" flags="b" />
-               <key id="KEY_3" mapto="seek:15" flags="b" />
-               <key id="KEY_1" mapto="seekBackDef" flags="l" />
-               <key id="KEY_3" mapto="seekFwdDef" flags="l" />
-               <key id="KEY_4" mapto="seek:-60" flags="m" />
-               <key id="KEY_6" mapto="seek:60" flags="m" />
-               <key id="KEY_7" mapto="seek:-300" flags="m" />
-               <key id="KEY_9" mapto="seek:300" flags="m" />
+               <key id="KEY_1" mapto="seekdef:1" flags="m" />
+               <key id="KEY_3" mapto="seekdef:3" flags="m" />
+               <key id="KEY_4" mapto="seekdef:4" flags="m" />
+               <key id="KEY_6" mapto="seekdef:6" flags="m" />
+               <key id="KEY_7" mapto="seekdef:7" flags="m" />
+               <key id="KEY_9" mapto="seekdef:9" flags="m" />
        </map>
 
        <map context="InfobarTimeshiftActions">
                <device name="dreambox remote control (native)">
+                       <key id="KEY_YELLOW" mapto="timeshiftStart" flags="b" />
                        <key id="KEY_TV" mapto="timeshiftStop" flags="m" />
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_PLAY" mapto="timeshiftStart" flags="m" />
                        <key id="KEY_PLAYPAUSE" mapto="timeshiftStart" flags="m" />
+                       <key id="KEY_TV" mapto="timeshiftStop" flags="m" />
                        <key id="KEY_STOP" mapto="timeshiftStop" flags="m" />
                </device>
                <device name="dreambox ir keyboard">
+                       <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
                        <key id="KEY_PAUSE" mapto="timeshiftStart" flags="m" />
                        <key id="KEY_STOP" mapto="timeshiftStop" flags="m" />
                </device>
-               <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
        </map>
 
        <map context="InfobarTimeshiftActivateActions">
                <device name="dreambox remote control (native)">
-                       <key id="KEY_RED" mapto="timeshiftActivateEnd" flags="m" />
-                       <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
+                       <key id="KEY_RED" mapto="timeshiftActivateEnd" flags="b" />
+                       <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" />
@@ -410,24 +408,20 @@
        
        <map context="MediaPlayerCueSheetActions">
                <device name="dreambox remote control (native)">
-                       <key id="KEY_PREVIOUS" mapto="jumpPreviousMark" flags="b" />
-                       <key id="KEY_NEXT" mapto="jumpNextMark" flags="b" />
                        <key id="KEY_0" mapto="toggleMark" flags="m" />
                </device>
                <device name="dreambox advanced remote control (native)">
-                       <key id="KEY_PREVIOUS" mapto="jumpPreviousMark" flags="b" />
                        <key id="KEY_0" mapto="toggleMark" flags="m" />
-                       <key id="KEY_NEXT" mapto="jumpNextMark" flags="b" />
-                       <key id="KEY_RED" mapto="jumpPreviousMark" flags="m" />
-                       <key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
-                       <key id="KEY_BLUE" mapto="jumpNextMark" flags="m" />
+                       <key id="KEY_YELLOW" mapto="toggleMark" flags="b" />
                </device>
                <device name="dreambox ir keyboard">
-                       <key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="b" />
                        <key id="KEY_TAB" mapto="toggleMark" flags="m" />
-                       <key id="KEY_NEXTSONG" mapto="jumpNextMark" flags="b" />
                </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" />
@@ -485,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">
@@ -590,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">
@@ -618,16 +614,19 @@
                        <key id="KEY_TV" mapto="stop" flags="b" />
                        <key id="KEY_TV" mapto="shift_stop" flags="l" />
                        <key id="KEY_RADIO" mapto="shift_record" flags="l" />
-                       <key id="KEY_PREVIOUS" mapto="previous" flags="l" />
-                       <key id="KEY_NEXT" mapto="next" flags="l" />
+                       <key id="KEY_PREVIOUS" mapto="previous" flags="m" />
+                       <key id="KEY_NEXT" mapto="next" flags="m" />
                </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" />
-                       <key id="KEY_PREVIOUS" mapto="previous" flags="l" />
-                       <key id="KEY_NEXT" mapto="next" flags="l" />
+                       <key id="KEY_PREVIOUS" mapto="previous" flags="m" />
+                       <key id="KEY_NEXT" mapto="next" flags="m" />
+                       <key id="KEY_RED" mapto="previous" flags="m" />
+                       <key id="KEY_BLUE" mapto="next" flags="m" />
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_PAUSE" mapto="pause" flags="m" />
@@ -635,8 +634,8 @@
                        <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" />
-                       <key id="KEY_PREVIOUSSONG" mapto="previous" flags="l" />
-                       <key id="KEY_NEXTSONG" mapto="next" flags="l" />
+                       <key id="KEY_PREVIOUSSONG" mapto="previous" flags="m" />
+                       <key id="KEY_NEXTSONG" mapto="next" flags="m" />
                </device>
                
                <key id="KEY_MENU" mapto="menu" flags="m" />
@@ -646,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>
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources