Update game.controller.default to v1.0.4

6 files changed, 32 insertions, 30 deletions

diff --git a/addons/game.controller.default/addon.xml b/addons/game.controller.default/addon.xml
index ead5c9e729..616a288012 100644
--- a/addons/game.controller.default/addon.xml
+++ b/addons/game.controller.default/addon.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="game.controller.default"
         name="Default Controller"
-        version="1.0.3"
+        version="1.0.4"
         provider-name="Team Kodi">
     <requires>
     </requires>
     <extension point="kodi.game.controller" library="resources/layout.xml"/>
     <extension point="xbmc.addon.metadata">
-        <summary>Default Controller</summary>
-        <description>The default media center controller is based on the Xbox 360 controller.</description>
-        <disclaimer></disclaimer>
+        <summary lang="en_GB">Default Controller</summary>
+        <description lang="en_GB">The default media center controller is based on the Xbox 360 controller.</description>
+        <disclaimer>Image credit: Wikipedia (wikipedia.org)</disclaimer>
         <platform>all</platform>
-        <nofanart>true</nofanart>
+        <assets>
+            <icon>resources/icon.png</icon>
+        </assets>
     </extension>
 </addon>
diff --git a/addons/game.controller.default/icon.png b/addons/game.controller.default/icon.png
deleted file mode 100644
index 18264c592e..0000000000
--- a/addons/game.controller.default/icon.png
+++ /dev/null
diff --git a/addons/game.controller.default/resources/icon.png b/addons/game.controller.default/resources/icon.png
new file mode 100644
index 0000000000..16a851a9d6
--- /dev/null
+++ b/addons/game.controller.default/resources/icon.png
diff --git a/addons/game.controller.default/resources/language/resource.language.en_gb/strings.po b/addons/game.controller.default/resources/language/resource.language.en_gb/strings.po
index 6cced45926..b1238e4c4f 100644
--- a/addons/game.controller.default/resources/language/resource.language.en_gb/strings.po
+++ b/addons/game.controller.default/resources/language/resource.language.en_gb/strings.po
@@ -1,14 +1,14 @@
-# XBMC Media Center language file
-# Addon Name: Default controller
+# Kodi Media Center language file
+# Addon Name: Default Controller
 # Addon id: game.controller.default
-# Addon Provider: Libretro Team
+# Addon Provider: Team Kodi
 msgid ""
 msgstr ""
-"Project-Id-Version: Libretro Clients\n"
+"Project-Id-Version: game.controller.default\n"
 "Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: 2014-05-30 17:00+8\n"
 "PO-Revision-Date: 2014-05-30 17:00+8\n"
-"Last-Translator: XBMC Translation Team\n"
+"Last-Translator: Kodi Translation Team\n"
 "Language-Team: English (http://www.transifex.com/projects/p/xbmc-addons/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/addons/game.controller.default/resources/layout.png b/addons/game.controller.default/resources/layout.png
index ff5c6b9240..3e041a1571 100644
--- a/addons/game.controller.default/resources/layout.png
+++ b/addons/game.controller.default/resources/layout.png
diff --git a/addons/game.controller.default/resources/layout.xml b/addons/game.controller.default/resources/layout.xml
index 0ceab7b62b..f95304785a 100644
--- a/addons/game.controller.default/resources/layout.xml
+++ b/addons/game.controller.default/resources/layout.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<layout name="default" label="30000" image="layout.png">
+<layout label="30000" image="layout.png">
   <category name="face" label="35074">
-    <button name="a" type="digital" label="30001" geometry="circle" x="651" y="266" radius="32"/>
-    <button name="b" type="digital" label="30002" geometry="circle" x="709" y="210" radius="32"/>
-    <button name="x" type="digital" label="30003" geometry="circle" x="583" y="210" radius="32"/>
-    <button name="y" type="digital" label="30004" geometry="circle" x="651" y="158" radius="32"/>
-    <button name="start" type="digital" label="30005" geometry="ellipse" x="478" y="227" rx="22" ry="16"/>
-    <button name="back" type="digital" label="30006" geometry="ellipse" x="290" y="227" rx="22" ry="16"/>
-    <button name="guide" type="digital" label="30007" geometry="circle" x="386" y="221" radius="50"/>
-    <button name="up" type="digital" label="30010" geometry="circle" x="117" y="234" r="52"/>
-    <button name="right" type="digital" label="30012" geometry="rectangle" x1="233" y1="288" x2="281" y2="332"/>
-    <button name="down" type="digital" label="30011" geometry="circle" x="500" y="342" r="52"/>
-    <button name="left" type="digital" label="30013" geometry="rectangle" x1="233" y1="353" x2="281" y2="397"/>
-    <button name="leftthumb" type="digital" label="30008" geometry="rectangle" x1="131" y1="0" x2="194" y2="40"/>
-    <button name="rightthumb" type="digital" label="30009" geometry="rectangle" x1="567" y1="0" x2="631" y2="40"/>
+    <button name="a" type="digital" label="30001"/>
+    <button name="b" type="digital" label="30002"/>
+    <button name="x" type="digital" label="30003"/>
+    <button name="y" type="digital" label="30004"/>
+    <button name="start" type="digital" label="30005"/>
+    <button name="back" type="digital" label="30006"/>
+    <button name="guide" type="digital" label="30007"/>
+    <button name="up" type="digital" label="30010"/>
+    <button name="right" type="digital" label="30012"/>
+    <button name="down" type="digital" label="30011"/>
+    <button name="left" type="digital" label="30013"/>
+    <button name="leftthumb" type="digital" label="30008"/>
+    <button name="rightthumb" type="digital" label="30009"/>
   </category>
   <category name="shoulder" label="35075">
-    <button name="leftbumper" type="digital" label="30014" geometry="rectangle" x1="272" y1="321" x2="316" y2="365"/>
-    <button name="rightbumper" type="digital" label="30015" geometry="rectangle" x1="198" y1="321" x2="242" y2="365"/>
+    <button name="leftbumper" type="digital" label="30014"/>
+    <button name="rightbumper" type="digital" label="30015"/>
   </category>
   <category name="triggers" label="35076">
-    <button name="lefttrigger" type="analog" label="30016" geometry="rectangle" x1="36" y1="40" x2="207" y2="108"/>
-    <button name="righttrigger" type="analog" label="30017" geometry="rectangle" x1="556" y1="40" x2="728" y2="108"/>
+    <button name="lefttrigger" type="analog" label="30016"/>
+    <button name="righttrigger" type="analog" label="30017"/>
   </category>
   <category name="analogsticks" label="35077">
-    <analogstick name="leftstick" label="30008" geometry="circle" x="500" y="342" r="52"/>
-    <analogstick name="rightstick" label="30009" geometry="circle" x="500" y="342" r="52"/>
+    <analogstick name="leftstick" label="30008"/>
+    <analogstick name="rightstick" label="30009"/>
   </category>
   <category name="haptics">
     <motor name="leftmotor"/>