Merge branch 'bug_615_replace_rawfile'

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index e207c3c9056cbc44b71684467e5312147f75b22b..9461d509fc3f5708645473a49226afd738d945b6 100755 (executable)
--- 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" />


@@ -586,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">