From b6f95a8f5457c60ccc14192a4d13d3c05fa608be Mon Sep 17 00:00:00 2001
From: thedoc <thedoc@atom.(none)>
Date: Fri, 1 Jan 2010 14:07:03 +0100
Subject: [PATCH] fixes bug #362 allow configuring short power button action to
 shutdown, standby, menu

---
 data/setup.xml                       | 1 +
 lib/python/Components/UsageConfig.py | 6 ++++++
 mytest.py                            | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/data/setup.xml b/data/setup.xml
index 9425afd..92bbc0f 100644
--- 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 f133f9f..21478e9 100644
--- 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 7eb045e..4b687e0 100755
--- 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:
-- 
2.7.4