dont show display contrast setting in display setup when a oled is detected

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

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 06c447039f446fbfee62f92e2b0239b26a890403..b8af16f5f19b5ba2c9e279b9b3d24c754dd5c02b 100644 (file)
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -2,9 +2,10 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.config import config
 from Components.AVSwitch import AVSwitch
 from Components.ActionMap import ActionMap
 from Components.config import config
 from Components.AVSwitch import AVSwitch

-from enigma import eDVBVolumecontrol, eDBoxLCD, eServiceReference
-from Components.Sources.Clock import Clock
+from enigma import eDVBVolumecontrol
+from Components.Sources.Source import ObsoleteSource

 
 

+inStandby = None

 
 class Standby(Screen):
        def Power(self):
 
 class Standby(Screen):
        def Power(self):


@@ -17,9 +18,9 @@ class Standby(Screen):
                #unmute adc
                self.leaveMute()
                #set brightness of lcd
                #unmute adc
                self.leaveMute()
                #set brightness of lcd

-               eDBoxLCD.getInstance().setLCDBrightness(config.lcd.bright.value * 20)
+               config.lcd.bright.apply()

                #kill me
                #kill me

-               self.close()
+               self.close(True)

 
        def setMute(self):
                if (eDVBVolumecontrol.getInstance().isMuted()):
 
        def setMute(self):
                if (eDVBVolumecontrol.getInstance().isMuted()):


@@ -33,9 +34,8 @@ class Standby(Screen):
                if self.wasMuted == 0:
                        eDVBVolumecontrol.getInstance().volumeToggleMute()
 
                if self.wasMuted == 0:
                        eDVBVolumecontrol.getInstance().volumeToggleMute()
 

-       def __init__(self, session, infobar):
+       def __init__(self, session):

                Screen.__init__(self, session)
                Screen.__init__(self, session)

-               self.infobar = infobar

                self.avswitch = AVSwitch()
 
                print "enter standby"
                self.avswitch = AVSwitch()
 
                print "enter standby"


@@ -54,19 +54,96 @@ class Standby(Screen):
                #set input to vcr scart
                self.avswitch.setInput("SCART")
                #set lcd brightness to standby value
                #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)

 
        def createSummary(self):
                return StandbySummary
 
 
        def createSummary(self):
                return StandbySummary
 

+       def __onShow(self):
+               global inStandby
+               inStandby = self
+
+       def __onHide(self):
+               global inStandby
+               inStandby = None
+

 class StandbySummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
 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>
                        <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)
        </screen>"""
 
        def __init__(self, session, parent):
                Screen.__init__(self, session)

-               self["CurrentTime"] = Clock()
+               self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
+
+from enigma import quitMainloop, iRecordableService
+from Screens.MessageBox import MessageBox
+from time import time
+
+inTryQuitMainloop = False
+
+class TryQuitMainloop(MessageBox):
+       def __init__(self, session, retvalue=1, timeout=-1):
+               self.retval=retvalue
+               recordings = len(session.nav.getRecordings())
+               self.connected = False
+               next_rec_time = -1
+               if not recordings:
+                       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)
+                       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)
+                       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)
+                       self.skinName = "MessageBox"
+                       session.nav.record_event.append(self.getRecordEvent)
+                       self.connected = True
+                       self.onShow.append(self.__onShow)
+                       self.onHide.append(self.__onHide)
+               else:
+                       self.skin = """<screen position="0,0" size="0,0"/>"""
+                       Screen.__init__(self, session)
+                       self.close(True)
+
+       def getRecordEvent(self, recservice, event):
+               if event == iRecordableService.evEnd:
+                       recordings = self.session.nav.getRecordings()
+                       if not len(recordings): # no more recordings exist
+                               rec_time = self.session.nav.RecordTimer.getNextRecordingTime()
+                               if rec_time > 0 and (rec_time - time()) < 360:
+                                       self.initTimeout(360) # wait for next starting timer
+                                       self.startTimer()
+                               else:
+                                       self.close(True) # immediate shutdown
+               elif event == iRecordableService.evStart:
+                       self.stopTimer()
+
+       def close(self, value):
+               if self.connected:
+                       self.conntected=False
+                       self.session.nav.record_event.remove(self.getRecordEvent)
+               if value:
+                       quitMainloop(self.retval)
+               else:
+                       MessageBox.close(self, True)
+
+       def __onShow(self):
+               global inTryQuitMainloop
+               inTryQuitMainloop = True
+
+       def __onHide(self):
+               global inTryQuitMainloop
+               inTryQuitMainloop = False