By Anders Holst:

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 01b77f3f6823100d714b7addc3d9928b1c89422d..be1407d39a69b44ca589e4d55f9af1a2b859d405 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -47,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, \
@@ -126,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
@@ -139,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)
 
@@ -158,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)
@@ -183,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()