bouquet +/- is now working in the channellist

diff --git a/data/keymap.xml b/data/keymap.xml
index a737ab29f791d59d9314e3628c6ebf12c9298825..1e6fbd5accfecf67a0060edd3bcd64862a41f395 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -195,6 +195,8 @@
                <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_CHANNELUP" mapto="nextBouquet" flags="m" />
+               <key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
        </map>
 
        <map context="ChannelSelectEPGActions">

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 43cf66d7af9fa11993cf54dc9ad301addefa063f..4c8b2486198bb3bab2e7e9bddc2fffa2f62106d7 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -377,6 +377,8 @@ class ChannelSelectionBase(Screen):
                                "showAllServices": self.showAllServices,
                                "showProviders": self.showProviders,
                                "showSatellites": self.showSatellites,
+                               "nextBouquet": self.nextBouquet,
+                               "prevBouquet": self.prevBouquet,
                                "1": self.keyNumberGlobal,
                                "2": self.keyNumberGlobal,
                                "3": self.keyNumberGlobal,
@@ -591,6 +593,23 @@ class ChannelSelectionBase(Screen):
                                                self.clearPath()
                                                self.enterPath(ref)
 
+       def changeBouquet(self, direction):
+               if not self.pathChangedDisabled:
+                       if self.isBasePathEqual(self.bouquet_root):
+                               self.pathUp()
+                               if direction < 0:
+                                       self.moveUp()
+                               else:
+                                       self.moveDown()
+                               ref = self.getCurrentSelection()
+                               self.enterPath(ref)
+
+       def nextBouquet(self):
+               self.changeBouquet(+1)
+
+       def prevBouquet(self):
+               self.changeBouquet(-1)
+
        def showFavourites(self):
                if not self.pathChangedDisabled:
                        if not self.preEnterPath(self.bouquet_rootstr):