Skip to content

Commit

Permalink
Merge pull request xbmc#24521 from jjd-uk/estuary_overlay_icons
Browse files Browse the repository at this point in the history 
[Estuary] Refactor of poster/widget overlay icons
  • Loading branch information
@jjd-uk
jjd-uk authored Jan 24, 2024
2 parents 09966e7 + 734d942 commit a4b164c
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 42 deletions.
4 changes: 2 additions & 2 deletions addons/skin.estuary/xml/Includes_Home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@
<top>30</top>
<width>32</width>
<height>32</height>
<texture>$VAR[WallWatchedIconVar]</texture>
<texture>$VAR[ItemStatusIconVar]</texture>
</control>
<control type="progress">
<left>20</left>
Expand Down Expand Up @@ -597,7 +597,7 @@
<top>30</top>
<width>32</width>
<height>32</height>
<texture>$VAR[WallWatchedIconVar]</texture>
<texture>$VAR[ItemStatusIconVar]</texture>
</control>
<control type="progress">
<left>20</left>
Expand Down
11 changes: 7 additions & 4 deletions addons/skin.estuary/xml/Variables.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,18 +473,21 @@
<value condition="!String.IsEmpty(ListItem.Overlay)">$INFO[ListItem.Overlay]</value>
<value condition="!ListItem.IsParentFolder">OverlayUnwatched.png</value>
</variable>
<variable name="WallWatchedIconVar">
<variable name="ItemStatusIconVar">
<value condition="String.IsEqual(ListItem.DBtype,tvshow) | String.IsEqual(ListItem.DBtype,set) | String.IsEqual(ListItem.DBType,season)">lists/played-total.png</value>
<value condition="ListItem.IsRecording">windows/pvr/record.png</value>
<value condition="ListItem.HasReminder">icons/pvr/timers/bell.png</value>
<value condition="ListItem.HasTimer">icons/pvr/timers/recording.png</value>
<value condition="ListItem.IsCollection">overlays/set.png</value>
<value condition="ListItem.HasVideoVersions">overlays/versions.png</value>
<value condition="ListItem.IsPlaying">overlays/watched/OverlayPlaying-List.png</value>
<value condition="ListItem.IsResumable">overlays/watched/resume.png</value>
<value condition="ListItem.HasVideoExtras">overlays/extras.png</value>
<value condition="ListItem.HasArchive">windows/pvr/archive.png</value>
<value condition="Integer.IsGreater(ListItem.Playcount,0)">$INFO[ListItem.Overlay]</value>
</variable>
<variable name="ItemTypeIconVar">
<value condition="ListItem.IsCollection">overlays/set.png</value>
<value condition="ListItem.HasVideoVersions">overlays/versions.png</value>
<value condition="ListItem.HasVideoExtras">overlays/extras.png</value>
</variable>
<variable name="ListPVRRecordingsIconVar">
<value condition="ListItem.IsRecording">windows/pvr/record.png</value>
<value condition="ListItem.IsResumable">overlays/watched/resume.png</value>
Expand Down
35 changes: 22 additions & 13 deletions addons/skin.estuary/xml/View_51_Poster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,19 +147,29 @@
<visible>!String.IsEmpty(ListItem.Art(poster))</visible>
</control>
<control type="image">
<left>6</left>
<left>10</left>
<top>684</top>
<width>32</width>
<height>32</height>
<texture>$VAR[WallWatchedIconVar]</texture>
<align>right</align>
<align>left</align>
<aligny>center</aligny>
<texture>$VAR[ItemTypeIconVar]</texture>
</control>
<control type="image">
<left>45</left>
<top>684</top>
<width>32</width>
<height>32</height>
<align>left</align>
<aligny>center</aligny>
<texture>overlays/extras.png</texture>
<visible>ListItem.HasVideoVersions + ListItem.HasVideoExtras</visible>
</control>
<control type="label">
<left>0</left>
<top>690</top>
<width>435</width>
<height>24</height>
<left>100</left>
<top>684</top>
<width>330</width>
<height>32</height>
<label>$VAR[WatchedStatusVar]</label>
<font>font20_title</font>
<shadowcolor>text_shadow</shadowcolor>
Expand All @@ -168,14 +178,13 @@
<visible>String.IsEqual(ListItem.DBtype,tvshow) | String.IsEqual(ListItem.DBtype,set) | String.IsEqual(ListItem.DBType,season)</visible>
</control>
<control type="image">
<left>445</left>
<top>690</top>
<width>24</width>
<height>24</height>
<texture>lists/played-total.png</texture>
<left>435</left>
<top>684</top>
<width>32</width>
<height>32</height>
<texture>$VAR[ItemStatusIconVar]</texture>
<align>right</align>
<aligny>center</aligny>
<visible>String.IsEqual(ListItem.DBtype,tvshow) | String.IsEqual(ListItem.DBtype,set) | String.IsEqual(ListItem.DBType,season)</visible>
</control>
</control>
<control type="progress">
Expand Down
35 changes: 22 additions & 13 deletions addons/skin.estuary/xml/View_53_Shift.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,36 +208,45 @@
<texture colordiffuse="CCFFFFFF">overlays/overlayfade.png</texture>
<visible>!String.IsEmpty(ListItem.Art(poster))</visible>
</control>
<control type="label">
<left>75</left>
<control type="image">
<left>45</left>
<top>522</top>
<width>222</width>
<width>24</width>
<height>24</height>
<label>$VAR[WatchedStatusVar]</label>
<font>font20_title</font>
<shadowcolor>text_shadow</shadowcolor>
<align>right</align>
<align>left</align>
<aligny>center</aligny>
<visible>String.IsEqual(ListItem.DBtype,tvshow) | String.IsEqual(ListItem.DBtype,set) | String.IsEqual(ListItem.DBType,season)</visible>
<texture>$VAR[ItemTypeIconVar]</texture>
</control>
<control type="image">
<left>302</left>
<left>75</left>
<top>522</top>
<width>24</width>
<height>24</height>
<texture>lists/played-total.png</texture>
<align>left</align>
<aligny>center</aligny>
<texture>overlays/extras.png</texture>
<visible>ListItem.HasVideoVersions + ListItem.HasVideoExtras</visible>
</control>
<control type="label">
<left>110</left>
<top>522</top>
<width>185</width>
<height>24</height>
<label>$VAR[WatchedStatusVar]</label>
<font>font20_title</font>
<shadowcolor>text_shadow</shadowcolor>
<align>right</align>
<aligny>center</aligny>
<visible>String.IsEqual(ListItem.DBtype,tvshow) | String.IsEqual(ListItem.DBtype,set) | String.IsEqual(ListItem.DBType,season)</visible>
</control>
<control type="image">
<left>45</left>
<left>302</left>
<top>522</top>
<width>24</width>
<height>24</height>
<align>left</align>
<texture>$VAR[ItemStatusIconVar]</texture>
<align>right</align>
<aligny>center</aligny>
<texture>$VAR[WallWatchedIconVar]</texture>
</control>
</control>
</include>
Expand Down
31 changes: 21 additions & 10 deletions addons/skin.estuary/xml/View_54_InfoWall.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<top>175</top>
<width>32</width>
<height>32</height>
<texture>$VAR[WallWatchedIconVar]</texture>
<texture>$VAR[ItemStatusIconVar]</texture>
</control>
<control type="textbox">
<left>28</left>
Expand Down Expand Up @@ -310,16 +310,28 @@
<visible>!String.IsEmpty(ListItem.Art(poster))</visible>
</control>
<control type="image">
<left>35</left>
<top>353</top>
<width>32</width>
<height>32</height>
<texture>$VAR[WallWatchedIconVar]</texture>
<left>40</left>
<top>358</top>
<width>24</width>
<height>24</height>
<align>left</align>
<aligny>center</aligny>
<texture>$VAR[ItemTypeIconVar]</texture>
</control>
<control type="image">
<left>70</left>
<top>358</top>
<width>24</width>
<height>24</height>
<align>left</align>
<aligny>center</aligny>
<texture>overlays/extras.png</texture>
<visible>ListItem.HasVideoVersions + ListItem.HasVideoExtras</visible>
</control>
<control type="label">
<left>0</left>
<left>105</left>
<top>355</top>
<width>244</width>
<width>145</width>
<label>$VAR[WatchedStatusVar]</label>
<font>font20_title</font>
<shadowcolor>text_shadow</shadowcolor>
Expand All @@ -331,8 +343,7 @@
<top>358</top>
<width>24</width>
<height>24</height>
<texture>lists/played-total.png</texture>
<visible>String.IsEqual(ListItem.DBtype,tvshow) | String.IsEqual(ListItem.DBtype,set) | String.IsEqual(ListItem.DBType,season)</visible>
<texture>$VAR[ItemStatusIconVar]</texture>
</control>
</control>
<control type="group">
Expand Down

0 comments on commit a4b164c

Please sign in to comment.