use < > keys vor next / previous service in single service epg

diff --git a/data/keymap.xml b/data/keymap.xml
index 264afcc..0865e41 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -475,6 +475,8 @@
                <key id="KEY_MENU" mapto="input_date_time" flags="m" />
                <key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
                <key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
                <key id="KEY_MENU" mapto="input_date_time" flags="m" />
                <key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
                <key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />

+               <key id="KEY_NEXT" mapto="nextService" flags="m" />
+               <key id="KEY_PREVIOUS" mapto="prevService" flags="m" />

        </map>
 
        <map context="EventViewActions">
        </map>
 
        <map context="EventViewActions">

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 4930899..d09ed00 100644 (file)
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -82,22 +82,28 @@ class EPGSelection(Screen):
                                "info": self.infoKeyPressed,
                                "red": self.zapTo,
                                "input_date_time": self.enterDateTime,
                                "info": self.infoKeyPressed,
                                "red": self.zapTo,
                                "input_date_time": self.enterDateTime,

-                               "nextBouquet": self.nextBouquet,
-                               "prevBouquet": self.prevBouquet,
+                               "nextBouquet": self.nextBouquet, # just used in multi epg yet
+                               "prevBouquet": self.prevBouquet, # just used in multi epg yet
+                               "nextService": self.nextService, # just used in single epg yet
+                               "prevService": self.prevService, # just used in single epg yet

                        })
                self["actions"].csel = self
                self.onLayoutFinish.append(self.onCreate)
 
        def nextBouquet(self):
                        })
                self["actions"].csel = self
                self.onLayoutFinish.append(self.onCreate)
 
        def nextBouquet(self):

-               if self.serviceChangeCB:
-                       self.serviceChangeCB(1, self)
-               elif self.bouquetChangeCB:
+               if self.bouquetChangeCB:

                        self.bouquetChangeCB(1, self)
 
        def prevBouquet(self):
                if self.bouquetChangeCB:
                        self.bouquetChangeCB(-1, self)
                        self.bouquetChangeCB(1, self)
 
        def prevBouquet(self):
                if self.bouquetChangeCB:
                        self.bouquetChangeCB(-1, self)

-               elif self.serviceChangeCB:
+
+       def nextService(self):
+               if self.serviceChangeCB:
+                       self.serviceChangeCB(1, self)
+
+       def prevService(self):
+               if self.serviceChangeCB:

                        self.serviceChangeCB(-1, self)
 
        def enterDateTime(self):
                        self.serviceChangeCB(-1, self)
 
        def enterDateTime(self):