fixes bug #362

allow configuring short power button action to shutdown, standby, menu

diff --git a/data/setup.xml b/data/setup.xml
index 9425afda93b0dfe1948a7f638bc6dd40058c1ea0..92bbc0f15acf06a8aab3c0cf46cb6fcdb224d558 100644 (file)
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -31,6 +31,7 @@
                        <item level="1" text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item>
                        <item level="1" text="Alternative radio mode">config.usage.e1like_radio_mode</item>
                        <item level="1" text="Action on long powerbutton press">config.usage.on_long_powerpress</item>
+                       <item level="1" text="Action on short powerbutton press">config.usage.on_short_powerpress</item>
                        <item level="0" text="Infobar timeout">config.usage.infobar_timeout</item>
                        <item level="1" text="12V output" requires="12V_Output">config.usage.output_12V</item>
                        <item level="2" text="Show infobar on channel change">config.usage.show_infobar_on_zap</item>

diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index f133f9f611e538b3180c4ce528dcf921386dea34..21478e9052df59beea2d9610e86cf90dd0f6f179 100644 (file)
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -53,6 +53,12 @@ def InitUsageConfig():
                ("show_menu", _("show shutdown menu")),
                ("shutdown", _("immediate shutdown")),
                ("standby", _("Standby")) ] )
+       
+       config.usage.on_short_powerpress = ConfigSelection(default = "standby", choices = [
+               ("show_menu", _("show shutdown menu")),
+               ("shutdown", _("immediate shutdown")),
+               ("standby", _("Standby")) ] )
+
 
        config.usage.alternatives_priority = ConfigSelection(default = "0", choices = [
                ("0", "DVB-S/-C/-T"),

diff --git a/mytest.py b/mytest.py
index 7eb045ee4812038df183ae5521d2b95cb4509b19..4b687e05440aa322ab3c6b75f0b8eddd63ddd287 100755 (executable)
--- a/mytest.py
+++ b/mytest.py
@@ -363,9 +363,10 @@ class PowerKey:
        def powerlong(self):
                if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
                        return
+               self.doAction(action = config.usage.on_long_powerpress.value)
 
+       def doAction(self, action):
                self.standbyblocked = 1
-               action = config.usage.on_long_powerpress.value
                if action == "shutdown":
                        self.shutdown()
                elif action == "show_menu":
@@ -388,8 +389,7 @@ class PowerKey:
 
        def powerup(self):
                if self.standbyblocked == 0:
-                       self.standbyblocked = 1
-                       self.standby()
+                       self.doAction(action = config.usage.on_short_powerpress.value)
 
        def standby(self):
                if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND and self.session.in_exec: