Skip to content
Browse files

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

  • Loading branch information...
2 parents 1d1f51c + 1b0a3b5 commit f24b4cd523a645617ae00cd14fe66377fee432d6 @MartijnKaijser MartijnKaijser committed Sep 4, 2012
Showing with 7 additions and 2 deletions.
  1. +1 −1 addon.xml
  2. +3 −0 changelog.txt
  3. +1 −1 resources/lib/settings.py
  4. +2 −0 resources/settings.xml
View
2 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>
View
3 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
View
2 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'
View
2 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 -->

0 comments on commit f24b4cd

Please sign in to comment.
Something went wrong with that request. Please try again.