From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Tue, 13 Nov 2007 11:54:04 +0000 (+0000)
Subject: dont show shutdown menu on long frontend power button press
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=e5c5859121a0b99607b618dc31e2e0588510785b

dont show shutdown menu on long frontend power button press
---

diff --git a/data/keymap.xml b/data/keymap.xml
index 94e19e1..452bf4a 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 7162565..7131276 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)
diff --git a/mytest.py b/mytest.py
index e0b86e7..38e18d6 100644
--- 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["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]