Merge pull request #14099 from ronie/estuary-fixes-18

Estuary fixes

3 files changed, 32 insertions, 32 deletions

diff --git a/addons/skin.estuary/xml/DialogKeyboard.xml b/addons/skin.estuary/xml/DialogKeyboard.xml
index 747e3a66a8..e0447c6c0f 100644
--- a/addons/skin.estuary/xml/DialogKeyboard.xml
+++ b/addons/skin.estuary/xml/DialogKeyboard.xml
@@ -145,14 +145,14 @@
 					</control>
 					<control type="button" id="110">
 						<description>(0,10) key button</description>
-						<onup condition="!Integer.IsGreater(Container(9010).NumItems,0)">8</onup>
+						<onup condition="!Integer.IsGreater(Container(9010).NumItems,0)">170</onup>
 						<onup condition="Integer.IsGreater(Container(9010).NumItems,0)">9010</onup>
 						<ondown>130</ondown>
 						<include>KeyboardButton</include>
 					</control>
 					<control type="button" id="111">
 						<description>(0,11) key button</description>
-						<onup condition="!Integer.IsGreater(Container(9010).NumItems,0)">8</onup>
+						<onup condition="!Integer.IsGreater(Container(9010).NumItems,0)">171</onup>
 						<onup condition="Integer.IsGreater(Container(9010).NumItems,0)">9010</onup>
 						<ondown>131</ondown>
 						<include>KeyboardButton</include>
@@ -239,7 +239,7 @@
 					</control>
 					<control type="button" id="132">
 						<description>(1,12) key button</description>
-						<onup>112</onup>
+						<onup>172</onup>
 						<ondown>152</ondown>
 						<include>KeyboardButton</include>
 					</control>
@@ -400,19 +400,19 @@
 					<control type="button" id="170">
 						<description>(3,10) key button</description>
 						<onup>150</onup>
-						<ondown>8</ondown>
+						<ondown>110</ondown>
 						<include>KeyboardButton</include>
 					</control>
 					<control type="button" id="171">
 						<description>(3,11) key button</description>
-						<onup>501</onup>
-						<ondown>8</ondown>
+						<onup>151</onup>
+						<ondown>111</ondown>
 						<include>KeyboardButton</include>
 					</control>
 					<control type="button" id="172">
 						<description>(3,12) key button</description>
-						<onup>502</onup>
-						<ondown>8</ondown>
+						<onup>152</onup>
+						<ondown>132</ondown>
 						<include>KeyboardButton</include>
 					</control>
 				</control>
diff --git a/addons/skin.estuary/xml/MyPVRChannels.xml b/addons/skin.estuary/xml/MyPVRChannels.xml
index 266d2ed8a5..066f43d761 100644
--- a/addons/skin.estuary/xml/MyPVRChannels.xml
+++ b/addons/skin.estuary/xml/MyPVRChannels.xml
@@ -81,10 +81,10 @@
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
 						<control type="label">
-							<left>12</left>
+							<left>10</left>
 							<top>0</top>
 							<height>90</height>
-							<width>75</width>
+							<width>82</width>
 							<align>center</align>
 							<aligny>center</aligny>
 							<font>font32_title</font>
@@ -140,10 +140,10 @@
 							<textcolor>grey</textcolor>
 						</control>
 						<control type="label">
-							<left>12</left>
+							<left>10</left>
 							<top>0</top>
 							<height>90</height>
-							<width>75</width>
+							<width>82</width>
 							<align>center</align>
 							<aligny>center</aligny>
 							<font>font32_title</font>
@@ -213,10 +213,10 @@
 							<label>$INFO[ListItem.Title]</label>
 						</control>
 						<control type="label">
-							<left>12</left>
+							<left>10</left>
 							<top>0</top>
 							<bottom>0</bottom>
-							<width>75</width>
+							<width>82</width>
 							<align>center</align>
 							<aligny>center</aligny>
 							<font>font32_title</font>
@@ -262,10 +262,10 @@
 							<textcolor>grey</textcolor>
 						</control>
 						<control type="label">
-							<left>12</left>
+							<left>10</left>
 							<top>0</top>
 							<bottom>0</bottom>
-							<width>75</width>
+							<width>82</width>
 							<align>center</align>
 							<aligny>center</aligny>
 							<font>font32_title</font>
diff --git a/addons/skin.estuary/xml/View_55_WideList.xml b/addons/skin.estuary/xml/View_55_WideList.xml
index 7442b40025..13f2203604 100644
--- a/addons/skin.estuary/xml/View_55_WideList.xml
+++ b/addons/skin.estuary/xml/View_55_WideList.xml
@@ -39,14 +39,14 @@
 						<left>105</left>
 						<top>0</top>
 						<bottom>0</bottom>
-						<right>100</right>
+						<right>40</right>
 						<aligny>center</aligny>
 						<scroll>true</scroll>
 						<label>$INFO[ListItem.Label]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
-						<left>40</left>
+						<left>105</left>
 						<top>0</top>
 						<bottom>0</bottom>
 						<right>40</right>
@@ -68,13 +68,13 @@
 						<left>105</left>
 						<top>0</top>
 						<bottom>0</bottom>
-						<right>100</right>
+						<right>40</right>
 						<aligny>center</aligny>
 						<label>$INFO[ListItem.Label]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
-						<left>40</left>
+						<left>105</left>
 						<top>0</top>
 						<bottom>0</bottom>
 						<right>40</right>
@@ -103,14 +103,14 @@
 						<left>105</left>
 						<top>0</top>
 						<bottom>0</bottom>
-						<right>100</right>
+						<right>40</right>
 						<aligny>center</aligny>
 						<scroll>true</scroll>
 						<label>$INFO[ListItem.Label]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
-						<left>40</left>
+						<left>105</left>
 						<top>0</top>
 						<bottom>0</bottom>
 						<right>40</right>
@@ -132,13 +132,13 @@
 						<left>105</left>
 						<top>0</top>
 						<bottom>0</bottom>
-						<right>100</right>
+						<right>40</right>
 						<aligny>center</aligny>
 						<label>$INFO[ListItem.Label]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
-						<left>40</left>
+						<left>105</left>
 						<top>0</top>
 						<bottom>0</bottom>
 						<right>40</right>
@@ -212,14 +212,14 @@
 			<control type="label">
 				<left>35</left>
 				<height>80</height>
-				<right>90</right>
+				<right>40</right>
 				<aligny>center</aligny>
 				<scroll>true</scroll>
 				<label>$INFO[ListItem.Label]</label>
 				<shadowcolor>text_shadow</shadowcolor>
 			</control>
 			<control type="label">
-				<left>40</left>
+				<left>35</left>
 				<height>80</height>
 				<right>40</right>
 				<align>right</align>
@@ -232,13 +232,13 @@
 			<control type="label">
 				<left>35</left>
 				<height>80</height>
-				<right>90</right>
+				<right>40</right>
 				<aligny>center</aligny>
 				<label>$INFO[ListItem.Label]</label>
 				<shadowcolor>text_shadow</shadowcolor>
 			</control>
 			<control type="label">
-				<left>40</left>
+				<left>35</left>
 				<height>80</height>
 				<right>40</right>
 				<align>right</align>
@@ -268,13 +268,13 @@
 			<control type="label">
 				<left>75</left>
 				<height>80</height>
-				<right>100</right>
+				<right>40</right>
 				<aligny>center</aligny>
 				<scroll>true</scroll>
 				<label>$INFO[ListItem.Label]</label>
 			</control>
 			<control type="label">
-				<left>40</left>
+				<left>75</left>
 				<height>80</height>
 				<right>40</right>
 				<align>right</align>
@@ -294,13 +294,13 @@
 			<control type="label">
 				<left>75</left>
 				<height>80</height>
-				<right>100</right>
+				<right>40</right>
 				<aligny>center</aligny>
 				<scroll>true</scroll>
 				<label>$INFO[ListItem.Label]</label>
 			</control>
 			<control type="label">
-				<left>40</left>
+				<left>75</left>
 				<height>80</height>
 				<right>40</right>
 				<align>right</align>