fix

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 23754824ecc9df0cea1078081678eb6790b325b1..51e77a8b6e469bb13a674847acc8cd5092ac5080 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,7 +1,9 @@
 from Screen import Screen
 
 from Screens.MovieSelection import MovieSelection
 from Screen import Screen
 
 from Screens.MovieSelection import MovieSelection

+from Screens.ChannelSelection import ChannelSelectionRadio

 from Screens.MessageBox import MessageBox
 from Screens.MessageBox import MessageBox

+from ServiceReference import ServiceReference

 
 from Components.Clock import Clock
 from Components.ActionMap import ActionMap, HelpableActionMap
 
 from Components.Clock import Clock
 from Components.ActionMap import ActionMap, HelpableActionMap


@@ -9,11 +11,12 @@ from Components.ServicePosition import ServicePosition
 
 from Tools.Notifications import AddNotificationWithCallback
 
 
 from Tools.Notifications import AddNotificationWithCallback
 

-from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
+from Screens.InfoBarGenerics import InfoBarShowHide, \

        InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
        InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \

-       InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
+       InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \

        InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
        InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \

-       InfoBarSubserviceSelection, InfoBarTuner
+       InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift,  \
+       InfoBarServiceNotifications, InfoBarPVRState

 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 
 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 


@@ -21,31 +24,37 @@ from enigma import *
 
 import time
 
 
 import time
 

-class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
+class InfoBar(Screen, InfoBarShowHide, InfoBarPowerKey,

        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
        InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
        HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
        InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
        HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,

-       InfoBarSubserviceSelection, InfoBarTuner):
+       InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek):

 
        def __init__(self, session):
                Screen.__init__(self, session)
 
                self["actions"] = HelpableActionMap(self, "InfobarActions",
                        {
 
        def __init__(self, session):
                Screen.__init__(self, session)
 
                self["actions"] = HelpableActionMap(self, "InfobarActions",
                        {

-                               "showMovies": (self.showMovies, _("Play recorded movies..."))
+                               "showMovies": (self.showMovies, _("Play recorded movies...")),
+                               "showRadio": (self.showRadio, _("Show the radio player..."))

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

-                               InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+                               InfoBarShowHide, InfoBarPowerKey, \

                                InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
                                InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
                                InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
                                InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \

-                               InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, InfoBarTuner:
+                               InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
+                               InfoBarTuner, InfoBarTimeshift, InfoBarSeek:

                        x.__init__(self)
 
                self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
                        x.__init__(self)
 
                self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))

+               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", "Hear Radio...")]))

 
                self["CurrentTime"] = Clock()
 
 
                self["CurrentTime"] = Clock()
 

+       def showRadio(self):
+               self.session.open(ChannelSelectionRadio)
+

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


@@ -53,9 +62,10 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
                if service is not None:
                        self.session.open(MoviePlayer, service)
 
                if service is not None:
                        self.session.open(MoviePlayer, service)
 

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

                InfoBarMenu, \
                InfoBarMenu, \

-               InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications):
+               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
+               InfoBarServiceNotifications, InfoBarPVRState):

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


@@ -65,10 +75,15 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
                                "leavePlayer": (self.leavePlayer, _("leave movie player..."))
                        })
                
                                "leavePlayer": (self.leavePlayer, _("leave movie player..."))
                        })
                

-               for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications:
+               for x in HelpableScreen, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, \
+                               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
+                               InfoBarAudioSelection, InfoBarNotifications, \
+                               InfoBarServiceNotifications, InfoBarPVRState:

                        x.__init__(self)
 
                self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
                        x.__init__(self)
 
                self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)

+               self["ElapsedTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_POSITION)
+               # TYPE_LENGTH?

                
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)
                
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)


@@ -82,7 +97,8 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
                        self.close()
                        
        def showMovies(self):
                        self.close()
                        
        def showMovies(self):

-               self.session.openWithCallback(self.movieSelected, MovieSelection)
+               ref = self.session.nav.getCurrentlyPlayingServiceReference()
+               self.session.openWithCallback(self.movieSelected, MovieSelection, ref)

 
        def movieSelected(self, service):
                if service is not None:
 
        def movieSelected(self, service):
                if service is not None: