Changed: [Confluence] Greatly simplified the way fanart works throughout the skin, Instead of having settings to enable/disable it for all different content types (Movies, Tvshows, Music) it has all been put under 1 skin setting in System\skin\General. This also gives the added bonus of addons and anything else can set ListItem.Property(Fanart_Image) and it will show if the main setting is enabled

7 files changed, 73 insertions, 150 deletions

diff --git a/addons/skin.confluence/720p/AddonBrowser.xml b/addons/skin.confluence/720p/AddonBrowser.xml
index 8de224a7f0..d95c48cd37 100644
--- a/addons/skin.confluence/720p/AddonBrowser.xml
+++ b/addons/skin.confluence/720p/AddonBrowser.xml
@@ -4,16 +4,6 @@
 	<views>50,51,550</views>
 	<controls>
 		<include>CommonSettingsBackground</include>
-		<control type="image">
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>1280</width>
-			<height>720</height>
-			<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
-			<include>backgroundfade</include>
-			<fadetime>FanartCrossfadeTime</fadetime>
-			<include>Window_OpenClose_Animation</include>		
-		</control>
 		<include>CommonMediaPlayingBackground</include>
 		<control type="group">
 			<include>Window_OpenClose_Animation</include>		
diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml
index e91a5415bf..ec2be8b7d8 100644
--- a/addons/skin.confluence/720p/MyMusicNav.xml
+++ b/addons/skin.confluence/720p/MyMusicNav.xml
@@ -4,29 +4,6 @@
 	<views>50,500,550,509,506,511,512,513</views>
 	<controls>
 		<include>CommonMusicBackground</include>
-		<control type="group">
-			<include>Window_OpenClose_Animation</include>		
-			<control type="image">
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>1280</width>
-				<height>720</height>
-				<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
-				<include>backgroundfade</include>
-				<fadetime>FanartCrossfadeTime</fadetime>
-				<visible>!Skin.HasSetting(MusicLibraryFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible>
-			</control>
-			<control type="image">
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>1280</width>
-				<height>720</height>
-				<texture background="true">$INFO[Fanart.Image]</texture>
-				<include>backgroundfade</include>
-				<fadetime>FanartCrossfadeTime</fadetime>
-				<visible>!Skin.HasSetting(MusicLibraryFanart) + !IsEmpty(Fanart.Image)</visible>
-			</control>
-		</control>
 		<include>CommonMediaPlayingBackground</include>
 		<control type="group">
 			<include>Window_OpenClose_Animation</include>		
@@ -188,14 +165,7 @@
 						<textcolor>dialogheader</textcolor>
 						<align>center</align>
 						<aligny>center</aligny>
-					</control>
-					<control type="radiobutton" id="201">
-						<description>Toggle Fanart</description>
-						<textwidth>170</textwidth>
-						<include>ButtonMediaSubCommonValues</include>
-						<label>31307</label>
-						<onclick>Skin.ToggleSetting(MusicLibraryFanart)</onclick>
-						<selected>Skin.HasSetting(MusicLibraryFanart)</selected>
+						<visible>Control.IsVisible(512) + Container.Content(Artists)</visible>
 					</control>
 					<control type="radiobutton" id="202">
 						<description>Toggle Fanart</description>
diff --git a/addons/skin.confluence/720p/MyVideo.xml b/addons/skin.confluence/720p/MyVideo.xml
index 6be283da29..49eb057c28 100644
--- a/addons/skin.confluence/720p/MyVideo.xml
+++ b/addons/skin.confluence/720p/MyVideo.xml
@@ -4,20 +4,9 @@
 	<views>50,51,550,560,500,501,508,505</views>
 	<controls>
 		<include>CommonVideoBackground</include>
-		<control type="image">
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>1280</width>
-			<height>720</height>
-			<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
-			<include>backgroundfade</include>
-			<fadetime>FanartCrossfadeTime</fadetime>
-			<visible>!Skin.HasSetting(VideoFilesFanart) | Control.IsVisible(508)</visible>
-			<include>Window_OpenClose_Animation</include>		
-		</control>
 		<include>CommonMediaPlayingBackground</include>
 		<control type="group">
-			<include>Window_OpenClose_Animation</include>		
+			<include>Window_OpenClose_Animation</include>
 			<control type="image">
 				<posx>0</posx>
 				<posy>0</posy>
@@ -172,24 +161,6 @@
 						<include>ButtonMediaSubCommonValues</include>
 						<label>346</label>
 					</control>
-					<control type="label" id="200">
-						<width>220</width>
-						<height>45</height>
-						<font>font12caps</font>
-						<label>14018</label>
-						<textcolor>dialogheader</textcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-					</control>
-					<control type="radiobutton" id="201">
-						<description>Toggle Fanart</description>
-						<textwidth>170</textwidth>
-						<include>ButtonMediaSubCommonValues</include>
-						<label>31307</label>
-						<onclick>Skin.ToggleSetting(VideoFilesFanart)</onclick>
-						<selected>Skin.HasSetting(VideoFilesFanart)</selected>
-						<visible>!Control.IsVisible(508)</visible>
-					</control>
 				</control>
 			</control>
 			<control type="button" id="8999">
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml
index 833bf20ee6..343c2b233c 100644
--- a/addons/skin.confluence/720p/MyVideoNav.xml
+++ b/addons/skin.confluence/720p/MyVideoNav.xml
@@ -4,57 +4,9 @@
 	<views>50,500,550,560,501,508,504,503,505,511</views>
 	<controls>
 		<include>CommonVideoBackground</include>
-		<control type="group">
-			<include>Window_OpenClose_Animation</include>		
-			<control type="image">
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>1280</width>
-				<height>720</height>
-				<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
-				<include>backgroundfade</include>
-				<fadetime>FanartCrossfadeTime</fadetime>
-				<visible>!Skin.HasSetting(VideoLibraryMovieFanart) | Control.IsVisible(508)</visible>
-				<visible>Container.Content(Movies)</visible>
-			</control>
-			<control type="image">
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>1280</width>
-				<height>720</height>
-				<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
-				<include>backgroundfade</include>
-				<fadetime>FanartCrossfadeTime</fadetime>
-				<visible>!Skin.HasSetting(VideoLibraryTVFanart)</visible>
-				<visible>Container.Content(TVShows) | [Container.Content(Episodes) + stringcompare(Container.FolderPath,videodb://5/)]</visible>
-			</control>
-			<control type="image">
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>1280</width>
-				<height>720</height>
-				<info>Fanart.Image</info>
-				<texture background="true">$INFO[Fanart.Image]</texture>
-				<include>backgroundfade</include>
-				<fadetime>FanartCrossfadeTime</fadetime>
-				<visible>!Skin.HasSetting(VideoLibraryTVFanart)</visible>
-				<visible>Container.Content(Seasons) | [Container.Content(Episodes) + !stringcompare(Container.FolderPath,videodb://5/)]</visible>
-			</control>
-			<control type="image">
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>1280</width>
-				<height>720</height>
-				<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
-				<include>backgroundfade</include>
-				<fadetime>FanartCrossfadeTime</fadetime>
-				<visible>!Skin.HasSetting(VideoLibraryMusicVideoFanart)</visible>
-				<visible>Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums)</visible>
-			</control>
-		</control>
 		<include>CommonMediaPlayingBackground</include>
 		<control type="group">
-			<include>Window_OpenClose_Animation</include>		
+			<include>Window_OpenClose_Animation</include>
 			<control type="image">
 				<posx>0</posx>
 				<posy>0</posy>
@@ -254,34 +206,7 @@
 						<textcolor>dialogheader</textcolor>
 						<align>center</align>
 						<aligny>center</aligny>
-						<visible>Control.IsVisible(201) | Control.IsVisible(202) | Control.IsVisible(203) | Control.IsVisible(204) | Control.IsVisible(205)</visible>
-					</control>
-					<control type="radiobutton" id="201">
-						<description>Toggle MoviesFanart</description>
-						<textwidth>170</textwidth>
-						<include>ButtonMediaSubCommonValues</include>
-						<label>31307</label>
-						<onclick>Skin.ToggleSetting(VideoLibraryMovieFanart)</onclick>
-						<selected>Skin.HasSetting(VideoLibraryMovieFanart)</selected>
-						<visible>Container.Content(Movies) + !Control.IsVisible(508)</visible>
-					</control>
-					<control type="radiobutton" id="202">
-						<description>Toggle TVShow Fanart</description>
-						<textwidth>170</textwidth>
-						<include>ButtonMediaSubCommonValues</include>
-						<label>31307</label>
-						<onclick>Skin.ToggleSetting(VideoLibraryTVFanart)</onclick>
-						<selected>Skin.HasSetting(VideoLibraryTVFanart)</selected>
-						<visible>Container.Content(TVShows) | Container.Content(Seasons) | Container.Content(Episodes)</visible>
-					</control>
-					<control type="radiobutton" id="203">
-						<description>Toggle MusicVideo Fanart</description>
-						<textwidth>170</textwidth>
-						<include>ButtonMediaSubCommonValues</include>
-						<label>31307</label>
-						<onclick>Skin.ToggleSetting(VideoLibraryMusicVideoFanart)</onclick>
-						<selected>Skin.HasSetting(VideoLibraryMusicVideoFanart)</selected>
-						<visible>Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums)</visible>
+						<visible>Control.IsVisible(204) | Control.IsVisible(205)</visible>
 					</control>
 					<control type="radiobutton" id="204">
 						<description>Toggle Fanart</description>
diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
index b7f2823637..f9dcdded96 100644
--- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
+++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
@@ -255,6 +255,18 @@
 						<onclick>Skin.ToggleSetting(HideFilenameFlagging)</onclick>
 						<selected>Skin.HasSetting(HideFilenameFlagging)</selected>
 					</control>
+					<control type="radiobutton" id="114">
+						<width>750</width>
+						<height>40</height>
+						<font>font13</font>
+						<label>31119</label>
+						<textcolor>grey2</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<texturefocus>MenuItemFO.png</texturefocus>
+						<texturenofocus>MenuItemNF.png</texturenofocus>
+						<onclick>Skin.ToggleSetting(HideBackGroundFanart)</onclick>
+						<selected>Skin.HasSetting(HideBackGroundFanart)</selected>
+					</control>
 					<control type="label" id="104">
 						<width>750</width>
 						<height>45</height>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index 11dda73aa0..b863f10e79 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -68,7 +68,18 @@
 			<timeperimage>10000</timeperimage>
 			<randomize>true</randomize>
 			<fadetime>1000</fadetime>
-			<visible>[Container.Content(TVShows) | Container.Content(Seasons) |Container.Content(Episodes)] + [!IsEmpty(Skin.String(Home_Custom_Back_TVShow_Folder) + Skin.HasSetting(HomeMenuNoTVShowsButton)])</visible>
+			<visible>[Container.Content(TVShows) | Container.Content(Seasons) | Container.Content(Episodes)] + [!IsEmpty(Skin.String(Home_Custom_Back_TVShow_Folder) + Skin.HasSetting(HomeMenuNoTVShowsButton)])</visible>
+		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>1280</width>
+			<height>720</height>
+			<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
+			<include>backgroundfade</include>
+			<fadetime>FanartCrossfadeTime</fadetime>
+			<visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible>
+			<include>Window_OpenClose_Animation</include>
 		</control>
 	</include>
 	<include name="CommonMusicBackground">
@@ -82,6 +93,17 @@
 			<randomize>true</randomize>
 			<fadetime>1000</fadetime>
 		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>1280</width>
+			<height>720</height>
+			<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
+			<include>backgroundfade</include>
+			<fadetime>FanartCrossfadeTime</fadetime>
+			<visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible>
+			<include>Window_OpenClose_Animation</include>
+		</control>
 	</include>
 	<include name="CommonPictureBackground">
 		<control type="multiimage">
@@ -94,6 +116,17 @@
 			<randomize>true</randomize>
 			<fadetime>1000</fadetime>
 		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>1280</width>
+			<height>720</height>
+			<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
+			<include>backgroundfade</include>
+			<fadetime>FanartCrossfadeTime</fadetime>
+			<visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible>
+			<include>Window_OpenClose_Animation</include>
+		</control>
 	</include>
 	<include name="CommonProgramsBackground">
 		<control type="multiimage">
@@ -106,6 +139,17 @@
 			<randomize>true</randomize>
 			<fadetime>1000</fadetime>
 		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>1280</width>
+			<height>720</height>
+			<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
+			<include>backgroundfade</include>
+			<fadetime>FanartCrossfadeTime</fadetime>
+			<visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible>
+			<include>Window_OpenClose_Animation</include>
+		</control>
 	</include>
 	<include name="CommonScriptBackground">
 		<control type="multiimage">
@@ -155,6 +199,17 @@
 			<randomize>true</randomize>
 			<fadetime>1000</fadetime>
 		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>1280</width>
+			<height>720</height>
+			<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
+			<include>backgroundfade</include>
+			<fadetime>FanartCrossfadeTime</fadetime>
+			<visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible>
+			<include>Window_OpenClose_Animation</include>
+		</control>
 	</include>
 	<include name="BehindDialogFadeOut">
 		<control type="image">
diff --git a/addons/skin.confluence/language/English/strings.xml b/addons/skin.confluence/language/English/strings.xml
index ae6ddbc62a..1dc8304afb 100644
--- a/addons/skin.confluence/language/English/strings.xml
+++ b/addons/skin.confluence/language/English/strings.xml
@@ -69,7 +69,7 @@
   <string id="31116"></string>
   <string id="31117">Show Recently added Videos</string>
   <string id="31118">Home Page Programs Submenu</string>
-  <string id="31119"></string>  <!-- blanked 2010-11-12 -->
+  <string id="31119">Hide Background Fanart</string>
   <string id="31120">BUTTON LABEL</string>
   <string id="31121"></string>  <!-- blanked 2010-11-12 -->
   <string id="31122">Weather Page</string>