[Estuary] Sync

12 files changed, 67 insertions, 44 deletions

diff --git a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml
index 2d28625407..ae0afa4237 100644
--- a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml
+++ b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml
@@ -17,16 +17,28 @@
 				<texture>frame/osdfade.png</texture>
 			</control>
 			<control type="image">
-				<left>10</left>
+				<left>15</left>
+				<top>10</top>
+				<width>300</width>
+				<height>140</height>
+				<texture>$VAR[PlayerClearLogoVar]</texture>
+				<aspectratio aligny="center" align="center">keep</aspectratio>
+			</control>
+			<control type="textbox">
+				<label>$VAR[NowPlayingBreadcrumbsVar]</label>
+				<font>font45</font>
+				<shadowcolor>text_shadow</shadowcolor>
 				<top>0</top>
-				<width>500</width>
-				<height>160</height>
-				<texture>$INFO[Player.Art(clearlogo)]</texture>
-				<aspectratio aligny="top" align="left">keep</aspectratio>
+				<height>150</height>
+				<left>330</left>
+				<right>400</right>
+				<aligny>center</aligny>
+				<visible>!String.IsEmpty(Player.Art(tvshow.clearlogo))</visible>
 			</control>
 			<control type="group">
 				<visible>!Window.IsActive(pvrosdchannels) + !Window.IsActive(pvrchannelguide)</visible>
 				<visible>String.IsEmpty(Player.Art(clearlogo))</visible>
+				<visible>String.IsEmpty(Player.Art(tvshow.clearlogo))</visible>
 				<animation effect="fade" time="150">VisibleChange</animation>
 				<left>30</left>
 				<right>400</right>
diff --git a/addons/skin.estuary/xml/DialogAddonInfo.xml b/addons/skin.estuary/xml/DialogAddonInfo.xml
index 55549badf3..cd58737574 100644
--- a/addons/skin.estuary/xml/DialogAddonInfo.xml
+++ b/addons/skin.estuary/xml/DialogAddonInfo.xml
@@ -254,7 +254,7 @@
 						<width>470</width>
 						<height>40</height>
 						<label>$INFO[ListItem.AddonOrigin,[COLOR button_focus]$LOCALIZE[31150]:[/COLOR] ]</label>
-						<visible>!String.IsEmpty(ListItem.AddonOrigin)</visible>
+						<visible>!String.IsEmpty(ListItem.AddonOrigin) + ListItem.Property(addon.isinstalled)</visible>
 					</control>
 				</control>
 			</control>
diff --git a/addons/skin.estuary/xml/DialogKeyboard.xml b/addons/skin.estuary/xml/DialogKeyboard.xml
index 90ff52fc2b..29898d42c4 100644
--- a/addons/skin.estuary/xml/DialogKeyboard.xml
+++ b/addons/skin.estuary/xml/DialogKeyboard.xml
@@ -525,7 +525,8 @@
 				<height>460</height>
 				<centerleft>86%</centerleft>
 				<itemgap>dialogbuttons_itemgap</itemgap>
-				<onup>95200</onup>
+				<onup condition="!Integer.IsGreater(Container(9010).NumItems,0)">95200</onup>
+				<onup condition="Integer.IsGreater(Container(9010).NumItems,0)">9010</onup>
 				<ondown>95200</ondown>
 				<onleft>78500</onleft>
 				<onright>140</onright>
@@ -543,7 +544,6 @@
 				</include>
 				<include content="DefaultDialogButton">
 					<param name="id" value="309" />
-					<param name="label" value="Layout" />
 					<param name="width" value="350" />
 				</include>
 				<include content="DefaultDialogButton">
diff --git a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
index c7c7f90208..6d1f1b4a83 100644
--- a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
+++ b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
@@ -23,7 +23,7 @@
 					<movement>4</movement>
 					<focusposition>5</focusposition>
 					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<focusedlayout height="90" width="1000">
+					<focusedlayout height="90" width="875">
 						<control type="image">
 							<left>0</left>
 							<right>0</right>
@@ -32,45 +32,45 @@
 							<visible>Control.hasFocus(11)</visible>
 						</control>
 						<control type="image">
-							<left>770</left>
+							<right>20</right>
 							<top>10</top>
-							<width>90</width>
-							<bottom>10</bottom>
+							<width>80</width>
+							<height>70</height>
 							<aspectratio align="right">keep</aspectratio>
 							<texture>$INFO[listitem.icon]</texture>
 						</control>
 						<control type="progress">
 							<left>105</left>
-							<top>55</top>
+							<top>58</top>
 							<width>50</width>
 							<height>12</height>
 							<midtexture border="3">progress/texturebg_white.png</midtexture>
-							<visible>ListItem.HasEpg + !ListItem.IsRecording</visible>
+							<visible>ListItem.HasEpg</visible>
 							<info>ListItem.Progress</info>
 						</control>
 						<control type="image">
-							<right>15</right>
-							<top>9</top>
+							<right>110</right>
+							<top>25</top>
 							<width>40</width>
 							<height>40</height>
 							<texture>$VAR[PVRStatusImageVar]</texture>
 						</control>
 						<control type="label">
 							<left>105</left>
-							<top>5</top>
+							<top>8</top>
 							<height>90</height>
-							<width>600</width>
+							<right>120</right>
 							<aligny>top</aligny>
-							<animation effect="slide" start="0,0" end="0,18" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation>
-							<label>$INFO[ListItem.Label]</label>
 							<font>font14</font>
+							<animation effect="slide" start="0,0" end="0,14" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation>
+							<label>$INFO[ListItem.Label]</label>
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
 						<control type="label">
 							<left>165</left>
-							<top>45</top>
+							<top>46</top>
 							<height>90</height>
-							<width>580</width>
+							<right>120</right>
 							<aligny>top</aligny>
 							<font>font12</font>
 							<label>$INFO[ListItem.Title]</label>
@@ -78,6 +78,7 @@
 						</control>
 						<control type="label">
 							<left>12</left>
+							<top>0</top>
 							<height>90</height>
 							<width>75</width>
 							<align>center</align>
@@ -87,47 +88,47 @@
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
 					</focusedlayout>
-					<itemlayout height="90">
+					<itemlayout height="90" width="875">
 						<control type="image">
-							<left>770</left>
+							<right>20</right>
 							<top>10</top>
-							<width>90</width>
-							<bottom>10</bottom>
+							<width>80</width>
+							<height>70</height>
 							<aspectratio align="right">keep</aspectratio>
 							<texture>$INFO[listitem.icon]</texture>
 						</control>
 						<control type="progress">
 							<left>105</left>
-							<top>55</top>
+							<top>58</top>
 							<width>50</width>
 							<height>12</height>
 							<colordiffuse>88FFFFFF</colordiffuse>
-							<visible>ListItem.HasEpg + !ListItem.IsRecording</visible>
+							<visible>ListItem.HasEpg</visible>
 							<info>ListItem.Progress</info>
 						</control>
 						<control type="image">
-							<right>15</right>
-							<top>9</top>
+							<right>110</right>
+							<top>25</top>
 							<width>40</width>
 							<height>40</height>
 							<texture>$VAR[PVRStatusImageVar]</texture>
 						</control>
 						<control type="label">
 							<left>105</left>
-							<top>5</top>
+							<top>8</top>
 							<height>90</height>
-							<width>640</width>
+							<right>120</right>
 							<aligny>top</aligny>
-							<label>$INFO[ListItem.Label]</label>
 							<font>font14</font>
-							<animation effect="slide" start="0,0" end="0,18" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation>
+							<label>$INFO[ListItem.Label]</label>
+							<animation effect="slide" start="0,0" end="0,14" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation>
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
 						<control type="label">
 							<left>165</left>
-							<top>45</top>
+							<top>46</top>
 							<height>90</height>
-							<width>580</width>
+							<right>120</right>
 							<aligny>top</aligny>
 							<font>font12</font>
 							<label>$INFO[ListItem.Title]</label>
@@ -136,6 +137,7 @@
 						</control>
 						<control type="label">
 							<left>12</left>
+							<top>0</top>
 							<height>90</height>
 							<width>75</width>
 							<align>center</align>
@@ -148,7 +150,7 @@
 					</itemlayout>
 				</control>
 				<control type="scrollbar" id="60">
-					<left>868</left>
+					<left>869</left>
 					<width>12</width>
 					<height>100%</height>
 					<onleft>11</onleft>
diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml
index 8ce6adcb39..82bcca2ca2 100644
--- a/addons/skin.estuary/xml/DialogSeekBar.xml
+++ b/addons/skin.estuary/xml/DialogSeekBar.xml
@@ -238,7 +238,7 @@
 				<align>left</align>
 				<orientation>horizontal</orientation>
 				<itemgap>10</itemgap>
-				<visible>!Player.ChannelPreviewActive</visible>
+				<visible>![Player.ChannelPreviewActive | Window.IsActive(videoosd)]</visible>
 				<animation effect="fade" start="0" end="100" time="200" delay="1000">Visible</animation>
 				<include content="MediaFlag">
 					<param name="texture" value="$INFO[VideoPlayer.AudioChannels,flags/audiochannel/,.png]" />
diff --git a/addons/skin.estuary/xml/DialogSubtitles.xml b/addons/skin.estuary/xml/DialogSubtitles.xml
index 38256bf8c9..449a4fd52b 100644
--- a/addons/skin.estuary/xml/DialogSubtitles.xml
+++ b/addons/skin.estuary/xml/DialogSubtitles.xml
@@ -92,7 +92,6 @@
 					<onup>120</onup>
 					<ondown>120</ondown>
 					<pagecontrol>73</pagecontrol>
-					<pagecontrol>121</pagecontrol>
 					<scrolltime>200</scrolltime>
 					<itemlayout width="920" height="100">
 						<control type="image">
diff --git a/addons/skin.estuary/xml/DialogVideoInfo.xml b/addons/skin.estuary/xml/DialogVideoInfo.xml
index c3bd88c6d6..991358e1f8 100644
--- a/addons/skin.estuary/xml/DialogVideoInfo.xml
+++ b/addons/skin.estuary/xml/DialogVideoInfo.xml
@@ -503,7 +503,7 @@
 				<textcolor>99FFFFFF</textcolor>
 				<shadowcolor>text_shadow</shadowcolor>
 				<haspath>true</haspath>
-				<label>$INFO[ListItem.FileNameANdPath]</label>
+				<label>$VAR[VideoInfoBottomLabelVar]</label>
 				<visible>Control.HasFocus(6)</visible>
 				<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
 				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
diff --git a/addons/skin.estuary/xml/Includes_MediaMenu.xml b/addons/skin.estuary/xml/Includes_MediaMenu.xml
index 660d90566c..0ed49870a9 100644
--- a/addons/skin.estuary/xml/Includes_MediaMenu.xml
+++ b/addons/skin.estuary/xml/Includes_MediaMenu.xml
@@ -370,6 +370,7 @@
 			<control type="button" id="19">
 				<visible>Container.CanFilter + !Container.CanFilterAdvanced</visible>
 				<include>MediaMenuItemsCommon</include>
+				<onclick>right</onclick>
 				<label>$LOCALIZE[137]</label>
 			</control>
 			<control type="button" id="199">
diff --git a/addons/skin.estuary/xml/MyPVRRecordings.xml b/addons/skin.estuary/xml/MyPVRRecordings.xml
index 8f34ff96be..38a87c300a 100644
--- a/addons/skin.estuary/xml/MyPVRRecordings.xml
+++ b/addons/skin.estuary/xml/MyPVRRecordings.xml
@@ -13,7 +13,7 @@
 				<control type="fixedlist" id="50">
 					<left>0</left>
 					<top>list_y_offset</top>
-					<right>778</right>
+					<right>860</right>
 					<bottom>list_y_offset</bottom>
 					<onleft>9000</onleft>
 					<onright>73</onright>
diff --git a/addons/skin.estuary/xml/Settings.xml b/addons/skin.estuary/xml/Settings.xml
index a7b39a9976..18ad10234b 100644
--- a/addons/skin.estuary/xml/Settings.xml
+++ b/addons/skin.estuary/xml/Settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol always="true">9000</defaultcontrol>
+	<defaultcontrol>9000</defaultcontrol>
 	<backgroundcolor>background</backgroundcolor>
 	<controls>
 		<include>DefaultBackground</include>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index 32434b3548..c2a8f67b6e 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -254,8 +254,13 @@
 		<value condition="String.IsEqual(ListItem.DBType,movie)">$INFO[ListItem.Tagline,[I],[/I]]</value>
 		<value>$INFO[ListItem.Genre]</value>
 	</variable>
+	<variable name="VideoInfoBottomLabelVar">
+		<value condition="Control.HasFocus(8)">$INFO[ListItem.LastPlayed,$LOCALIZE[568]: ]</value>
+		<value condition="Control.HasFocus(6)">$INFO[ListItem.FileNameAndPath]</value>
+	</variable>
 	<variable name="NowPlayingBreadcrumbsVar">
 		<value condition="VideoPlayer.Content(livetv)">$INFO[VideoPlayer.Title]</value>
+		<value condition="VideoPlayer.Content(episodes) + !String.IsEmpty(Player.Art(tvshow.clearlogo))">$INFO[VideoPlayer.Season,[COLOR button_focus]S,[/COLOR]]$INFO[VideoPlayer.Episode,[COLOR button_focus]E,: [/COLOR]]$INFO[VideoPlayer.Title]</value>
 		<value condition="Window.IsActive(fullscreenvideo)">$INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year, ([COLOR button_focus],[/COLOR])]</value>
 		<value condition="MusicPartyMode.Enabled">$LOCALIZE[589]</value>
 		<value>$LOCALIZE[31000]...</value>
@@ -267,6 +272,10 @@
 		<value condition="VideoPlayer.Content(LiveTV) | PVR.IsPlayingRecording | PVR.IsPlayingEpgTag">$INFO[VideoPlayer.ChannelNumberLabel,([COLOR=blue],[/COLOR]) ]$INFO[VideoPlayer.ChannelName] $INFO[VideoPlayer.EpisodeName, - ]</value>
 		<value>$INFO[VideoPlayer.Genre]</value>
 	</variable>
+	<variable name="PlayerClearLogoVar">
+		<value condition="!String.IsEmpty(Player.Art(tvshow.clearlogo))">$INFO[Player.Art(tvshow.clearlogo)]</value>
+		<value condition="!String.IsEmpty(Player.Art(clearlogo))">$INFO[Player.Art(clearlogo)]</value>
+	</variable>
 	<variable name="AddonsFanartVar">
 		<value condition="Skin.HasSetting(no_fanart)"></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>
diff --git a/addons/skin.estuary/xml/View_501_Banner.xml b/addons/skin.estuary/xml/View_501_Banner.xml
index 37b815930e..5accfb92af 100644
--- a/addons/skin.estuary/xml/View_501_Banner.xml
+++ b/addons/skin.estuary/xml/View_501_Banner.xml
@@ -23,7 +23,7 @@
 				<visible>Container.Content(tvshows)</visible>
 				<itemlayout height="220" width="900">
 					<control type="group">
-						<posy>100</posy>
+						<top>100</top>
 						<control type="image">
 							<left>0</left>
 							<top>0</top>
@@ -60,7 +60,7 @@
 						<animation type="Unfocus">
 							<effect type="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="450,180" />
 						</animation>
-						<posy>100</posy>
+						<top>100</top>
 						<control type="image">
 							<left>0</left>
 							<top>0</top>