dont show shutdown menu on long frontend power button press

diff --git a/data/keymap.xml b/data/keymap.xml
index 94e19e1592776dcbe43e3ea979f1e56bf6f0d43b..452bf4a1e8748c03e4739bd17d0ad5d26c366c15 100644 (file)
--- 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_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_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">
        </map>
        
        <map context="PowerKeyActions">

diff --git a/keymapparser.py b/keymapparser.py
index 71625651b61acacde164b4bebd489fd18f547f65..7131276f44a75d7626feac690157d5e3a0ef5ae2 100644 (file)
--- 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)
 
                                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)
 
                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)
 def removeKeymap(filename):
        p = enigma.eActionMap.getInstance()
        p.unbindKeyDomain(filename)

diff --git a/mytest.py b/mytest.py
index e0b86e7ea82c9fa0974f19b6a6f11d1f90f4288c..38e18d692d65bc573f9df7bcf69f1bea2e0f341b 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -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["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
 
                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":
        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]
                elif action == "show_menu":
                        print "Show shutdown Menu"
                        menu = mdom.childNodes[0]