X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a7bc9fd319677465f0561773401ff0390ae3af9c..6eeefece35e4269e02fdb7abab4f79d8e7b8f98b:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index c2616dab..41083777 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -3,19 +3,23 @@ from Screen import Screen
 from Screens.MovieSelection import MovieSelection
 from Screens.ChannelSelection import ChannelSelectionRadio
 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
+from Components.config import config
 
 from Tools.Notifications import AddNotificationWithCallback
 
-from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
-	InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
-	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
+from Screens.InfoBarGenerics import InfoBarShowHide, \
+	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
+	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
 	InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
-	InfoBarSubserviceSelection, InfoBarTuner
+	InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift,  \
+	InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
+	InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
+	InfoBarSubtitleSupport, InfoBarPiP, InfoBarSubtitles, InfoBarPlugins
 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 
@@ -23,36 +27,52 @@ from enigma import *
 
 import time
 
-class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
+class InfoBar(InfoBarShowHide,
 	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
 	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
 	HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
-	InfoBarSubserviceSelection, InfoBarTuner):
+	InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek,
+	InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
+	InfoBarPiP, InfoBarSubtitles, InfoBarPlugins,
+	InfoBarSubtitleSupport, Screen):
+	
+	ALLOW_SUSPEND = True
 
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
+		CiHandler.setSession(session)
+
 		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, \
-				InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+				InfoBarShowHide, \
 				InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
 				InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
 				InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
-				InfoBarTuner:
+				InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
+				InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitles, InfoBarSubtitleSupport, \
+				InfoBarPlugins:
 			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()
 
+	def showTv(self):
+		self.showTvChannelList(True)
+
 	def showRadio(self):
-		self.session.open(ChannelSelectionRadio)
+		if config.usage.e1like_radio_mode.value:
+			self.showRadioChannelList(True)
+		else:
+			self.session.open(ChannelSelectionRadio)
 
 	def showMovies(self):
 		self.session.openWithCallback(self.movieSelected, MovieSelection)
@@ -61,9 +81,14 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
 		if service is not None:
 			self.session.open(MoviePlayer, service)
 
-class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+class MoviePlayer(InfoBarShowHide, \
 		InfoBarMenu, \
-		InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications):
+		InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
+		InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
+		InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport, Screen):
+
+	ENABLE_RESUME_SUPPORT = True
+	ALLOW_SUSPEND = True
 		
 	def __init__(self, session, service):
 		Screen.__init__(self, session)
@@ -73,15 +98,18 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
 				"leavePlayer": (self.leavePlayer, _("leave movie player..."))
 			})
 		
-		for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications:
+		for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \
+				InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
+				InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
+				InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
+				InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport:
 			x.__init__(self)
 
-		self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-		
 		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):