allow standby only in InfoBar, MoviePlayer, Menus, Setup and Radiomode

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 90c12a5d785ea8c99bc97697dbbca4fd546da158..6239b001c88bd75dbb860d22d5c8660e1f1fd69a 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -1118,6 +1118,9 @@ class RadioInfoBar(Screen, InfoBarEvent, InfoBarServiceName, InfoBarInstantRecor
                self["CurrentTime"] = Clock()
 
 class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelectionEPG):
+
+       ALLOW_SUSPEND = True
+
        def __init__(self, session):
                ChannelSelectionBase.__init__(self, session)
                ChannelSelectionEdit.__init__(self)

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 471b1abe8a8e3078a70096f5907482524d5aa32e..0a297fbfa201496dacb0cd618f95d361561e8804 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -34,6 +34,8 @@ class InfoBar(InfoBarShowHide,
        InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek,
        InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, 
        InfoBarSubtitleSupport, Screen):
+       
+       ALLOW_SUSPEND = True
 
        def __init__(self, session):
                Screen.__init__(self, session)
@@ -84,6 +86,7 @@ class MoviePlayer(InfoBarShowHide, \
                InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport, Screen):
 
        ENABLE_RESUME_SUPPORT = True
+       ALLOW_SUSPEND = True
                
        def __init__(self, session, service):
                Screen.__init__(self, session)

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index da07be16b19a421539ba2d804c2c894eb82cb35a..1390b51a74ad0e99d2f14cbf177829fccae10c4d 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -89,6 +89,9 @@ class MenuSummary(Screen):
                self["MenuEntry"].setText(self.parent["menu"].getCurrent()[0])
 
 class Menu(Screen):
+
+       ALLOW_SUSPEND = True
+
        def okbuttonClick(self):
                print "okbuttonClick"
                selection = self["menu"].getCurrent()

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 0727f78ba034ae3ef2a3fdd79cd6e681841e74af..b581e62baca7be4a7c026d28941b09f64d7263ef 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -5,7 +5,8 @@ from Components.Sources.Source import Source
 import sys
 
 class Screen(dict, HTMLSkin, GUISkin):
-       """ bla """
+
+       ALLOW_SUSPEND = False
 
        def __init__(self, session):
                self.skinName = self.__class__.__name__

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 0d4764acfb214e0a8a2ad605181665ecf9643348..746c26d304af5bf78ad7f50d87ac1d889230c3d7 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -54,6 +54,9 @@ class SetupSummary(Screen):
                self["SetupValue"].text = self.parent.getCurrentValue()
 
 class Setup(Screen):
+
+       ALLOW_SUSPEND = True
+
        def __init__(self, session, setup):
                Screen.__init__(self, session)
 

diff --git a/mytest.py b/mytest.py
index aa63567a48e5c684b15a47eef9aa4bffe569bc5e..8ea13e0a5e59468b7f3dea678d243a04851bcc3c 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -397,7 +397,8 @@ class PowerKey:
                        self.standby()
 
        def standby(self):
-               self.session.open(Standby, self)
+               if self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+                       self.session.open(Standby, self)
 
        def quit(self):
                # halt