X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBar.py;h=a15c7ac1b89b5597b0b314d6cf6f5fc55935d5e7;hp=0d33217d9d3a2826b0747de7f8cf1de78ed9b884;hb=18469e4dedcfe75e8128b489774f79fb790a23da;hpb=df0caf48b4590bbb469ec065ac08284903292394

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 0d33217..a15c7ac 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,5 +1,8 @@
 from Tools.Profile import profile
 
+# workaround for required config entry dependencies.
+from Screens.MovieSelection import MovieSelection
+
 from Screen import Screen
 
 profile("LOAD:enigma")
@@ -13,7 +16,7 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \
 	InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift,  \
 	InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
 	InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
-	InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, InfoBarJobman
+	InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarServiceErrorPopupSupport, InfoBarJobman
 
 profile("LOAD:InitBar_Components")
 from Components.ActionMap import HelpableActionMap
@@ -29,7 +32,7 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
 	HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
 	InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek,
 	InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
-	InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, InfoBarJobman,
+	InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarServiceErrorPopupSupport, InfoBarJobman,
 	Screen):
 	
 	ALLOW_SUSPEND = True
@@ -44,6 +47,8 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
 				"showTv": (self.showTv, _("Show the tv player...")),
 			}, prio=2)
 		
+		self.allowPiP = True
+		
 		for x in HelpableScreen, \
 				InfoBarBase, InfoBarShowHide, \
 				InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \
@@ -51,7 +56,7 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
 				InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
 				InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
 				InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \
-				InfoBarSleepTimer, InfoBarPlugins, InfoBarServiceErrorPopupSupport:
+				InfoBarPlugins, InfoBarServiceErrorPopupSupport:
 			x.__init__(self)
 
 		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
@@ -123,7 +128,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 		InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
 		InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
 		InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
-		InfoBarServiceErrorPopupSupport):
+		InfoBarServiceErrorPopupSupport, InfoBarExtensions, InfoBarPlugins, InfoBarPiP):
 
 	ENABLE_RESUME_SUPPORT = True
 	ALLOW_SUSPEND = True
@@ -136,16 +141,19 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 				"leavePlayer": (self.leavePlayer, _("leave movie player..."))
 			})
 		
+		self.allowPiP = False
+		
 		for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \
 				InfoBarBase, InfoBarSeek, InfoBarShowMovies, \
 				InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
 				InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
 				InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \
-				InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport:
+				InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfoBarExtensions, \
+				InfoBarPlugins, InfoBarPiP:
 			x.__init__(self)
 
-		self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
-		self.session.nav.playService(service)
+		self.lastservice = session.nav.getCurrentlyPlayingServiceReference()
+		session.nav.playService(service)
 		self.returning = False
 		self.onClose.append(self.__onClose)
 
@@ -155,15 +163,19 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 	def handleLeave(self, how):
 		self.is_closing = True
 		if how == "ask":
-			list = []
-			list.append((_("Yes"), "quit"))
-			if config.usage.setup_level.index >= 2: # expert+
-				list.append((_("Yes, returning to movie list"), "movielist"))
-			if config.usage.setup_level.index >= 2: # expert+
-				list.append((_("Yes, and delete this movie"), "quitanddelete"))
-			list.append((_("No"), "continue"))
-			if config.usage.setup_level.index >= 2: # expert+
-				list.append((_("No, but restart from begin"), "restart"))
+			if config.usage.setup_level.index < 2: # -expert
+				list = (
+					(_("Yes"), "quit"),
+					(_("No"), "continue")
+				)
+			else:
+				list = (
+					(_("Yes"), "quit"),
+					(_("Yes, returning to movie list"), "movielist"),
+					(_("Yes, and delete this movie"), "quitanddelete"),
+					(_("No"), "continue"),
+					(_("No, but restart from begin"), "restart")
+				)
 
 			from Screens.ChoiceBox import ChoiceBox
 			self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
@@ -180,27 +192,26 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 	def leavePlayerConfirmed(self, answer):
 		answer = answer and answer[1]
 
-		if answer in ["quitanddelete", "quitanddeleteconfirmed"]:
+		if answer in ("quitanddelete", "quitanddeleteconfirmed"):
 			ref = self.session.nav.getCurrentlyPlayingServiceReference()
 			from enigma import eServiceCenter
 			serviceHandler = eServiceCenter.getInstance()
 			info = serviceHandler.info(ref)
 			name = info and info.getName(ref) or _("this recording")
 
-		if answer == "quitanddelete":
-			from Screens.MessageBox import MessageBox
-			self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete %s?") % name)
-			return
-
-		if answer == "quitanddeleteconfirmed":
-			offline = serviceHandler.offlineOperations(ref)
-			if offline.deleteFromDisk(0):
+			if answer == "quitanddelete":
 				from Screens.MessageBox import MessageBox
-				self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"), MessageBox.TYPE_ERROR)
+				self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete %s?") % name)
 				return
 
-		if answer in ["quit", "quitanddeleteconfirmed"]:
-			config.movielist.last_videodir.cancel()
+			elif answer == "quitanddeleteconfirmed":
+				offline = serviceHandler.offlineOperations(ref)
+				if offline.deleteFromDisk(0):
+					from Screens.MessageBox import MessageBox
+					self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"), MessageBox.TYPE_ERROR)
+					return
+
+		if answer in ("quit", "quitanddeleteconfirmed"):
 			self.close()
 		elif answer == "movielist":
 			ref = self.session.nav.getCurrentlyPlayingServiceReference()