git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix prev stupid change
[enigma2.git]
/
mytest.py
diff --git
a/mytest.py
b/mytest.py
index 2b032e6c2244ff10169862e491d0be2516779f11..2169857f13ecbe273d967be2aa3ec14030fa3ff9 100644
(file)
--- a/
mytest.py
+++ b/
mytest.py
@@
-387,7
+387,7
@@
class VolumeControl:
self.muteDialog.hide()
self.volumeDialog.setValue(vol)
self.muteDialog.hide()
self.volumeDialog.setValue(vol)
-from Screens.Standby import Standby
+from Screens.Standby import Standby
, inStandby, TryQuitMainloop, inTryQuitMainloop
class PowerKey:
""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
class PowerKey:
""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
@@
-398,7
+398,7
@@
class PowerKey:
self.powerKeyTimer.timeout.get().append(self.powertimer)
globalActionMap.actions["powerdown"]=self.powerdown
globalActionMap.actions["powerup"]=self.powerup
self.powerKeyTimer.timeout.get().append(self.powertimer)
globalActionMap.actions["powerdown"]=self.powerdown
globalActionMap.actions["powerup"]=self.powerup
- self.standbyblocked =
0
+ self.standbyblocked =
1
# self["PowerKeyActions"] = HelpableActionMap(self, "PowerKeyActions",
#{
#"powerdown": self.powerdown,
# self["PowerKeyActions"] = HelpableActionMap(self, "PowerKeyActions",
#{
#"powerdown": self.powerdown,
@@
-409,7
+409,9
@@
class PowerKey:
def powertimer(self):
print "PowerOff - Now!"
def powertimer(self):
print "PowerOff - Now!"
- self.quit()
+ global inTryQuitMainloop
+ if not inTryQuitMainloop:
+ self.session.open(TryQuitMainloop, 1)
def powerdown(self):
self.standbyblocked = 0
def powerdown(self):
self.standbyblocked = 0
@@
-422,12
+424,9
@@
class PowerKey:
self.standby()
def standby(self):
self.standby()
def standby(self):
- if self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
- self.session.open(Standby, self)
-
- def quit(self):
- # halt
- quitMainloop(1)
+ global inStandby
+ if not inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+ self.session.open(Standby)
from Screens.Scart import Scart
from Screens.Scart import Scart
@@
-489,7
+488,7
@@
def runScreenTest():
# we need session.scart to access it from within menu.xml
session.scart = AutoScartControl(session)
# we need session.scart to access it from within menu.xml
session.scart = AutoScartControl(session)
-
+
runReactor()
configfile.save()
runReactor()
configfile.save()