diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-11-13 11:54:04 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-11-13 11:54:04 +0000 |
| commit | e5c5859121a0b99607b618dc31e2e0588510785b (patch) | |
| tree | 1bff1e7649374a35c34b9d7c845935a2f8eb8ba0 | |
| parent | 8da63bbbaab4a3bb03e0711003a71aa373ee251a (diff) | |
| download | enigma2-e5c5859121a0b99607b618dc31e2e0588510785b.tar.gz enigma2-e5c5859121a0b99607b618dc31e2e0588510785b.zip | |
dont show shutdown menu on long frontend power button press
| -rw-r--r-- | data/keymap.xml | 5 | ||||
| -rw-r--r-- | keymapparser.py | 4 | ||||
| -rw-r--r-- | mytest.py | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/data/keymap.xml b/data/keymap.xml index 94e19e15..452bf4a1 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -187,9 +187,12 @@ <key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" /> <key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" /> <key id="KEY_MUTE" mapto="volumeMute" flags="mr" /> + <key id="KEY_POWER" mapto="power_long" flags="l" /> <key id="KEY_POWER" mapto="power_down" flags="m" /> <key id="KEY_POWER" mapto="power_up" flags="b" /> - <key id="KEY_POWER" mapto="power_long" flags="l" /> + <device name="dreambox front panel"> + <key id="KEY_POWER" mapto="deepstandby" flags="l" /> + </device> </map> <map context="PowerKeyActions"> diff --git a/keymapparser.py b/keymapparser.py index 71625651..7131276f 100644 --- a/keymapparser.py +++ b/keymapparser.py @@ -63,11 +63,11 @@ def readKeymap(filename): p.bindKey(filename, device, keyid, flags, context, mapto) addKeyBinding(filename, keyid, context, mapto, flags) - parseKeys("generic", cmap) - for device in elementsWithTag(cmap.childNodes, "device"): parseKeys(str(device.getAttribute("name")), device) + parseKeys("generic", cmap) + def removeKeymap(filename): p = enigma.eActionMap.getInstance() p.unbindKeyDomain(filename) @@ -404,18 +404,22 @@ class PowerKey: globalActionMap.actions["power_down"]=self.powerdown globalActionMap.actions["power_up"]=self.powerup globalActionMap.actions["power_long"]=self.powerlong + globalActionMap.actions["deepstandby"]=self.shutdown # frontpanel long power button press self.standbyblocked = 1 def MenuClosed(self, *val): self.session.infobar = None + def shutdown(self): + print "PowerOff - Now!" + if not Screens.Standby.inTryQuitMainloop: + self.session.open(Screens.Standby.TryQuitMainloop, 1) + def powerlong(self): self.standbyblocked = 1 action = config.usage.on_long_powerpress.value if action == "shutdown": - print "PowerOff - Now!" - if not Screens.Standby.inTryQuitMainloop: - self.session.open(Screens.Standby.TryQuitMainloop, 1) + self.shutdown() elif action == "show_menu": print "Show shutdown Menu" menu = mdom.childNodes[0] |