Changed: [Confluence] Recently added layout

2 files changed, 143 insertions, 197 deletions

diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 58babe0d5a..bf257e60bd 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -43,6 +43,16 @@
 			<include>VisibleFadeEffect</include>
 			<include>Window_OpenClose_Animation</include>
 		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>125</posy>
+			<width>1280</width>
+			<height>250</height>
+			<colordiffuse>AAFFFFFF</colordiffuse>
+			<texture>HomeNowPlayingBack.png</texture>
+			<visible>[Player.HasAudio + !Skin.HasSetting(homepageMusicinfo)] | [Player.HasVideo + !Skin.HasSetting(homepageVideoinfo)] | [Container(9000).HasFocus(2) + Skin.HasSetting(homepageShowRecentlyAdded)]</visible>
+			<include>Window_OpenClose_Animation</include>
+		</control>
 		<!-- Music Info -->
 		<control type="group">
 			<posx>0</posx>
@@ -51,14 +61,6 @@
 			<include>VisibleFadeEffect</include>
 			<include>Window_OpenClose_Animation</include>
 			<control type="image">
-				<posx>0</posx>
-				<posy>105</posy>
-				<width>1280</width>
-				<height>250</height>
-				<colordiffuse>AAFFFFFF</colordiffuse>
-				<texture>HomeNowPlayingBack.png</texture>
-			</control>
-			<control type="image">
 				<description>Cover image</description>
 				<posx>20</posx>
 				<posy>40</posy>
@@ -142,14 +144,6 @@
 			<visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo)</visible>
 			<include>VisibleFadeEffect</include>
 			<include>Window_OpenClose_Animation</include>
-			<control type="image">
-				<posx>0</posx>
-				<posy>105</posy>
-				<width>1280</width>
-				<height>250</height>
-				<colordiffuse>AAFFFFFF</colordiffuse>
-				<texture>HomeNowPlayingBack.png</texture>
-			</control>
 			<control type="group">
 				<visible>!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes)</visible>
 				<control type="image">
diff --git a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
index 3702086db6..959f50583e 100644
--- a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
+++ b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
@@ -8,26 +8,17 @@
 			<animation effect="fade" time="300" delay="1000">WindowOpen</animation>
 			<animation effect="fade" time="200">WindowClose</animation>
 			<control type="group">
-				<posx>275r</posx>
-				<posy>40</posy>
+				<posx>730</posx>
+				<posy>30</posy>
 				<visible>Library.HasContent(Movies)</visible>
 				<visible>Container(9000).Hasfocus(2)</visible>
 				<include>VisibleFadeEffect</include>
-				<animation effect="slide" time="0" start="0,0" end="-260,0" condition="Library.HasContent(TVShows)">Conditional</animation>
-				<control type="image">
-					<description>background</description>
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>260</width>
-					<height>330</height>
-					<texture border="15">RecentAddedBack.png</texture>
-				</control>
 				<control type="label">
 					<description>Title label</description>
-					<posx>10</posx>
-					<posy>8</posy>
+					<posx>0</posx>
+					<posy>220</posy>
 					<height>20</height>
-					<width>240</width>
+					<width>540</width>
 					<label>31323</label>
 					<align>center</align>
 					<aligny>center</aligny>
@@ -35,112 +26,90 @@
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
 				</control>
-				<control type="image">
-					<description>Main Icon -3</description>
-					<posx>170</posx>
-					<posy>65</posy>
-					<width>75</width>
-					<height>110</height>
-					<aspectratio align="left">keep</aspectratio>
-					<texture background="true">$INFO[Window.Property(LatestMovie.4.Thumb)]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
-					<bordersize>8</bordersize>
-				</control>
-				<control type="image">
-					<description>Main Icon -2</description>
-					<posx>135</posx>
-					<posy>55</posy>
-					<width>86</width>
-					<height>130</height>
-					<aspectratio align="left">keep</aspectratio>
-					<texture background="true">$INFO[Window.Property(LatestMovie.3.Thumb)]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
-					<bordersize>8</bordersize>
-				</control>
-				<control type="image">
-					<description>Main Icon -1</description>
-					<posx>85</posx>
-					<posy>45</posy>
-					<width>100</width>
-					<height>150</height>
-					<aspectratio align="left">keep</aspectratio>
-					<texture background="true">$INFO[Window.Property(LatestMovie.2.Thumb)]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
-					<bordersize>8</bordersize>
-				</control>
-				<control type="image">
-					<description>Main Icon</description>
-					<posx>15</posx>
-					<posy>30</posy>
-					<width>120</width>
-					<height>180</height>
-					<aspectratio align="left">keep</aspectratio>
-					<texture background="true">$INFO[Window.Property(LatestMovie.1.Thumb)]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
-					<bordersize>8</bordersize>
-				</control>
 				<control type="list" id="8000">
-					<posx>10</posx>
-					<posy>208</posy>
-					<width>240</width>
-					<height>114</height>
-					<onleft>8001</onleft>
-					<onright>8001</onright>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>540</width>
+					<height>220</height>
+					<onleft>SetFocus(8001,1)</onleft>
+					<onright>SetFocus(8001,0)</onright>
 					<onup>20</onup>
 					<ondown>9000</ondown>
 					<viewtype label="535">list</viewtype>
 					<pagecontrol>-</pagecontrol>
-					<scrolltime>0</scrolltime>
-					<itemlayout height="28" width="240">
+					<scrolltime>200</scrolltime>
+					<orientation>Horizontal</orientation>
+					<itemlayout height="220" width="180">
 						<control type="image">
+							<description>background</description>
 							<posx>0</posx>
 							<posy>0</posy>
-							<width>240</width>
-							<height>29</height>
-							<texture border="0,2,0,2">MenuItemNF.png</texture>
+							<width>180</width>
+							<height>220</height>
+							<texture border="15">RecentAddedBack.png</texture>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>160</width>
+							<height>170</height>
+							<texture>$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordersize>5</bordersize>
 						</control>
 						<control type="label">
-							<posx>5</posx>
-							<posy>0</posy>
-							<width>230</width>
-							<height>28</height>
+							<posx>90</posx>
+							<posy>185</posy>
+							<width>150</width>
+							<height>20</height>
 							<font>font12</font>
 							<textcolor>white</textcolor>
 							<shadowcolor>black</shadowcolor>
 							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
+							<align>center</align>
 							<aligny>center</aligny>
 							<label>$INFO[ListItem.Label]</label>
 						</control>
 					</itemlayout>
-					<focusedlayout height="28" width="240">
+					<focusedlayout height="220" width="180">
 						<control type="image">
+							<description>background</description>
 							<posx>0</posx>
 							<posy>0</posy>
-							<width>240</width>
-							<height>29</height>
-							<texture border="0,2,0,2">MenuItemNF.png</texture>
-							<visible>!Control.HasFocus(8000)</visible>
+							<width>180</width>
+							<height>220</height>
+							<texture border="15">RecentAddedBack.png</texture>
 						</control>
 						<control type="image">
-							<posx>0</posx>
-							<posy>0</posy>
-							<width>240</width>
-							<height>28</height>
-							<texture border="0,2,0,2">MenuItemFO.png</texture>
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>160</width>
+							<height>170</height>
+							<texture>$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">folder-focus.png</bordertexture>
+							<bordersize>5</bordersize>
 							<visible>Control.HasFocus(8000)</visible>
-							<include>VisibleFadeEffect</include>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>160</width>
+							<height>170</height>
+							<texture>$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordersize>5</bordersize>
+							<visible>!Control.HasFocus(8000)</visible>
 						</control>
 						<control type="label">
-							<posx>5</posx>
-							<posy>0</posy>
-							<width>230</width>
-							<height>28</height>
+							<posx>90</posx>
+							<posy>185</posy>
+							<width>150</width>
+							<height>20</height>
 							<font>font12</font>
 							<textcolor>white</textcolor>
 							<shadowcolor>black</shadowcolor>
 							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
+							<align>center</align>
 							<aligny>center</aligny>
 							<label>$INFO[ListItem.Label]</label>
 						</control>
@@ -150,53 +119,38 @@
 							<label>$INFO[Window.Property(LatestMovie.1.Title)]</label>
 							<label2></label2>
 							<onclick>PlayMedia($INFO[Window.Property(LatestMovie.1.Path)])</onclick>
-							<icon>-</icon>
+							<icon>$INFO[Window.Property(LatestMovie.1.Thumb)]</icon>
 							<thumb>-</thumb>
 						</item>
 						<item id="2">
 							<label>$INFO[Window.Property(LatestMovie.2.Title)]</label>
 							<label2></label2>
 							<onclick>PlayMedia($INFO[Window.Property(LatestMovie.2.Path)])</onclick>
-							<icon>-</icon>
+							<icon>$INFO[Window.Property(LatestMovie.2.Thumb)]</icon>
 							<thumb>-</thumb>
 						</item>
 						<item id="3">
 							<label>$INFO[Window.Property(LatestMovie.3.Title)]</label>
 							<label2></label2>
 							<onclick>PlayMedia($INFO[Window.Property(LatestMovie.3.Path)])</onclick>
-							<icon>-</icon>
-							<thumb>-</thumb>
-						</item>
-						<item id="4">
-							<label>$INFO[Window.Property(LatestMovie.4.Title)]</label>
-							<label2></label2>
-							<onclick>PlayMedia($INFO[Window.Property(LatestMovie.4.Path)])</onclick>
-							<icon>-</icon>
+							<icon>$INFO[Window.Property(LatestMovie.3.Thumb)]</icon>
 							<thumb>-</thumb>
 						</item>
 					</content>
 				</control>
 			</control>
 			<control type="group">
-				<posx>275r</posx>
-				<posy>40</posy>
+				<posx>10</posx>
+				<posy>30</posy>
 				<visible>Library.HasContent(TVShows)</visible>
 				<visible>Container(9000).Hasfocus(2)</visible>
 				<include>VisibleFadeEffect</include>
-				<control type="image">
-					<description>background</description>
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>260</width>
-					<height>330</height>
-					<texture border="15">RecentAddedBack.png</texture>
-				</control>
 				<control type="label">
 					<description>Title label</description>
-					<posx>10</posx>
-					<posy>8</posy>
+					<posx>0</posx>
+					<posy>220</posy>
 					<height>20</height>
-					<width>240</width>
+					<width>480</width>
 					<label>31324</label>
 					<align>center</align>
 					<aligny>center</aligny>
@@ -204,121 +158,119 @@
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
 				</control>
-				<control type="image">
-					<description>Main Icon</description>
-					<posx>10</posx>
-					<posy>25</posy>
-					<width>240</width>
-					<height>135</height>
-					<aspectratio>keep</aspectratio>
-					<texture background="true">$INFO[Window.Property(LatestEpisode.1.Thumb)]</texture>
-					<visible>!Control.HasFocus(8001)</visible>
-					<include>VisibleFadeEffect</include>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
-					<bordersize>8</bordersize>
-				</control>
-				<control type="image">
-					<description>Main Icon</description>
-					<posx>10</posx>
-					<posy>25</posy>
-					<width>240</width>
-					<height>135</height>
-					<aspectratio>keep</aspectratio>
-					<fadetime>200</fadetime>
-					<texture background="true">$INFO[Container(8001).ListItem.Thumb]</texture>
-					<visible>Control.HasFocus(8001)</visible>
-					<include>VisibleFadeEffect</include>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
-					<bordersize>8</bordersize>
-				</control>
 				<control type="list" id="8001">
-					<posx>10</posx>
-					<posy>160</posy>
-					<width>240</width>
-					<height>161</height>
-					<onleft>8000</onleft>
-					<onright>8000</onright>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>480</width>
+					<height>240</height>
+					<onleft>SetFocus(8000,2)</onleft>
+					<onright>SetFocus(8000,0)</onright>
 					<onup>20</onup>
 					<ondown>9000</ondown>
 					<viewtype label="535">list</viewtype>
 					<pagecontrol>-</pagecontrol>
 					<scrolltime>0</scrolltime>
-					<itemlayout height="40" width="240">
+					<orientation>Horizontal</orientation>
+					<itemlayout height="220" width="240">
 						<control type="image">
+							<description>background</description>
 							<posx>0</posx>
 							<posy>0</posy>
 							<width>240</width>
-							<height>41</height>
-							<texture border="0,2,0,2">MenuItemNF.png</texture>
+							<height>220</height>
+							<texture border="15">RecentAddedBack.png</texture>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>220</width>
+							<height>155</height>
+							<aspectratio>scale</aspectratio>
+							<texture>$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordersize>5</bordersize>
 						</control>
 						<control type="label">
-							<posx>5</posx>
-							<posy>6</posy>
-							<width>230</width>
-							<height>10</height>
+							<posx>120</posx>
+							<posy>168</posy>
+							<width>200</width>
+							<height>20</height>
 							<font>font10</font>
-							<textcolor>grey</textcolor>
+							<textcolor>grey2</textcolor>
 							<shadowcolor>black</shadowcolor>
 							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
+							<align>center</align>
 							<aligny>center</aligny>
 							<label>$INFO[ListItem.Label2]</label>
 						</control>
 						<control type="label">
-							<posx>5</posx>
-							<posy>16</posy>
-							<width>230</width>
+							<posx>120</posx>
+							<posy>185</posy>
+							<width>200</width>
 							<height>20</height>
 							<font>font12</font>
 							<textcolor>white</textcolor>
 							<shadowcolor>black</shadowcolor>
 							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
+							<align>center</align>
 							<aligny>center</aligny>
 							<label>$INFO[ListItem.Label]</label>
 						</control>
 					</itemlayout>
-					<focusedlayout height="40" width="240">
+					<focusedlayout height="220" width="240">
 						<control type="image">
+							<description>background</description>
 							<posx>0</posx>
 							<posy>0</posy>
 							<width>240</width>
-							<height>41</height>
-							<texture border="0,2,0,2">MenuItemNF.png</texture>
-							<visible>!Control.HasFocus(8001)</visible>
+							<height>220</height>
+							<texture border="15">RecentAddedBack.png</texture>
 						</control>
 						<control type="image">
-							<posx>0</posx>
-							<posy>0</posy>
-							<width>240</width>
-							<height>41</height>
-							<texture border="0,2,0,2">MenuItemFO.png</texture>
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>220</width>
+							<height>155</height>
+							<aspectratio>scale</aspectratio>
+							<texture>$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">folder-focus.png</bordertexture>
+							<bordersize>5</bordersize>
 							<visible>Control.HasFocus(8001)</visible>
-							<include>VisibleFadeEffect</include>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>220</width>
+							<height>155</height>
+							<aspectratio>scale</aspectratio>
+							<texture>$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordersize>5</bordersize>
+							<visible>!Control.HasFocus(8001)</visible>
 						</control>
 						<control type="label">
-							<posx>5</posx>
-							<posy>6</posy>
-							<width>230</width>
-							<height>10</height>
+							<posx>120</posx>
+							<posy>168</posy>
+							<width>200</width>
+							<height>20</height>
 							<font>font10</font>
-							<textcolor>grey</textcolor>
+							<textcolor>grey2</textcolor>
 							<shadowcolor>black</shadowcolor>
 							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
+							<align>center</align>
 							<aligny>center</aligny>
 							<label>$INFO[ListItem.Label2]</label>
 						</control>
 						<control type="label">
-							<posx>5</posx>
-							<posy>16</posy>
-							<width>230</width>
+							<posx>120</posx>
+							<posy>185</posy>
+							<width>200</width>
 							<height>20</height>
 							<font>font12</font>
 							<textcolor>white</textcolor>
 							<shadowcolor>black</shadowcolor>
 							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
+							<align>center</align>
 							<aligny>center</aligny>
 							<label>$INFO[ListItem.Label]</label>
 						</control>
@@ -338,7 +290,7 @@
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.2.Thumb)]</thumb>
 						</item>
-						<item id="3">
+						<!-- item id="3">
 							<label>$INFO[Window.Property(LatestEpisode.3.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.3.ShowTitle)] - $INFO[Window.Property(LatestEpisode.3.EpisodeNo)]</label2>
 							<onclick>PlayMedia($INFO[Window.Property(LatestEpisode.3.Path)])</onclick>
@@ -351,7 +303,7 @@
 							<onclick>PlayMedia($INFO[Window.Property(LatestEpisode.4.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.4.Thumb)]</thumb>
-						</item>
+						</item -->
 					</content>
 				</control>
 			</control>