workaround for not working /etc/init.d/network script

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 9d3e327cae06d789d8edbb84930c3bd6c8ac5e8a..6ee49522eeecaae17733d682054e0c6f6cf13075 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -8,18 +8,18 @@ from ServiceReference import ServiceReference
 
 from Components.Sources.Clock import Clock
 from Components.ActionMap import ActionMap, HelpableActionMap
-from Components.config import currentConfigSelectionElement, config
+from Components.config import config
 
 from Tools.Notifications import AddNotificationWithCallback
 
 from Screens.InfoBarGenerics import InfoBarShowHide, \
-       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
+       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRadioText, \
        InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
        InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
        InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift,  \
        InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
        InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
-       InfoBarSubtitleSupport
+       InfoBarSubtitleSupport, InfoBarPiP, InfoBarSubtitles, InfoBarPlugins
 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 
@@ -28,12 +28,15 @@ from enigma import *
 import time
 
 class InfoBar(InfoBarShowHide,
-       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
+       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRadioText,
        InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
        HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
        InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek,
-       InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, 
+       InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
+       InfoBarPiP, InfoBarSubtitles, InfoBarPlugins,
        InfoBarSubtitleSupport, Screen):
+       
+       ALLOW_SUSPEND = True
 
        def __init__(self, session):
                Screen.__init__(self, session)
@@ -49,11 +52,12 @@ class InfoBar(InfoBarShowHide,
                
                for x in HelpableScreen, \
                                InfoBarShowHide, \
-                               InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
+                               InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRadioText, \
                                InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
                                InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
                                InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
-                               InfoBarTeletextPlugin, InfoBarExtensions, InfoBarSubtitleSupport:
+                               InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitles, InfoBarSubtitleSupport, \
+                               InfoBarPlugins:
                        x.__init__(self)
 
                self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
@@ -65,7 +69,7 @@ class InfoBar(InfoBarShowHide,
                self.showTvChannelList(True)
 
        def showRadio(self):
-               if currentConfigSelectionElement(config.usage.e1like_radio_mode) == "yes":
+               if config.usage.e1like_radio_mode.value:
                        self.showRadioChannelList(True)
                else:
                        self.session.open(ChannelSelectionRadio)
@@ -82,6 +86,9 @@ class MoviePlayer(InfoBarShowHide, \
                InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
                InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport, Screen):
+
+       ENABLE_RESUME_SUPPORT = True
+       ALLOW_SUSPEND = True
                
        def __init__(self, session, service):
                Screen.__init__(self, session)
@@ -102,6 +109,7 @@ class MoviePlayer(InfoBarShowHide, \
                self.session.nav.playService(service)
 
        def leavePlayer(self):
+               self.is_closing = True
                self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))
        
        def leavePlayerConfirmed(self, answer):