make colorButtons more useful (or not :-)

diff --git a/data/keymap.xml b/data/keymap.xml
index 1682c693dfaf00223d9f8fe7d25742141c57eb1d..f4ef3ae033426f56d6916a603dbe4a7a5f7b1d12 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -68,13 +68,14 @@
                <key id="p" mapto="bouquet:(provider == PREMIERE)" flags="m" />
                <key id="d" mapto="bouquet:(provider == ARD)" flags="m" />
                <key id="a" mapto="bouquet:" flags="m" />
                <key id="p" mapto="bouquet:(provider == PREMIERE)" flags="m" />
                <key id="d" mapto="bouquet:(provider == ARD)" flags="m" />
                <key id="a" mapto="bouquet:" flags="m" />

-               

                <key id="KEY_C" mapto="contextMenu" flags="m" />
                <key id="KEY_M" mapto="mark" flags="m" />
                <key id="KEY_C" mapto="contextMenu" flags="m" />
                <key id="KEY_M" mapto="mark" flags="m" />

-               <!-- yes, this is flexible as hell. -->
-               <key id="KEY_RED" mapto="bouquet:(provider == PREMIERE)" flags="m" />

                <key id="KEY_D" mapto="bouquet:(provider == ARD)" flags="m" />
                <key id="KEY_A" mapto="bouquet:" 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:" flags="m" />
+               <key id="KEY_GREEN" mapto="bouquet:(provider == ARD) &amp;&amp; (type == 1)" flags="m" />
+               <key id="KEY_YELLOW" mapto="bouquet:(provider == ZDF) &amp;&amp; (type == 1)" flags="m" />

                <key id="KEY_BLUE" mapto="showFavourites" flags="m" />
        </map>
        <map context="OkCancelActions">
                <key id="KEY_BLUE" mapto="showFavourites" flags="m" />
        </map>
        <map context="OkCancelActions">