show movieSelection on up/down keys in movie player

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index a48cb75c6ec3b9ba3f07717aefc71b5a7d4698cb..23754824ecc9df0cea1078081678eb6790b325b1 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -4,7 +4,7 @@ from Screens.MovieSelection import MovieSelection
 from Screens.MessageBox import MessageBox
 
 from Components.Clock import Clock
 from Screens.MessageBox import MessageBox
 
 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
 from Components.ServicePosition import ServicePosition
 
 from Tools.Notifications import AddNotificationWithCallback


@@ -30,9 +30,9 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
        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..."))

                        })
                
                for x in HelpableScreen, \
                        })
                
                for x in HelpableScreen, \


@@ -60,9 +60,9 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
        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 HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications:
                        })
                
                for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications:


@@ -80,3 +80,10 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
                if answer == True:
                        self.session.nav.playService(self.lastservice)
                        self.close()
                if answer == True:
                        self.session.nav.playService(self.lastservice)
                        self.close()

+                       
+       def showMovies(self):
+               self.session.openWithCallback(self.movieSelected, MovieSelection)
+
+       def movieSelected(self, service):
+               if service is not None:
+                       self.session.nav.playService(service)