move the movie selector to the currently playing movie

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 3ddb1c3c7da6ddfc5b92522b2fb1781c6e950e8f..aaa3debace3b2857b9ad629856a3a04a3292542c 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -2,9 +2,10 @@ from Screen import Screen
 
 from Screens.MovieSelection import MovieSelection
 from Screens.MessageBox import MessageBox
+from ServiceReference import ServiceReference
 
 from Components.Clock import Clock
-from Components.ActionMap import ActionMap
+from Components.ActionMap import ActionMap, HelpableActionMap
 from Components.ServicePosition import ServicePosition
 
 from Tools.Notifications import AddNotificationWithCallback
@@ -12,7 +13,8 @@ from Tools.Notifications import AddNotificationWithCallback
 from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
        InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
        InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
-       InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications
+       InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
+       InfoBarSubserviceSelection, InfoBarTuner
 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 
@@ -23,21 +25,22 @@ import time
 class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
        InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
-       HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications):
+       HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
+       InfoBarSubserviceSelection, InfoBarTuner):
 
        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..."))
                        })
                
                for x in HelpableScreen, \
                                InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
                                InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
                                InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
-                               InfoBarAdditionalInfo, InfoBarNotifications:
+                               InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, InfoBarTuner:
                        x.__init__(self)
 
                self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
@@ -58,9 +61,9 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
        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 HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications:
@@ -78,3 +81,11 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
                if answer == True:
                        self.session.nav.playService(self.lastservice)
                        self.close()
+                       
+       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)