Merge pull request #11121 from phil65/estuary_master

[estuary] sync

addons/skin.estuary/extras/home-images/LICENSE

@@ -1,5 +1,3 @@
 movie.jpg: https://creativecommons.org/licenses/by/2.0/legalcode
-pictures.jpg: https://creativecommons.org/licenses/by/2.0/legalcode
-tv.jpg: https://creativecommons.org/licenses/by-sa/2.0/legalcode
 
 images were resized.

addons/skin.estuary/language/resource.language.en_gb/strings.po

@@ -678,3 +678,8 @@ msgstr ""
 msgctxt "#31161"
 msgid "Numeric pad"
 msgstr ""
+
+#: /xml/Home.xml
+msgctxt "#31162"
+msgid "Play your personal games or download one of the many game add-ons from the official repository."
+msgstr ""

addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml

@@ -26,31 +26,27 @@
 					<param name="container_path" value="addons://sources/video/" />
 					<param name="container_target" value="videos" />
 					<param name="imagewidget_onclick" value="ActivateWindow(addonbrowser,addons://all/xbmc.addon.video,return)" />
-					<param name="imagewidget_image" value="special://skin/extras/home-images/movie.jpg" />
 				</include>
 				<include content="AddonLauncherPanel">
 					<param name="group_id" value="501" />
 					<param name="id" value="music" />
 					<param name="container_path" value="addons://sources/audio/" />
 					<param name="container_target" value="music" />
 					<param name="imagewidget_onclick" value="ActivateWindow(addonbrowser,addons://all/xbmc.addon.audio,return)" />
-					<param name="imagewidget_image" value="special://skin/extras/home-images/music.jpg" />
 				</include>
 				<include content="AddonLauncherPanel">
 					<param name="group_id" value="509" />
 					<param name="id" value="game" />
 					<param name="container_path" value="addons://sources/game/" />
 					<param name="container_target" value="games" />
 					<param name="imagewidget_onclick" value="ActivateWindow(addonbrowser,addons://all/category.standalonegames,return)" />
-					<param name="imagewidget_image" value="special://skin/extras/home-images/games.jpg" />
 				</include>
 				<include content="AddonLauncherPanel">
 					<param name="group_id" value="502" />
 					<param name="id" value="addons" />
 					<param name="container_path" value="addons://sources/executable/" />
 					<param name="container_target" value="programs" />
 					<param name="imagewidget_onclick" value="ActivateWindow(addonbrowser,addons://all/xbmc.addon.executable,return)" />
-					<param name="imagewidget_image" value="special://skin/extras/home-images/add-ons.jpg" />
 				</include>
 				<include content="AddonLauncherPanel" condition="System.Platform.Android">
 					<param name="group_id" value="506" />
@@ -64,7 +60,6 @@
 					<param name="container_path" value="addons://sources/image/" />
 					<param name="container_target" value="pictures" />
 					<param name="imagewidget_onclick" value="ActivateWindow(addonbrowser,addons://all/xbmc.addon.image,return)" />
-					<param name="imagewidget_image" value="special://skin/extras/home-images/pictures.jpg" />
 				</include>
 				<include content="AddonLauncherPanel">
 					<param name="group_id" value="507" />
@@ -163,7 +158,6 @@
 							<property name="id">video</property>
 							<property name="path">addons://sources/video/</property>
 							<property name="menu_id">$NUMBER[500]</property>
-							<!-- <visible>Integer.IsGreater(Container(500).NumItems,0)</visible> -->
 						</item>
 						<item id="2">
 							<label>$LOCALIZE[1038]</label>
@@ -172,7 +166,6 @@
 							<property name="id">music</property>
 							<property name="path">addons://sources/audio/</property>
 							<property name="menu_id">$NUMBER[501]</property>
-							<!-- <visible>Integer.IsGreater(Container(501).NumItems,0)</visible> -->
 						</item>
 						<item id="8">
 							<label>$LOCALIZE[35049]</label>
@@ -182,7 +175,6 @@
 							<property name="id">game</property>
 							<property name="path">addons://sources/game/</property>
 							<property name="menu_id">$NUMBER[509]</property>
-							<!-- <visible>Integer.IsGreater(Container(509).NumItems,0)</visible> -->
 						</item>
 						<item id="3">
 							<label>$LOCALIZE[1043]</label>
@@ -191,7 +183,6 @@
 							<property name="id">addons</property>
 							<property name="path">addons://sources/executable/</property>
 							<property name="menu_id">$NUMBER[502]</property>
-							<!-- <visible>Integer.IsGreater(Container(502).NumItems,0)</visible> -->
 						</item>
 						<item id="4">
 							<label>$LOCALIZE[20244]</label>
@@ -209,8 +200,6 @@
 							<property name="id">pictures</property>
 							<property name="path">addons://sources/image/</property>
 							<property name="menu_id">$NUMBER[503]</property>
-							<!-- 							<visible>Integer.IsGreater(Container(503).NumItems,0)</visible>
-							 -->
 						</item>
 						<item id="7">
 							<label>$LOCALIZE[24998]</label>

addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml

@@ -16,8 +16,17 @@
 				<height>170</height>
 				<texture>frame/osdfade.png</texture>
 			</control>
+			<control type="image">
+				<left>10</left>
+				<top>0</top>
+				<width>500</width>
+				<height>160</height>
+				<texture>$INFO[Player.Art(clearlogo)]</texture>
+				<aspectratio aligny="top" align="left">keep</aspectratio>
+			</control>
 			<control type="group">
 				<visible>!Window.IsActive(pvrosdchannels) + !Window.IsActive(pvrosdguide)</visible>
+				<visible>IsEmpty(Player.Art(clearlogo))</visible>
 				<animation effect="fade" time="150">VisibleChange</animation>
 				<left>30</left>
 				<right>400</right>

addons/skin.estuary/xml/DialogVideoInfo.xml

@@ -244,7 +244,7 @@
 					<texture>$VAR[BannerVar]</texture>
 					<visible>Integer.IsEqual(Container(50).NumItems,0)</visible>
 				</control>
-				<control type="list" id="50">
+				<control type="panel" id="50">
 					<top>158</top>
 					<width>1235</width>
 					<height>370</height>
@@ -364,7 +364,6 @@
 								<width>232</width>
 								<height>285</height>
 								<texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
-								<visible>Control.HasFocus(50)</visible>
 							</control>
 						</control>
 					</focusedlayout>