Skip to content

Commit

Permalink
Merge pull request xbmc#24609 from jjd-uk/estuary_extras_select
Browse files Browse the repository at this point in the history 
[Estuary] Extras - change layout
  • Loading branch information
@jjd-uk
jjd-uk authored Feb 2, 2024
2 parents d1ba986 + 15ee4f6 commit 9b1bf09
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 37 deletions.
3 changes: 2 additions & 1 deletion addons/skin.estuary/xml/DialogSelect.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
40 changes: 17 additions & 23 deletions addons/skin.estuary/xml/Includes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]">
Expand All @@ -1707,38 +1701,38 @@
<top>7</top>
<width>110</width>
<height>110</height>
<texture>$PARAM[thumbtexture]</texture>
<texture>$VAR[VideoListThumbVar]</texture>
<aspectratio>keep</aspectratio>
</control>
<control type="label">
<left>135</left>
<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]">
Expand All @@ -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">
Expand All @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions addons/skin.estuary/xml/Includes_DialogSelect.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 16 additions & 10 deletions addons/skin.estuary/xml/Variables.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

0 comments on commit 9b1bf09

Please sign in to comment.