a lot of new wizard functionality

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 2dcef59f3c30489e5c02c72e82c321f466461a31..1e8f761fede482936d162ec667a2ee1a631fac31 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,72 +1,168 @@
 from Screen import Screen
 
 from Screens.MovieSelection import MovieSelection
 from Screen import Screen
 
 from Screens.MovieSelection import MovieSelection

-from Screens.MessageBox import MessageBox
+from Screens.ChannelSelection import ChannelSelectionRadio
+from Screens.ChoiceBox import ChoiceBox

 
 

-from Components.Clock import Clock
-from Components.ActionMap import ActionMap
-from Components.ServicePosition import ServicePosition
+from Components.Sources.Source import ObsoleteSource
+from Components.ActionMap import HelpableActionMap
+from Components.config import config
+from Components.ServiceEventTracker import ServiceEventTracker

 
 

-from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
-       InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
-       InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
-       InfoBarAudioSelection
+from Screens.InfoBarGenerics import InfoBarShowHide, \
+       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
+       InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
+       InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
+       InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift,  \
+       InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
+       InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
+       InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport

 
 

-from enigma import *
+from Screens.HelpMenu import HelpableScreen

 
 

-import time
+from enigma import iPlayableService

 
 

-class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
-       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-       InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection):
+class InfoBar(InfoBarShowHide,
+       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder,
+       InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
+       HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
+       InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek,
+       InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
+       InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport,
+       Screen):
+       
+       ALLOW_SUSPEND = True

 
        def __init__(self, session):
                Screen.__init__(self, session)
 
 
        def __init__(self, session):
                Screen.__init__(self, session)
 

-               self["actions"] = ActionMap( [ "InfobarActions" ],
+               self["actions"] = HelpableActionMap(self, "InfobarActions",

                        {
                        {

-                               "showMovies": self.showMovies,
-                       })
+                               "showMovies": (self.showMovies, _("Play recorded movies...")),
+                               "showRadio": (self.showRadio, _("Show the radio player...")),
+                               "showTv": (self.showTv, _("Show the tv player...")),
+                       }, prio=2)

                
                

-               for x in InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
-                       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-                       InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection:
+               for x in HelpableScreen, \
+                               InfoBarShowHide, \
+                               InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \
+                               InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
+                               InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
+                               InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
+                               InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarSleepTimer, \
+                               InfoBarPlugins, InfoBarServiceErrorPopupSupport:

                        x.__init__(self)
 
                        x.__init__(self)
 

-               self["CurrentTime"] = Clock()
+               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
+               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))]))
+
+               self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
+
+               self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+                       {
+                               iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged
+                       })
+
+               self.current_begin_time=0
+
+       def __eventInfoChanged(self):
+               if self.execing:
+                       service = self.session.nav.getCurrentService()
+                       old_begin_time = self.current_begin_time
+                       info = service and service.info()
+                       ptr = info and info.getEvent(0)
+                       self.current_begin_time = ptr and ptr.getBeginTime() or 0
+                       if config.usage.show_infobar_on_event_change.value:
+                               if old_begin_time and old_begin_time != self.current_begin_time:
+                                       self.doShow()
+
+       def __checkServiceStarted(self):
+               self.__serviceStarted(True)
+               self.onExecBegin.remove(self.__checkServiceStarted)
+
+       def serviceStarted(self):  #override from InfoBarShowHide
+               new = self.servicelist.newServicePlayed()
+               if self.execing:
+                       InfoBarShowHide.serviceStarted(self)
+                       self.current_begin_time=0
+               elif not self.__checkServiceStarted in self.onShown and new:
+                       self.onShown.append(self.__checkServiceStarted)
+
+       def __checkServiceStarted(self):
+               self.serviceStarted()
+               self.onShown.remove(self.__checkServiceStarted)
+
+       def showTv(self):
+               self.showTvChannelList(True)
+
+       def showRadio(self):
+               if config.usage.e1like_radio_mode.value:
+                       self.showRadioChannelList(True)
+               else:
+                       self.rds_display.hide() # in InfoBarRdsDecoder
+                       self.session.openWithCallback(self.ChannelSelectionRadioClosed, ChannelSelectionRadio, self)
+
+       def ChannelSelectionRadioClosed(self, *arg):
+               self.rds_display.show()  # in InfoBarRdsDecoder

 
        def showMovies(self):
                self.session.openWithCallback(self.movieSelected, MovieSelection)
 
        def showMovies(self):
                self.session.openWithCallback(self.movieSelected, MovieSelection)

-       
+

        def movieSelected(self, service):
                if service is not None:
                        self.session.open(MoviePlayer, service)
 
        def movieSelected(self, service):
                if service is not None:
                        self.session.open(MoviePlayer, service)
 

-class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+class MoviePlayer(InfoBarShowHide, \

                InfoBarMenu, \
                InfoBarMenu, \

-               InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection):
+               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
+               InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
+               InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
+               InfoBarServiceErrorPopupSupport):
+
+       ENABLE_RESUME_SUPPORT = True
+       ALLOW_SUSPEND = True

                
        def __init__(self, session, service):
                Screen.__init__(self, session)
                
                
        def __init__(self, session, service):
                Screen.__init__(self, session)
                

-               self["actions"] = ActionMap( [ "MoviePlayerActions" ],
+               self["actions"] = HelpableActionMap(self, "MoviePlayerActions",

                        {
                        {

-                               "leavePlayer": self.leavePlayer
+                               "leavePlayer": (self.leavePlayer, _("leave movie player..."))

                        })
                
                        })
                

-               for x in InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection:
+               for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \
+                               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
+                               InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
+                               InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
+                               InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \
+                               InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport:

                        x.__init__(self)
 
                        x.__init__(self)
 

-               self["CurrentTime"] = Clock()
-               # ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-               

                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)
 
        def leavePlayer(self):
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)
 
        def leavePlayer(self):

-               self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, "Stop playing this movie?")
-       
+               self.is_closing = True
+
+               list = []
+               list.append((_("Yes"), "quit"))
+               list.append((_("No"), "continue"))
+               if config.usage.setup_level.index >= 2: # expert+
+                       list.append((_("No, but restart from begin"), "restart"))
+               self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
+

        def leavePlayerConfirmed(self, answer):
        def leavePlayerConfirmed(self, answer):

-               if answer == True:
+               answer = answer and answer[1]
+               if answer == "quit":

                        self.session.nav.playService(self.lastservice)
                        self.close()
                        self.session.nav.playService(self.lastservice)
                        self.close()

+               elif answer == "restart":
+                       self.doSeek(0)
+
+       def showMovies(self):
+               ref = self.session.nav.getCurrentlyPlayingServiceReference()
+               self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
+
+       def movieSelected(self, service):
+               if service is not None:
+                       self.session.nav.playService(service)