git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs bug #587
[enigma2.git]
/
lib
/
python
/
Screens
/
Standby.py
diff --git
a/lib/python/Screens/Standby.py
b/lib/python/Screens/Standby.py
index c598b5459b9209d7ca705ed5d0f93b5e170b740a..1a7ebbd1ae61b09fa7c5716cae28fe5475ad7884 100644
(file)
--- a/
lib/python/Screens/Standby.py
+++ b/
lib/python/Screens/Standby.py
@@
-3,6
+3,7
@@
from Components.ActionMap import ActionMap
from Components.config import config
from Components.AVSwitch import AVSwitch
from Components.SystemInfo import SystemInfo
from Components.config import config
from Components.AVSwitch import AVSwitch
from Components.SystemInfo import SystemInfo
+from GlobalActions import globalActionMap
from enigma import eDVBVolumecontrol
inStandby = None
from enigma import eDVBVolumecontrol
inStandby = None
@@
-15,8
+16,6
@@
class Standby(Screen):
#restart last played service
#unmute adc
self.leaveMute()
#restart last played service
#unmute adc
self.leaveMute()
- #set brightness of lcd
- config.lcd.bright.apply()
#kill me
self.close(True)
#kill me
self.close(True)
@@
-43,6
+42,8
@@
class Standby(Screen):
"power": self.Power
}, -1)
"power": self.Power
}, -1)
+ globalActionMap.setEnabled(False)
+
#mute adc
self.setMute()
#mute adc
self.setMute()
@@
-63,8
+64,6
@@
class Standby(Screen):
self.avswitch.setInput("SCART")
else:
self.avswitch.setInput("AUX")
self.avswitch.setInput("SCART")
else:
self.avswitch.setInput("AUX")
- #set lcd brightness to standby value
- config.lcd.standby.apply()
self.onFirstExecBegin.append(self.__onFirstExecBegin)
self.onClose.append(self.__onClose)
self.onFirstExecBegin.append(self.__onFirstExecBegin)
self.onClose.append(self.__onClose)
@@
-76,6
+75,7
@@
class Standby(Screen):
elif self.paused_service:
self.paused_service.unPauseService()
self.session.screen["Standby"].boolean = False
elif self.paused_service:
self.paused_service.unPauseService()
self.session.screen["Standby"].boolean = False
+ globalActionMap.setEnabled(True)
def __onFirstExecBegin(self):
global inStandby
def __onFirstExecBegin(self):
global inStandby