Estuary cleanup (#25584)

* Can't align to top

* Undefined font (font16)

* Don't think you can use align or aligny in a progress control

* No control ids in list 1103

* Nothing ondown from PVR osd buttons

* Lowercase false

* Remove unused variable

* Remove unused include

11 files changed, 23 insertions, 67 deletions

diff --git a/addons/skin.estuary/xml/DialogVideoManager.xml b/addons/skin.estuary/xml/DialogVideoManager.xml
index a02f3398a4..ceb73694a9 100644
--- a/addons/skin.estuary/xml/DialogVideoManager.xml
+++ b/addons/skin.estuary/xml/DialogVideoManager.xml
@@ -84,7 +84,6 @@
 				<height>565</height>
 				<onleft condition="Integer.IsGreater(Container(50).NumItems,0)">100</onleft>
 				<itemgap>dialogbuttons_itemgap</itemgap>
-				<align>top</align>
 				<scrolltime tween="quadratic">200</scrolltime>
 				<include content="DefaultDialogButton">
 					<param name="id" value="21" />
diff --git a/addons/skin.estuary/xml/GameOSD.xml b/addons/skin.estuary/xml/GameOSD.xml
index b2f5fd429e..1d4c0dc8b9 100644
--- a/addons/skin.estuary/xml/GameOSD.xml
+++ b/addons/skin.estuary/xml/GameOSD.xml
@@ -77,7 +77,6 @@
 				<control type="group" id="2000">
 					<top>80</top>
 					<control type="list" id="1103">
-						<defaultcontrol always="true">2101</defaultcontrol>
 						<height>560</height>
 						<orientation>vertical</orientation>
 						<itemlayout condition="!Control.IsVisible(2200)" width="700" height="80">
diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml
index 8dd226ec45..7675dae0e5 100644
--- a/addons/skin.estuary/xml/Includes.xml
+++ b/addons/skin.estuary/xml/Includes.xml
@@ -106,7 +106,7 @@
 		<font></font>
 	</include>
 	<include name="RatingCircle">
-		<param name="animation">False</param>
+		<param name="animation">false</param>
 		<definition>
 			<control type="group">
 				<animation effect="fade" time="0" condition="$PARAM[animation]">VisibleChange</animation>
@@ -1299,7 +1299,7 @@
 		</definition>
 	</include>
 	<include name="BottomBar">
-		<param name="info_visible">False</param>
+		<param name="info_visible">false</param>
 		<definition>
 			<control type="group">
 				<animation effect="slide" end="0,112" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation>
diff --git a/addons/skin.estuary/xml/Includes_Animations.xml b/addons/skin.estuary/xml/Includes_Animations.xml
index 1b02def93b..a317b31c9c 100644
--- a/addons/skin.estuary/xml/Includes_Animations.xml
+++ b/addons/skin.estuary/xml/Includes_Animations.xml
@@ -54,31 +54,31 @@
 		<include condition="!Skin.HasSetting(no_slide_animations)">Vis_FadeSlide_Right</include>
 	</include>
 	<include name="Animation_TopSlide">
-		<animation type="WindowOpen" reversible="False">
+		<animation type="WindowOpen" reversible="false">
 			<effect type="fade" start="0" end="100" time="300"/>
 			<effect type="slide" start="0,-200" end="0,0" time="300" tween="cubic" easing="out" />
 		</animation>
-		<animation type="WindowClose" reversible="False">
+		<animation type="WindowClose" reversible="false">
 			<effect type="fade" start="100" end="0" time="300"/>
 			<effect type="slide" start="0,0" end="0,-200" time="300" tween="cubic" easing="out" />
 		</animation>
 	</include>
 	<include name="Animation_BottomSlide">
-		<animation type="WindowOpen" reversible="False">
+		<animation type="WindowOpen" reversible="false">
 			<effect type="fade" start="0" end="100" time="300"/>
 			<effect type="slide" start="0,200" end="0,0" time="300" tween="cubic" easing="out" />
 		</animation>
-		<animation type="WindowClose" reversible="False">
+		<animation type="WindowClose" reversible="false">
 			<effect type="fade" start="100" end="0" time="300"/>
 			<effect type="slide" start="0,0" end="0,200" time="300" tween="cubic" easing="out" />
 		</animation>
 	</include>
 	<include name="Vis_FadeSlide_Right">
-		<animation type="Visible" reversible="False">
+		<animation type="Visible" reversible="false">
 			<effect type="fade" start="0" end="100" time="300" tween="sine" easing="out"/>
 			<effect type="slide" start="320" end="0" time="400" tween="cubic" easing="out" />
 		</animation>
-		<animation type="Hidden" reversible="False">
+		<animation type="Hidden" reversible="false">
 			<effect type="fade" start="100" end="0" time="300" tween="sine" easing="out" />
 			<effect type="slide" start="0" end="320" time="300" tween="cubic" easing="out" />
 		</animation>
@@ -88,11 +88,11 @@
 		<include condition="!Skin.HasSetting(no_slide_animations)">Vis_FadeSlide_Left</include>
 	</include>
 	<include name="Vis_FadeSlide_Left">
-		<animation type="Visible" reversible="False">
+		<animation type="Visible" reversible="false">
 			<effect type="fade" start="0" end="100" time="300" tween="sine" easing="out" />
 			<effect type="slide" start="-320" end="0" time="400" tween="cubic" easing="out" />
 		</animation>
-		<animation type="Hidden" reversible="False">
+		<animation type="Hidden" reversible="false">
 			<effect type="fade" start="100" end="0" time="300" tween="sine" easing="out" />
 			<effect type="slide" start="0" end="-320" time="300" tween="cubic" easing="out" />
 		</animation>
diff --git a/addons/skin.estuary/xml/Includes_Buttons.xml b/addons/skin.estuary/xml/Includes_Buttons.xml
index e7deab53c4..f8ace0d34d 100644
--- a/addons/skin.estuary/xml/Includes_Buttons.xml
+++ b/addons/skin.estuary/xml/Includes_Buttons.xml
@@ -126,36 +126,6 @@
 			</control>
 		</definition>
 	</include>
-	<include name="DialogToggleButton">
-		<param name="width">300</param>
-		<param name="height">100</param>
-		<param name="wrapmultiline">false</param>
-		<param name="font">font25_title</param>
-		<param name="onclick"></param>
-		<param name="visible">true</param>
-		<param name="enable">true</param>
-		<param name="usealttexture">false</param>
-		<definition>
-			<control type="togglebutton" id="$PARAM[id]">
-				<width>$PARAM[width]</width>
-				<height>$PARAM[height]</height>
-				<label>$PARAM[label]</label>
-				<font>$PARAM[font]</font>
-				<textoffsetx>20</textoffsetx>
-				<onclick>noop</onclick>
-				<wrapmultiline>$PARAM[wrapmultiline]</wrapmultiline>
-				<align>center</align>
-				<aligny>center</aligny>
-				<texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus>
-				<texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus>
-				<alttexturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</alttexturefocus>
-				<alttexturenofocus border="40" colordiffuse="button_alt_focus">buttons/dialogbutton-fo.png</alttexturenofocus>
-				<usealttexture>$PARAM[usealttexture]</usealttexture>
-				<visible>$PARAM[visible]</visible>
-				<enable>$PARAM[enable]</enable>
-			</control>
-		</definition>
-	</include>
 	<include name="KeyboardButton">
 		<width>120</width>
 		<height>120</height>
diff --git a/addons/skin.estuary/xml/Includes_DialogSelect.xml b/addons/skin.estuary/xml/Includes_DialogSelect.xml
index 3ee9240ba3..7ca4f0d459 100644
--- a/addons/skin.estuary/xml/Includes_DialogSelect.xml
+++ b/addons/skin.estuary/xml/Includes_DialogSelect.xml
@@ -61,7 +61,7 @@
 						<top>22</top>
 						<width>80</width>
 						<height>80</height>
-						<aspectratio align="top">keep</aspectratio>
+						<aspectratio>keep</aspectratio>
 						<aligny>center</aligny>
 						<texture>icons/pvr/timers/recording.png</texture>
 						<visible>ListItem.Property(PVR.IsRecordingTimer)</visible>
@@ -71,7 +71,7 @@
 						<top>22</top>
 						<width>80</width>
 						<height>80</height>
-						<aspectratio align="top">keep</aspectratio>
+						<aspectratio>keep</aspectratio>
 						<aligny>center</aligny>
 						<texture>icons/pvr/timers/bell.png</texture>
 						<visible>ListItem.Property(PVR.IsRemindingTimer)</visible>
@@ -118,7 +118,7 @@
 						<top>22</top>
 						<width>80</width>
 						<height>80</height>
-						<aspectratio align="top">keep</aspectratio>
+						<aspectratio>keep</aspectratio>
 						<aligny>center</aligny>
 						<texture>icons/pvr/timers/recording.png</texture>
 						<visible>ListItem.Property(PVR.IsRecordingTimer)</visible>
@@ -128,7 +128,7 @@
 						<top>22</top>
 						<width>80</width>
 						<height>80</height>
-						<aspectratio align="top">keep</aspectratio>
+						<aspectratio>keep</aspectratio>
 						<aligny>center</aligny>
 						<texture>icons/pvr/timers/bell.png</texture>
 						<visible>ListItem.Property(PVR.IsRemindingTimer)</visible>
@@ -342,7 +342,6 @@
 							<description>Label for Saved with: text</description>
 							<top>14</top>
 							<height>20</height>
-							<font>font16</font>
 							<shadowcolor>text_shadow</shadowcolor>
 							<label>35255</label>
 							<align>center</align>
diff --git a/addons/skin.estuary/xml/Includes_PVR.xml b/addons/skin.estuary/xml/Includes_PVR.xml
index c482d2b708..f2a8041525 100644
--- a/addons/skin.estuary/xml/Includes_PVR.xml
+++ b/addons/skin.estuary/xml/Includes_PVR.xml
@@ -108,8 +108,6 @@
 					<top>66</top>
 					<width>70</width>
 					<height>12</height>
-					<align>center</align>
-					<aligny>center</aligny>
 					<colordiffuse>88FFFFFF</colordiffuse>
 					<visible>ListItem.HasEpg + !$PARAM[has_info_icon]</visible>
 					<info>ListItem.Progress</info>
@@ -140,8 +138,6 @@
 					<top>66</top>
 					<width>70</width>
 					<height>12</height>
-					<align>center</align>
-					<aligny>center</aligny>
 					<midtexture border="3">progress/texturebg_white.png</midtexture>
 					<visible>ListItem.HasEpg + !$PARAM[has_info_icon]</visible>
 					<info>ListItem.Progress</info>
diff --git a/addons/skin.estuary/xml/MusicOSD.xml b/addons/skin.estuary/xml/MusicOSD.xml
index 9b97121a19..0fd35b92e4 100644
--- a/addons/skin.estuary/xml/MusicOSD.xml
+++ b/addons/skin.estuary/xml/MusicOSD.xml
@@ -260,18 +260,18 @@
 		<control type="group">
 			<bottom>0</bottom>
 			<height>120</height>
-			<animation type="WindowOpen" condition="!Player.ShowInfo" reversible="False">
+			<animation type="WindowOpen" condition="!Player.ShowInfo" reversible="false">
 				<effect type="fade" start="0" end="100" time="300"/>
 				<effect type="slide" start="0,200" end="0,0" time="300" tween="cubic" easing="out" />
 			</animation>
-			<animation type="WindowClose" condition="!Player.ShowInfo" reversible="False">
+			<animation type="WindowClose" condition="!Player.ShowInfo" reversible="false">
 				<effect type="fade" start="100" end="0" time="300"/>
 				<effect type="slide" start="0,0" end="0,200" time="300" tween="cubic" easing="out" />
 			</animation>
-			<animation type="WindowOpen" condition="Player.ShowInfo" reversible="False">
+			<animation type="WindowOpen" condition="Player.ShowInfo" reversible="false">
 				<effect type="fade" start="0" end="100" time="300"/>
 			</animation>
-			<animation type="WindowClose" condition="Player.ShowInfo" reversible="False">
+			<animation type="WindowClose" condition="Player.ShowInfo" reversible="false">
 				<effect type="fade" start="100" end="0" time="300"/>
 			</animation>
 			<control type="button" id="87">
diff --git a/addons/skin.estuary/xml/SettingsCategory.xml b/addons/skin.estuary/xml/SettingsCategory.xml
index c14b63584b..cd305a1682 100644
--- a/addons/skin.estuary/xml/SettingsCategory.xml
+++ b/addons/skin.estuary/xml/SettingsCategory.xml
@@ -184,7 +184,7 @@
 		</control>
 		<control type="label" id="2">
 			<description>breadcrumbs label</description>
-			<visible>False</visible>
+			<visible>false</visible>
 		</control>
 	</controls>
 </window>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index 6a9b291a76..78568c61b3 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -542,10 +542,6 @@
 	<variable name="BreadcrumbsGameVar">
 		<value>$LOCALIZE[15016]</value>
 	</variable>
-	<variable name="RepeatButtonColordiffuseVar">
-		<value condition="Control.HasFocus(704)">button_focus</value>
-		<value>FFFFFFFF</value>
-	</variable>
 	<variable name="PVRChannelMgrHeader">
 		<value condition="!String.IsEmpty(Window.Property(IsRadio))">$LOCALIZE[19199] - $LOCALIZE[19024]</value>
 		<value>$LOCALIZE[19199] - $LOCALIZE[19023]</value>
diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml
index 6c25ea3a86..41e9fdc3f3 100644
--- a/addons/skin.estuary/xml/VideoOSD.xml
+++ b/addons/skin.estuary/xml/VideoOSD.xml
@@ -141,9 +141,6 @@
 					<scrolltime tween="sine">200</scrolltime>
 					<orientation>horizontal</orientation>
 					<onup>87</onup>
-					<ondown condition="Control.HasFocus(70043)">11104</ondown>
-					<ondown condition="Control.HasFocus(704)">12104</ondown>
-					<ondown condition="Control.HasFocus(255)">13103</ondown>
 					<onleft>608</onleft>
 					<onright>600</onright>
 					<control type="radiobutton" id="804">
@@ -226,18 +223,18 @@
 			</control>
 			<control type="group" id="6000">
 				<top>60</top>
-				<animation type="WindowOpen" condition="!Window.IsVisible(fullscreeninfo)" reversible="False">
+				<animation type="WindowOpen" condition="!Window.IsVisible(fullscreeninfo)" reversible="false">
 					<effect type="fade" start="0" end="100" time="300"/>
 					<effect type="slide" start="0,200" end="0,0" time="300" tween="cubic" easing="out" />
 				</animation>
-				<animation type="WindowClose" condition="!Window.IsVisible(fullscreeninfo)" reversible="False">
+				<animation type="WindowClose" condition="!Window.IsVisible(fullscreeninfo)" reversible="false">
 					<effect type="fade" start="100" end="0" time="300"/>
 					<effect type="slide" start="0,0" end="0,200" time="300" tween="cubic" easing="out" />
 				</animation>
-				<animation type="WindowOpen" condition="Window.IsVisible(fullscreeninfo)" reversible="False">
+				<animation type="WindowOpen" condition="Window.IsVisible(fullscreeninfo)" reversible="false">
 					<effect type="fade" start="0" end="100" time="300"/>
 				</animation>
-				<animation type="WindowClose" condition="Window.IsVisible(fullscreeninfo)" reversible="False">
+				<animation type="WindowClose" condition="Window.IsVisible(fullscreeninfo)" reversible="false">
 					<effect type="fade" start="100" end="0" time="300"/>
 				</animation>
 				<visible>Player.SeekEnabled</visible>