Merge pull request #11255 from phil65/estuary_update

[estuary] sync

addons/skin.estuary/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.estuary" version="1.9.2" name="Estuary" provider-name="phil65, Piers">
+<addon id="skin.estuary" version="1.9.5" name="Estuary" provider-name="phil65, Piers">
 	<requires>
 		<import addon="xbmc.gui" version="5.12.0"/>
 	</requires>

addons/skin.estuary/colors/brown.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF674032</color>
-	<color name="secondary_background">80738627</color>
+	<color name="primary_background">FF563529</color>
+	<color name="secondary_background">33738627</color>
 	<color name="dialog_tint">FF282524</color>
 	<color name="button_focus">FF83513F</color>
 	<color name="selected">FFFF4400</color>

addons/skin.estuary/colors/charcoal.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF404040</color>
-	<color name="secondary_background">CCA2A2A2</color>
+	<color name="primary_background">FF666666</color>
+	<color name="secondary_background">4D808080</color>
 	<color name="dialog_tint">FF262626</color>
 	<color name="button_focus">FFA2A2A2</color>
 	<color name="selected">FF11E7B1</color>

addons/skin.estuary/colors/chartreuse.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF67A61E</color>
-	<color name="secondary_background">90AF3F37</color>
-	<color name="dialog_tint">FF222A22</color>
+	<color name="primary_background">FF3B5E12</color>
+	<color name="secondary_background">3398FF05</color>
+	<color name="dialog_tint">FF202920</color>
 	<color name="button_focus">FF4FAF00</color>
 	<color name="selected">FF24C6C9</color>
 </colors>

addons/skin.estuary/colors/concrete.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF607D8B</color>
-	<color name="secondary_background">33FF8750</color>
+	<color name="primary_background">FF4B5F69</color>
+	<color name="secondary_background">33DA845C</color>
 	<color name="dialog_tint">FF242728</color>
 	<color name="button_focus">FF607D8B</color>
 	<color name="selected">FFFF8C00</color>

addons/skin.estuary/colors/defaults.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF006699</color>
-	<color name="secondary_background">80A6111F</color>
-	<color name="dialog_tint">FF22282A</color>
+	<color name="primary_background">FF0E597E</color>
+	<color name="secondary_background">330BAA8E</color>
+	<color name="dialog_tint">FF1A2123</color>
 	<color name="background">FF000000</color>
 	<color name="bg_image">FF909090</color>
 	<color name="bg_overlay">30FFFFFF</color>

addons/skin.estuary/colors/gold.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF974D02</color>
-	<color name="secondary_background">99CCCC00</color>
+	<color name="primary_background">FF966300</color>
+	<color name="secondary_background">33FFFF00</color>
 	<color name="dialog_tint">FF2B2B22</color>
 	<color name="button_focus">FFCFA700</color>
-	<color name="selected">FF11E7B1</color>
+	<color name="selected">FFFFF000</color>
 </colors>

addons/skin.estuary/colors/green.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF24CA7A</color>
-	<color name="secondary_background">FF004466</color>
-	<color name="dialog_tint">FF222A26</color>
+	<color name="primary_background">FF1C6E45</color>
+	<color name="secondary_background">3300A3CC</color>
+	<color name="dialog_tint">FF1F2722</color>
 	<color name="button_focus">FF24CA7A</color>
-	<color name="selected">FF24C6C9</color>
+	<color name="selected">FF14D519</color>
 </colors>

addons/skin.estuary/colors/maroon.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF7B0100</color>
-	<color name="secondary_background">4D1442CC</color>
-	<color name="dialog_tint">FF2C2121</color>
+	<color name="primary_background">FF6B1414</color>
+	<color name="secondary_background">33DB2C83</color>
+	<color name="dialog_tint">FF262020</color>
 	<color name="button_focus">FFC40300</color>
 	<color name="selected">FF24C6C9</color>
 </colors>

addons/skin.estuary/colors/midnight.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<colors>
+	<color name="primary_background">FF11375C</color>
+	<color name="secondary_background">334F4F9E</color>
+	<color name="dialog_tint">FF181B1E</color>
+	<color name="button_focus">FF2866A4</color>
+	<color name="selected">FF5BE5EE</color>
+</colors>

addons/skin.estuary/colors/orange.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FFFF7200</color>
-	<color name="secondary_background">60B300B3</color>
-	<color name="dialog_tint">FF2A2622</color>
+	<color name="primary_background">FFA74012</color>
+	<color name="secondary_background">33BDAE12</color>
+	<color name="dialog_tint">FF2B2621</color>
 	<color name="button_focus">FFFF9800</color>
 	<color name="selected">FFFFF100</color>
 </colors>

addons/skin.estuary/colors/pink.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FFF23F94</color>
-	<color name="secondary_background">6F00ADCC</color>
+	<color name="primary_background">FFA61558</color>
+	<color name="secondary_background">3363BCE9</color>
 	<color name="dialog_tint">FF2B2225</color>
 	<color name="button_focus">FFE91E63</color>
 	<color name="selected">FF94D800</color>

addons/skin.estuary/colors/rose.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FFFF8EC4</color>
-	<color name="secondary_background">80B30000</color>
-	<color name="dialog_tint">FF282427</color>
+	<color name="primary_background">FFA22A66</color>
+	<color name="secondary_background">33FFB3D7</color>
+	<color name="dialog_tint">FF251F24</color>
 	<color name="button_focus">FFFF8EC4</color>
-	<color name="selected">FF24C6C9</color>
+	<color name="selected">FFFF0261</color>
 </colors>

addons/skin.estuary/colors/teal.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF00897B</color>
-	<color name="secondary_background">93FF8750</color>
+	<color name="primary_background">FF00665C</color>
+	<color name="secondary_background">33F07942</color>
 	<color name="dialog_tint">FF222A2A</color>
 	<color name="button_focus">FF009688</color>
 	<color name="selected">FFC67F03</color>

addons/skin.estuary/colors/violet.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FFA200FF</color>
-	<color name="secondary_background">4DF6FF02</color>
+	<color name="primary_background">FF5B1C80</color>
+	<color name="secondary_background">33FFB3D7</color>
 	<color name="dialog_tint">FF27222A</color>
 	<color name="button_focus">FFC050FF</color>
-	<color name="selected">FF11E7B1</color>
+	<color name="selected">FFFF0054</color>
 </colors>

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

@@ -56,7 +56,10 @@ msgctxt "#31007"
 msgid "Unwatched movies"
 msgstr ""
 
-#empty string with id 31008
+#: /xml/SkinSettings.xml
+msgctxt "#31008"
+msgid "Enable category widgets"
+msgstr ""
 
 #: /1080i/MyVideoNav.xml
 msgctxt "#31009"
@@ -585,12 +588,7 @@ msgctxt "#31131"
 msgid "Choose skin fanart pack"
 msgstr ""
 
-#: /1080i/MyVideoNav.xml /1080i/View_502_FanArt.xml
-msgctxt "#31132"
-msgid "min"
-msgstr ""
-
-#empty string with id 31133
+#empty strings from id 31132 to 31133
 
 #: /1080i/DialogSeekBar.xml
 msgctxt "#31134"

addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml

@@ -89,64 +89,61 @@
 					<ondown>700</ondown>
 					<onright>SetFocus($INFO[Container(9000).ListItem.Property(menu_id)])</onright>
 					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<focusedlayout height="95">
-						<control type="group">
-							<animation effect="fade" start="100" end="0" time="0">UnFocus</animation>
-							<control type="image">
-								<left>0</left>
-								<width>462</width>
-								<height>95</height>
-								<texture colordiffuse="button_focus">lists/focus.png</texture>
-								<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !ControlGroup(700).HasFocus">Conditional</animation>
-							</control>
-							<control type="image">
-								<left>-3</left>
-								<top>1</top>
-								<width>95</width>
-								<height>95</height>
-								<texture colordiffuse="button_focus">$INFO[ListItem.Art(thumb)]</texture>
-								<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
-							</control>
-							<control type="image">
-								<left>0</left>
-								<width>95</width>
-								<height>95</height>
-								<texture colordiffuse="51FFFFFF">colors/black.png</texture>
-								<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !ControlGroup(700).HasFocus">Conditional</animation>
-							</control>
+					<focusedlayout height="95" width="462">
+						<control type="image">
+							<left>0</left>
+							<right>0</right>
+							<bottom>0</bottom>
+							<texture colordiffuse="button_focus">lists/focus.png</texture>
+							<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000)">Conditional</animation>
+						</control>
+						<control type="image">
+							<left>-3</left>
+							<top>0</top>
+							<width>95</width>
+							<bottom>0</bottom>
+							<texture colordiffuse="button_focus">$INFO[ListItem.Art(thumb)]</texture>
+							<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
+						</control>
+						<control type="image">
+							<left>0</left>
+							<width>95</width>
+							<bottom>0</bottom>
+							<texture colordiffuse="51FFFFFF">colors/black.png</texture>
+							<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000)">Conditional</animation>
 						</control>
 						<control type="image">
 							<left>-3</left>
-							<top>1</top>
+							<top>0</top>
 							<width>95</width>
-							<height>95</height>
+							<bottom>0</bottom>
 							<texture>$INFO[ListItem.Art(thumb)]</texture>
 						</control>
 						<control type="label">
 							<left>104</left>
-							<height>95</height>
-							<width>560</width>
+							<bottom>0</bottom>
+							<right>10</right>
 							<aligny>center</aligny>
 							<font>font14</font>
 							<label>$INFO[ListItem.Label]</label>
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
 					</focusedlayout>
-					<itemlayout height="95">
+					<itemlayout height="95" width="462">
 						<control type="label">
 							<left>104</left>
-							<height>95</height>
-							<width>560</width>
+							<bottom>0</bottom>
+							<right>10</right>
 							<aligny>center</aligny>
 							<font>font14</font>
 							<label>$INFO[ListItem.Label]</label>
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
 						<control type="image">
 							<left>-3</left>
-							<top>1</top>
+							<top>0</top>
 							<width>95</width>
-							<height>95</height>
+							<bottom>0</bottom>
 							<texture colordiffuse="44FFFFFF">$INFO[ListItem.Art(thumb)]</texture>
 						</control>
 					</itemlayout>

addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml

@@ -38,7 +38,6 @@
 				<info>Player.Volume</info>
 			</control>
 			<control type="slider">
-				<description>Slider</description>
 				<left>40</left>
 				<top>55</top>
 				<width>400</width>

addons/skin.estuary/xml/DialogAddonSettings.xml

@@ -87,16 +87,13 @@
 				<texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus>
 			</control>
 			<control type="button" id="3">
-				<description>Default Button</description>
 				<include>DefaultSettingButton</include>
 			</control>
 			<control type="radiobutton" id="4">
-				<description>Default RadioButton</description>
 				<include>DefaultSettingButton</include>
 				<textwidth>900</textwidth>
 			</control>
 			<control type="spincontrolex" id="5">
-				<description>Default spincontrolex</description>
 				<include>DefaultSettingButton</include>
 				<textwidth>900</textwidth>
 			</control>
@@ -116,7 +113,6 @@
 				<texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture>
 			</control>
 			<control type="sliderex" id="8">
-				<description>Default Slider</description>
 				<include>DefaultSettingButton</include>
 			</control>
 		</control>

addons/skin.estuary/xml/DialogAudioDSPManager.xml

@@ -30,14 +30,14 @@
 					<control type="image">
 						<left>0</left>
 						<top>0</top>
-						<width>330</width>
+						<right>0</right>
 						<height>130</height>
 						<texture border="40">buttons/dialogbutton-nofo.png</texture>
 					</control>
 					<control type="label">
 						<left>0</left>
 						<top>0</top>
-						<width>330</width>
+						<right>0</right>
 						<height>130</height>
 						<textcolor>grey</textcolor>
 						<font>font25_title</font>
@@ -50,15 +50,15 @@
 					<control type="image">
 						<left>0</left>
 						<top>0</top>
-						<width>330</width>
+						<right>0</right>
 						<height>130</height>
 						<animation effect="fade" start="100" end="20" time="200" condition="!Control.HasFocus(9000)">Conditional</animation>
 						<texture border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texture>
 					</control>
 					<control type="label">
 						<left>0</left>
 						<top>0</top>
-						<width>330</width>
+						<right>0</right>
 						<height>130</height>
 						<font>font25_title</font>
 						<aligny>center</aligny>
@@ -68,7 +68,6 @@
 				</focusedlayout>
 			</control>
 			<control type="group" id="200">
-				<description>available- and active mode lists</description>
 				<top>90</top>
 				<control type="group">
 					<left>320</left>

addons/skin.estuary/xml/DialogContextMenu.xml

@@ -5,7 +5,8 @@
 	<coordinates>
 		<left>0</left>
 		<top>0</top>
-		<origin x="735" y="400">Window.IsActive(Home)</origin>
+		<origin x="1055" y="400">Window.IsActive(Home) + String.IsEqual(Skin.AspectRatio,21:9)</origin>
+		<origin x="735" y="400">Window.IsActive(Home) + !String.IsEqual(Skin.AspectRatio,21:9)</origin>
 	</coordinates>
 	<controls>
 		<control type="image">

addons/skin.estuary/xml/DialogExtendedProgressBar.xml

@@ -46,13 +46,11 @@
 				<align>right</align>
 				<orientation>horizontal</orientation>
 				<control type="label" id="30">
-					<description>Header label</description>
 					<width min="0" max="680">auto</width>
 					<height>120</height>
 					<font>font12</font>
 				</control>
 				<control type="label">
-					<description>Header label</description>
 					<width min="0" max="120">auto</width>
 					<height>120</height>
 					<font>font12</font>
@@ -71,7 +69,6 @@
 			</control>
 			<control type="progress" id="32">
 				<left>3000</left>
-				<description>progress control</description>
 				<height>15</height>
 			</control>
 		</control>