data/defaultlists.xml: additionally ask to do a servicescan when no defaultservicelis...

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
old mode 100644 (file)
new mode 100755 (executable)
index 0865e41..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" />


@@ -197,12 +201,12 @@
                        <key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
                </device>
                <device name="dreambox advanced remote control (native)">
                        <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">
                </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">
        </map>
 
        <map context="InfobarSubserviceQuickzapActions">


@@ -265,8 +269,8 @@
 
        <map context="InfobarSeekActions">
                <device name="dreambox remote control (native)">
 
        <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" />
                        <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 +336,7 @@
 
        <map context="InfobarTimeshiftActions">
                <device name="dreambox remote control (native)">
 
        <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)">
                        <key id="KEY_TV" mapto="timeshiftStop" flags="m" />
                </device>
                <device name="dreambox advanced remote control (native)">


@@ -351,7 +355,7 @@
        <map context="InfobarTimeshiftActivateActions">
                <device name="dreambox remote control (native)">
                        <key id="KEY_RED" mapto="timeshiftActivateEnd" flags="b" />
        <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" />
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_PREVIOUSSONG" mapto="timeshiftActivateEnd" flags="m" />


@@ -412,12 +416,16 @@
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_0" mapto="toggleMark" flags="m" />
                </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>
                </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" />
        
        <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">