Merge commit 'origin/bug_563_fix_backuprestore_crash'

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
old mode 100644 (file)
new mode 100755 (executable)
index 036ea46..9461d50
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -98,6 +98,10 @@
                <key id="KEY_BLUE" mapto="extensions" flags="b" />
        </map>
        
                <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" />
        <map context="InfobarChannelSelection">
                <key id="KEY_LEFT" mapto="zapUp" flags="mr" />
                <key id="KEY_RIGHT" mapto="zapDown" flags="mr" />


@@ -418,6 +422,10 @@
                        <key id="KEY_TAB" mapto="toggleMark" flags="m" />
                </device>
        </map>
                        <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" />
        
        <map context="InfobarTeletextActions">
                <key id="KEY_TEXT" mapto="startTeletext" flags="m" />


@@ -582,7 +590,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_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">
        </map>  
        
        <map context="CiSelectionActions">