Merge remote-tracking branch 'upstream/master' into stable

XBMC-Addons · Sep 4, 2012 · f24b4cd · f24b4cd
2 parents 1d1f51c + 1b0a3b5
commit f24b4cd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/addon.xml b/addon.xml
@@ -2,7 +2,7 @@
 <addon
 	id="script.artwork.downloader"
 	name="Artwork Downloader"
-	version="1.0.16"
+	version="1.0.17"
 	provider-name="paddycarey, putneyj, Martijn"
     >
   <requires>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.0.17[/B]
+- Forgot to update settings.xml
+
 [B]1.0.16[/B]
 - Added: Movie Thumb
 - Added: Movie Banner

diff --git a/resources/lib/settings.py b/resources/lib/settings.py
@@ -31,7 +31,7 @@ def _get_artwork(self):
         self.movie_clearart         = __addon__.getSetting("movie_clearart")        == 'true'
         self.movie_discart          = __addon__.getSetting("movie_discart")         == 'true'
         self.movie_thumb            = __addon__.getSetting("movie_thumb")           == 'true'
-        self.movie_banner            = __addon__.getSetting("movie_banner")          == 'true'
+        self.movie_banner           = __addon__.getSetting("movie_banner")          == 'true'
 
         self.tvshow_enable          = __addon__.getSetting("tvshow_enable")         == 'true'
         self.tvshow_poster          = __addon__.getSetting("tvshow_poster")         == 'true'

diff --git a/resources/settings.xml b/resources/settings.xml
@@ -47,6 +47,8 @@
         <setting label="32126" type="bool"      id="movie_logo"                 subsetting="true" enable="eq(-5,true)"  default="false"/>
         <setting label="32125" type="bool"      id="movie_clearart"             subsetting="true" enable="eq(-6,true)"  default="true" />
         <setting label="32132" type="bool"      id="movie_discart"              subsetting="true" enable="eq(-7,true)"  default="false"/>
+        <setting label="32123" type="bool"      id="movie_banner"               subsetting="true" enable="eq(-8,true)"  default="false" />
+        <setting label="32130" type="bool"      id="movie_thumb"                subsetting="true" enable="eq(-9,true)"  default="false"/>
     </category>
 
 <!-- Plugin settings: TV Show section -->