aboutsummaryrefslogtreecommitdiff
path: root/system/keymaps
diff options
context:
space:
mode:
authorJohn Rennie <renniej@RatBuntu.(none)>2013-01-15 13:12:42 +0000
committerJohn Rennie <renniej@RatBuntu.(none)>2013-01-15 13:12:42 +0000
commit6d0fe342052140c0153ddf4d253a6376fecc7c49 (patch)
treef4210d3165b39fb651ebf23b274b4be4b37d14b6 /system/keymaps
parent169be40560488d0e6ca9548dc694e7ca0005288e (diff)
Move the Nyxboard sleep key mapping to the main keymap
Diffstat (limited to 'system/keymaps')
-rw-r--r--system/keymaps/keyboard.xml3
-rw-r--r--system/keymaps/nyxboard/keyboard.xml1
2 files changed, 2 insertions, 2 deletions
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index d8b6f47f0e..a6431eb1aa 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -94,7 +94,8 @@
<backslash>ToggleFullScreen</backslash>
<home>FirstPage</home>
<end>LastPage</end>
- <power>XBMC.ShutDown()</power>
+ <power>ActivateWindow(shutdownmenu)</power>
+ <sleep>ActivateWindow(shutdownmenu)</sleep>
<!-- PVR windows -->
<e>XBMC.ActivateWindowAndFocus(MyPVR, 31,0, 10,0)</e>
<h>XBMC.ActivateWindowAndFocus(MyPVR, 32,0, 11,0)</h>
diff --git a/system/keymaps/nyxboard/keyboard.xml b/system/keymaps/nyxboard/keyboard.xml
index 41914cb0ec..278ffcee62 100644
--- a/system/keymaps/nyxboard/keyboard.xml
+++ b/system/keymaps/nyxboard/keyboard.xml
@@ -8,7 +8,6 @@
<f4 mod="shift">ActivateWindow(music)</f4> <!-- Green -->
<f5 mod="shift">ActivateWindow(pictures)</f5> <!-- Yellow -->
<f6 mod="shift">ActivateWindow(programs)</f6> <!-- Blue -->
- <key id='61952'>ActivateWindow(shutdownmenu)</key> <!-- Power button -->
<key id='285'>ContextMenu</key> <!-- User button -->
</keyboard>
</global>