aboutsummaryrefslogtreecommitdiff
path: root/system/keymaps
diff options
context:
space:
mode:
authormontellese <montellese@xbmc.org>2012-11-01 00:37:38 +0100
committermontellese <montellese@xbmc.org>2012-11-01 00:37:38 +0100
commit19ea77e6fd136153519fff774a95fbcd8293eac3 (patch)
tree4905aba3444f8ec44869837c1dbed19fa7262d4b /system/keymaps
parentde2873b71e175ed5113b8b0a9933797484271a36 (diff)
keymaps: use "OSD" instead of "ActivateWindow(MusicOSD)"
Diffstat (limited to 'system/keymaps')
-rw-r--r--system/keymaps/gamepad.xml2
-rw-r--r--system/keymaps/joystick.AppleRemote.xml2
-rw-r--r--system/keymaps/joystick.Harmony.xml2
-rw-r--r--system/keymaps/joystick.Logitech.RumblePad.2.xml2
-rw-r--r--system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml2
-rw-r--r--system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml2
-rw-r--r--system/keymaps/joystick.PS3.Remote.Keyboard.xml2
-rw-r--r--system/keymaps/joystick.WiiRemote.xml2
-rw-r--r--system/keymaps/keyboard.xml6
-rw-r--r--system/keymaps/remote.xml4
10 files changed, 13 insertions, 13 deletions
diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml
index 44e77dc0fe..ba28fbb3c4 100644
--- a/system/keymaps/gamepad.xml
+++ b/system/keymaps/gamepad.xml
@@ -130,7 +130,7 @@
<Y>XBMC.ActivateWindow(VisualisationPresetList)</Y>
<black>CodecInfo</black>
<white>Info</white>
- <start>XBMC.ActivateWindow(MusicOSD)</start>
+ <start>OSD</start>
<back>LockPreset</back>
<leftanalogtrigger>AnalogRewind</leftanalogtrigger>
<rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
diff --git a/system/keymaps/joystick.AppleRemote.xml b/system/keymaps/joystick.AppleRemote.xml
index f93769d1a6..1de3579662 100644
--- a/system/keymaps/joystick.AppleRemote.xml
+++ b/system/keymaps/joystick.AppleRemote.xml
@@ -119,7 +119,7 @@
<button id="4">SkipNext</button>
<button id="5">Pause</button>
<button id="6">Fullscreen</button>
- <button id="7">XBMC.ActivateWindow(MusicOSD)</button>
+ <button id="7">OSD</button>
<button id="8">Stop</button>
<!-- SwipeLeft --> <button id="80">SkipPrevious</button>
<!-- SwipeRight --> <button id="81">SkipNext</button>
diff --git a/system/keymaps/joystick.Harmony.xml b/system/keymaps/joystick.Harmony.xml
index a9f6baf343..bb61e707a4 100644
--- a/system/keymaps/joystick.Harmony.xml
+++ b/system/keymaps/joystick.Harmony.xml
@@ -188,7 +188,7 @@
<!-- minus --> <button id="2">DecreaseRating</button>
<!-- left --> <button id="3">PreviousPreset</button>
<!-- right --> <button id="4">NextPreset</button>
- <!-- menu --> <button id="6">XBMC.ActivateWindow(MusicOSD)</button>
+ <!-- menu --> <button id="6">OSD</button>
<!-- Prev --> <button id="32">LockPreset</button>
<!-- Info --> <button id="31">Info</button>
<!-- F8 --> <button id="96">XBMC.ActivateWindow(VisualisationPresetList)</button>
diff --git a/system/keymaps/joystick.Logitech.RumblePad.2.xml b/system/keymaps/joystick.Logitech.RumblePad.2.xml
index 7927a58e52..bc2140373b 100644
--- a/system/keymaps/joystick.Logitech.RumblePad.2.xml
+++ b/system/keymaps/joystick.Logitech.RumblePad.2.xml
@@ -71,7 +71,7 @@
<button id="4">XBMC.ActivateWindow(VisualisationPresetList)</button>
<button id="5">Rewind</button>
<button id="6">FastForward</button>
- <button id="10">XBMC.ActivateWindow(MusicOSD)</button>
+ <button id="10">OSD</button>
<hat id="1" position="left">SkipPrevious</hat>
<hat id="1" position="right">SkipNext</hat>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
index ee1769031d..1a84d2f3fe 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
@@ -128,7 +128,7 @@
<button id="3">CodecInfo</button>
<button id="5">XBMC.ActivateWindow(VisualisationPresetList)</button>
<button id="6">Info</button>
- <button id="9">XBMC.ActivateWindow(MusicOSD)</button>
+ <button id="9">OSD</button>
<button id="13">NextPreset</button>
<button id="14">SkipNext</button>
<button id="15">PreviousPreset</button>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
index a9b1bfc91b..5edd52b982 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
@@ -158,7 +158,7 @@
<button id="3">CodecInfo</button>
<button id="5">XBMC.ActivateWindow(VisualisationPresetList)</button>
<button id="6">Info</button>
- <button id="9">XBMC.ActivateWindow(MusicOSD)</button>
+ <button id="9">OSD</button>
<button id="13">NextPreset</button>
<button id="14">SkipNext</button>
<button id="15">PreviousPreset</button>
diff --git a/system/keymaps/joystick.PS3.Remote.Keyboard.xml b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
index 0cccbebb1d..9cb520ae71 100644
--- a/system/keymaps/joystick.PS3.Remote.Keyboard.xml
+++ b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
@@ -67,7 +67,7 @@
<joystick name="PLAYSTATION(R)3 Remote Keyboard">
<altname>PS3 Remote Keyboard</altname>
<altname>MoSart PS3 Remote Keyboard</altname>
- <button id="4">XBMC.ActivateWindow(MusicOSD)</button>
+ <button id="4">OSD</button>
<button id="1">Info</button>
<button id="2">Play</button>
<button id="3">Stop</button>
diff --git a/system/keymaps/joystick.WiiRemote.xml b/system/keymaps/joystick.WiiRemote.xml
index d6fa40927b..f386af6e61 100644
--- a/system/keymaps/joystick.WiiRemote.xml
+++ b/system/keymaps/joystick.WiiRemote.xml
@@ -111,7 +111,7 @@
<button id="2">Stop</button>
<button id="3">SkipNext</button>
<button id="4">SkipPrevious</button>
- <button id="5">XBMC.ActivateWindow(MusicOSD)</button>
+ <button id="5">OSD</button>
<button id="6">Info</button>
<button id="8">XBMC.ActivateWindow(music)</button>
<button id="10">IncreaseRating</button>
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index e783145191..222fda9326 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -269,9 +269,9 @@
<r>Rewind</r>
<period>SkipNext</period>
<comma>SkipPrevious</comma>
- <return>ActivateWindow(MusicOSD)</return>
- <enter>ActivateWindow(MusicOSD)</enter>
- <m>ActivateWindow(MusicOSD)</m>
+ <return>OSD</return>
+ <enter>OSD</enter>
+ <m>OSD</m>
<i>Info</i>
<p>ActivateWindow(VisualisationPresetList)</p>
<v>ActivateWindow(VisualisationSettings)</v>
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index e8d68be681..71fdc5de45 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -191,8 +191,8 @@
<back>LockPreset</back>
<title>CodecInfo</title>
<select>XBMC.ActivateWindow(VisualisationPresetList)</select>
- <menu>XBMC.ActivateWindow(MusicOSD)</menu>
- <start>XBMC.ActivateWindow(MusicOSD)</start>
+ <menu>OSD</menu>
+ <start>OSD</start>
<info>Info</info>
<guide>XBMC.ActivateWindow(PVROSDGuide)</guide>
<playlist>XBMC.ActivateWindow(PVROSDChannels)</playlist>