Merge pull request xbmc#10646 from phil65/estuary_updates

[estuary] another sync, misc fixes / additions
wzyy2 · Oct 7, 2016 · 87fabf2 · 87fabf2
2 parents 0b28386 + 8fa6db5
commit 87fabf2
Show file tree

Hide file tree

Showing 14 changed files with 178 additions and 464 deletions.
diff --git a/addons/skin.estuary/1080i/DialogAddonSettings.xml b/addons/skin.estuary/1080i/DialogAddonSettings.xml
@@ -47,7 +47,7 @@
 			<width>1060</width>
 			<height>680</height>
 			<onup>2</onup>
-			<ondown>9001</ondown>
+			<ondown>2</ondown>
 			<onleft>9</onleft>
 			<onright>9001</onright>
 		</control>

diff --git a/addons/skin.estuary/1080i/DialogContextMenu.xml b/addons/skin.estuary/1080i/DialogContextMenu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol>1000</defaultcontrol>
+	<defaultcontrol>996</defaultcontrol>
 	<include>Animation_DialogPopupOpenClose</include>
 	<coordinates>
 		<left>0</left>
@@ -17,6 +17,15 @@
 			<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
 			<texture colordiffuse="B0FFFFFF">colors/black.png</texture>
 		</control>
+		<control type="button" id="22001">
+			<left>-1920</left>
+			<top>-1080</top>
+			<width>5760</width>
+			<height>3240</height>
+			<texturefocus></texturefocus>
+			<texturenofocus></texturenofocus>
+			<onclick>Action(close)</onclick>
+		</control>
 		<control type="image" id="999">
 			<description>background image</description>
 			<left>0</left>

diff --git a/addons/skin.estuary/1080i/DialogNotification.xml b/addons/skin.estuary/1080i/DialogNotification.xml
@@ -6,6 +6,7 @@
 			<depth>DepthMax</depth>
 			<top>945</top>
 			<left>640</left>
+			<animation effect="slide" end="600,-850" time="500" tween="sine" easing="inout" condition="Window.IsActive(fullscreenvideo)">conditional</animation>
 			<include>Animation_DialogPopupOpenClose</include>
 			<visible>String.IsEmpty(Window(Home).Property(script.cinemavision.running))</visible>
 			<control type="image">

diff --git a/addons/skin.estuary/1080i/DialogSelect.xml b/addons/skin.estuary/1080i/DialogSelect.xml
@@ -115,6 +115,7 @@
 						<width>700</width>
 						<height>60</height>
 						<aligny>center</aligny>
+						<scroll>true</scroll>
 						<label>[B]$INFO[ListItem.Label][/B]</label>
 					</control>
 					<control type="textbox">

diff --git a/addons/skin.estuary/1080i/DialogVideoInfo.xml b/addons/skin.estuary/1080i/DialogVideoInfo.xml
@@ -51,7 +51,7 @@
 				</control>
 			</control>
 			<control type="group">
-				<top>184</top>
+				<top>154</top>
 				<left>70</left>
 				<visible>Stringcompare(ListItem.DBType,musicvideo)</visible>
 				<include>OpenClose_Left</include>
@@ -498,6 +498,20 @@
 				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
 				<top>980</top>
 				<include>MediaFlags</include>
+				<control type="label">
+					<right>100</right>
+					<top>60</top>
+					<align>right</align>
+					<width>1400</width>
+					<height>44</height>
+					<font>font10_title</font>
+					<textcolor>77FFFFFF</textcolor>
+					<shadowcolor>text_shadow</shadowcolor>
+					<label>$INFO[ListItem.FileNameANdPath]</label>
+					<visible>Control.HasFocus(6)</visible>
+					<animation effect="fade" start="0" end="100" time="300">Visible</animation>
+					<animation effect="fade" start="100" end="0" time="200">Hidden</animation>
+				</control>
 				<control type="group">
 					<visible>Control.HasFocus(50)</visible>
 					<animation effect="fade" time="200">VisibleChange</animation>

diff --git a/addons/skin.estuary/1080i/Home.xml b/addons/skin.estuary/1080i/Home.xml
@@ -587,6 +587,35 @@
 							<param name="widget_header" value="$LOCALIZE[19020]" />
 							<param name="visible" value="!System.HasPVRAddon"/>
 						</include>
+						<control type="grouplist">
+							<height>218</height>
+							<left>478</left>
+							<top>36</top>
+							<orientation>horizontal</orientation>
+							<visible>PVR.IsRecordingTV | PVR.HasNonRecordingTVTimer</visible>
+							<align>right</align>
+							<width>1360</width>
+							<control type="group">
+								<width>680</width>
+								<visible>PVR.IsRecordingTV</visible>
+								<include content="PVRWidget">
+									<param name="icon" value="$INFO[PVR.TVNowRecordingChannelIcon]" />
+									<param name="header" value="$LOCALIZE[19158]" />
+									<param name="label1" value="$INFO[PVR.TVNowRecordingDateTime,$LOCALIZE[19126] - ]" />
+									<param name="label2" value="$INFO[PVR.TVNowRecordingTitle][CR][COLOR=grey]$INFO[PVR.TVNowRecordingChannel][/COLOR]" />
+								</include>
+							</control>
+							<control type="group">
+								<visible>PVR.HasNonRecordingTVTimer</visible>
+								<width>680</width>
+								<include content="PVRWidget">
+									<param name="icon" value="$INFO[PVR.TVNextRecordingChannelIcon]" />
+									<param name="header" value="$LOCALIZE[19157]" />
+									<param name="label1" value="$INFO[PVR.TVNextRecordingDateTime,$LOCALIZE[19126] - ]" />
+									<param name="label2" value="$INFO[PVR.TVNextRecordingTitle][CR][COLOR=grey]$INFO[PVR.TVNextRecordingChannel][/COLOR]" />
+								</include>
+							</control>
+						</control>
 						<include content="ImageWidget">
 							<param name="image_path" value="special://skin/extras/home-images/tv.jpg"/>
 							<param name="text_label" value="$LOCALIZE[31143]" />
@@ -620,34 +649,6 @@
 							<param name="height" value="550"/>
 							<param name="visible" value="System.HasPVRAddon"/>
 						</include>
-						<control type="grouplist">
-							<height>218</height>
-							<left>478</left>
-							<top>36</top>
-							<orientation>horizontal</orientation>
-							<align>right</align>
-							<width>1360</width>
-							<control type="group">
-								<width>680</width>
-								<visible>PVR.IsRecordingTV</visible>
-								<include content="PVRWidget">
-									<param name="icon" value="$INFO[PVR.TVNowRecordingChannelIcon]" />
-									<param name="header" value="$LOCALIZE[19158]" />
-									<param name="label1" value="$INFO[PVR.TVNowRecordingDateTime,$LOCALIZE[19126] - ]" />
-									<param name="label2" value="$INFO[PVR.TVNowRecordingTitle][CR][COLOR=grey]$INFO[PVR.TVNowRecordingChannel][/COLOR]" />
-								</include>
-							</control>
-							<control type="group">
-								<visible>PVR.HasNonRecordingTVTimer</visible>
-								<width>680</width>
-								<include content="PVRWidget">
-									<param name="icon" value="$INFO[PVR.TVNextRecordingChannelIcon]" />
-									<param name="header" value="$LOCALIZE[19157]" />
-									<param name="label1" value="$INFO[PVR.TVNextRecordingDateTime,$LOCALIZE[19126] - ]" />
-									<param name="label2" value="$INFO[PVR.TVNextRecordingTitle][CR][COLOR=grey]$INFO[PVR.TVNextRecordingChannel][/COLOR]" />
-								</include>
-							</control>
-						</control>
 					</control>
 				</control>
 				<control type="group" id="13000">
@@ -697,6 +698,35 @@
 							<param name="widget_header" value="$LOCALIZE[19021]" />
 							<param name="visible" value="!System.HasPVRAddon"/>
 						</include>
+						<control type="grouplist">
+							<height>218</height>
+							<left>478</left>
+							<top>36</top>
+							<orientation>horizontal</orientation>
+							<align>right</align>
+							<width>1360</width>
+							<visible>PVR.IsRecordingRadio | PVR.HasNonRecordingRadioTimer</visible>
+							<control type="group">
+								<width>680</width>
+								<visible>PVR.IsRecordingRadio</visible>
+								<include content="PVRWidget">
+									<param name="icon" value="$INFO[PVR.RadioNowRecordingChannelIcon]" />
+									<param name="header" value="$LOCALIZE[19158]" />
+									<param name="label1" value="$INFO[PVR.RadioNowRecordingDateTime,$LOCALIZE[19126] - ]" />
+									<param name="label2" value="$INFO[PVR.RadioNowRecordingTitle][CR][COLOR=grey]$INFO[PVR.RadioNowRecordingChannel][/COLOR]" />
+								</include>
+							</control>
+							<control type="group">
+								<visible>PVR.HasNonRecordingRadioTimer</visible>
+								<width>680</width>
+								<include content="PVRWidget">
+									<param name="icon" value="$INFO[PVR.RadioNextRecordingChannelIcon]" />
+									<param name="header" value="$LOCALIZE[19157]" />
+									<param name="label1" value="$INFO[PVR.RadioNextRecordingDateTime,$LOCALIZE[19126] - ]" />
+									<param name="label2" value="$INFO[PVR.RadioNextRecordingTitle][CR][COLOR=grey]$INFO[PVR.RadioNextRecordingChannel][/COLOR]" />
+								</include>
+							</control>
+						</control>
 						<include content="ImageWidget">
 							<param name="image_path" value="special://skin/extras/home-images/tv.jpg"/>
 							<param name="text_label" value="$LOCALIZE[31143]" />
@@ -730,34 +760,6 @@
 							<param name="height" value="550"/>
 							<param name="visible" value="System.HasPVRAddon"/>
 						</include>
-						<control type="grouplist">
-							<height>218</height>
-							<left>478</left>
-							<top>36</top>
-							<orientation>horizontal</orientation>
-							<align>right</align>
-							<width>1360</width>
-							<control type="group">
-								<width>680</width>
-								<visible>PVR.IsRecordingRadio</visible>
-								<include content="PVRWidget">
-									<param name="icon" value="$INFO[PVR.RadioNowRecordingChannelIcon]" />
-									<param name="header" value="$LOCALIZE[19158]" />
-									<param name="label1" value="$INFO[PVR.RadioNowRecordingDateTime,$LOCALIZE[19126] - ]" />
-									<param name="label2" value="$INFO[PVR.RadioNowRecordingTitle][CR][COLOR=grey]$INFO[PVR.RadioNowRecordingChannel][/COLOR]" />
-								</include>
-							</control>
-							<control type="group">
-								<visible>PVR.HasNonRecordingRadioTimer</visible>
-								<width>680</width>
-								<include content="PVRWidget">
-									<param name="icon" value="$INFO[PVR.RadioNextRecordingChannelIcon]" />
-									<param name="header" value="$LOCALIZE[19157]" />
-									<param name="label1" value="$INFO[PVR.RadioNextRecordingDateTime,$LOCALIZE[19126] - ]" />
-									<param name="label2" value="$INFO[PVR.RadioNextRecordingTitle][CR][COLOR=grey]$INFO[PVR.RadioNextRecordingChannel][/COLOR]" />
-								</include>
-							</control>
-						</control>
 					</control>
 				</control>
 				<control type="group" id="15000">

diff --git a/addons/skin.estuary/1080i/MusicVisualisation.xml b/addons/skin.estuary/1080i/MusicVisualisation.xml
@@ -95,7 +95,7 @@
 				<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
 				<bordersize>4</bordersize>
 				<visible>!String.IsEmpty(Player.Art(fanart))</visible>
-				<visible>![Window.IsActive(VisualisationSettings) | Window.IsActive(VisualisationPresetList)]</visible>
+				<visible>!Window.IsActive(VisualisationPresetList)</visible>
 				<animation effect="fade" start="0" end="100" delay="400" time="200">Visible</animation>
 				<animation effect="fade" end="0" time="200">Hidden</animation>
 			</control>
@@ -149,6 +149,20 @@
 				<animation effect="fade" start="0" end="100" delay="400" time="200">WindowOpen</animation>
 				<animation effect="fade" end="0" time="200">WindowClose</animation>
 			</control>
+			<control type="label">
+				<left>1450</left>
+				<top>770</top>
+				<width>400</width>
+				<height>45</height>
+				<align>right</align>
+				<aligny>bottom</aligny>
+				<label>$VAR[SeekLabel]</label>
+				<font>font30_title</font>
+				<shadowcolor>black</shadowcolor>
+				<textcolor>grey</textcolor>
+				<animation effect="fade" start="0" end="100" delay="400" time="200">WindowOpen</animation>
+				<animation effect="fade" end="0" time="200">WindowClose</animation>
+			</control>
 			<control type="progress">
 				<animation effect="fade" end="0" time="200">WindowClose</animation>
 				<left>30</left>

diff --git a/addons/skin.estuary/1080i/MyVideoNav.xml b/addons/skin.estuary/1080i/MyVideoNav.xml
@@ -50,25 +50,15 @@
 					<height>338</height>
 					<font>font13_title</font>
 					<label>$INFO[ListItem.Label]</label>
-					<visible>Control.IsVisible(54) | ListItem.IsCollection</visible>
-				</control>
-				<control type="textbox">
-					<right>130</right>
-					<top>245</top>
-					<width>429</width>
-					<height>338</height>
-					<font>font12</font>
-					<visible>Control.IsVisible(54)</visible>
-					<label>$INFO[ListItem.Plot]</label>
-					<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(autoscroll)</autoscroll>
+					<visible>ListItem.IsCollection</visible>
 				</control>
 				<control type="textbox">
 					<right>130</right>
 					<top>194</top>
 					<width>429</width>
 					<height>398</height>
 					<font>font12</font>
-					<visible>!Control.IsVisible(54)</visible>
+					<visible>!ListItem.IsCollection</visible>
 					<label>$INFO[ListItem.Tagline,[B],[/B][CR]]$INFO[ListItem.Plot]</label>
 					<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(autoscroll)</autoscroll>
 				</control>

diff --git a/addons/skin.estuary/1080i/MyWeather.xml b/addons/skin.estuary/1080i/MyWeather.xml
@@ -115,7 +115,7 @@
 			<visible>Container(300).HasFocus(3)</visible>
 			<include>Visible_Right_Delayed</include>
 			<control type="image">
-				<left>90</left>
+				<left>80</left>
 				<top>138</top>
 				<width>1370</width>
 				<height>796</height>
@@ -306,7 +306,7 @@
 			<visible>Container(300).HasFocus(2)</visible>
 			<include>Visible_Right_Delayed</include>
 			<control type="image">
-				<left>90</left>
+				<left>80</left>
 				<top>138</top>
 				<width>1370</width>
 				<height>796</height>
@@ -562,7 +562,7 @@
 			<include>OpenClose_Right</include>
 			<visible>Container(300).HasFocus(4)</visible>
 			<include>Visible_Right_Delayed</include>
-			<left>520</left>
+			<left>480</left>
 			<top>120</top>
 			<control type="image">
 				<top>20</top>

diff --git a/addons/skin.estuary/1080i/PlayerControls.xml b/addons/skin.estuary/1080i/PlayerControls.xml
@@ -95,31 +95,31 @@
 			</control>
 			<control type="slider">
 				<left>0</left>
-				<top>-20</top>
+				<top>-10</top>
 				<width>800</width>
-				<height>50</height>
+				<height>30</height>
 				<onup>8010</onup>
 				<ondown>650</ondown>
-				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar>
-				<textureslidernib>osd/progress/nub_bar.png</textureslidernib>
-				<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernibfocus>
+				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+				<textureslidernib>osd/progress/nub_leftright.png</textureslidernib>
+				<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
 				<info>Player.Progress</info>
 				<action>seek</action>
-				<visible>!Control.HasFocus(87)</visible>
+				<visible>!Control.HasFocus(87) + Player.SeekEnabled</visible>
 			</control>
 			<control type="slider">
 				<left>0</left>
-				<top>-20</top>
+				<top>-10</top>
 				<width>800</width>
-				<height>50</height>
+				<height>30</height>
 				<onup>8010</onup>
 				<ondown>650</ondown>
-				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar>
-				<textureslidernib colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernib>
-				<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernibfocus>
+				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+				<textureslidernib colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernib>
+				<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
 				<info>Player.Progress</info>
 				<action>seek</action>
-				<visible>Control.HasFocus(87)</visible>
+				<visible>Control.HasFocus(87) + Player.SeekEnabled</visible>
 			</control>
 		</control>
 		<control type="grouplist" id="201">

diff --git a/addons/skin.estuary/1080i/Variables.xml b/addons/skin.estuary/1080i/Variables.xml
@@ -74,6 +74,10 @@
 		<value condition="ListItem.IsFolder + String.IsEmpty(ListItem.Thumb)">DefaultFolderSquare.png</value>
 		<value>$INFO[ListItem.Thumb]</value>
 	</variable>
+	<variable name="InfoWallThumbVar">
+		<value condition="!String.IsEmpty(Listitem.Art(poster))">$INFO[Listitem.Art(poster)]</value>
+		<value>$INFO[ListItem.Icon]</value>
+	</variable>
 	<variable name="IconWallThumbVar">
 		<value condition="Container.Content(studios)">$INFO[ListItem.Label,resource://resource.images.studios.white/,.png]</value>
 		<value condition="!IsEmpty(ListItem.Thumb)">$INFO[ListItem.Thumb]</value>
@@ -298,9 +302,9 @@
 		<value condition="Skin.HasSetting(no_fanart)">$VAR[GlobalFanartVar]</value>
 		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">$INFO[Window(home).Property(infobackground)]</value>
 		<value condition="Window.IsActive(pictures) + String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.FolderPath]</value>
+		<value condition="!String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.Art(tvshow.fanart))">$INFO[Container.Art(tvshow.fanart)]</value>
 		<value condition="!String.IsEmpty(Container.Art(artist.fanart))">$INFO[Container.Art(artist.fanart)]</value>
-		<value condition="!String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value>
 		<value>$INFO[Container.Art(fanart)]</value>
 	</variable>
 	<variable name="WeatherFanartVar">