aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
Diffstat (limited to 'addons')
-rw-r--r--addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml65
-rw-r--r--addons/skin.estuary/xml/DialogAudioDSPManager.xml8
-rw-r--r--addons/skin.estuary/xml/DialogContextMenu.xml3
-rw-r--r--addons/skin.estuary/xml/DialogMediaSource.xml16
-rw-r--r--addons/skin.estuary/xml/DialogPVRChannelManager.xml83
-rw-r--r--addons/skin.estuary/xml/DialogPVRChannelsOSD.xml12
-rw-r--r--addons/skin.estuary/xml/DialogPVRGuideOSD.xml10
-rw-r--r--addons/skin.estuary/xml/DialogSelect.xml10
-rw-r--r--addons/skin.estuary/xml/DialogSubtitles.xml4
-rw-r--r--addons/skin.estuary/xml/EventLog.xml4
-rw-r--r--addons/skin.estuary/xml/FileBrowser.xml12
-rw-r--r--addons/skin.estuary/xml/Includes.xml34
-rw-r--r--addons/skin.estuary/xml/Includes_PVR.xml24
-rw-r--r--addons/skin.estuary/xml/LoginScreen.xml16
-rw-r--r--addons/skin.estuary/xml/SettingsProfile.xml18
15 files changed, 165 insertions, 154 deletions
diff --git a/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml b/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml
index 69121bb9a6..01a871c25b 100644
--- a/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml
+++ b/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml
@@ -82,54 +82,51 @@
<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>
@@ -137,9 +134,9 @@
</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>
diff --git a/addons/skin.estuary/xml/DialogAudioDSPManager.xml b/addons/skin.estuary/xml/DialogAudioDSPManager.xml
index d41d3caeb9..878e24ee65 100644
--- a/addons/skin.estuary/xml/DialogAudioDSPManager.xml
+++ b/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,7 +50,7 @@
<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>
@@ -58,7 +58,7 @@
<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>
diff --git a/addons/skin.estuary/xml/DialogContextMenu.xml b/addons/skin.estuary/xml/DialogContextMenu.xml
index 5db627ddec..ab08b67f04 100644
--- a/addons/skin.estuary/xml/DialogContextMenu.xml
+++ b/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">
diff --git a/addons/skin.estuary/xml/DialogMediaSource.xml b/addons/skin.estuary/xml/DialogMediaSource.xml
index 50ab3fc473..4a37a28825 100644
--- a/addons/skin.estuary/xml/DialogMediaSource.xml
+++ b/addons/skin.estuary/xml/DialogMediaSource.xml
@@ -43,31 +43,31 @@
<ondown>12</ondown>
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
- <itemlayout height="70">
+ <itemlayout height="70" width="820">
<control type="label">
<left>10</left>
+ <right>10</right>
<top>0</top>
- <width>820</width>
- <height>60</height>
+ <bottom>0</bottom>
<aligny>center</aligny>
<textcolor>grey</textcolor>
<label>$INFO[ListItem.Label]</label>
</control>
</itemlayout>
- <focusedlayout height="70">
+ <focusedlayout height="70" width="820">
<control type="image">
<left>0</left>
<top>0</top>
- <width>820</width>
- <height>61</height>
+ <bottom>0</bottom>
+ <right>0</right>
<visible>Control.HasFocus(10)</visible>
<texture colordiffuse="button_focus">lists/focus.png</texture>
</control>
<control type="label">
<left>10</left>
<top>0</top>
- <width>820</width>
- <height>60</height>
+ <bottom>0</bottom>
+ <right>10</right>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
</control>
diff --git a/addons/skin.estuary/xml/DialogPVRChannelManager.xml b/addons/skin.estuary/xml/DialogPVRChannelManager.xml
index c0aa0ff456..9d477c461a 100644
--- a/addons/skin.estuary/xml/DialogPVRChannelManager.xml
+++ b/addons/skin.estuary/xml/DialogPVRChannelManager.xml
@@ -7,9 +7,9 @@
<centertop>50%</centertop>
<height>830</height>
<centerleft>50%</centerleft>
- <width>1720</width>
+ <width>1820</width>
<include content="DialogBackgroundCommons">
- <param name="width" value="1720" />
+ <param name="width" value="1820" />
<param name="height" value="830" />
<param name="header_label" value="$VAR[PVRChannelMgrHeader]" />
<param name="header_id" value="2" />
@@ -18,7 +18,7 @@
<left>10</left>
<top>70</top>
<control type="scrollbar" id="60">
- <left>630</left>
+ <left>660</left>
<top>30</top>
<width>12</width>
<height>710</height>
@@ -29,14 +29,14 @@
<control type="image">
<left>0</left>
<top>10</top>
- <width>642</width>
+ <width>672</width>
<height>750</height>
<texture border="40">buttons/dialogbutton-nofo.png</texture>
</control>
<control type="list" id="20">
<left>20</left>
<top>30</top>
- <width>600</width>
+ <width>630</width>
<height>710</height>
<onup>20</onup>
<ondown>20</ondown>
@@ -44,47 +44,53 @@
<onright>60</onright>
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
- <itemlayout height="70" width="600">
+ <itemlayout height="70" width="630">
<control type="image">
<left>0</left>
- <width>600</width>
- <height>68</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="selected">colors/white.png</texture>
<animation effect="fade" end="20" time="0" condition="true">Conditional</animation>
- <visible>!String.IsEmpty(ListItem.Property(Changed))</visible>
+ <visible>ListItem.Property(Changed)</visible>
</control>
<control type="image">
<left>15</left>
<top>10</top>
<width>50</width>
<height>50</height>
- <texture>$INFO[ListItem.Property(Icon)]</texture>
+ <texture>$INFO[ListItem.Property(icon)]</texture>
<aspectratio>keep</aspectratio>
- <!-- <visible>!ListItem.Property(ActiveChannel)</visible>
- -->
+ </control>
+ <control type="image">
+ <right>0</right>
+ <top>10</top>
+ <width>50</width>
+ <height>50</height>
+ <texture>OverlayLocked.png</texture>
+ <aspectratio>keep</aspectratio>
+ <visible>ListItem.Property(ParentalLocked)</visible>
</control>
<control type="label">
- <left>45</left>
- <width>600</width>
- <height>70</height>
- <textoffsetx>40</textoffsetx>
+ <left>85</left>
+ <right>40</right>
+ <bottom>0</bottom>
<aligny>center</aligny>
<label>$INFO[ListItem.Property(Number),[B],[/B] - ]$INFO[ListItem.Property(Name)]</label>
</control>
</itemlayout>
- <focusedlayout height="70" width="600">
+ <focusedlayout height="70" width="630">
<control type="image">
<left>0</left>
- <width>600</width>
- <height>68</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="selected">colors/white.png</texture>
<animation effect="fade" end="20" time="0" condition="true">Conditional</animation>
- <visible>!String.IsEmpty(ListItem.Property(Changed))</visible>
+ <visible>ListItem.Property(Changed)</visible>
</control>
<control type="image">
<left>0</left>
- <width>600</width>
- <height>70</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<animation effect="fade" start="100" end="30" time="0" condition="!Control.HasFocus(20)">conditional</animation>
</control>
@@ -93,23 +99,31 @@
<top>10</top>
<width>50</width>
<height>50</height>
- <texture>$INFO[ListItem.Property(Icon)]</texture>
+ <texture>$INFO[ListItem.Property(icon)]</texture>
<aspectratio>keep</aspectratio>
</control>
+ <control type="image">
+ <right>0</right>
+ <top>10</top>
+ <width>50</width>
+ <height>50</height>
+ <texture>OverlayLocked.png</texture>
+ <aspectratio>keep</aspectratio>
+ <visible>ListItem.Property(ParentalLocked)</visible>
+ </control>
<control type="label">
<left>45</left>
<top>-15</top>
- <width>600</width>
+ <right>40</right>
<height>70</height>
<textoffsetx>40</textoffsetx>
<aligny>center</aligny>
<label>$INFO[ListItem.Property(Number),[B],[/B] - ]$INFO[ListItem.Property(Name)]</label>
</control>
<control type="label">
- <left>45</left>
- <textoffsetx>40</textoffsetx>
+ <left>85</left>
<top>35</top>
- <width>600</width>
+ <right>40</right>
<height>30</height>
<font>font12</font>
<aligny>center</aligny>
@@ -119,7 +133,7 @@
</control>
</control>
<control type="group">
- <left>665</left>
+ <left>700</left>
<control type="grouplist" id="9002">
<top>80</top>
<onleft>60</onleft>
@@ -181,7 +195,7 @@
<width>70</width>
<height>50</height>
<aspectratio>keep</aspectratio>
- <texture background="true">$INFO[Container(20).ListItem.Icon]</texture>
+ <texture background="true">$INFO[Container(20).ListItem.Property(icon)]</texture>
</control>
<control type="grouplist">
<top>565</top>
@@ -232,29 +246,30 @@
</control>
</control>
<control type="grouplist" id="9000">
- <left>1360</left>
+ <right>20</right>
<top>90</top>
<onleft>9002</onleft>
<onright>20</onright>
<itemgap>dialogbuttons_itemgap</itemgap>
+ <width>400</width>
<include content="DefaultDialogButton">
- <param name="width" value="350" />
+ <param name="width" value="400" />
<param name="id" value="4" />
<param name="label" value="$LOCALIZE[186]" />
</include>
<include content="DefaultDialogButton">
- <param name="width" value="350" />
+ <param name="width" value="400" />
<param name="id" value="5" />
<param name="label" value="$LOCALIZE[14070]" />
</include>
<include content="DefaultDialogButton">
- <param name="width" value="350" />
+ <param name="width" value="400" />
<param name="id" value="6" />
<param name="label" value="$LOCALIZE[222]" />
</include>
</control>
<control type="label">
- <left>1355</left>
+ <right>40</right>
<top>780</top>
<width>330</width>
<height>35</height>
diff --git a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
index f21ffca185..0750f42b6e 100644
--- a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
+++ b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
@@ -25,8 +25,8 @@
<focusedlayout height="90" width="1000">
<control type="image">
<left>0</left>
- <width>1000</width>
- <height>90</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<visible>Control.hasFocus(11)</visible>
</control>
@@ -34,7 +34,7 @@
<left>770</left>
<top>10</top>
<width>90</width>
- <height>70</height>
+ <bottom>10</bottom>
<aspectratio align="right">keep</aspectratio>
<texture>$INFO[listitem.icon]</texture>
</control>
@@ -48,7 +48,7 @@
<info>ListItem.Progress</info>
</control>
<control type="image">
- <left>945</left>
+ <right>15</right>
<top>9</top>
<width>40</width>
<height>40</height>
@@ -91,7 +91,7 @@
<left>770</left>
<top>10</top>
<width>90</width>
- <height>70</height>
+ <bottom>10</bottom>
<aspectratio align="right">keep</aspectratio>
<texture>$INFO[listitem.icon]</texture>
</control>
@@ -105,7 +105,7 @@
<info>ListItem.Progress</info>
</control>
<control type="image">
- <left>945</left>
+ <right>15</right>
<top>9</top>
<width>40</width>
<height>40</height>
diff --git a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml
index 1f4bc1126d..a7762e3544 100644
--- a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml
+++ b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml
@@ -26,7 +26,7 @@
<control type="label">
<left>20</left>
<width>150</width>
- <height>90</height>
+ <bottom>0</bottom>
<aligny>center</aligny>
<textcolor>grey</textcolor>
<label>$INFO[ListItem.StartTime]</label>
@@ -34,7 +34,7 @@
<control type="label">
<left>150</left>
<width>610</width>
- <height>90</height>
+ <bottom>0</bottom>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
@@ -44,7 +44,7 @@
<control type="image">
<left>0</left>
<width>780</width>
- <height>90</height>
+ <bottom>0</bottom>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<visible>Control.HasFocus(11)</visible>
<animation effect="fade" start="100" end="0" time="0">UnFocus</animation>
@@ -52,14 +52,14 @@
<control type="label">
<left>20</left>
<width>150</width>
- <height>90</height>
+ <bottom>0</bottom>
<aligny>center</aligny>
<label>$INFO[ListItem.StartTime]</label>
</control>
<control type="label">
<left>150</left>
<width>610</width>
- <height>90</height>
+ <bottom>0</bottom>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
diff --git a/addons/skin.estuary/xml/DialogSelect.xml b/addons/skin.estuary/xml/DialogSelect.xml
index 326f4f74b2..6044d95a0b 100644
--- a/addons/skin.estuary/xml/DialogSelect.xml
+++ b/addons/skin.estuary/xml/DialogSelect.xml
@@ -62,7 +62,7 @@
<control type="label">
<left>135</left>
<top>0</top>
- <width>730</width>
+ <right>20</right>
<height>60</height>
<font>font14</font>
<aligny>center</aligny>
@@ -71,7 +71,7 @@
<control type="textbox">
<left>135</left>
<top>52</top>
- <width>730</width>
+ <right>20</right>
<height>65</height>
<font>font12</font>
<textcolor>grey</textcolor>
@@ -82,7 +82,7 @@
<control type="image">
<left>0</left>
<top>0</top>
- <width>880</width>
+ <right>0</right>
<height>125</height>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<visible>Control.HasFocus(6)</visible>
@@ -98,7 +98,7 @@
<control type="label">
<left>135</left>
<top>0</top>
- <width>730</width>
+ <right>20</right>
<height>60</height>
<aligny>center</aligny>
<scroll>true</scroll>
@@ -108,7 +108,7 @@
<control type="textbox">
<left>135</left>
<top>52</top>
- <width>730</width>
+ <right>20</right>
<height>65</height>
<font>font12</font>
<label>$INFO[ListItem.Label2]</label>
diff --git a/addons/skin.estuary/xml/DialogSubtitles.xml b/addons/skin.estuary/xml/DialogSubtitles.xml
index ba9a12e458..38256bf8c9 100644
--- a/addons/skin.estuary/xml/DialogSubtitles.xml
+++ b/addons/skin.estuary/xml/DialogSubtitles.xml
@@ -150,8 +150,8 @@
<focusedlayout width="920" height="100">
<control type="image">
<left>0</left>
- <width>920</width>
- <height>100</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<visible>Control.HasFocus(120)</visible>
</control>
diff --git a/addons/skin.estuary/xml/EventLog.xml b/addons/skin.estuary/xml/EventLog.xml
index 5d7be79f37..0f842611be 100644
--- a/addons/skin.estuary/xml/EventLog.xml
+++ b/addons/skin.estuary/xml/EventLog.xml
@@ -30,7 +30,7 @@
<top>10</top>
<width>120</width>
<height>120</height>
- <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture>
+ <texture fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture>
<aspectratio>scale</aspectratio>
<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
<bordersize>4</bordersize>
@@ -77,7 +77,7 @@
<top>10</top>
<width>120</width>
<height>120</height>
- <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture>
+ <texture fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture>
<aspectratio>scale</aspectratio>
<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
<bordersize>4</bordersize>
diff --git a/addons/skin.estuary/xml/FileBrowser.xml b/addons/skin.estuary/xml/FileBrowser.xml
index 0d378b111b..8b7e2e93c6 100644
--- a/addons/skin.estuary/xml/FileBrowser.xml
+++ b/addons/skin.estuary/xml/FileBrowser.xml
@@ -84,7 +84,7 @@
<control type="label">
<left>75</left>
<top>0</top>
- <width>560</width>
+ <right>20</right>
<height>70</height>
<aligny>center</aligny>
<selectedcolor>green</selectedcolor>
@@ -95,7 +95,7 @@
<control type="image">
<left>0</left>
<top>0</top>
- <width>940</width>
+ <right>0</right>
<height>71</height>
<visible>Control.HasFocus(450)</visible>
<texture colordiffuse="button_focus">lists/focus.png</texture>
@@ -111,7 +111,7 @@
<control type="label">
<left>75</left>
<top>0</top>
- <width>560</width>
+ <right>20</right>
<height>70</height>
<aligny>center</aligny>
<selectedcolor>green</selectedcolor>
@@ -142,7 +142,7 @@
<control type="label">
<left>75</left>
<top>0</top>
- <width>800</width>
+ <right>20</right>
<height>70</height>
<aligny>center</aligny>
<selectedcolor>green</selectedcolor>
@@ -153,7 +153,7 @@
<control type="image">
<left>0</left>
<top>0</top>
- <width>940</width>
+ <right>0</right>
<height>71</height>
<visible>Control.HasFocus(451)</visible>
<texture colordiffuse="button_focus">lists/focus.png</texture>
@@ -169,7 +169,7 @@
<control type="label">
<left>75</left>
<top>0</top>
- <width>800</width>
+ <right>20</right>
<height>70</height>
<aligny>center</aligny>
<selectedcolor>green</selectedcolor>
diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml
index 0777712b14..a5fbecadbe 100644
--- a/addons/skin.estuary/xml/Includes.xml
+++ b/addons/skin.estuary/xml/Includes.xml
@@ -204,7 +204,7 @@
<control type="label">
<left>82</left>
<top>3</top>
- <width>388</width>
+ <right>20</right>
<height>40</height>
<font>font12</font>
<aligny>center</aligny>
@@ -213,7 +213,7 @@
<control type="label">
<left>82</left>
<top>37</top>
- <width>388</width>
+ <right>20</right>
<height>30</height>
<font>font12</font>
<aligny>center</aligny>
@@ -225,8 +225,8 @@
<control type="image">
<left>0</left>
<top>0</top>
- <width>470</width>
- <height>80</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<visible>Control.HasFocus($PARAM[list_id])</visible>
</control>
@@ -241,7 +241,7 @@
<control type="label">
<left>82</left>
<top>3</top>
- <width>388</width>
+ <right>20</right>
<height>40</height>
<font>font12</font>
<aligny>center</aligny>
@@ -250,7 +250,7 @@
<control type="label">
<left>82</left>
<top>37</top>
- <width>388</width>
+ <right>20</right>
<height>30</height>
<font>font12</font>
<aligny>center</aligny>
@@ -289,13 +289,12 @@
<param name="font">font13</param>
<param name="fontcolor">grey</param>
<definition>
- <itemlayout height="$PARAM[height]">
+ <itemlayout width="$PARAM[width]" height="$PARAM[height]">
<control type="label">
- <left>0</left>
- <textoffsetx>20</textoffsetx>
+ <left>20</left>
<top>0</top>
- <width>$PARAM[width]</width>
- <height>$PARAM[height]</height>
+ <right>20</right>
+ <bottom>0</bottom>
<align>$PARAM[align]</align>
<font>$PARAM[font]</font>
<aligny>center</aligny>
@@ -303,21 +302,20 @@
<label>$INFO[ListItem.Label]</label>
</control>
</itemlayout>
- <focusedlayout height="$PARAM[height]" width="600">
+ <focusedlayout width="$PARAM[width]" height="$PARAM[height]">
<control type="image">
<left>0</left>
<top>0</top>
- <width>$PARAM[width]</width>
- <height>$PARAM[height]</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<visible>Control.HasFocus($PARAM[list_id])</visible>
</control>
<control type="label">
- <left>0</left>
- <textoffsetx>20</textoffsetx>
+ <left>20</left>
<top>0</top>
- <width>$PARAM[width]</width>
- <height>$PARAM[height]</height>
+ <right>20</right>
+ <bottom>0</bottom>
<align>$PARAM[align]</align>
<font>$PARAM[font]</font>
<aligny>center</aligny>
diff --git a/addons/skin.estuary/xml/Includes_PVR.xml b/addons/skin.estuary/xml/Includes_PVR.xml
index ecaacd6633..675396f96c 100644
--- a/addons/skin.estuary/xml/Includes_PVR.xml
+++ b/addons/skin.estuary/xml/Includes_PVR.xml
@@ -40,20 +40,20 @@
<onright>$PARAM[scrollbar_id]</onright>
<pagecontrol>$PARAM[scrollbar_id]</pagecontrol>
<scrolltime>200</scrolltime>
- <itemlayout height="70">
+ <itemlayout height="70" width="470">
<control type="image">
<width>60</width>
<height>60</height>
- <left>405</left>
- <top>4</top>
- <texture border="2">$INFO[ListItem.ActualIcon]</texture>
+ <right>5</right>
+ <top>5</top>
+ <texture>$INFO[ListItem.ActualIcon]</texture>
<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
<bordersize>2</bordersize>
<aspectratio>keep</aspectratio>
</control>
<control type="label">
<left>20</left>
- <width>390</width>
+ <right>70</right>
<height>70</height>
<aligny>center</aligny>
<font>font27</font>
@@ -61,27 +61,27 @@
<label>$INFO[ListItem.ChannelNumberLabel,[B],[/B] - ]$INFO[ListItem.ChannelName]</label>
</control>
</itemlayout>
- <focusedlayout height="70">
+ <focusedlayout height="70" width="470">
<control type="image">
<left>0</left>
- <width>470</width>
- <height>70</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<visible>Control.HasFocus($PARAM[list_id])</visible>
</control>
<control type="image">
<width>60</width>
<height>60</height>
- <left>405</left>
- <top>4</top>
- <texture border="2">$INFO[ListItem.ActualIcon]</texture>
+ <right>5</right>
+ <top>5</top>
+ <texture>$INFO[ListItem.ActualIcon]</texture>
<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
<bordersize>2</bordersize>
<aspectratio>keep</aspectratio>
</control>
<control type="label">
<left>20</left>
- <width>390</width>
+ <right>70</right>
<height>70</height>
<font>font27</font>
<aligny>center</aligny>
diff --git a/addons/skin.estuary/xml/LoginScreen.xml b/addons/skin.estuary/xml/LoginScreen.xml
index c5a9220e11..f92e539c73 100644
--- a/addons/skin.estuary/xml/LoginScreen.xml
+++ b/addons/skin.estuary/xml/LoginScreen.xml
@@ -74,12 +74,12 @@
<width>110</width>
<height>110</height>
<texture fallback="DefaultUser.png">$INFO[ListItem.Icon]</texture>
- <aspectratio>scale</aspectratio>
+ <aspectratio>keep</aspectratio>
</control>
<control type="label">
<left>130</left>
<top>14</top>
- <width>610</width>
+ <right>20</right>
<height>60</height>
<font>font37</font>
<aligny>center</aligny>
@@ -88,7 +88,7 @@
<control type="label">
<left>130</left>
<top>58</top>
- <width>610</width>
+ <right>20</right>
<height>50</height>
<font>font12</font>
<textcolor>grey</textcolor>
@@ -100,8 +100,8 @@
<control type="image">
<left>0</left>
<top>0</top>
- <width>775</width>
- <height>130</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<visible>Control.HasFocus(52)</visible>
</control>
@@ -111,12 +111,12 @@
<width>110</width>
<height>110</height>
<texture fallback="DefaultUser.png">$INFO[ListItem.Icon]</texture>
- <aspectratio>scale</aspectratio>
+ <aspectratio>keep</aspectratio>
</control>
<control type="label">
<left>130</left>
<top>14</top>
- <width>610</width>
+ <right>20</right>
<height>60</height>
<font>font37</font>
<aligny>center</aligny>
@@ -125,7 +125,7 @@
<control type="label">
<left>130</left>
<top>58</top>
- <width>610</width>
+ <right>20</right>
<height>50</height>
<font>font12</font>
<aligny>center</aligny>
diff --git a/addons/skin.estuary/xml/SettingsProfile.xml b/addons/skin.estuary/xml/SettingsProfile.xml
index 06abe32085..725a7157f1 100644
--- a/addons/skin.estuary/xml/SettingsProfile.xml
+++ b/addons/skin.estuary/xml/SettingsProfile.xml
@@ -194,9 +194,9 @@
<scrolltime>300</scrolltime>
<itemlayout height="90" width="470">
<control type="label">
- <textoffsetx>30</textoffsetx>
- <width>470</width>
- <height>90</height>
+ <left>30</left>
+ <right>30</right>
+ <bottom>0</bottom>
<label>$INFO[ListItem.Label]</label>
<font>font37</font>
<aligny>center</aligny>
@@ -204,18 +204,18 @@
</itemlayout>
<focusedlayout height="90" width="470">
<control type="image">
- <width>470</width>
- <height>90</height>
+ <right>0</right>
+ <bottom>0</bottom>
<texture colordiffuse="button_focus">lists/focus.png</texture>
<animation effect="fade" start="100" end="50" time="40" condition="!Control.HasFocus(9000)">Conditional</animation>
</control>
<control type="label">
- <textoffsetx>30</textoffsetx>
- <width>470</width>
- <height>90</height>
+ <left>30</left>
+ <right>30</right>
+ <bottom>0</bottom>
+ <label>$INFO[ListItem.Label]</label>
<font>font37</font>
<aligny>center</aligny>
- <label>$INFO[ListItem.Label]</label>
</control>
</focusedlayout>
<content>
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-21 19:30:31 +0000