From 96b6fee4fdab02f125821e7a5eb5a647a6598f8e Mon Sep 17 00:00:00 2001
From: HitcherUK <HitcherUK@gmail.com>
Date: Mon, 29 Aug 2016 11:51:35 +0100
Subject: [PATCH] [skin.confluence] v3.0.36

- Added customisable home submenus that use library nodes
- Added news feature
---
 720p/DialogAddonInfo.xml       | 27 +++++++++-
 720p/Home.xml                  | 39 ++++++++++++++
 720p/Includes.xml              |  1 +
 720p/IncludesHomeMenuItems.xml | 92 +++++++++++++++++++---------------
 addon.xml                      |  3 +-
 changelog.txt                  |  5 ++
 6 files changed, 124 insertions(+), 43 deletions(-)

diff --git a/720p/DialogAddonInfo.xml b/720p/DialogAddonInfo.xml
index 4c9bb76..dc83ab2 100644
--- a/720p/DialogAddonInfo.xml
+++ b/720p/DialogAddonInfo.xml
@@ -45,7 +45,7 @@
 			</control>
 			<control type="group">
 				<left>270</left>
-				<top>130</top>
+				<top>115</top>
 				<control type="label">
 					<description>Type txt</description>
 					<left>10</left>
@@ -143,6 +143,31 @@
 					<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>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<scrollout>false</scrollout>
+					<pauseatend>2000</pauseatend>
+				</control>
 				<control type="image">
 					<left>0</left>
 					<top>160</top>
diff --git a/720p/Home.xml b/720p/Home.xml
index 63c9586..537f4e0 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -6,6 +6,45 @@
 	<onunload condition="Control.HasFocus(9000) + Container(9000).Hasfocus(2)">ClearProperty(VideosDirectLink)</onunload>
 	<onunload condition="Control.HasFocus(9000) + Container(9000).Hasfocus(3)">ClearProperty(MusicDirectLink)</onunload>
 	<controls>
+		<control type="list" id="90160">
+			<left>-10</left>
+			<top>-10</top>
+			<width>1</width>
+			<height>1</height>
+			<viewtype label="535">list</viewtype>
+			<itemlayout height="1" width="1">
+			</itemlayout>
+			<focusedlayout height="1" width="1">
+			</focusedlayout>
+			<content target="video" limit="6">library://video/movies/</content>
+			<visible>Library.HasContent(Movies)</visible>
+		</control>
+		<control type="list" id="90170">
+			<left>-10</left>
+			<top>-10</top>
+			<width>1</width>
+			<height>1</height>
+			<viewtype label="535">list</viewtype>
+			<itemlayout height="1" width="1">
+			</itemlayout>
+			<focusedlayout height="1" width="1">
+			</focusedlayout>
+			<content target="video" limit="6">library://video/tvshows/</content>
+			<visible>Library.HasContent(TVShows)</visible>
+		</control>
+		<control type="list" id="90110">
+			<left>-10</left>
+			<top>-10</top>
+			<width>1</width>
+			<height>1</height>
+			<viewtype label="535">list</viewtype>
+			<itemlayout height="1" width="1">
+			</itemlayout>
+			<focusedlayout height="1" width="1">
+			</focusedlayout>
+			<content target="video" limit="6">library://music/</content>
+			<visible>Library.HasContent(Music)</visible>
+		</control>
 		<include>CommonBackground</include>
 		<control type="image">
 			<depth>DepthFloor</depth>
diff --git a/720p/Includes.xml b/720p/Includes.xml
index 76bf04d..a777cdb 100644
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@@ -338,6 +338,7 @@
 		<font>font12</font>
 		<textcolor>grey2</textcolor>
 		<focusedcolor>white</focusedcolor>
+		<scroll>true</scroll>
 		<texturefocus border="5">HomeSubFO.png</texturefocus>
 		<texturenofocus border="5">HomeSubNF.png</texturenofocus>
 		<pulseonselect>false</pulseonselect>
diff --git a/720p/IncludesHomeMenuItems.xml b/720p/IncludesHomeMenuItems.xml
index 2377816..bd71348 100644
--- a/720p/IncludesHomeMenuItems.xml
+++ b/720p/IncludesHomeMenuItems.xml
@@ -54,34 +54,38 @@
 		</control>
 		<control type="button" id="90162">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>31328</label>
-			<onclick>ActivateWindow(Videos,RecentlyAddedMovies,return)</onclick>
+			<label>$INFO[Container(90160).ListItemNoWrap(0).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90160).ListItemNoWrap(0).FileNameAndPath],return)</onclick>
 		</control>
 		<control type="button" id="90163">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>20434</label>
-			<onclick>ActivateWindow(Videos,MovieSets,return)</onclick>
-			<visible>Library.HasContent(MovieSets)</visible>
+			<label>$INFO[Container(90160).ListItemNoWrap(1).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90160).ListItemNoWrap(1).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90160).ListItemNoWrap(1).Label)</visible>
 		</control>
 		<control type="button" id="90164">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>369</label>
-			<onclick>ActivateWindow(Videos,MovieTitles,return)</onclick>
+			<label>$INFO[Container(90160).ListItemNoWrap(2).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90160).ListItemNoWrap(2).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90160).ListItemNoWrap(2).Label)</visible>
 		</control>
 		<control type="button" id="90165">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>135</label>
-			<onclick>ActivateWindow(Videos,MovieGenres,return)</onclick>
+			<label>$INFO[Container(90160).ListItemNoWrap(3).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90160).ListItemNoWrap(3).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90160).ListItemNoWrap(3).Label)</visible>
 		</control>
 		<control type="button" id="90166">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>652</label>
-			<onclick>ActivateWindow(Videos,MovieYears,return)</onclick>
+			<label>$INFO[Container(90160).ListItemNoWrap(4).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90160).ListItemNoWrap(4).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90160).ListItemNoWrap(4).Label)</visible>
 		</control>
 		<control type="button" id="90167">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>344</label>
-			<onclick>ActivateWindow(Videos,MovieActors,return)</onclick>
+			<label>$INFO[Container(90160).ListItemNoWrap(5).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90160).ListItemNoWrap(5).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90160).ListItemNoWrap(5).Label)</visible>
 		</control>
 		<control type="image" id="90168">
 			<width>35</width>
@@ -97,33 +101,38 @@
 		</control>
 		<control type="button" id="90172">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>31328</label>
-			<onclick>ActivateWindow(Videos,RecentlyAddedEpisodes,return)</onclick>
+			<label>$INFO[Container(90170).ListItemNoWrap(0).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90170).ListItemNoWrap(0).FileNameAndPath],return)</onclick>
 		</control>
 		<control type="button" id="90173">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>575</label>
-			<onclick>ActivateWindow(Videos,InProgressTvShows,return)</onclick>
+			<label>$INFO[Container(90170).ListItemNoWrap(1).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90170).ListItemNoWrap(1).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90170).ListItemNoWrap(1).Label)</visible>
 		</control>
 		<control type="button" id="90174">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>369</label>
-			<onclick>ActivateWindow(Videos,TVShowTitles,return)</onclick>
+			<label>$INFO[Container(90170).ListItemNoWrap(2).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90170).ListItemNoWrap(2).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90170).ListItemNoWrap(2).Label)</visible>
 		</control>
 		<control type="button" id="90175">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>135</label>
-			<onclick>ActivateWindow(Videos,TVShowGenres,return)</onclick>
+			<label>$INFO[Container(90170).ListItemNoWrap(3).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90170).ListItemNoWrap(3).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90170).ListItemNoWrap(3).Label)</visible>
 		</control>
 		<control type="button" id="90176">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>652</label>
-			<onclick>ActivateWindow(Videos,TVShowYears,return)</onclick>
+			<label>$INFO[Container(90170).ListItemNoWrap(4).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90170).ListItemNoWrap(4).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90170).ListItemNoWrap(4).Label)</visible>
 		</control>
 		<control type="button" id="90177">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>344</label>
-			<onclick>ActivateWindow(Videos,TVShowActors,return)</onclick>
+			<label>$INFO[Container(90170).ListItemNoWrap(5).Label]</label>
+			<onclick>ActivateWindow(Videos,$INFO[Container(90170).ListItemNoWrap(5).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90170).ListItemNoWrap(5).Label)</visible>
 		</control>
 		<control type="image" id="90178">
 			<width>35</width>
@@ -139,37 +148,38 @@
 		</control>
 		<control type="button" id="90112">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>133</label>
-			<onclick>ActivateWindow(Music,Artists,return)</onclick>
-			<visible>Library.HasContent(Music)</visible>
+			<label>$INFO[Container(90110).ListItemNoWrap(0).Label]</label>
+			<onclick>ActivateWindow(Music,$INFO[Container(90110).ListItemNoWrap(0).FileNameAndPath],return)</onclick>
 		</control>
 		<control type="button" id="90113">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>132</label>
-			<onclick>ActivateWindow(Music,Albums,return)</onclick>
-			<visible>Library.HasContent(Music)</visible>
+			<label>$INFO[Container(90110).ListItemNoWrap(1).Label]</label>
+			<onclick>ActivateWindow(Music,$INFO[Container(90110).ListItemNoWrap(1).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90110).ListItemNoWrap(1).Label)</visible>
 		</control>
 		<control type="button" id="90114">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>134</label>
-			<onclick>ActivateWindow(Music,Songs,return)</onclick>
-			<visible>Library.HasContent(Music)</visible>
+			<label>$INFO[Container(90110).ListItemNoWrap(2).Label]</label>
+			<onclick>ActivateWindow(Music,$INFO[Container(90110).ListItemNoWrap(2).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90110).ListItemNoWrap(2).Label)</visible>
 		</control>
 		<control type="button" id="90115">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>744</label>
-			<onclick>ActivateWindow(Music,Files,return)</onclick>
+			<label>$INFO[Container(90110).ListItemNoWrap(3).Label]</label>
+			<onclick>ActivateWindow(Music,$INFO[Container(90110).ListItemNoWrap(3).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90110).ListItemNoWrap(3).Label)</visible>
 		</control>
 		<control type="button" id="90116">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>14022</label>
-			<onclick>ActivateWindow(Music,Root)</onclick>
-			<visible>Library.HasContent(Music)</visible>
+			<label>$INFO[Container(90110).ListItemNoWrap(4).Label]</label>
+			<onclick>ActivateWindow(Music,$INFO[Container(90110).ListItemNoWrap(4).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90110).ListItemNoWrap(4).Label)</visible>
 		</control>
 		<control type="button" id="90117">
 			<include>ButtonHomeSubCommonValues</include>
-			<label>24001</label>
-			<onclick>ActivateWindow(Music,Addons,return)</onclick>
+			<label>$INFO[Container(90110).ListItemNoWrap(5).Label]</label>
+			<onclick>ActivateWindow(Music,$INFO[Container(90110).ListItemNoWrap(5).FileNameAndPath],return)</onclick>
+			<visible>!String.IsEmpty(Container(90110).ListItemNoWrap(5).Label)</visible>
 		</control>
 		<control type="image" id="90119">
 			<width>35</width>
diff --git a/addon.xml b/addon.xml
index c9093fd..60d4285 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.35" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="3.0.36" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.12.0"/>
 	</requires>
@@ -136,5 +136,6 @@
 			<icon>resources/icon.png</icon>
 			<fanart>resources/fanart.jpg</fanart>
 		</assets>
+		<news>Customisable home submenus using the Library Node Editor addon</news>
 	</extension>
 </addon>
diff --git a/changelog.txt b/changelog.txt
index eb60d5a..d708ebb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+[B]3.0.36[/B]
+
+- Added customisable home submenus that use library nodes
+- Added news feature
+
 [B]3.0.35[/B]
 
 - Updated language files from Transifex