[estuary] sync

1 files changed, 237 insertions, 41 deletions

diff --git a/addons/skin.estuary/xml/View_54_InfoWall.xml b/addons/skin.estuary/xml/View_54_InfoWall.xml
index cc4f0cd3d2..ae6272f3e1 100644
--- a/addons/skin.estuary/xml/View_54_InfoWall.xml
+++ b/addons/skin.estuary/xml/View_54_InfoWall.xml
@@ -5,7 +5,7 @@
 		<definition>
 			<control type="image">
 				<top>-10</top>
-				<width>396</width>
+				<width>376</width>
 				<height>380</height>
 				<texture border="21">dialogs/dialog-bg-nobo.png</texture>
 				<bordertexture border="20">overlays/shadow.png</bordertexture>
@@ -14,18 +14,18 @@
 			<control type="image">
 				<top>-14</top>
 				<left>-4</left>
-				<width>404</width>
+				<width>384</width>
 				<height>388</height>
 				<texture colordiffuse="button_focus">colors/grey.png</texture>
 				<bordertexture border="20">overlays/shadow.png</bordertexture>
 				<bordersize>20</bordersize>
 				<visible>$PARAM[focused]</visible>
-				<include>Animation_FocusTextureFade</include>
+				<include condition="$PARAM[focused]">Animation_FocusTextureFade</include>
 			</control>
 			<control type="image">
 				<left>20</left>
 				<top>10</top>
-				<width>356</width>
+				<width>336</width>
 				<height>300</height>
 				<texture border="2" background="true">$VAR[InfoWallThumbVar]</texture>
 				<aspectratio>keep</aspectratio>
@@ -33,18 +33,21 @@
 			<control type="label">
 				<left>20</left>
 				<top>318</top>
-				<width>358</width>
+				<width>338</width>
 				<textoffsetx>20</textoffsetx>
 				<height>20</height>
 				<align>center</align>
 				<aligny>center</aligny>
+				<font>font12</font>
 				<label>$INFO[ListItem.Label]</label>
 			</control>
 		</definition>
 	</include>
 	<include name="InfoWallMusicLayout">
 		<param name="fallback_image">DefaultFolder.png</param>
-		<param name="label">$INFO[ListItem.Year,[B], - [/B]]$INFO[ListItem.Label]</param>
+		<param name="main_label">$INFO[ListItem.Artist]</param>
+		<param name="sub_label">$INFO[ListItem.Year,[B],[/B]]</param>
+		<param name="single_label">$INFO[ListItem.Label]</param>
 		<param name="focused">false</param>
 		<definition>
 			<control type="image">
@@ -64,7 +67,7 @@
 				<bordertexture border="20">overlays/shadow.png</bordertexture>
 				<bordersize>20</bordersize>
 				<visible>$PARAM[focused]</visible>
-				<include>Animation_FocusTextureFade</include>
+				<include condition="$PARAM[focused]">Animation_FocusTextureFade</include>
 			</control>
 			<control type="image">
 				<left>0</left>
@@ -83,12 +86,150 @@
 				<font>font12</font>
 				<align>center</align>
 				<aligny>center</aligny>
-				<label>$PARAM[label]</label>
+				<label>$PARAM[single_label]</label>
+				<visible>!String.IsEqual(ListItem.DBType,album)</visible>
+			</control>
+			<control type="group">
+				<visible>String.IsEqual(ListItem.DBType,album)</visible>
+				<control type="label">
+					<left>29</left>
+					<top>300</top>
+					<width>260</width>
+					<label>$PARAM[sub_label]</label>
+					<font>font10</font>
+					<shadowcolor>text_shadow</shadowcolor>
+					<scroll>$PARAM[focused]</scroll>
+					<align>center</align>
+				</control>
+				<control type="label">
+					<left>29</left>
+					<top>328</top>
+					<width>260</width>
+					<label>$PARAM[main_label]</label>
+					<font>font12</font>
+					<shadowcolor>text_shadow</shadowcolor>
+					<scroll>$PARAM[focused]</scroll>
+					<align>center</align>
+				</control>
+			</control>
+			<control type="group">
+				<left>145</left>
+				<top>2</top>
+				<include>UserRatingCircle</include>
+			</control>
+		</definition>
+	</include>
+	<include name="InfoWallEpisodeLayout">
+		<param name="main_label">$INFO[ListItem.Title]</param>
+		<param name="sub_label">$INFO[ListItem.TVShowTitle]</param>
+		<param name="thumb_label">$INFO[ListItem.Season,,x]$INFO[ListItem.Episode]</param>
+		<param name="fallback_image">DefaultTVShows.png</param>
+		<param name="focused">false</param>
+		<definition>
+			<control type="image">
+				<top>10</top>
+				<width>316</width>
+				<height>288</height>
+				<texture border="21">dialogs/dialog-bg-nobo.png</texture>
+				<bordertexture border="20">overlays/shadow.png</bordertexture>
+				<bordersize>20</bordersize>
+			</control>
+			<control type="image">
+				<top>6</top>
+				<left>-4</left>
+				<width>324</width>
+				<height>296</height>
+				<texture colordiffuse="button_focus">colors/grey.png</texture>
+				<bordertexture border="20">overlays/shadow.png</bordertexture>
+				<bordersize>20</bordersize>
+				<visible>$PARAM[focused]</visible>
+				<include condition="$PARAM[focused]">Animation_FocusTextureFade</include>
+			</control>
+			<control type="image">
+				<left>0</left>
+				<top>10</top>
+				<width>316</width>
+				<height>218</height>
+				<texture border="2" fallback="$PARAM[fallback_image]" background="true">$VAR[InfoWallThumbVar]</texture>
+				<aspectratio>scale</aspectratio>
+				<bordersize>20</bordersize>
+			</control>
+			<control type="image">
+				<left>136</left>
+				<top>138</top>
+				<width>160</width>
+				<height>70</height>
+				<texture flipx="true">overlays/overlay-bg.png</texture>
+				<visible>String.IsEqual(ListItem.DBtype,episode)</visible>
+			</control>
+			<control type="label">
+				<left>31</left>
+				<top>178</top>
+				<width>260</width>
+				<label>$PARAM[thumb_label]</label>
+				<font>font20_title</font>
+				<shadowcolor>text_shadow</shadowcolor>
+				<align>right</align>
+			</control>
+			<control type="image">
+				<left>20</left>
+				<top>175</top>
+				<width>32</width>
+				<height>32</height>
+				<texture>$VAR[WallWatchedIconVar]</texture>
+			</control>
+			<control type="textbox">
+				<left>28</left>
+				<top>202</top>
+				<width>262</width>
+				<height>80</height>
+				<font>font12</font>
+				<align>center</align>
+				<aligny>center</aligny>
+				<label>$INFO[ListItem.Label]</label>
+				<visible>Window.IsActive(videos)</visible>
+			</control>
+			<control type="group">
+				<visible>!Window.IsActive(videos)</visible>
+				<control type="label">
+					<left>29</left>
+					<top>210</top>
+					<width>260</width>
+					<label>$PARAM[sub_label]</label>
+					<font>font12</font>
+					<shadowcolor>text_shadow</shadowcolor>
+					<scroll>$PARAM[focused]</scroll>
+					<align>center</align>
+				</control>
+				<control type="label">
+					<left>29</left>
+					<top>240</top>
+					<width>260</width>
+					<label>$PARAM[main_label]</label>
+					<font>font10</font>
+					<shadowcolor>text_shadow</shadowcolor>
+					<scroll>$PARAM[focused]</scroll>
+					<align>center</align>
+				</control>
+			</control>
+			<control type="progress">
+				<left>20</left>
+				<top>258</top>
+				<width>276</width>
+				<height>1</height>
+				<texturebg></texturebg>
+				<midtexture colordiffuse="button_focus" border="3">progress/texturebg_alt_white.png</midtexture>
+				<info>ListItem.PercentPlayed</info>
+				<visible>!Integer.IsEqual(ListItem.PercentPlayed,0)</visible>
+			</control>
+			<control type="group">
+				<left>134</left>
+				<top>8</top>
+				<include>UserRatingCircle</include>
 			</control>
 		</definition>
 	</include>
 	<include name="InfoWallMovieLayout">
-		<param name="fallback_image">DefaultVideo.png</param>
 		<param name="focused">false</param>
 		<definition>
 			<control type="group">
@@ -110,20 +251,20 @@
 					<texture colordiffuse="button_focus">colors/grey.png</texture>
 					<bordersize>20</bordersize>
 					<visible>$PARAM[focused]</visible>
-					<include>Animation_FocusTextureFade</include>
+					<include condition="$PARAM[focused]">Animation_FocusTextureFade</include>
 				</control>
 				<control type="image">
 					<left>26</left>
 					<top>0</top>
 					<width>270</width>
 					<height>290</height>
-					<texture border="2" fallback="$PARAM[fallback_image]" background="true">$INFO[ListItem.Icon]</texture>
+					<texture fallback="DefaultMovies.png" background="true">$INFO[ListItem.Icon]</texture>
 					<aspectratio>keep</aspectratio>
 					<bordersize>20</bordersize>
 				</control>
 				<control type="textbox">
 					<left>40</left>
-					<top>270</top>
+					<top>240</top>
 					<width>242</width>
 					<height>90</height>
 					<font>font27</font>
@@ -142,14 +283,14 @@
 				<bordertexture border="20">overlays/shadow.png</bordertexture>
 				<bordersize>20</bordersize>
 				<visible>$PARAM[focused] + !String.IsEmpty(ListItem.Art(poster))</visible>
-				<include>Animation_FocusTextureFade</include>
+				<include condition="$PARAM[focused]">Animation_FocusTextureFade</include>
 			</control>
 			<control type="image">
 				<left>15</left>
 				<top>-10</top>
 				<width>290</width>
 				<height>400</height>
-				<texture border="2" fallback="$PARAM[fallback_image]" background="true">$INFO[ListItem.Art(poster)]</texture>
+				<texture background="true">$INFO[ListItem.Art(poster)]</texture>
 				<aspectratio>scale</aspectratio>
 				<bordertexture border="20">overlays/shadow.png</bordertexture>
 				<bordersize>20</bordersize>
@@ -163,6 +304,33 @@
 				<texture>overlays/overlay-bg.png</texture>
 				<visible>Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0)</visible>
 			</control>
+			<control type="group">
+				<visible>String.IsEqual(ListItem.DBtype,tvshow)</visible>
+				<top>320</top>
+				<control type="image">
+					<left>35</left>
+					<top>0</top>
+					<width>250</width>
+					<height>50</height>
+					<texture>overlays/overlayfade.png</texture>
+				</control>
+				<control type="label">
+					<left>0</left>
+					<top>20</top>
+					<width>244</width>
+					<label>$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</label>
+					<font>font20_title</font>
+					<shadowcolor>text_shadow</shadowcolor>
+					<align>right</align>
+				</control>
+				<control type="image">
+					<left>254</left>
+					<top>23</top>
+					<width>24</width>
+					<height>24</height>
+					<texture>lists/played-total.png</texture>
+				</control>
+			</control>
 			<control type="image">
 				<left>35</left>
 				<top>338</top>
@@ -170,6 +338,21 @@
 				<height>32</height>
 				<texture>$VAR[WallWatchedIconVar]</texture>
 			</control>
+			<control type="group">
+				<left>135</left>
+				<top>-8</top>
+				<include>UserRatingCircle</include>
+			</control>
+			<control type="progress">
+				<left>35</left>
+				<top>350</top>
+				<width>250</width>
+				<height>1</height>
+				<texturebg></texturebg>
+				<midtexture colordiffuse="button_focus" border="3">progress/texturebg_alt_white.png</midtexture>
+				<info>ListItem.PercentPlayed</info>
+				<visible>!Integer.IsEqual(ListItem.PercentPlayed,0)</visible>
+			</control>
 		</definition>
 	</include>
 	<include name="View_54_InfoWall">
@@ -180,9 +363,9 @@
 			<visible>Control.IsVisible(54)</visible>
 			<include>Visible_Right</include>
 			<control type="panel" id="54">
-				<left>440</left>
+				<left>490</left>
 				<top>0</top>
-				<width>80%</width>
+				<right>15</right>
 				<height>100%</height>
 				<onleft>9000</onleft>
 				<onright>531</onright>
@@ -193,40 +376,53 @@
 				<preloaditems>2</preloaditems>
 				<pagecontrol>531</pagecontrol>
 				<scrolltime tween="cubic" easing="out">500</scrolltime>
-				<visible>Container.Content(artists) | Container.Content(albums) | Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(musicvideos) | Container.Content(images)</visible>
+				<visible>Container.Content(artists) | Container.Content(albums) | Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos) | Container.Content(images)</visible>
 				<itemlayout height="445" width="320" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)">
 					<control type="group">
-						<left>80</left>
+						<left>30</left>
 						<top>120</top>
 						<include>InfoWallMovieLayout</include>
 					</control>
-					<control type="group">
-						<left>215</left>
-						<top>108</top>
-						<include>UserRatingCircle</include>
-					</control>
 				</itemlayout>
 				<focusedlayout height="445" width="320" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)">
 					<control type="group">
 						<depth>DepthContentPopout</depth>
-						<left>80</left>
-						<animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="240,300">Focus</animation>
-						<animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="240,300">UnFocus</animation>
+						<left>30</left>
+						<animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="190,300">Focus</animation>
+						<animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="190,300">UnFocus</animation>
 						<top>120</top>
 						<include content="InfoWallMovieLayout">
 							<param name="focused" value="true" />
 						</include>
-						<control type="group">
-							<left>135</left>
-							<top>-12</top>
-							<include>UserRatingCircle</include>
-						</control>
+					</control>
+				</focusedlayout>
+				<itemlayout height="300" width="300" condition="Container.Content(episodes)">
+					<control type="group">
+						<left>40</left>
+						<top>110</top>
+						<include content="InfoWallEpisodeLayout">
+							<param name="focused" value="false" />
+							<param name="thumb_label" value="$INFO[ListItem.Label2]" />
+						</include>
+					</control>
+				</itemlayout>
+				<focusedlayout height="300" width="300" condition="Container.Content(episodes)">
+					<control type="group">
+						<depth>DepthContentPopout</depth>
+						<animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="200,250">Focus</animation>
+						<animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="200,250">UnFocus</animation>
+						<left>40</left>
+						<top>110</top>
+						<include content="InfoWallEpisodeLayout">
+							<param name="focused" value="true" />
+							<param name="thumb_label" value="$INFO[ListItem.Label2]" />
+						</include>
 					</control>
 				</focusedlayout>
 				<itemlayout height="410" width="310" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)">
 					<control type="group">
 						<top>150</top>
-						<left>90</left>
+						<left>40</left>
 						<include>InfoWallMusicLayout</include>
 						<control type="group">
 							<left>133</left>
@@ -238,10 +434,10 @@
 				<focusedlayout height="410" width="310" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)">
 					<control type="group">
 						<depth>DepthContentPopout</depth>
-						<animation effect="zoom" start="100" end="115" time="200" tween="sine" easing="inout" center="250,350">Focus</animation>
-						<animation effect="zoom" start="115" end="100" time="200" tween="sine" easing="inout" center="250,350">UnFocus</animation>
+						<animation effect="zoom" start="100" end="115" time="200" tween="sine" easing="inout" center="200,350">Focus</animation>
+						<animation effect="zoom" start="115" end="100" time="200" tween="sine" easing="inout" center="200,350">UnFocus</animation>
 						<top>150</top>
-						<left>90</left>
+						<left>40</left>
 						<include content="InfoWallMusicLayout">
 							<param name="focused" value="true" />
 						</include>
@@ -252,20 +448,20 @@
 						</control>
 					</control>
 				</focusedlayout>
-				<itemlayout height="400" width="401" condition="Container.Content(images)">
+				<itemlayout height="400" width="378" condition="Container.Content(images)">
 					<control type="group">
-						<left>30</left>
+						<left>0</left>
 						<top>150</top>
 						<include>InfoWallPictureLayout</include>
 					</control>
 				</itemlayout>
-				<focusedlayout height="400" width="401" condition="Container.Content(images)">
+				<focusedlayout height="400" width="378" condition="Container.Content(images)">
 					<control type="group">
 						<depth>DepthContentPopout</depth>
-						<left>30</left>
+						<left>0</left>
 						<top>150</top>
-						<animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="220,330">Focus</animation>
-						<animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="220,330">UnFocus</animation>
+						<animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="180,330">Focus</animation>
+						<animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="180,330">UnFocus</animation>
 						<include content="InfoWallPictureLayout">
 							<param name="focused" value="true" />
 						</include>