use slotid as parameter for the SatSetup instead of nim for easier inclusing into...

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index b909e09a7a3927d4d22652d7d3004eaeb8e3ba83..91f82622951111ff524330f6b3dbfd5768a9cae2 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -83,6 +83,10 @@
                <key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
        </map>
 
                <key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
        </map>
 

+       <map context="InfobarSubserviceSelectionActions">
+               <key id="KEY_GREEN" mapto="subserviceSelection" flags="m" />
+       </map>
+

        <map context="InfobarVolumeActions">
                <key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
                <key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />
        <map context="InfobarVolumeActions">
                <key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
                <key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />


@@ -129,16 +133,19 @@
        <map context="ChannelSelectActions">
                <key id="m" mapto="mark" flags="m" />
                <!-- yes, this is flexible as hell. -->
        <map context="ChannelSelectActions">
                <key id="m" mapto="mark" flags="m" />
                <!-- yes, this is flexible as hell. -->

-               <key id="p" mapto="bouquet:(provider == PREMIERE) &amp;&amp; (type == 1)" flags="m" />
+               <!--key id="p" mapto="bouquet:(provider == PREMIERE) &amp;&amp; (type == 1)" flags="m" />

                <key id="d" mapto="bouquet:(provider == ARD) &amp;&amp; (type == 1)" flags="m" />
                <key id="a" mapto="bouquet:" flags="m" />
                <key id="KEY_M" mapto="mark" flags="m" />
                <key id="KEY_D" mapto="bouquet:(provider == ARD)" flags="m" />
                <key id="KEY_A" mapto="bouquet:" flags="m" />
                <key id="KEY_RED" mapto="bouquet:(type == 1) || (type == 17) ORDER BY name" flags="m" />
                <key id="d" mapto="bouquet:(provider == ARD) &amp;&amp; (type == 1)" flags="m" />
                <key id="a" mapto="bouquet:" flags="m" />
                <key id="KEY_M" mapto="mark" flags="m" />
                <key id="KEY_D" mapto="bouquet:(provider == ARD)" flags="m" />
                <key id="KEY_A" mapto="bouquet:" flags="m" />
                <key id="KEY_RED" mapto="bouquet:(type == 1) || (type == 17) ORDER BY name" flags="m" />

-               <!--<key id="KEY_GREEN" mapto="bouquet:(type == 1) || (type == 17) ORDER BY provider" flags="m" />
-               <key id="KEY_YELLOW" mapto="bouquet:(type == 1) || (type == 17) ORDER BY satellitePosition" flags="m" />-->
-               <!--<key id="KEY_BLUE" mapto="bouquet:(type == 1) FROM BOUQUET &quot;bouquets.tv&quot; ORDER BY bouquet" flags="m" />-->
+               <key id="KEY_GREEN" mapto="bouquet:(type == 1) || (type == 17) FROM SATELLITES ORDER BY satellitePosition" flags="m" />
+               <key id="KEY_YELLOW" mapto="bouquet:(type == 1) || (type == 17) FROM PROVIDERS ORDER BY name" flags="m" /-->
+
+               <key id="KEY_RED" mapto="showAllServices" flags="m" />
+               <key id="KEY_GREEN" mapto="showSatellites" flags="m" />
+               <key id="KEY_YELLOW" mapto="showProviders" flags="m" />

                <key id="KEY_BLUE" mapto="showFavourites" flags="m" />
                <key id="KEY_INFO" mapto="showEPGList" flags="m" />
                
                <key id="KEY_BLUE" mapto="showFavourites" flags="m" />
                <key id="KEY_INFO" mapto="showEPGList" flags="m" />