add possibility to change services in single service epg with bouquet +/- key

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index bae8f7ded05f19ee1b4b35b16e45483d4dfcbcbf..0ff4042bf0562b20706835ab0ce7ae84567bf95b 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -317,11 +317,24 @@ class ChannelSelectionEPG:
 
        def showEPGList(self):
                ref=self.getCurrentSelection()
 
        def showEPGList(self):
                ref=self.getCurrentSelection()

-               ptr=eEPGCache.getInstance()
-               if ptr.startTimeQuery(ref) != -1:
-                       self.session.open(EPGSelection, ref)
-               else:
-                       print 'no epg for service', ref.toString()
+               if ref:
+                       self.savedService = ref
+                       self.session.openWithCallback(self.SingleServiceEPGClosed, EPGSelection, ref, serviceChangeCB=self.changeServiceCB)
+
+       def SingleServiceEPGClosed(self, ret=False):
+               self.setCurrentSelection(self.savedService)
+
+       def changeServiceCB(self, direction, epg):
+               beg = self.getCurrentSelection()
+               while True:
+                       if direction > 0:
+                               self.moveDown()
+                       else:
+                               self.moveUp()
+                       cur = self.getCurrentSelection()
+                       if cur == beg or not (cur.flags & eServiceReference.isMarker):
+                               break
+               epg.setService(ServiceReference(self.getCurrentSelection()))

 
 class ChannelSelectionEdit:
        def __init__(self):
 
 class ChannelSelectionEdit:
        def __init__(self):

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index ae96333ef8a4db7295cb2c7a2651b079a43c49f3..49308994fe593e3ab4437e10a8a9da1df816340a 100644 (file)
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -25,12 +25,14 @@ class EPGSelection(Screen):
        
        ZAP = 1
 
        
        ZAP = 1
 

-       def __init__(self, session, service, zapFunc=None, eventid=None, bouquetChangeCB=None):
+       def __init__(self, session, service, zapFunc=None, eventid=None, bouquetChangeCB=None, serviceChangeCB=None):

                Screen.__init__(self, session)
                self.bouquetChangeCB = bouquetChangeCB
                Screen.__init__(self, session)
                self.bouquetChangeCB = bouquetChangeCB

+               self.serviceChangeCB = serviceChangeCB

                self.ask_time = -1 #now
                self["key_red"] = Button("")
                self.closeRecursive = False
                self.ask_time = -1 #now
                self["key_red"] = Button("")
                self.closeRecursive = False

+               self.saved_title = None

                if isinstance(service, str) and eventid != None:
                        self.type = EPG_TYPE_SIMILAR
                        self["key_yellow"] = Button()
                if isinstance(service, str) and eventid != None:
                        self.type = EPG_TYPE_SIMILAR
                        self["key_yellow"] = Button()


@@ -81,19 +83,22 @@ class EPGSelection(Screen):
                                "red": self.zapTo,
                                "input_date_time": self.enterDateTime,
                                "nextBouquet": self.nextBouquet,
                                "red": self.zapTo,
                                "input_date_time": self.enterDateTime,
                                "nextBouquet": self.nextBouquet,

-                               "prevBouquet": self.prevBouquet
+                               "prevBouquet": self.prevBouquet,

                        })
                self["actions"].csel = self
                        })
                self["actions"].csel = self

-

                self.onLayoutFinish.append(self.onCreate)
 
        def nextBouquet(self):
                self.onLayoutFinish.append(self.onCreate)
 
        def nextBouquet(self):

-               if self.bouquetChangeCB:
+               if self.serviceChangeCB:
+                       self.serviceChangeCB(1, self)
+               elif 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:
+                       self.serviceChangeCB(-1, self)

 
        def enterDateTime(self):
                if self.type == EPG_TYPE_MULTI:
 
        def enterDateTime(self):
                if self.type == EPG_TYPE_MULTI:


@@ -129,6 +134,10 @@ class EPGSelection(Screen):
                self.services = services
                self.onCreate()
 
                self.services = services
                self.onCreate()
 

+       def setService(self, service):
+               self.currentService = service
+               self.onCreate()
+

        #just used in multipeg
        def onCreate(self):
                l = self["list"]
        #just used in multipeg
        def onCreate(self):
                l = self["list"]


@@ -137,7 +146,12 @@ class EPGSelection(Screen):
                        l.fillMultiEPG(self.services, self.ask_time)
                        l.moveToService(self.session.nav.getCurrentlyPlayingServiceReference())
                elif self.type == EPG_TYPE_SINGLE:
                        l.fillMultiEPG(self.services, self.ask_time)
                        l.moveToService(self.session.nav.getCurrentlyPlayingServiceReference())
                elif self.type == EPG_TYPE_SINGLE:

-                       l.fillSingleEPG(self.currentService)
+                       service = self.currentService
+                       if self.saved_title is None:
+                               self.saved_title = self.instance.getTitle()
+                       title = self.saved_title + ' - ' + service.getServiceName()
+                       self.instance.setTitle(title)
+                       l.fillSingleEPG(service)

                else:
                        l.fillSimilarList(self.currentService, self.eventid)
 
                else:
                        l.fillSimilarList(self.currentService, self.eventid)
 

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index e39e028d2f50442fe02330ee2e8ab3a7eb99a21a..1594b3a5261b9f673d10fb5f298f279d7cfc8f72 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -391,6 +391,32 @@ class InfoBarSimpleEventView:
                        epglist[1] = tmp
                        setEvent(epglist[0])
 
                        epglist[1] = tmp
                        setEvent(epglist[0])
 

+class SimpleServicelist:
+       def __init__(self, services):
+               self.services = services
+               self.length = len(services)
+               self.current = 0
+
+       def selectService(self, service):
+               self.current = 0
+               while self.services[self.current].ref != service:
+                       self.current += 1
+
+       def nextService(self):
+               if self.current+1 < self.length:
+                       self.current += 1
+               else:
+                       self.current = 0
+
+       def prevService(self):
+               if self.current-1 > -1:
+                       self.current -= 1
+               else:
+                       self.current = self.length - 1
+
+       def currentService(self):
+               return self.services[self.current]
+

 class InfoBarEPG:
        """ EPG - Opens an EPG list when the showEPGList action fires """
        def __init__(self):
 class InfoBarEPG:
        """ EPG - Opens an EPG list when the showEPGList action fires """
        def __init__(self):


@@ -487,9 +513,28 @@ class InfoBarEPG:
                elif cnt == 1:
                        self.openBouquetEPG(bouquets[0][1], withCallback)
 
                elif cnt == 1:
                        self.openBouquetEPG(bouquets[0][1], withCallback)
 

+       def changeServiceCB(self, direction, epg):
+               if self.serviceSel:
+                       if direction > 0:
+                               self.serviceSel.nextService()
+                       else:
+                               self.serviceSel.prevService()
+                       epg.setService(self.serviceSel.currentService())
+
+       def SingleServiceEPGClosed(self, ret=False):
+               self.serviceSel = None
+

        def openSingleServiceEPG(self):
                ref=self.session.nav.getCurrentlyPlayingServiceReference()
        def openSingleServiceEPG(self):
                ref=self.session.nav.getCurrentlyPlayingServiceReference()

-               self.session.open(EPGSelection, ref)
+               if ref:
+                       if self.servicelist.getMutableList() is not None: # bouquet in channellist
+                               current_path = self.servicelist.getRoot()
+                               services = self.getBouquetServices(current_path)
+                               self.serviceSel = SimpleServicelist(services)
+                               self.serviceSel.selectService(ref)
+                               self.session.openWithCallback(self.SingleServiceEPGClosed, EPGSelection, ref, serviceChangeCB = self.changeServiceCB)
+                       else:
+                               self.session.open(EPGSelection, ref)

 
        def showEventInfoPlugins(self):
                list = [(p.name, boundFunction(self.runPlugin, p)) for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EVENTINFO)]
 
        def showEventInfoPlugins(self):
                list = [(p.name, boundFunction(self.runPlugin, p)) for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EVENTINFO)]