aboutsummaryrefslogtreecommitdiff
path: root/addons/skin.estuary/xml
diff options
context:
space:
mode:
authorjjd-uk <jjd-uk@kodi.tv>2024-01-30 18:44:15 +0000
committerjjd-uk <jjd-uk@kodi.tv>2024-01-30 18:44:15 +0000
commit15ee4f6d463e0c9c07b8e45600fdd55bbafb641f (patch)
tree8a60bde1886abee041d9e955c85eb194ee2ac0d9 /addons/skin.estuary/xml
parentb11eb7ccf761424bb68e35189e393b1739286b83 (diff)
[Estuary] Extras - change layout
Diffstat (limited to 'addons/skin.estuary/xml')
-rw-r--r--addons/skin.estuary/xml/DialogSelect.xml3
-rw-r--r--addons/skin.estuary/xml/Includes.xml40
-rw-r--r--addons/skin.estuary/xml/Includes_DialogSelect.xml4
-rw-r--r--addons/skin.estuary/xml/Variables.xml26
4 files changed, 36 insertions, 37 deletions
diff --git a/addons/skin.estuary/xml/DialogSelect.xml b/addons/skin.estuary/xml/DialogSelect.xml
index 674ec50de1..308c14b743 100644
--- a/addons/skin.estuary/xml/DialogSelect.xml
+++ b/addons/skin.estuary/xml/DialogSelect.xml
@@ -4,12 +4,13 @@
<include>Animation_DialogPopupOpenClose</include>
<depth>DepthOSD</depth>
<controls>
- <include condition="![Window.IsActive(selectvideoversion) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DefaultDialogSelectLayout</include>
+ <include condition="![Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DefaultDialogSelectLayout</include>
<include condition="Window.IsActive(gamesaves)">GameDialogSelectSaveLayout</include>
<include condition="Window.IsActive(gamevideofilter)">GameDialogSelectFilterLayout</include>
<include condition="Window.IsActive(gamestretchmode)">GameDialogSelectViewLayout</include>
<include condition="Window.IsActive(gamevideorotation)">GameDialogSelectViewLayout</include>
<include condition="Window.IsActive(ingamesaves)">GameDialogSelectSaveInGameLayout</include>
<include condition="Window.IsActive(selectvideoversion)">VideoSelectLayout</include>
+ <include condition="Window.IsActive(selectvideoextra)">VideoSelectLayout</include>
</controls>
</window>
diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml
index 93871956e8..e3d3fe5977 100644
--- a/addons/skin.estuary/xml/Includes.xml
+++ b/addons/skin.estuary/xml/Includes.xml
@@ -1693,12 +1693,6 @@
<include name="MediaInfoListLayout">
<param name="height">125</param>
<param name="width">880</param>
- <param name="thumbtexture">$VAR[VideoListThumbVar]</param>
- <param name="font_1">font14</param>
- <param name="font_2">font12</param>
- <param name="label_1">$INFO[ListItem.Label]</param>
- <param name="label_2">$INFO[ListItem.Duration,$LOCALIZE[180]: ]</param>
- <param name="label_3">$VAR[VideoCodecVar,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDRVar,| , ]$INFO[ListItem.VideoAspect,| ,:1 ]$VAR[AudioCodecVar,| , ]$VAR[AudioChannelsVar]</param>
<param name="fontcolor">grey</param>
<definition>
<itemlayout height="$PARAM[height]" width="$PARAM[width]">
@@ -1707,7 +1701,7 @@
<top>7</top>
<width>110</width>
<height>110</height>
- <texture>$PARAM[thumbtexture]</texture>
+ <texture>$VAR[VideoListThumbVar]</texture>
<aspectratio>keep</aspectratio>
</control>
<control type="label">
@@ -1715,30 +1709,30 @@
<top>0</top>
<right>20</right>
<height>60</height>
- <font>$PARAM[font_1]</font>
+ <font>font14</font>
<aligny>center</aligny>
- <textcolor>$PARAM[fontcolor]</textcolor>
- <label>$PARAM[label_1]</label>
+ <textcolor>grey</textcolor>
+ <label>$VAR[MediaInfoListLabelVar]</label>
</control>
<control type="label">
<left>135</left>
<top>50</top>
<right>20</right>
<height>35</height>
- <font>$PARAM[font_2]</font>
+ <font>font12</font>
<aligny>center</aligny>
- <textcolor>$PARAM[fontcolor]</textcolor>
- <label>$PARAM[label_2]</label>
+ <textcolor>grey</textcolor>
+ <label>$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label>
</control>
<control type="label">
<left>135</left>
<top>85</top>
<right>20</right>
<height>30</height>
- <font>$PARAM[font_2]</font>
+ <font>font12</font>
<aligny>center</aligny>
- <textcolor>$PARAM[fontcolor]</textcolor>
- <label>$PARAM[label_3]</label>
+ <textcolor>grey</textcolor>
+ <label>$VAR[VideoCodecVar,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDRVar,| , ]$INFO[ListItem.VideoAspect,| ,:1 ]$VAR[AudioCodecVar,| , ]$VAR[AudioChannelsVar]</label>
</control>
</itemlayout>
<focusedlayout height="$PARAM[height]" width="$PARAM[width]">
@@ -1755,7 +1749,7 @@
<top>7</top>
<width>110</width>
<height>110</height>
- <texture>$PARAM[thumbtexture]</texture>
+ <texture>$VAR[VideoListThumbVar]</texture>
<aspectratio>keep</aspectratio>
</control>
<control type="label">
@@ -1765,26 +1759,26 @@
<height>60</height>
<aligny>center</aligny>
<scroll>true</scroll>
- <font>$PARAM[font_1]</font>
- <label>$PARAM[label_1]</label>
+ <font>font14</font>
+ <label>$VAR[MediaInfoListLabelVar]</label>
</control>
<control type="label">
<left>135</left>
<top>50</top>
<right>20</right>
<height>35</height>
- <font>$PARAM[font_2]</font>
+ <font>font12</font>
<aligny>center</aligny>
- <label>$PARAM[label_2]</label>
+ <label>$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label>
</control>
<control type="label">
<left>135</left>
<top>85</top>
<right>20</right>
<height>30</height>
- <font>$PARAM[font_2]</font>
+ <font>font12</font>
<aligny>center</aligny>
- <label>$PARAM[label_3]</label>
+ <label>$VAR[VideoCodecVar,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDRVar,| , ]$INFO[ListItem.VideoAspect,| ,:1 ]$VAR[AudioCodecVar,| , ]$VAR[AudioChannelsVar]</label>
</control>
</focusedlayout>
</definition>
diff --git a/addons/skin.estuary/xml/Includes_DialogSelect.xml b/addons/skin.estuary/xml/Includes_DialogSelect.xml
index f311ae3e06..3ee9240ba3 100644
--- a/addons/skin.estuary/xml/Includes_DialogSelect.xml
+++ b/addons/skin.estuary/xml/Includes_DialogSelect.xml
@@ -750,9 +750,7 @@
<onright>61</onright>
<pagecontrol>61</pagecontrol>
<scrolltime>200</scrolltime>
- <include content="MediaInfoListLayout">
- <param name="label_1" value="$INFO[ListItem.VideoVersionName]" />
- </include>
+ <include>MediaInfoListLayout</include>
</control>
<control type="scrollbar" id="61">
<left>1320</left>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index c35195e270..ed26c1247f 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -683,18 +683,20 @@
<value>[B]$LOCALIZE[1223][/B]</value>
</variable>
<variable name="VideoListPosterVar">
- <value condition="!String.IsEmpty(container(6).listitem.art(poster))">$INFO[container(6).listitem.art(poster)]</value>
- <value condition="!String.IsEmpty(container(6).listitem.art(thumb))">$INFO[container(6).listitem.art(thumb)]</value>
- <value condition="!String.IsEmpty(container(50).listitem.art(poster))">$INFO[container(50).listitem.art(poster)]</value>
- <value condition="!String.IsEmpty(container(50).listitem.art(thumb))">$INFO[container(50).listitem.art(thumb)]</value>
- <value condition="String.IsEmpty(Listitem.Art(poster))">$INFO[Listitem.Art(poster)]</value>
- <value>$INFO[ListItem.Icon]</value>
+ <value condition="!String.IsEmpty(Container(6).ListItem.Art(poster))">$INFO[Container(6).ListItem.Art(poster)]</value>
+ <value condition="!String.IsEmpty(Container(6).ListItem.Art(thumb))">$INFO[Container(6).ListItem.Art(thumb)]</value>
+ <value condition="!String.IsEmpty(Container(50).ListItem.Art(poster))">$INFO[Container(50).ListItem.Art(poster)]</value>
+ <value condition="!String.IsEmpty(Container(50).ListItem.Art(thumb))">$INFO[Container(50).ListItem.Art(thumb)]</value>
+ <value condition="String.IsEmpty(Container(50).ListItem.Art(thumb))">DefaultMovies.png</value>
+ <value condition="!String.IsEmpty(Listitem.Art(poster))">$INFO[ListItem.Art(poster)]</value>
+ <value>$INFO[ListItem.Art(thumb)]</value>
</variable>
<variable name="VideoListThumbVar">
- <value condition="!String.IsEmpty(Listitem.Art(landscape))">$INFO[Listitem.Art(landscape)]</value>
- <value condition="!String.IsEmpty(Listitem.Art(fanart))">$INFO[Listitem.Art(fanart)]</value>
- <value condition="!String.IsEmpty(Listitem.Art(thumb))">$INFO[Listitem.Art(thumb)]</value>
- <value>$INFO[ListItem.Icon]</value>
+ <value condition="!String.IsEmpty(Container(6).ListItem.Art(landscape))">$INFO[Container(6).ListItem.Art(landscape)]</value>
+ <value condition="!String.IsEmpty(Container(6).ListItem.Art(thumb))">$INFO[Container(6).ListItem.Art(thumb)]</value>
+ <value condition="!String.IsEmpty(Container(50).ListItem.Art(landscape))">$INFO[Container(50).ListItem.Art(landscape)]</value>
+ <value condition="!String.IsEmpty(Container(50).ListItem.Art(thumb))">$INFO[Container(50).ListItem.Art(thumb)]</value>
+ <value>$INFO[ListItem.Art(thumb)]</value>
</variable>
<variable name="VideoResolutionTypeVar">
<value condition="String.IsEqual(ListItem.VideoResolution,480)">SD</value>
@@ -787,4 +789,8 @@
<value condition="String.IsEqual(ListItem.AudioChannels,10)">9.1</value>
<value>$INFO[ListItem.AudioChannels]</value>
</variable>
+ <variable name="MediaInfoListLabelVar">
+ <value condition="Window.IsActive(selectvideoversion)">$INFO[ListItem.VideoVersionName]</value>
+ <value>$INFO[ListItem.Label]</value>
+ </variable>
</includes>
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-22 06:36:01 +0000