remove deprecated code (deprecation date was 2008-01 and 2008-02)

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 1e8f761fede482936d162ec667a2ee1a631fac31..ad38f46ab5ec286b567db1170f54f0268fb03477 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,32 +1,40 @@
+from Tools.Profile import profile, profile_final
+
 from Screen import Screen
 
-from Screens.MovieSelection import MovieSelection
+profile("LOAD:enigma")
+from enigma import iPlayableService
+
+profile("LOAD:ChannelSelectionRadio")
 from Screens.ChannelSelection import ChannelSelectionRadio
+profile("LOAD:MovieSelection")
+from Screens.MovieSelection import MovieSelection
+profile("LOAD:ChoiceBox")
 from Screens.ChoiceBox import ChoiceBox
 
-from Components.Sources.Source import ObsoleteSource
-from Components.ActionMap import HelpableActionMap
-from Components.config import config
-from Components.ServiceEventTracker import ServiceEventTracker
-
+profile("LOAD:InfoBarGenerics")
 from Screens.InfoBarGenerics import InfoBarShowHide, \
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
-       InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
+       InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, \
        InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
-       InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift,  \
+       InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift,  \
        InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
        InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
        InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport
 
-from Screens.HelpMenu import HelpableScreen
+profile("LOAD:InitBar_Components")
+from Components.ActionMap import HelpableActionMap
+from Components.config import config
+from Components.ServiceEventTracker import ServiceEventTracker
 
-from enigma import iPlayableService
+profile("LOAD:HelpableScreen")
+from Screens.HelpMenu import HelpableScreen
 
 class InfoBar(InfoBarShowHide,
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder,
-       InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
+       InfoBarInstantRecord, InfoBarAudioSelection, 
        HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
-       InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek,
+       InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek,
        InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
        InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport,
        Screen):
@@ -46,9 +54,9 @@ class InfoBar(InfoBarShowHide,
                for x in HelpableScreen, \
                                InfoBarShowHide, \
                                InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \
-                               InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
+                               InfoBarInstantRecord, InfoBarAudioSelection, \
                                InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
-                               InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
+                               InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
                                InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarSleepTimer, \
                                InfoBarPlugins, InfoBarServiceErrorPopupSupport:
                        x.__init__(self)
@@ -56,8 +64,6 @@ class InfoBar(InfoBarShowHide,
                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
@@ -114,7 +120,7 @@ class InfoBar(InfoBarShowHide,
 
 class MoviePlayer(InfoBarShowHide, \
                InfoBarMenu, \
-               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
+               InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
                InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
                InfoBarServiceErrorPopupSupport):
@@ -131,7 +137,7 @@ class MoviePlayer(InfoBarShowHide, \
                        })
                
                for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \
-                               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
+                               InfoBarSeek, InfoBarShowMovies, \
                                InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
                                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
                                InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \
@@ -140,29 +146,63 @@ class MoviePlayer(InfoBarShowHide, \
 
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)
+               self.returning = False
 
        def leavePlayer(self):
                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)
+               if config.usage.on_movie_stop.value == "ask":
+                       list = []
+                       list.append((_("Yes"), "quit"))
+                       if config.usage.setup_level.index >= 2: # expert+
+                               list.append((_("Yes, returning to movie list"), "movielist"))
+                       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)
+               else:
+                       self.leavePlayerConfirmed([True, config.usage.on_movie_stop.value])
 
        def leavePlayerConfirmed(self, answer):
                answer = answer and answer[1]
                if answer == "quit":
                        self.session.nav.playService(self.lastservice)
+                       config.movielist.last_videodir.cancel()
                        self.close()
+               elif answer == "movielist":
+                       ref = self.session.nav.getCurrentlyPlayingServiceReference()
+                       self.returning = True
+                       self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
+                       self.session.nav.playService(self.lastservice)
                elif answer == "restart":
                        self.doSeek(0)
 
+       def doEofInternal(self, playing):
+               if not self.execing:
+                       return
+               if not playing :
+                       return
+               self.is_closing = True
+               if config.usage.on_movie_eof.value == "ask":
+                       list = []
+                       list.append((_("Yes"), "quit"))
+                       if config.usage.setup_level.index >= 2: # expert+
+                               list.append((_("Yes, returning to movie list"), "movielist"))
+                       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)
+               else:
+                       self.leavePlayerConfirmed([True, config.usage.on_movie_eof.value])
+
        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.is_closing = False
                        self.session.nav.playService(service)
+                       self.returning = False
+               elif self.returning:
+                       self.close()