added: back button now closes addon dialogs. Thanks for the patch for remote.xml to hjbotha!

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@32154 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

10 files changed, 115 insertions, 0 deletions

diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml
index 7814d61745..4d02b251f7 100644
--- a/system/keymaps/gamepad.xml
+++ b/system/keymaps/gamepad.xml
@@ -337,6 +337,16 @@
       <B>PreviousMenu</B>
     </gamepad>
   </Settings>
+  <AddonInformation>
+    <gamepad>
+      <b>Close</b>
+    </gamepad>
+  </AddonInformation>
+  <AddonSettings>
+    <gamepad>
+      <b>Close</b>
+    </gamepad>
+  </AddonSettings>
   <MyPicturesSettings>
     <gamepad>
       <B>PreviousMenu</B>
diff --git a/system/keymaps/joystick.AppleRemote.xml b/system/keymaps/joystick.AppleRemote.xml
index 75355487df..0218c7d828 100644
--- a/system/keymaps/joystick.AppleRemote.xml
+++ b/system/keymaps/joystick.AppleRemote.xml
@@ -258,4 +258,14 @@
       <button id="6">ParentDir</button>
     </joystick>
   </AddonBrowser>
+  <AddonInformation>
+    <joystick name="AppleRemote">
+      <button id="6">Close</button>
+    </joystick>
+  </AddonInformation>
+  <AddonSettings>
+    <joystick name="AppleRemote">
+      <button id="6">Close</button>
+    </joystick>
+  </AddonSettings>
 </keymap>
diff --git a/system/keymaps/joystick.Harmony.xml b/system/keymaps/joystick.Harmony.xml
index 41fef57176..3824a077c3 100644
--- a/system/keymaps/joystick.Harmony.xml
+++ b/system/keymaps/joystick.Harmony.xml
@@ -478,4 +478,14 @@
       <!-- Prev		-->      <button id="32">Close</button>
     </joystick>
   </PictureInfo>
+  <AddonInformation>
+    <joystick name="Harmony">
+      <!-- Prev		-->      <button id="32">Close</button>
+    </joystick>
+  </AddonInformation>
+  <AddonSettings>
+    <joystick name="Harmony">
+      <!-- Prev		-->      <button id="32">Close</button>
+    </joystick>
+  </AddonSettings>
 </keymap>
diff --git a/system/keymaps/joystick.Logitech.RumblePad.2.xml b/system/keymaps/joystick.Logitech.RumblePad.2.xml
index be4e8678cd..1874a9fb43 100644
--- a/system/keymaps/joystick.Logitech.RumblePad.2.xml
+++ b/system/keymaps/joystick.Logitech.RumblePad.2.xml
@@ -237,4 +237,17 @@
       <button id="3">Close</button>
     </joystick>
   </PictureInfo>
+
+  <AddonInformation>
+    <joystick name="Logitech Logitech Cordless RumblePad 2">
+      <button id="3">Close</button>
+    </joystick>
+  </AddonInformation>
+
+  <AddonSettings>
+    <joystick name="Logitech Logitech Cordless RumblePad 2">
+      <button id="3">Close</button>
+    </joystick>
+  </AddonSettings>
+
 </keymap>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
index d313661697..8d3b8eab86 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
@@ -304,6 +304,16 @@
       <button id="2">PreviousMenu</button>
     </joystick>
   </Settings>
+  <AddonInformation>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <button id="2">Close</button>
+    </joystick>
+  </AddonInformation>
+  <AddonSettings>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <button id="2">Close</button>
+    </joystick>
+  </AddonSettings>
   <MyPicturesSettings>
     <joystick name="Xbox 360 Wireless Receiver">
       <button id="2">PreviousMenu</button>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
index 503cee7bd5..743389a1c2 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
@@ -400,6 +400,22 @@
       <button id="2">PreviousMenu</button>
     </joystick>
   </Settings>
+  <AddonInformation>
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <altname>Microsoft X-Box pad (Japan)</altname> 
+      <button id="2">Close</button>
+    </joystick>
+  </AddonInformation>
+  <AddonSettings>
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <altname>Microsoft X-Box pad (Japan)</altname> 
+      <button id="2">Close</button>
+    </joystick>
+  </AddonSettings>
   <MyPicturesSettings>
     <joystick name="Microsoft Xbox Controller S">
       <altname>Mad Catz MicroCON</altname>
diff --git a/system/keymaps/joystick.PS3.Remote.Keyboard.xml b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
index 2fecd01147..f15a86c8ff 100644
--- a/system/keymaps/joystick.PS3.Remote.Keyboard.xml
+++ b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
@@ -170,6 +170,22 @@
     </joystick>
   </Settings>
 
+  <AddonInformation>
+    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
+      <altname>PS3 Remote Keyboard</altname>
+      <altname>MoSart PS3 Remote Keyboard</altname>
+      <button id="3">Close</button>
+    </joystick>
+  </AddonInformation>
+
+  <AddonSettings>
+    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
+      <altname>PS3 Remote Keyboard</altname>
+      <altname>MoSart PS3 Remote Keyboard</altname>
+      <button id="3">Close</button>
+    </joystick>
+  </AddonSettings>
+
   <MyPicturesSettings>
     <joystick name="PLAYSTATION(R)3 Remote Keyboard">
       <altname>PS3 Remote Keyboard</altname>
diff --git a/system/keymaps/joystick.WiiRemote.xml b/system/keymaps/joystick.WiiRemote.xml
index c61cf9794e..e9a71aec26 100644
--- a/system/keymaps/joystick.WiiRemote.xml
+++ b/system/keymaps/joystick.WiiRemote.xml
@@ -263,4 +263,14 @@
       <button id="6">Close</button>
     </joystick>
   </PictureInfo>
+  <AddonInformation>
+    <joystick name="WiiRemote">
+      <button id="6">Close</button>
+    </joystick>
+  </AddonInformation>
+  <AddonSettings>
+    <joystick name="WiiRemote">
+      <button id="6">Close</button>
+    </joystick>
+  </AddonSettings>
 </keymap>
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index 12c47c90e1..19390ee8e1 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -482,6 +482,16 @@
       <key id='65446'>Close</key>
     </keyboard>
   </MovieInformation>
+  <AddonInformation>
+    <keyboard>
+      <backspace>Close</backspace>
+    </keyboard>
+  </AddonInformation>
+  <AddonSettings>
+    <keyboard>
+      <backspace>Close</backspace>
+    </keyboard>
+  </AddonSettings>
   <LockSettings>
     <keyboard>
       <escape>Close</escape>
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index 33be211666..224029dbc1 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -365,6 +365,16 @@
     <remote>
     </remote>
   </AddonBrowser>
+  <AddonInformation>
+    <remote>
+      <back>Close</back>
+    </remote>
+  </AddonInformation>
+  <AddonSettings>
+    <remote>
+      <back>Close</back>
+    </remote>
+  </AddonSettings>
   <MyPicturesSettings>
     <remote>
       <back>PreviousMenu</back>