X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ffdf6c83794ef5702d4ddcd2ca56c3358a77a680..f604d2c7c5b6d8c004017007028415fe3560208a:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index def45d69..2b96f1e5 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,46 +1,98 @@
 from Screen import Screen
 
-from Components.Clock import Clock
-from Components.ActionMap import ActionMap
-from Screens.AudioSelection import AudioSelection
 from Screens.MovieSelection import MovieSelection
+from Screens.ChannelSelection import ChannelSelectionRadio
+from Screens.MessageBox import MessageBox
+from ServiceReference import ServiceReference
+
+from Components.Clock import Clock
+from Components.ActionMap import ActionMap, HelpableActionMap
+from Components.ServicePosition import ServicePosition
 
-from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
+from Tools.Notifications import AddNotificationWithCallback
+
+from Screens.InfoBarGenerics import InfoBarShowHide, \
 	InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
-	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord
+	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
+	InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
+	InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift
+
+from Screens.HelpMenu import HelpableScreen, HelpMenu
 
 from enigma import *
 
 import time
 
-class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
-	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-	InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord):
+class InfoBar(Screen, InfoBarShowHide, InfoBarPowerKey,
+	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
+	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
+	HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
+	InfoBarSubserviceSelection, InfoBarTuner):
+
 	def __init__(self, session):
 		Screen.__init__(self, session)
+
+		self["actions"] = HelpableActionMap(self, "InfobarActions",
+			{
+				"showMovies": (self.showMovies, _("Play recorded movies...")),
+				"showRadio": (self.showRadio, _("Show the radio player..."))
+			})
 		
-		for x in InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
-			InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-			InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord:
+		for x in HelpableScreen, \
+				InfoBarShowHide, InfoBarPowerKey, \
+				InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
+				InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
+				InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
+				InfoBarTuner:
 			x.__init__(self)
 
-		self["actions"] = ActionMap( [ "InfobarActions" ], 
+		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
+		self.helpList.append((self["actions"], "InfobarActions", [("showRadio", "Hear Radio...")]))
+
+		self["CurrentTime"] = Clock()
+
+	def showRadio(self):
+		self.session.open(ChannelSelectionRadio)
+
+	def showMovies(self):
+		self.session.openWithCallback(self.movieSelected, MovieSelection)
+
+	def movieSelected(self, service):
+		if service is not None:
+			self.session.open(MoviePlayer, service)
+
+class MoviePlayer(Screen, InfoBarShowHide, InfoBarPowerKey, \
+		InfoBarMenu, \
+		InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications):
+		
+	def __init__(self, session, service):
+		Screen.__init__(self, session)
+		
+		self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
 			{
-				"showMovies": self.showMovies,
-				#"quit": self.quit,
-				"audioSelection": self.audioSelection,
+				"leavePlayer": (self.leavePlayer, _("leave movie player..."))
 			})
+		
+		for x in HelpableScreen, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, InfoBarNotifications:
+			x.__init__(self)
 
-		self["CurrentTime"] = Clock()
-		# ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-		# Clock()
+		self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
+		
+		self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
+		self.session.nav.playService(service)
 
+	def leavePlayer(self):
+		self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))
+	
+	def leavePlayerConfirmed(self, answer):
+		if answer == True:
+			self.session.nav.playService(self.lastservice)
+			self.close()
+			
 	def showMovies(self):
-		self.session.open(MovieSelection)
-
-	def audioSelection(self):
-		service = self.session.nav.getCurrentService()
-		audio = service.audioTracks()
-		n = audio.getNumberOfTracks()
-		if n > 0:
-			self.session.open(AudioSelection, audio)
+		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)