From d24b7155e8764f21abafe98a0a753e3a714e846e Mon Sep 17 00:00:00 2001
From: Kevin Goffe <HitcherUK@gmail.com>
Date: Fri, 8 Feb 2019 09:38:12 +0000
Subject: [PATCH] [skin.confluence] v5.12.1

Fixed 'What's New' for addon info
---
 720p/DialogAddonInfo.xml | 71 ++++++++++++++++------------------------
 720p/Includes.xml        | 12 +++++++
 addon.xml                |  4 +--
 3 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/720p/DialogAddonInfo.xml b/720p/DialogAddonInfo.xml
index dc83ab2..87d5f07 100644
--- a/720p/DialogAddonInfo.xml
+++ b/720p/DialogAddonInfo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<defaultcontrol always="true">9000</defaultcontrol>
+	<onload>ClearProperty(WhatsNew,home)</onload>
 	<coordinates>
 		<left>185</left>
 		<top>40</top>
@@ -64,7 +65,7 @@
 					<top>0</top>
 					<width>440</width>
 					<height>25</height>
-					<label fallback="416">$INFO[ListItem.AddonType]</label>
+					<label fallback="10005">$INFO[ListItem.AddonType]</label>
 					<align>left</align>
 					<aligny>center</aligny>
 					<font>font13</font>
@@ -88,7 +89,7 @@
 					<top>30</top>
 					<width>440</width>
 					<height>25</height>
-					<label fallback="416">$INFO[ListItem.AddonCreator]</label>
+					<label fallback="10005">$INFO[ListItem.AddonCreator]</label>
 					<align>left</align>
 					<aligny>center</aligny>
 					<font>font13</font>
@@ -112,7 +113,7 @@
 					<top>60</top>
 					<width>440</width>
 					<height>25</height>
-					<label fallback="416">$INFO[ListItem.AddonVersion]</label>
+					<label fallback="10005">$INFO[ListItem.AddonVersion]</label>
 					<align>left</align>
 					<aligny>center</aligny>
 					<font>font13</font>
@@ -136,32 +137,7 @@
 					<top>90</top>
 					<width>440</width>
 					<height>25</height>
-					<label fallback="416">$INFO[ListItem.AddonSummary]</label>
-					<align>left</align>
-					<aligny>center</aligny>
-					<font>font13</font>
-					<scrollout>false</scrollout>
-					<pauseatend>2000</pauseatend>
-				</control>
-				<control type="label">
-					<description>News txt</description>
-					<left>10</left>
-					<top>120</top>
-					<width>140</width>
-					<height>25</height>
-					<label>$LOCALIZE[24054]:</label>
-					<align>right</align>
-					<aligny>center</aligny>
-					<font>font13</font>
-					<textcolor>blue</textcolor>
-				</control>
-				<control type="fadelabel">
-					<description>News Value</description>
-					<left>160</left>
-					<top>120</top>
-					<width>440</width>
-					<height>25</height>
-					<label fallback="416">$INFO[ListItem.AddonNews]</label>
+					<label fallback="10005">$INFO[ListItem.AddonSummary]</label>
 					<align>left</align>
 					<aligny>center</aligny>
 					<font>font13</font>
@@ -170,7 +146,7 @@
 				</control>
 				<control type="image">
 					<left>0</left>
-					<top>160</top>
+					<top>130</top>
 					<width>600</width>
 					<height>4</height>
 					<texture>separator.png</texture>
@@ -178,10 +154,10 @@
 				<control type="label">
 					<description>Description txt</description>
 					<left>0</left>
-					<top>170</top>
+					<top>140</top>
 					<width>300</width>
 					<height>25</height>
-					<label>$LOCALIZE[21821]</label>
+					<label>$VAR[AddonInfoHeading]</label>
 					<align>left</align>
 					<aligny>center</aligny>
 					<font>font13</font>
@@ -192,7 +168,7 @@
 					<control type="label">
 						<description>Description Page Count</description>
 						<left>310</left>
-						<top>170</top>
+						<top>140</top>
 						<width>300</width>
 						<height>25</height>
 						<label>$INFO[Container(400).CurrentPage, $LOCALIZE[31024] [COLOR=blue]([/COLOR]]$INFO[Container(400).NumPages,/,[COLOR=blue])[/COLOR]]</label>
@@ -204,18 +180,18 @@
 					<control type="textbox" id="400">
 						<description>Description</description>
 						<left>10</left>
-						<top>197</top>
+						<top>167</top>
 						<width>600</width>
-						<height>188</height>
+						<height>218</height>
 						<font>font13</font>
 						<align>justify</align>
 						<textcolor>white</textcolor>
-						<label>$INFO[ListItem.AddonDescription]</label>
+						<label>$VAR[AddonInfoDescription]</label>
 						<pagecontrol>60</pagecontrol>
 					</control>
 					<control type="scrollbar" id="60">
 						<left>610</left>
-						<top>195</top>
+						<top>165</top>
 						<width>25</width>
 						<height>190</height>
 						<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
@@ -258,7 +234,7 @@
 					<control type="label">
 						<description>Description Page Count</description>
 						<left>310</left>
-						<top>170</top>
+						<top>140</top>
 						<width>300</width>
 						<height>25</height>
 						<label>$INFO[Container(401).CurrentPage, $LOCALIZE[31024] [COLOR=blue]([/COLOR]]$INFO[Container(401).NumPages,/,[COLOR=blue])[/COLOR]]</label>
@@ -270,18 +246,18 @@
 					<control type="textbox" id="401">
 						<description>Description</description>
 						<left>10</left>
-						<top>207</top>
+						<top>177</top>
 						<width>600</width>
-						<height>258</height>
+						<height>288</height>
 						<font>font13</font>
 						<align>left</align>
 						<textcolor>white</textcolor>
-						<label>$INFO[ListItem.AddonDescription]</label>
+						<label>$VAR[AddonInfoDescription]</label>
 						<pagecontrol>61</pagecontrol>
 					</control>
 					<control type="scrollbar" id="61">
 						<left>610</left>
-						<top>205</top>
+						<top>175</top>
 						<width>25</width>
 						<height>260</height>
 						<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
@@ -306,6 +282,17 @@
 				<onup>9000</onup>
 				<ondown>9000</ondown>
 				<itemgap>2</itemgap>
+				<control type="button" id="11">
+					<description>What's New button</description>
+					<width>220</width>
+					<height>43</height>
+					<label>$VAR[AddonInfoButtonLabel]</label>
+					<align>center</align>
+					<font>font12_title</font>
+					<onclick condition="!String.IsEmpty(Window(home).Property(WhatsNew))">ClearProperty(WhatsNew,home)</onclick>
+					<onclick condition="String.IsEmpty(Window(home).Property(WhatsNew))">SetProperty(WhatsNew,True,home)</onclick>
+					<visible>!String.IsEmpty(ListItem.AddonNews)</visible>
+				</control>
 				<control type="button" id="9">
 					<description>Configure Addon</description>
 					<width>220</width>
diff --git a/720p/Includes.xml b/720p/Includes.xml
index 6044cf8..1dba009 100644
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@@ -38,6 +38,18 @@
 	<constant name="DepthFloor">-0.20</constant>
 	<constant name="DepthSideBlade">0.15</constant>
 	<!-- VARIABLES -->
+	<variable name="AddonInfoHeading">
+		<value condition="!String.IsEmpty(Window(home).Property(WhatsNew))">$LOCALIZE[24054]</value>
+		<value>$LOCALIZE[21821]</value>
+	</variable>
+	<variable name="AddonInfoDescription">
+		<value condition="!String.IsEmpty(Window(home).Property(WhatsNew))">$INFO[ListItem.AddonNews]</value>
+		<value>$INFO[ListItem.AddonDescription]</value>
+	</variable>
+	<variable name="AddonInfoButtonLabel">
+		<value condition="!String.IsEmpty(Window(home).Property(WhatsNew))">$LOCALIZE[21821]</value>
+		<value>$LOCALIZE[24054]</value>
+	</variable>
 	<variable name="AddonLabel2">
 		<value condition="!String.IsEmpty(ListItem.Property(Addon.Status))">$INFO[ListItem.Property(Addon.Status)]</value>
 		<value condition="!String.IsEmpty(ListItem.AddonSize)">$INFO[ListItem.AddonSize]</value>
diff --git a/addon.xml b/addon.xml
index 3448511..34f5aa5 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="skin.confluence" version="3.1.5" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
-		<import addon="xbmc.gui" version="5.12.0"/>
+		<import addon="xbmc.gui" version="5.12.1"/>
 	</requires>
 	<extension point="xbmc.gui.skin" debugging="false" effectslowdown="1.0">
 		<res width="1280" height="720" aspect="16:9" default="true" folder="720p" />
@@ -145,6 +145,6 @@
 			<screenshot>resources/screenshot-08.jpg</screenshot>
 			<screenshot>resources/screenshot-09.jpg</screenshot>
 		</assets>
-		<news>Updated language files</news>
+		<news>Fixed 'What's New' for addon info</news>
 	</extension>
 </addon>