make resume optional

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 5669a77a9e82348bbd8575f146529c27c06598e5..471b1abe8a8e3078a70096f5907482524d5aa32e 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -6,9 +6,9 @@ from Screens.MessageBox import MessageBox
 from Screens.Ci import CiHandler
 from ServiceReference import ServiceReference
 
-from Components.Clock import Clock
+from Components.Sources.Clock import Clock
 from Components.ActionMap import ActionMap, HelpableActionMap
-from Components.ServicePosition import ServicePosition, ServicePositionGauge
+from Components.config import currentConfigSelectionElement, config
 
 from Tools.Notifications import AddNotificationWithCallback
 
@@ -43,8 +43,9 @@ class InfoBar(InfoBarShowHide,
                self["actions"] = HelpableActionMap(self, "InfobarActions",
                        {
                                "showMovies": (self.showMovies, _("Play recorded movies...")),
-                               "showRadio": (self.showRadio, _("Show the radio player..."))
-                       })
+                               "showRadio": (self.showRadio, _("Show the radio player...")),
+                               "showTv": (self.showTv, _("Show the tv player...")),
+                       }, prio=2)
                
                for x in HelpableScreen, \
                                InfoBarShowHide, \
@@ -55,14 +56,19 @@ class InfoBar(InfoBarShowHide,
                                InfoBarTeletextPlugin, InfoBarExtensions, InfoBarSubtitleSupport:
                        x.__init__(self)
 
-               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
-               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", "Hear Radio...")]))
+               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
+               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))]))
 
                self["CurrentTime"] = Clock()
-               # ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
+
+       def showTv(self):
+               self.showTvChannelList(True)
 
        def showRadio(self):
-               self.session.open(ChannelSelectionRadio)
+               if currentConfigSelectionElement(config.usage.e1like_radio_mode) == "yes":
+                       self.showRadioChannelList(True)
+               else:
+                       self.session.open(ChannelSelectionRadio)
 
        def showMovies(self):
                self.session.openWithCallback(self.movieSelected, MovieSelection)
@@ -76,6 +82,8 @@ class MoviePlayer(InfoBarShowHide, \
                InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
                InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport, Screen):
+
+       ENABLE_RESUME_SUPPORT = True
                
        def __init__(self, session, service):
                Screen.__init__(self, session)
@@ -92,16 +100,11 @@ class MoviePlayer(InfoBarShowHide, \
                                InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport:
                        x.__init__(self)
 
-               self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-               self["ElapsedTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_POSITION)
-               self["PositionGauge"] = ServicePositionGauge(self.session.nav)
-               
-               # TYPE_LENGTH?
-               
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)
 
        def leavePlayer(self):
+               self.is_closing = True
                self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))
        
        def leavePlayerConfirmed(self, answer):