Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer' into experimental

[vuplus_dvbapp] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
old mode 100644 (file)
new mode 100755 (executable)
index 036ea46..f986b62
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -98,6 +98,10 @@
                <key id="KEY_BLUE" mapto="extensions" flags="b" />
        </map>
        
+       <map context="SatlistShortcutAction">
+               <key id="KEY_BLUE" mapto="nothingconnected" flags="b" />
+       </map>
+       
        <map context="InfobarChannelSelection">
                <key id="KEY_LEFT" mapto="zapUp" flags="mr" />
                <key id="KEY_RIGHT" mapto="zapDown" flags="mr" />
@@ -170,10 +174,12 @@
        
        <map context="InfobarMenuActions">
                <key id="KEY_MENU" mapto="mainMenu" flags="mr" />
+               <key id="KEY_SPACE" mapto="mainMenu" flags="mr" />
        </map>
        
        <map context="MenuActions">
                <key id="KEY_MENU" mapto="menu" flags="mr" />
+               <key id="KEY_SPACE" mapto="menu" flags="mr" />
        </map>
        
        <map context="InfobarShowHideActions">
@@ -366,6 +372,7 @@
 
        <map context="MovieSelectionActions">
                <key id="KEY_MENU" mapto="contextMenu" flags="m" />
+               <key id="KEY_SPACE" mapto="contextMenu" flags="m" />
                <key id="KEY_INFO" mapto="showEventInfo" flags="m" />
        </map>
 
@@ -418,6 +425,10 @@
                        <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" />
@@ -455,6 +466,7 @@
 
        <map context="ChannelSelectEditActions">
                <key id="KEY_MENU" mapto="contextMenu" flags="m" />
+               <key id="KEY_SPACE" mapto="contextMenu" flags="m" />
        </map>
 
        <map context="TvRadioActions">
@@ -582,7 +594,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">
@@ -635,6 +647,7 @@
                </device>
                
                <key id="KEY_MENU" mapto="menu" flags="m" />
+               <key id="KEY_SPACE" mapto="menu" flags="m" />
 
                <key id="KEY_2" mapto="skipListbegin" flags="m" />
                <key id="KEY_8" mapto="skipListend" flags="m" />