From 0e3e7773e5d8e7ff159316db3de7fcfad57bb9e8 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Mon, 30 Oct 2006 16:04:21 +0000 Subject: move subtitles selection to mainmenu, some subtitle fixes --- lib/python/Screens/InfoBar.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib/python/Screens/InfoBar.py') diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 6ee49522..c4ae6fa9 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -19,7 +19,7 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ - InfoBarSubtitleSupport, InfoBarPiP, InfoBarSubtitles, InfoBarPlugins + InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins from Screens.HelpMenu import HelpableScreen, HelpMenu @@ -33,8 +33,7 @@ class InfoBar(InfoBarShowHide, HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, - InfoBarPiP, InfoBarSubtitles, InfoBarPlugins, - InfoBarSubtitleSupport, Screen): + InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, Screen): ALLOW_SUSPEND = True @@ -56,7 +55,7 @@ class InfoBar(InfoBarShowHide, InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ - InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitles, InfoBarSubtitleSupport, \ + InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, \ InfoBarPlugins: x.__init__(self) @@ -85,7 +84,7 @@ class MoviePlayer(InfoBarShowHide, \ InfoBarMenu, \ InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, - InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport, Screen): + InfoBarSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarExtensions): ENABLE_RESUME_SUPPORT = True ALLOW_SUSPEND = True @@ -102,7 +101,7 @@ class MoviePlayer(InfoBarShowHide, \ InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \ InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ - InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport: + InfoBarSummarySupport, InfoBarSubtitleSupport, InfoBarExtensions: x.__init__(self) self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference() -- cgit v1.2.3