Merge pull request #120 from Taapat/MoviePlayer
authorlittlesat <littlesat99@yahoo.com>
Tue, 8 Dec 2015 18:30:16 +0000 (19:30 +0100)
committerlittlesat <littlesat99@yahoo.com>
Tue, 8 Dec 2015 18:30:16 +0000 (19:30 +0100)
Enable exit to movie list with key exit in MoviePlayer, thx vvv2

lib/python/Components/UsageConfig.py
lib/python/Screens/InfoBar.py

index 621e40e..c853457 100644 (file)
@@ -112,7 +112,7 @@ def InitUsageConfig():
        config.usage.next_movie_msg = ConfigYesNo(default = True)
        config.usage.last_movie_played = ConfigText()
        config.usage.leave_movieplayer_onExit = ConfigSelection(default = "popup", choices = [
-               ("no", _("No")), ("popup", _("With popup")), ("without popup", _("Without popup")) ])
+               ("no", _("No")), ("popup", _("With popup")), ("without popup", _("Without popup")), ("movielist", _("Return to movie list")) ])
 
        config.usage.setup_level = ConfigSelection(default = "expert", choices = [
                ("simple", _("Simple")),
index df5646d..045da4c 100644 (file)
@@ -235,6 +235,8 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, InfoBarMenu, InfoBarSeek, InfoBa
                                self.session.openWithCallback(self.hidePipOnExitCallback, MessageBox, _("Disable Picture in Picture"), simple=True)
                        else:
                                self.hidePipOnExitCallback(True)
+               elif config.usage.leave_movieplayer_onExit.value == "movielist":
+                       self.leavePlayer()
                elif config.usage.leave_movieplayer_onExit.value == "popup":
                        self.session.openWithCallback(self.leavePlayerOnExitCallback, MessageBox, _("Exit movie player?"), simple=True)
                elif config.usage.leave_movieplayer_onExit.value == "without popup":