diff options
| -rwxr-xr-x | data/setup.xml | 1 | ||||
| -rw-r--r-- | lib/python/Components/UsageConfig.py | 9 | ||||
| -rwxr-xr-x | mytest.py | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/data/setup.xml b/data/setup.xml index b920edd6..f5dea734 100755 --- 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="0" text="Show event-progress in channel selection">config.usage.show_event_progress_in_servicelist</item> diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py index 572f47e0..b86c1a13 100644 --- a/lib/python/Components/UsageConfig.py +++ b/lib/python/Components/UsageConfig.py @@ -51,7 +51,14 @@ def InitUsageConfig(): config.usage.on_long_powerpress = ConfigSelection(default = "show_menu", choices = [ ("show_menu", _("show shutdown menu")), - ("shutdown", _("immediate shutdown")) ] ) + ("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"), @@ -365,9 +365,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: |