aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens/InfoBar.py
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-10-30 16:04:21 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-10-30 16:04:21 +0000
commit0e3e7773e5d8e7ff159316db3de7fcfad57bb9e8 (patch)
tree5c63acbc6e8d531d01b0ab8bf016f7b5ce08f4eb /lib/python/Screens/InfoBar.py
parent59567589c05c2756dcf779cc24aa86becd63a68c (diff)
downloadenigma2-0e3e7773e5d8e7ff159316db3de7fcfad57bb9e8.tar.gz
enigma2-0e3e7773e5d8e7ff159316db3de7fcfad57bb9e8.zip
move subtitles selection to mainmenu, some subtitle fixes
Diffstat (limited to 'lib/python/Screens/InfoBar.py')
-rw-r--r--lib/python/Screens/InfoBar.py11
1 files changed, 5 insertions, 6 deletions
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()