more changes for service groups (replacement for zapping alternatives

[enigma2.git] / lib / python / Screens / InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 4f0e76b16375c246eea03be4e0b9234a1875a6d5..ed8149e488879e3d1393edd8ed7ba1816f6d6e43 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -12,12 +12,12 @@ from Components.ProgressBar import *
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.CurrentService import CurrentService
 from Components.Sources.EventInfo import EventInfo
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.CurrentService import CurrentService
 from Components.Sources.EventInfo import EventInfo

+from Components.Sources.RadioText import RadioText

 from Components.Sources.FrontendStatus import FrontendStatus
 from Components.Sources.Boolean import Boolean
 from Components.Sources.Clock import Clock
 from Components.TimerList import TimerEntryComponent
 from Components.Sources.FrontendStatus import FrontendStatus
 from Components.Sources.Boolean import Boolean
 from Components.Sources.Clock import Clock
 from Components.TimerList import TimerEntryComponent

-from Components.config import config, configElement, ConfigSubsection, configSequence, configElementBoolean, configSelection, configElement_nonSave, getConfigListEntry
-from Components.config import configfile, configsequencearg
+from Components.config import config, ConfigBoolean

 
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor
 
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor


@@ -32,6 +32,7 @@ from Screens.MinuteInput import MinuteInput
 from Screens.TimerSelection import TimerSelection
 from Screens.PictureInPicture import PictureInPicture
 from Screens.SubtitleDisplay import SubtitleDisplay
 from Screens.TimerSelection import TimerSelection
 from Screens.PictureInPicture import PictureInPicture
 from Screens.SubtitleDisplay import SubtitleDisplay

+from Screens.SleepTimerEdit import SleepTimerEdit

 from ServiceReference import ServiceReference
 
 from Tools import Notifications
 from ServiceReference import ServiceReference
 
 from Tools import Notifications


@@ -44,8 +45,6 @@ import time
 import os
 import bisect
 
 import os
 import bisect
 

-from Components.config import config, currentConfigSelectionElement
-

 # hack alert!
 from Menu import MainMenu, mdom
 
 # hack alert!
 from Menu import MainMenu, mdom
 


@@ -87,7 +86,9 @@ class InfoBarShowHide:
        
        def startHideTimer(self):
                if self.__state == self.STATE_SHOWN and not self.__locked:
        
        def startHideTimer(self):
                if self.__state == self.STATE_SHOWN and not self.__locked:

-                       self.hideTimer.start(5000, True)
+                       idx = config.usage.infobar_timeout.index
+                       if idx:
+                               self.hideTimer.start(idx*1000, True)

 
        def __onHide(self):
                self.__state = self.STATE_HIDDEN
 
        def __onHide(self):
                self.__state = self.STATE_HIDDEN


@@ -192,7 +193,8 @@ class InfoBarNumberZap:
 #              print "You pressed number " + str(number)
                if number == 0:
                        self.servicelist.recallPrevService()
 #              print "You pressed number " + str(number)
                if number == 0:
                        self.servicelist.recallPrevService()

-                       self.doShow()
+                       if config.usage.show_infobar_on_zap.value:
+                               self.doShow()

                else:
                        self.session.openWithCallback(self.numberEntered, NumberZap, number)
 
                else:
                        self.session.openWithCallback(self.numberEntered, NumberZap, number)
 


@@ -219,7 +221,7 @@ class InfoBarNumberZap:
                bouquet = self.servicelist.bouquet_root
                service = None
                serviceHandler = eServiceCenter.getInstance()
                bouquet = self.servicelist.bouquet_root
                service = None
                serviceHandler = eServiceCenter.getInstance()

-               if bouquet.toString().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK
+               if not config.usage.multibouquet.value:

                        service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
                else:
                        bouquetlist = serviceHandler.list(bouquet)
                        service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
                else:
                        bouquetlist = serviceHandler.list(bouquet)


@@ -228,7 +230,7 @@ class InfoBarNumberZap:
                                        bouquet = self.servicelist.appendDVBTypes(bouquetlist.getNext())
                                        if not bouquet.valid(): #check end of list
                                                break
                                        bouquet = self.servicelist.appendDVBTypes(bouquetlist.getNext())
                                        if not bouquet.valid(): #check end of list
                                                break

-                                       if (bouquet.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory:
+                                       if not (bouquet.flags & eServiceReference.isDirectory):

                                                continue
                                        service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
                if not service is None:
                                                continue
                                        service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
                if not service is None:


@@ -240,7 +242,7 @@ class InfoBarNumberZap:
                        self.servicelist.setCurrentSelection(service) #select the service in servicelist
                        self.servicelist.zap()
 
                        self.servicelist.setCurrentSelection(service) #select the service in servicelist
                        self.servicelist.zap()
 

-config.misc.initialchannelselection = configElementBoolean("config.misc.initialchannelselection", 1);
+config.misc.initialchannelselection = ConfigBoolean(default = True)

 
 class InfoBarChannelSelection:
        """ ChannelSelection - handles the channelSelection dialog and the initial 
 
 class InfoBarChannelSelection:
        """ ChannelSelection - handles the channelSelection dialog and the initial 


@@ -249,7 +251,7 @@ class InfoBarChannelSelection:
                #instantiate forever
                self.servicelist = self.session.instantiateDialog(ChannelSelection)
                
                #instantiate forever
                self.servicelist = self.session.instantiateDialog(ChannelSelection)
                

-               if config.misc.initialchannelselection.value == 1:
+               if config.misc.initialchannelselection.value:

                        self.onShown.append(self.firstRun)
 
                self["ChannelSelectActions"] = HelpableActionMap(self, "InfobarChannelSelection",
                        self.onShown.append(self.firstRun)
 
                self["ChannelSelectActions"] = HelpableActionMap(self, "InfobarChannelSelection",


@@ -277,7 +279,7 @@ class InfoBarChannelSelection:
 
        def firstRun(self):
                self.onShown.remove(self.firstRun)
 
        def firstRun(self):
                self.onShown.remove(self.firstRun)

-               config.misc.initialchannelselection.value = 0
+               config.misc.initialchannelselection.value = False

                config.misc.initialchannelselection.save()
                self.switchChannelDown()
 
                config.misc.initialchannelselection.save()
                self.switchChannelDown()
 


@@ -299,20 +301,42 @@ class InfoBarChannelSelection:
                self.session.execDialog(self.servicelist)
 
        def zapUp(self):
                self.session.execDialog(self.servicelist)
 
        def zapUp(self):

-               if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes":
-                       if self.servicelist.inBouquet() and self.servicelist.atBegin():
-                               self.servicelist.prevBouquet()
-               self.servicelist.moveUp()
+               if self.servicelist.inBouquet():
+                       prev = self.servicelist.getCurrentSelection()
+                       if prev:
+                               prev = prev.toString()
+                               while True:
+                                       if config.usage.quickzap_bouquet_change.value:
+                                               if self.servicelist.atBegin():
+                                                       self.servicelist.prevBouquet()
+                                       self.servicelist.moveUp()
+                                       cur = self.servicelist.getCurrentSelection()
+                                       if not cur or (not (cur.flags & 64)) or cur.toString() == prev:
+                                               break
+               else:
+                       self.servicelist.moveUp()

                self.servicelist.zap()
                self.servicelist.zap()

-               self.doShow()
+               if config.usage.show_infobar_on_zap.value:
+                       self.doShow()

 
        def zapDown(self):
 
        def zapDown(self):

-               if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes" and self.servicelist.inBouquet() and self.servicelist.atEnd():
-                       self.servicelist.nextBouquet()
+               if self.servicelist.inBouquet():
+                       prev = self.servicelist.getCurrentSelection()
+                       if prev:
+                               prev = prev.toString()
+                               while True:
+                                       if config.usage.quickzap_bouquet_change.value and self.servicelist.atEnd():
+                                               self.servicelist.nextBouquet()
+                                       else:
+                                               self.servicelist.moveDown()
+                                       cur = self.servicelist.getCurrentSelection()
+                                       if not cur or (not (cur.flags & 64)) or cur.toString() == prev:
+                                               break

                else:
                        self.servicelist.moveDown()
                self.servicelist.zap()
                else:
                        self.servicelist.moveDown()
                self.servicelist.zap()

-               self.doShow()
+               if config.usage.show_infobar_on_zap.value:
+                       self.doShow()

 
 class InfoBarMenu:
        """ Handles a menu action, to open the (main) menu """
 
 class InfoBarMenu:
        """ Handles a menu action, to open the (main) menu """


@@ -321,12 +345,21 @@ class InfoBarMenu:
                        {
                                "mainMenu": (self.mainMenu, _("Enter main menu...")),
                        })
                        {
                                "mainMenu": (self.mainMenu, _("Enter main menu...")),
                        })

+               self.session.infobar = None

 
        def mainMenu(self):
                print "loading mainmenu XML..."
                menu = mdom.childNodes[0]
                assert menu.tagName == "menu", "root element in menu must be 'menu'!"
 
        def mainMenu(self):
                print "loading mainmenu XML..."
                menu = mdom.childNodes[0]
                assert menu.tagName == "menu", "root element in menu must be 'menu'!"

-               self.session.open(MainMenu, menu, menu.childNodes)
+
+               self.session.infobar = self
+               # so we can access the currently active infobar from screens opened from within the mainmenu
+               # at the moment used from the SubserviceSelection
+
+               self.session.openWithCallback(self.mainMenuClosed, MainMenu, menu, menu.childNodes)
+
+       def mainMenuClosed(self, *val):
+               self.session.infobar = None

 
 class InfoBarSimpleEventView:
        """ Opens the Eventview for now/next """
 
 class InfoBarSimpleEventView:
        """ Opens the Eventview for now/next """


@@ -392,7 +425,7 @@ class InfoBarEPG:
                                service = servicelist.getNext()
                                if not service.valid(): #check if end of list
                                        break
                                service = servicelist.getNext()
                                if not service.valid(): #check if end of list
                                        break

-                               if service.flags: #ignore non playable services
+                               if service.flags & (eServiceReference.isDirectory | eServiceReference.isMarker): #ignore non playable services

                                        continue
                                services.append(ServiceReference(service))
                return services
                                        continue
                                services.append(ServiceReference(service))
                return services


@@ -508,6 +541,11 @@ class InfoBarEvent:
                self["Event_Now"] = EventInfo(self.session.nav, EventInfo.NOW)
                self["Event_Next"] = EventInfo(self.session.nav, EventInfo.NEXT)
 
                self["Event_Now"] = EventInfo(self.session.nav, EventInfo.NOW)
                self["Event_Next"] = EventInfo(self.session.nav, EventInfo.NEXT)
 

+class InfoBarRadioText:
+       """provides radio (RDS) text info display"""
+       def __init__(self):
+               self["RadioText"] = RadioText(self.session.nav)
+

 class InfoBarServiceName:
        def __init__(self):
                self["CurrentService"] = CurrentService(self.session.nav)
 class InfoBarServiceName:
        def __init__(self):
                self["CurrentService"] = CurrentService(self.session.nav)


@@ -672,7 +710,7 @@ class InfoBarSeek:
                print "unpause"
                if self.seekstate == self.SEEK_STATE_PLAY:
                        return 0
                print "unpause"
                if self.seekstate == self.SEEK_STATE_PLAY:
                        return 0

-               self.setSeekState(self.SEEK_STATE_PLAY);
+               self.setSeekState(self.SEEK_STATE_PLAY)

        
        def doSeek(self, seektime):
                print "doseek", seektime
        
        def doSeek(self, seektime):
                print "doseek", seektime


@@ -781,13 +819,14 @@ class InfoBarSeek:
        def checkSkipShowHideLock(self):
                wantlock = self.seekstate != self.SEEK_STATE_PLAY
                
        def checkSkipShowHideLock(self):
                wantlock = self.seekstate != self.SEEK_STATE_PLAY
                

-               if self.lockedBecauseOfSkipping and not wantlock:
-                       self.unlockShow()
-                       self.lockedBecauseOfSkipping = False
+               if config.usage.show_infobar_on_zap.value:
+                       if self.lockedBecauseOfSkipping and not wantlock:
+                               self.unlockShow()
+                               self.lockedBecauseOfSkipping = False

                
                

-               if wantlock and not self.lockedBecauseOfSkipping:
-                       self.lockShow()
-                       self.lockedBecauseOfSkipping = True
+                       if wantlock and not self.lockedBecauseOfSkipping:
+                               self.lockShow()
+                               self.lockedBecauseOfSkipping = True

 
        def __evEOF(self):
                if self.seekstate != self.SEEK_STATE_PLAY:
 
        def __evEOF(self):
                if self.seekstate != self.SEEK_STATE_PLAY:


@@ -807,6 +846,11 @@ class InfoBarSeek:
                if seekable is not None:
                        seekable.seekRelative(1, diff)
 
                if seekable is not None:
                        seekable.seekRelative(1, diff)
 

+       def seekAbsolute(self, abs):
+               seekable = self.getSeek()
+               if seekable is not None:
+                       seekable.seekTo(abs)
+

 from Screens.PVRState import PVRState, TimeshiftState
 
 class InfoBarPVRState:
 from Screens.PVRState import PVRState, TimeshiftState
 
 class InfoBarPVRState:


@@ -902,8 +946,8 @@ class InfoBarTimeshift:
                print "enable timeshift"
                ts = self.getTimeshift()
                if ts is None:
                print "enable timeshift"
                ts = self.getTimeshift()
                if ts is None:

-#                      self.session.open(MessageBox, _("Timeshift not possible!"), MessageBox.TYPE_ERROR)
-#                      print "no ts interface"
+                       self.session.open(MessageBox, _("Timeshift not possible!"), MessageBox.TYPE_ERROR)
+                       print "no ts interface"

                        return 0;
                
                if self.timeshift_enabled:
                        return 0;
                
                if self.timeshift_enabled:


@@ -1002,69 +1046,164 @@ class InfoBarTimeshift:
 from Screens.PiPSetup import PiPSetup
 
 class InfoBarExtensions:
 from Screens.PiPSetup import PiPSetup
 
 class InfoBarExtensions:

+       EXTENSION_SINGLE = 0
+       EXTENSION_LIST = 1
+       

        def __init__(self):
        def __init__(self):

-               self.session.pipshown = False
+               self.list = []

                
                self["InstantExtensionsActions"] = HelpableActionMap(self, "InfobarExtensions",
                        {
                
                self["InstantExtensionsActions"] = HelpableActionMap(self, "InfobarExtensions",
                        {

-                               "extensions": (self.extensions, _("view extensions...")),
+                               "extensions": (self.showExtensionSelection, _("view extensions...")),

                        })
 
                        })
 

-       PIPON = 0
-       PIPOFF = 1
-       MOVEPIP = 2
-       PIPSWAP = 3
-       ENABLE_SUBTITLE = 4
+       def addExtension(self, extension, key = None, type = EXTENSION_SINGLE):
+               self.list.append((type, extension, key))
+               
+       def updateExtension(self, extension, key = None):
+               self.extensionsList.append(extension)
+               if key is not None:
+                       if self.extensionKeys.has_key(key):
+                               key = None
+               
+               if key is None:
+                       for x in self.availableKeys:
+                               if not self.extensionKeys.has_key(x):
+                                       key = x
+                                       break

 
 

-       def extensions(self):
+               if key is not None:
+                       self.extensionKeys[key] = len(self.extensionsList) - 1
+                       
+       def updateExtensions(self):
+               self.extensionsList = []
+               self.availableKeys = [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "red", "green", "yellow", "blue" ]
+               self.extensionKeys = {}
+               for x in self.list:
+                       if x[0] == self.EXTENSION_SINGLE:
+                               self.updateExtension(x[1], x[2])
+                       else:
+                               for y in x[1]():
+                                       self.updateExtension(y[0], y[1])
+
+
+       def showExtensionSelection(self):
+               self.updateExtensions()
+               extensionsList = self.extensionsList[:]
+               keys = []

                list = []
                list = []

-               if self.session.pipshown == False:
-                       list.append((_("Activate Picture in Picture"), self.PIPON))
-               elif self.session.pipshown == True:
-                       list.append((_("Disable Picture in Picture"), self.PIPOFF))
-                       list.append((_("Move Picture in Picture"), self.MOVEPIP))
-                       list.append((_("Swap services"), self.PIPSWAP))
+               for x in self.availableKeys:
+                       if self.extensionKeys.has_key(x):
+                               entry = self.extensionKeys[x]
+                               extension = self.extensionsList[entry]
+                               if extension[2]():
+                                       name = str(extension[0]())
+                                       list.append((extension[0](), extension))
+                                       keys.append(x)
+                                       extensionsList.remove(extension)
+                               else:
+                                       extensionsList.remove(extension)
+               for x in extensionsList:
+                       list.append((x[0](), x))
+               keys += [""] * len(extensionsList)
+               self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list, keys = keys)
+
+       def extensionCallback(self, answer):
+               if answer is not None:
+                       answer[1][1]()
+
+from Tools.BoundFunction import boundFunction
+
+# depends on InfoBarExtensions
+from Components.PluginComponent import plugins
+
+class InfoBarPlugins:
+       def __init__(self):
+               self.addExtension(extension = self.getPluginList, type = InfoBarExtensions.EXTENSION_LIST)

                
                

-               s = self.getCurrentServiceSubtitle()
-               l = s and s.getSubtitleList() or [ ]
+       def getPluginName(self, name):
+               return name

                
                

-               for x in l:
-                       list.append(("Enable Subtitles: " + x[0], self.ENABLE_SUBTITLE, x[1]))
+       def getPluginList(self):
+               list = []
+               for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EXTENSIONSMENU):
+                       list.append(((boundFunction(self.getPluginName, p.name), boundFunction(self.runPlugin, p), lambda: True), None))
+               return list
+
+       def runPlugin(self, plugin):
+               plugin(session = self.session)
+
+# depends on InfoBarExtensions
+class InfoBarSleepTimer:
+       def __init__(self):
+               self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, self.available), "1")      

                
                

-               self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list)
+       def available(self):
+               return True

 
 

-       def extensionCallback(self, answer):
-               if answer is not None:
-                       if answer[1] == self.PIPON:
-                               self.session.pip = self.session.instantiateDialog(PictureInPicture)
-                               newservice = self.session.nav.getCurrentlyPlayingServiceReference()
-                               if self.session.pip.playService(newservice):
-                                       self.session.pipshown = True
-                                       self.session.pip.servicePath = self.servicelist.getCurrentServicePath()
-                               else:
-                                       self.session.pipshown = False
-                                       del self.session.pip
-                               self.session.nav.playService(newservice)
-                       elif answer[1] == self.PIPOFF:
-                               del self.session.pip
+       def getSleepTimerName(self):
+               return _("Sleep Timer")
+
+       def showSleepTimerSetup(self):
+               self.session.open(SleepTimerEdit)
+
+# depends on InfoBarExtensions
+class InfoBarPiP:
+       def __init__(self):
+               self.session.pipshown = False
+
+               self.addExtension((self.getShowHideName, self.showPiP, self.available), "blue")
+               self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
+               self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")
+       
+       def available(self):
+               return True
+       
+       def pipShown(self):
+               return self.session.pipshown
+       
+       def getShowHideName(self):
+               if self.session.pipshown:
+                       return _("Disable Picture in Picture")
+               else:
+                       return _("Activate Picture in Picture")
+               
+       def getSwapName(self):
+               return _("Swap Services")
+               
+       def getMoveName(self):
+               return _("Move Picture in Picture")
+       
+       def showPiP(self):
+               if self.session.pipshown:
+                       del self.session.pip
+                       self.session.pipshown = False
+               else:
+                       self.session.pip = self.session.instantiateDialog(PictureInPicture)
+                       newservice = self.session.nav.getCurrentlyPlayingServiceReference()
+                       if self.session.pip.playService(newservice):
+                               self.session.pipshown = True
+                               self.session.pip.servicePath = self.servicelist.getCurrentServicePath()
+                       else:

                                self.session.pipshown = False
                                self.session.pipshown = False

-                       elif answer[1] == self.PIPSWAP:
-                               swapservice = self.session.nav.getCurrentlyPlayingServiceReference()
-                               if self.session.pip.servicePath:
-                                       servicepath = self.servicelist.getCurrentServicePath()
-                                       ref=servicepath[len(servicepath)-1]
-                                       pipref=self.session.pip.getCurrentService()
-                                       self.session.pip.playService(swapservice)
-                                       self.servicelist.setCurrentServicePath(self.session.pip.servicePath)
-                                       if pipref.toString() != ref.toString(): # is a subservice ?
-                                               self.session.nav.stopService() # stop portal
-                                               self.session.nav.playService(pipref) # start subservice
-                                       self.session.pip.servicePath=servicepath
-                       elif answer[1] == self.MOVEPIP:
-                               self.session.open(PiPSetup, pip = self.session.pip)
-                       elif answer[1] == self.ENABLE_SUBTITLE:
-                               self.selected_subtitle = answer[2]
-                               self.subtitles_enabled = True
+                               del self.session.pip
+                       self.session.nav.playService(newservice)
+       
+       def swapPiP(self):
+               swapservice = self.session.nav.getCurrentlyPlayingServiceReference()
+               if self.session.pip.servicePath:
+                       servicepath = self.servicelist.getCurrentServicePath()
+                       ref=servicepath[len(servicepath)-1]
+                       pipref=self.session.pip.getCurrentService()
+                       self.session.pip.playService(swapservice)
+                       self.servicelist.setCurrentServicePath(self.session.pip.servicePath)
+                       if pipref.toString() != ref.toString(): # is a subservice ?
+                               self.session.nav.stopService() # stop portal
+                               self.session.nav.playService(pipref) # start subservice
+                       self.session.pip.servicePath=servicepath
+       
+       def movePiP(self):
+               self.session.open(PiPSetup, pip = self.session.pip)

 
 from RecordTimer import parseEvent
 
 
 from RecordTimer import parseEvent
 


@@ -1205,11 +1344,11 @@ class InfoBarAudioSelection:
                service = self.session.nav.getCurrentService()
                audio = service and service.audioTracks()
                self.audioTracks = audio
                service = self.session.nav.getCurrentService()
                audio = service and service.audioTracks()
                self.audioTracks = audio

-               n = audio and audio.getNumberOfTracks()
+               n = audio and audio.getNumberOfTracks() or 0

                keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n
                tlist = []
                print "tlist:", tlist
                keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n
                tlist = []
                print "tlist:", tlist

-               if n and n > 0:
+               if n > 0:

                        self.audioChannel = service.audioChannel()
 
                        for x in range(n):
                        self.audioChannel = service.audioChannel()
 
                        for x in range(n):


@@ -1217,9 +1356,8 @@ class InfoBarAudioSelection:
                                language = i.getLanguage()
                                description = i.getDescription()
        
                                language = i.getLanguage()
                                description = i.getDescription()
        

-                               if len(language) == 3:
-                                       if language in LanguageCodes:
-                                               language = LanguageCodes[language][0]
+                               if LanguageCodes.has_key(language):
+                                       language = LanguageCodes[language][0]

        
                                if len(description):
                                        description += " (" + language + ")"
        
                                if len(description):
                                        description += " (" + language + ")"


@@ -1280,6 +1418,8 @@ class InfoBarSubserviceSelection:
 
                self.session.nav.event.append(self.checkSubservicesAvail) # we like to get service events
 
 
                self.session.nav.event.append(self.checkSubservicesAvail) # we like to get service events
 

+               self.bsel = None
+

        def checkSubservicesAvail(self, ev):
                if ev == iPlayableService.evUpdatedEventInfo:
                        service = self.session.nav.getCurrentService()
        def checkSubservicesAvail(self, ev):
                if ev == iPlayableService.evUpdatedEventInfo:
                        service = self.session.nav.getCurrentService()


@@ -1313,12 +1453,14 @@ class InfoBarSubserviceSelection:
                                if newservice.valid():
                                        del subservices
                                        del service
                                if newservice.valid():
                                        del subservices
                                        del service

+                                       if config.usage.show_infobar_on_zap.value:
+                                               self.doShow()

                                        self.session.nav.playService(newservice)
 
        def subserviceSelection(self):
                service = self.session.nav.getCurrentService()
                subservices = service and service.subServices()
                                        self.session.nav.playService(newservice)
 
        def subserviceSelection(self):
                service = self.session.nav.getCurrentService()
                subservices = service and service.subServices()

-               
+               self.bouquets = self.servicelist.getBouquetList()

                n = subservices and subservices.getNumberOfSubservices()
                selection = 0
                if n and n > 0:
                n = subservices and subservices.getNumberOfSubservices()
                selection = 0
                if n and n > 0:


@@ -1330,12 +1472,58 @@ class InfoBarSubserviceSelection:
                                        selection = x
                                tlist.append((i.getName(), i))
 
                                        selection = x
                                tlist.append((i.getName(), i))
 

-                       self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice..."), list = tlist, selection = selection)
+                       if self.bouquets and len(self.bouquets):
+                               keys = ["red", "green", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
+                               if config.usage.multibouquet.value:
+                                       tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to bouquet"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
+                               else:
+                                       tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to favourites"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
+                               selection += 3
+                       else:
+                               tlist = [(_("Quickzap"), "quickzap", service.subServices()), ("--", "")] + tlist
+                               keys = ["red", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
+                               selection += 2
+
+                       self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice..."), list = tlist, selection = selection, keys = keys)

 
        def subserviceSelected(self, service):
 
        def subserviceSelected(self, service):

+               del self.bouquets

                if not service is None:
                if not service is None:

-                       self["SubserviceQuickzapAction"].setEnabled(True)
-                       self.session.nav.playService(service[1])
+                       if isinstance(service[1], str):
+                               if service[1] == "quickzap":
+                                       from Screens.SubservicesQuickzap import SubservicesQuickzap
+                                       self.session.open(SubservicesQuickzap, service[2])
+                       else:
+                               self["SubserviceQuickzapAction"].setEnabled(True)
+                               if config.usage.show_infobar_on_zap.value:
+                                       self.doShow()
+                               self.session.nav.playService(service[1])
+
+       def addSubserviceToBouquetCallback(self, service):
+               if len(service) > 1 and isinstance(service[1], eServiceReference):
+                       self.selectedSubservice = service
+                       if self.bouquets is None:
+                               cnt = 0
+                       else:
+                               cnt = len(self.bouquets)
+                       if cnt > 1: # show bouquet list
+                               self.bsel = self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, self.bouquets, self.addSubserviceToBouquet)
+                       elif cnt == 1: # add to only one existing bouquet
+                               self.addSubserviceToBouquet(self.bouquets[0][1])
+                               self.session.open(MessageBox, _("Service has been added to the favourites."), MessageBox.TYPE_INFO)
+
+       def bouquetSelClosed(self, confirmed):
+               self.bsel = None
+               del self.selectedSubservice
+               if confirmed:
+                       self.session.open(MessageBox, _("Service has been added to the selected bouquet."), MessageBox.TYPE_INFO)
+
+       def addSubserviceToBouquet(self, dest):
+               self.servicelist.addServiceToBouquet(dest, self.selectedSubservice[1])
+               if self.bsel:
+                       self.bsel.close(True)
+               else:
+                       del self.selectedSubservice

 
 class InfoBarAdditionalInfo:
        def __init__(self):
 
 class InfoBarAdditionalInfo:
        def __init__(self):


@@ -1423,6 +1611,9 @@ class InfoBarCueSheetSupport:
        CUT_TYPE_IN = 0
        CUT_TYPE_OUT = 1
        CUT_TYPE_MARK = 2
        CUT_TYPE_IN = 0
        CUT_TYPE_OUT = 1
        CUT_TYPE_MARK = 2

+       CUT_TYPE_LAST = 3
+       
+       ENABLE_RESUME_SUPPORT = False

        
        def __init__(self):
                self["CueSheetActions"] = HelpableActionMap(self, "InfobarCueSheetActions", 
        
        def __init__(self):
                self["CueSheetActions"] = HelpableActionMap(self, "InfobarCueSheetActions", 


@@ -1433,14 +1624,34 @@ class InfoBarCueSheetSupport:
                        }, prio=1) 
                
                self.cut_list = [ ]
                        }, prio=1) 
                
                self.cut_list = [ ]

+               self.is_closing = False

                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
                                iPlayableService.evStart: self.__serviceStarted,
                        })
 
        def __serviceStarted(self):
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
                                iPlayableService.evStart: self.__serviceStarted,
                        })
 
        def __serviceStarted(self):

+               if self.is_closing:
+                       return

                print "new service started! trying to download cuts!"
                self.downloadCuesheet()
                print "new service started! trying to download cuts!"
                self.downloadCuesheet()

+               
+               if self.ENABLE_RESUME_SUPPORT:
+                       last = None
+                       
+                       for (pts, what) in self.cut_list:
+                               if what == self.CUT_TYPE_LAST:
+                                       last = pts
+                       
+                       if last is not None:
+                               self.resume_point = last
+                               Notifications.AddNotificationWithCallback(self.playLastCB, MessageBox, _("Do you want to resume this playback?"), timeout=10)
+
+       def playLastCB(self, answer):
+               if answer == True:
+                       seekable = self.__getSeekable()
+                       if seekable is not None:
+                               seekable.seekTo(self.resume_point)

 
        def __getSeekable(self):
                service = self.session.nav.getCurrentService()
 
        def __getSeekable(self):
                service = self.session.nav.getCurrentService()


@@ -1542,10 +1753,10 @@ class InfoBarCueSheetSupport:
 class InfoBarSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
 class InfoBarSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">

-               <widget source="CurrentTime" render="Label" position="50,46" size="82,18" font="Regular;16" >
+               <widget source="CurrentTime" render="Label" position="56,46" size="82,18" font="Regular;16" >

                        <convert type="ClockToText">WithSeconds</convert>
                </widget>
                        <convert type="ClockToText">WithSeconds</convert>
                </widget>

-               <widget source="CurrentService" render="Label" position="0,4" size="132,42" font="Regular;18" >
+               <widget source="CurrentService" render="Label" position="6,4" size="120,42" font="Regular;18" >

                        <convert type="ServiceName">Name</convert>
                </widget>
        </screen>"""
                        <convert type="ServiceName">Name</convert>
                </widget>
        </screen>"""


@@ -1588,15 +1799,26 @@ class InfoBarSubtitleSupport(object):
 
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
 
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {

-                               iPlayableService.evStart: self.__serviceStarted,
+                               iPlayableService.evEnd: self.__serviceStopped,
+                               iPlayableService.evUpdatedInfo: self.__updatedInfo

                        })
                        })

+               self.cached_subtitle_checked = False

 
 

-       def __serviceStarted(self):
-               # reenable if it was enabled
-               r = self.__subtitles_enabled
+       def __serviceStopped(self):
+               self.subtitle_window.hide()

                self.__subtitles_enabled = False
                self.__subtitles_enabled = False

-               self.__selected_subtitle = None
-               self.setSubtitlesEnable(r)
+               self.cached_subtitle_checked = False
+
+       def __updatedInfo(self):
+               if not self.cached_subtitle_checked:
+                       subtitle = self.getCurrentServiceSubtitle()
+                       self.cached_subtitle_checked = True
+                       if subtitle:
+                               self.__selected_subtitle = subtitle.getCachedSubtitle()
+                       if self.__selected_subtitle:
+                               subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle)
+                               self.subtitle_window.show()
+                               self.__subtitles_enabled = True

 
        def getCurrentServiceSubtitle(self):
                service = self.session.nav.getCurrentService()
 
        def getCurrentServiceSubtitle(self):
                service = self.session.nav.getCurrentService()


@@ -1604,7 +1826,7 @@ class InfoBarSubtitleSupport(object):
        
        def setSubtitlesEnable(self, enable=True):
                subtitle = self.getCurrentServiceSubtitle()
        
        def setSubtitlesEnable(self, enable=True):
                subtitle = self.getCurrentServiceSubtitle()

-               if enable and self.__selected_subtitle:
+               if enable and self.__selected_subtitle is not None:

                        if subtitle and not self.__subtitles_enabled:
                                subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle)
                                self.subtitle_window.show()
                        if subtitle and not self.__subtitles_enabled:
                                subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle)
                                self.subtitle_window.show()


@@ -1612,17 +1834,11 @@ class InfoBarSubtitleSupport(object):
                else:
                        if subtitle:
                                subtitle.disableSubtitles(self.subtitle_window.instance)
                else:
                        if subtitle:
                                subtitle.disableSubtitles(self.subtitle_window.instance)

-
-                       self.subtitle_window.hide()

                        self.__subtitles_enabled = False
                        self.__subtitles_enabled = False

+                       self.subtitle_window.hide()

 
        def setSelectedSubtitle(self, subtitle):
 
        def setSelectedSubtitle(self, subtitle):

-               if self.__selected_subtitle != subtitle and self.subtitles_enabled:
-                       # kick
-                       self.__selected_subtitle = subtitle
-                       self.__serviceStarted()
-               else:
-                       self.__selected_subtitle = subtitle
+               self.__selected_subtitle = subtitle

 
        subtitles_enabled = property(lambda self: self.__subtitles_enabled, setSubtitlesEnable)
        selected_subtitle = property(lambda self: self.__selected_subtitle, setSelectedSubtitle)
 
        subtitles_enabled = property(lambda self: self.__subtitles_enabled, setSubtitlesEnable)
        selected_subtitle = property(lambda self: self.__selected_subtitle, setSelectedSubtitle)