Merge branch 'bug_607_parental_control_fix' into experimental

[enigma2.git] / SleepTimer.py

diff --git a/SleepTimer.py b/SleepTimer.py
index 82acc1243339ddefe146f1a88ab6e67a51c0d7d2..221e8f0b29422826edeb3368fcf24bdd752d7a6d 100644 (file)
--- a/SleepTimer.py
+++ b/SleepTimer.py
@@ -7,7 +7,11 @@ from Tools import Notifications
 from Components.config import config, ConfigYesNo, ConfigSelection, ConfigSubsection
 
 from Screens.MessageBox import MessageBox
-from Screens.Standby import Standby, TryQuitMainloop, inStandby, inTryQuitMainloop
+import Screens.Standby
+
+config.SleepTimer = ConfigSubsection()
+config.SleepTimer.ask = ConfigYesNo(default = True)
+config.SleepTimer.action = ConfigSelection(default = "shutdown", choices = [("shutdown", _("shutdown")), ("standby", _("standby"))])
 
 class SleepTimerEntry(timer.TimerEntry):
        def __init__(self, begin):
@@ -21,15 +25,13 @@ class SleepTimerEntry(timer.TimerEntry):
        def activate(self):
                if self.state == self.StateRunning:
                        if config.SleepTimer.action.value == "shutdown":
-                               global inTryQuitMainloop
-                               if config.SleepTimer.ask.value and not inTryQuitMainloop:
-                                       Notifications.AddNotificationWithCallback(self.shutdown, MessageBox, _("A sleep timer want's to shut down\nyour Dreambox. Shutdown now?"), timeout = 20)
+                               if config.SleepTimer.ask.value and not Screens.Standby.inTryQuitMainloop:
+                                       Notifications.AddNotificationWithCallback(self.shutdown, MessageBox, _("A sleep timer wants to shut down\nyour Dreambox. Shutdown now?"), timeout = 20)
                                else:
                                        self.shutdown(True)
                        elif config.SleepTimer.action.value == "standby":
-                               global inStandby
-                               if config.SleepTimer.ask.value and not inStandby:
-                                       Notifications.AddNotificationWithCallback(self.standby, MessageBox, _("A sleep timer want's to set your\nDreambox to standby. Do that now?"), timeout = 20)
+                               if config.SleepTimer.ask.value and not Screens.Standby.inStandby:
+                                       Notifications.AddNotificationWithCallback(self.standby, MessageBox, _("A sleep timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20)
                                else:
                                        self.standby(True)
 
@@ -39,39 +41,34 @@ class SleepTimerEntry(timer.TimerEntry):
                return False
        
        def shutdown(self, answer):
-               global inTryQuitMainloop
                if answer is not None:
-                       if answer and not inTryQuitMainloop:
-                               Notifications.AddNotification(TryQuitMainloop, 1)
+                       if answer and not Screens.Standby.inTryQuitMainloop:
+                               Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1)
 
        def standby(self, answer):
                if answer is not None:
-                       global inStandby
-                       if answer and not inStandby:
-                               Notifications.AddNotification(Standby)
-               
+                       if answer and not Screens.Standby.inStandby:
+                               Notifications.AddNotification(Screens.Standby.Standby)
+
 class SleepTimer(timer.Timer):
        def __init__(self):
-               config.SleepTimer = ConfigSubsection()
-               config.SleepTimer.ask = ConfigYesNo(default = True)
-               config.SleepTimer.action = ConfigSelection(default = "shutdown", choices = [("shutdown", _("shutdown")), ("standby", _("standby"))])
-               
                timer.Timer.__init__(self)
                self.defaultTime = 30
-               
+
        def setSleepTime(self, sleeptime):
                self.clear()
                self.addTimerEntry(SleepTimerEntry(time.time() + 60 * sleeptime))
 
        def clear(self):
                self.timer_list = []
-               
+
        def getCurrentSleepTime(self):
-               if (self.getNextRecordingTime() == -1):
-                       return self.defaultTime
-               return int(math.ceil((self.getNextRecordingTime() - time.time()) / 60))
+               llen = len(self.timer_list)
+               idx = 0
+               while idx < llen:
+                       timer = self.timer_list[idx]
+                       return int(math.ceil((timer.begin - time.time()) / 60))
+               return self.defaultTime
 
        def isActive(self):
                return len(self.timer_list) > 0
-       
-       
\ No newline at end of file