From b8f3391e81d2c9d74e61e6b9256c32f6571fc98f Mon Sep 17 00:00:00 2001
From: HitcherUK <HitcherUK@gmail.com>
Date: Sun, 20 Nov 2016 17:27:25 +0000
Subject: [PATCH] [skin.confluence] v3.0.39

- Fixed home Weather item
- Added 'Privacy Policy' to system info
- Updated background video conditions
---
 720p/Home.xml                       |  5 ++--
 720p/IncludesBackgroundBuilding.xml |  8 ++---
 720p/SettingsSystemInfo.xml         | 46 +++++++++++++++++++++++++++++
 addon.xml                           |  4 +--
 changelog.txt                       |  6 ++++
 5 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/720p/Home.xml b/720p/Home.xml
index 7223206..6784aa5 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -962,10 +962,11 @@
 				<content>
 					<item id="7">
 						<label>31950</label>
-						<onclick>ActivateWindow(Weather)</onclick>
+						<onclick condition="!String.IsEmpty(Weather.Plugin)">ActivateWindow(Weather)</onclick>
+						<onclick condition="String.IsEmpty(Weather.Plugin)">ActivateWindow(servicesettings,weather)</onclick>
 						<icon>-</icon>
 						<thumb>-</thumb>
-						<visible>!Skin.HasSetting(HomeMenuNoWeatherButton) + !String.IsEmpty(Weather.Plugin)</visible>
+						<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
 					</item>
 					<item id="4">
 						<label>31951</label>
diff --git a/720p/IncludesBackgroundBuilding.xml b/720p/IncludesBackgroundBuilding.xml
index ae09df9..026d24c 100644
--- a/720p/IncludesBackgroundBuilding.xml
+++ b/720p/IncludesBackgroundBuilding.xml
@@ -28,12 +28,12 @@
 			<fadetime>FanartCrossfadeTime</fadetime>
 			<visible>!Skin.HasSetting(HideBackGroundFanart) + !String.IsEmpty(ListItem.Property(Fanart_Image))</visible>
 			<include>Window_OpenClose_Animation</include>
-			<visible>![Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)]</visible>
+			<visible>![Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasVideo + Window.IsActive(movieinformation)]</visible>
 		</control>
 		<control type="image">
 			<include>BackgroundDimensions</include>
 			<texture>special://skin/backgrounds/media-overlay.jpg</texture>
-			<visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels)</visible>
+			<visible>[Player.HasVideo + !Slideshow.IsActive + !Window.IsActive(movieinformation) + !Skin.HasSetting(ShowBackgroundVideo)] + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels)</visible>
 			<include>VisibleFadeEffect</include>
 		</control>
 		<control type="visualisation">
@@ -50,7 +50,7 @@
 			<top>0</top>
 			<width>1280</width>
 			<height>720</height>
-			<visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo) + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels)</visible>
+			<visible>Player.HasVideo + !Slideshow.IsActive + !Window.IsActive(movieinformation) + !Skin.HasSetting(ShowBackgroundVideo) + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels)</visible>
 		</control>
 		<control type="image">
 			<depth>DepthBackground</depth>
@@ -59,7 +59,7 @@
 			<width>1320</width>
 			<height>120</height>
 			<texture flipy="true" border="1">HomeNowPlayingBack.png</texture>
-			<visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + ![Skin.HasSetting(ShowBackgroundVis) | !String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia))]] | [!Skin.HasSetting(HideBackGroundFanart) + !String.IsEmpty(ListItem.Property(Fanart_Image))]</visible>
+			<visible>[Player.HasVideo + !Slideshow.IsActive + !Window.IsActive(movieinformation) + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + ![Skin.HasSetting(ShowBackgroundVis) | !String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia))]] | [!Skin.HasSetting(HideBackGroundFanart) + !String.IsEmpty(ListItem.Property(Fanart_Image))]</visible>
 			<include>VisibleFadeEffect</include>
 		</control>
 	</include>
diff --git a/720p/SettingsSystemInfo.xml b/720p/SettingsSystemInfo.xml
index df9f2a2..8b1f7f9 100644
--- a/720p/SettingsSystemInfo.xml
+++ b/720p/SettingsSystemInfo.xml
@@ -161,6 +161,22 @@
 					<pulseonselect>false</pulseonselect>
 					<label>19191</label>
 				</control>
+				<control type="button" id="100">
+					<description>Button Privacy Policy</description>
+					<height>60</height>
+					<width>241</width>
+					<textoffsetx>0</textoffsetx>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font13_title</font>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">MenuItemFO.png</texturefocus>
+					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+					<pulseonselect>false</pulseonselect>
+					<label>12389</label>
+					<onright>61</onright>
+				</control>
 			</control>
 			<control type="image">
 				<left>268</left>
@@ -272,6 +288,36 @@
 					<label>-</label>
 					<font>font13</font>
 				</control>
+				<control type="textbox" id="30">
+					<description>Privacy Policy</description>
+					<left>0</left>
+					<top>0</top>
+					<width>720</width>
+					<height>350</height>
+					<font>font13</font>
+					<align>justify</align>
+					<textcolor>white</textcolor>
+					<shadowcolor>black</shadowcolor>
+					<pagecontrol>61</pagecontrol>
+				</control>
+				<control type="scrollbar" id="61">
+					<left>730</left>
+					<top>0</top>
+					<width>25</width>
+					<height>350</height>
+					<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+					<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+					<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+					<textureslidernib>ScrollBarNib.png</textureslidernib>
+					<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+					<onleft>100</onleft>
+					<onright>100</onright>
+					<ondown>61</ondown>
+					<onup>61</onup>
+					<showonepage>true</showonepage>
+					<orientation>vertical</orientation>
+					<visible>Control.HasFocus(100) | Control.HasFocus(61)</visible>
+				</control>
 				<control type="label">
 					<description>CPU Text</description>
 					<left>0</left>
diff --git a/addon.xml b/addon.xml
index c80730d..bb76f9b 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="3.0.38" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="3.0.39" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.12.0"/>
 	</requires>
@@ -145,6 +145,6 @@
 			<screenshot>resources/screenshot-08.jpg</screenshot>
 			<screenshot>resources/screenshot-09.jpg</screenshot>
 		</assets>
-		<news>Added screenshots</news>
+		<news>Fixed home Weather item / Added 'Privacy Policy' to system info / Updated background video conditions</news>
 	</extension>
 </addon>
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 0cda13e..27937c5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+[B]3.0.39[/B]
+
+- Fixed home Weather item
+- Added 'Privacy Policy' to system info
+- Updated background video conditions
+
 [B]3.0.38[/B]
 
 - Fix using DeafultUser.png added in v3.0.6 and remove unknown-user.png