add support for dm8000 rtc,

[vuplus_dvbapp] / lib / python / Screens / Standby.py

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index b572bd8..fd7ca8e 100644 (file)
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -2,8 +2,7 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.config import config
 from Components.AVSwitch import AVSwitch
-from enigma import eDVBVolumecontrol, eDBoxLCD
-from Components.Sources.Clock import Clock
+from enigma import eDVBVolumecontrol
 
 inStandby = None
 
@@ -13,12 +12,10 @@ class Standby(Screen):
                #set input to encoder
                self.avswitch.setInput("ENCODER")
                #restart last played service
-               if self.prev_running_service:
-                       self.session.nav.playService(self.prev_running_service)
                #unmute adc
                self.leaveMute()
                #set brightness of lcd
-               eDBoxLCD.getInstance().setLCDBrightness(config.lcd.bright.value * 20)
+               config.lcd.bright.apply()
                #kill me
                self.close(True)
 
@@ -54,9 +51,14 @@ class Standby(Screen):
                #set input to vcr scart
                self.avswitch.setInput("SCART")
                #set lcd brightness to standby value
-               eDBoxLCD.getInstance().setLCDBrightness(config.lcd.standby.value * 20)
+               config.lcd.standby.apply()
                self.onShow.append(self.__onShow)
                self.onHide.append(self.__onHide)
+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               if self.prev_running_service:
+                       self.session.nav.playService(self.prev_running_service)
 
        def createSummary(self):
                return StandbySummary
@@ -72,14 +74,17 @@ class Standby(Screen):
 class StandbySummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
-               <widget source="CurrentTime" render="Label" position="0,0" size="132,64" font="Regular;40" halign="center">
+               <widget source="global.CurrentTime" render="Label" position="0,0" size="132,64" font="Regular;40" halign="center">
                        <convert type="ClockToText" />
                </widget>
+               <widget source="session.RecordState" render="FixedLabel" text=" " position="0,0" size="132,64" zPosition="1" >
+                       <convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
+                       <convert type="ConditionalShowHide">Blink</convert>
+               </widget>
        </screen>"""
 
        def __init__(self, session, parent):
                Screen.__init__(self, session)
-               self["CurrentTime"] = Clock()
 
 from enigma import quitMainloop, iRecordableService
 from Screens.MessageBox import MessageBox
@@ -88,7 +93,7 @@ from time import time
 inTryQuitMainloop = False
 
 class TryQuitMainloop(MessageBox):
-       def __init__(self, session, retvalue=1, timeout=-1):
+       def __init__(self, session, retvalue=1, timeout=-1, default_yes = True):
                self.retval=retvalue
                recordings = len(session.nav.getRecordings())
                self.connected = False
@@ -97,13 +102,13 @@ class TryQuitMainloop(MessageBox):
                        next_rec_time = session.nav.RecordTimer.getNextRecordingTime()
                if recordings or (next_rec_time > 0 and (next_rec_time - time()) < 360):
                        if retvalue == 1:
-                               MessageBox.__init__(self, session, _("Recording(s) are in progress or coming up in few seconds... really shutdown now?"), type = MessageBox.TYPE_YESNO, timeout = timeout)
+                               MessageBox.__init__(self, session, _("Recording(s) are in progress or coming up in few seconds... really shutdown now?"), type = MessageBox.TYPE_YESNO, timeout = timeout, default = default_yes)
                        elif retvalue == 2:
-                               MessageBox.__init__(self, session, _("Recording(s) are in progress or coming up in few seconds... really reboot now?"), type = MessageBox.TYPE_YESNO, timeout = timeout)
+                               MessageBox.__init__(self, session, _("Recording(s) are in progress or coming up in few seconds... really reboot now?"), type = MessageBox.TYPE_YESNO, timeout = timeout, default = default_yes)
                        elif retvalue == 4:
                                pass
                        else:
-                               MessageBox.__init__(self, session, _("Recording(s) are in progress or coming up in few seconds... really restart now?"), type = MessageBox.TYPE_YESNO, timeout = timeout)
+                               MessageBox.__init__(self, session, _("Recording(s) are in progress or coming up in few seconds... really restart now?"), type = MessageBox.TYPE_YESNO, timeout = timeout, default = default_yes)
                        self.skinName = "MessageBox"
                        session.nav.record_event.append(self.getRecordEvent)
                        self.connected = True