diff options
| author | ksooo <3226626+ksooo@users.noreply.github.com> | 2023-08-23 12:20:02 +0200 |
|---|---|---|
| committer | ksooo <3226626+ksooo@users.noreply.github.com> | 2023-08-25 17:31:59 +0200 |
| commit | 046553fe1b4f232d5306758e684b50409bd161d1 (patch) | |
| tree | 15c171fced5272814966213b762359ef16aa8073 /addons | |
| parent | b93ac7db8ab9397e8361a508f7c7809953366270 (diff) | |
[Estuary] TV Shows: Show in progress episodes count along with watched episodes and total episodes count in home screen listings and video window listings.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.estuary/xml/Variables.xml | 8 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/View_501_Banner.xml | 6 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/View_51_Poster.xml | 2 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/View_53_Shift.xml | 4 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/View_54_InfoWall.xml | 2 |
5 files changed, 10 insertions, 12 deletions
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index 6090d86e48..c7e19d8dfb 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -86,7 +86,7 @@ <value>$INFO[ListItem.Label]</value> </variable> <variable name="ListLabel2Var"> - <value condition="String.IsEmpty(Container.PluginName) + Container.Content(tvshows) + Container.SortMethod(29)">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value> + <value condition="String.IsEmpty(Container.PluginName) + Container.Content(tvshows) + Container.SortMethod(29)">$VAR[WatchedStatusVar]</value> <value condition="Container.SortMethod(7) | Container.SortMethod(29)">$INFO[ListItem.Year]</value> <value condition="!String.isempty(ListItem.Appearances)">$LOCALIZE[38026]: $INFO[ListItem.Appearances]</value> <value condition="Window.IsActive(musicplaylist) | Window.IsActive(videoplaylist)">$INFO[ListItem.Duration]</value> @@ -275,10 +275,8 @@ <value condition="!String.IsEmpty(ListItem.Art(season.poster))">$INFO[ListItem.Art(season.poster)]</value> <value condition="!String.IsEmpty(ListItem.Art(tvshow.poster))">$INFO[ListItem.Art(tvshow.poster)]</value> </variable> - <variable name="BannerLabel2Var"> - <value condition="String.IsEqual(Listitem.DBType,tvshow)">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value> - <!-- <value>$INFO[ListItem.Year]</value> - --> + <variable name="WatchedStatusVar"> + <value condition="String.IsEqual(Listitem.DBType,tvshow)">$INFO[ListItem.Property(InProgressEpisodes)]$INFO[ListItem.Property(WatchedEpisodes), / ,]$INFO[ListItem.Property(TotalEpisodes), / ,]</value> </variable> <variable name="VideoPlayerForwardRewindVar"> <value condition="Player.Forwarding2x | Player.Rewinding2x">2x</value> diff --git a/addons/skin.estuary/xml/View_501_Banner.xml b/addons/skin.estuary/xml/View_501_Banner.xml index 6219bd9440..f63e2f650b 100644 --- a/addons/skin.estuary/xml/View_501_Banner.xml +++ b/addons/skin.estuary/xml/View_501_Banner.xml @@ -118,7 +118,7 @@ <visible>!Listitem.IsParentFolder</visible> </control> <control type="image"> - <right>220</right> + <right>230</right> <top>143</top> <width>22</width> <height>22</height> @@ -126,7 +126,7 @@ <visible>!String.IsEmpty(ListItem.Rating)</visible> </control> <control type="label"> - <right>258</right> + <right>268</right> <top>144</top> <width>800</width> <height>20</height> @@ -152,7 +152,7 @@ <font>font12</font> <align>right</align> <aligny>center</aligny> - <label>$VAR[BannerLabel2Var]</label> + <label>$VAR[WatchedStatusVar]</label> </control> </control> <control type="group"> diff --git a/addons/skin.estuary/xml/View_51_Poster.xml b/addons/skin.estuary/xml/View_51_Poster.xml index 62e976fadb..7ee7748c19 100644 --- a/addons/skin.estuary/xml/View_51_Poster.xml +++ b/addons/skin.estuary/xml/View_51_Poster.xml @@ -158,7 +158,7 @@ <top>690</top> <width>435</width> <height>24</height> - <label>$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</label> + <label>$VAR[WatchedStatusVar]</label> <font>font20_title</font> <shadowcolor>text_shadow</shadowcolor> <align>right</align> diff --git a/addons/skin.estuary/xml/View_53_Shift.xml b/addons/skin.estuary/xml/View_53_Shift.xml index b9bf6e0007..d6c2372a9d 100644 --- a/addons/skin.estuary/xml/View_53_Shift.xml +++ b/addons/skin.estuary/xml/View_53_Shift.xml @@ -107,7 +107,7 @@ <top>522</top> <width>292</width> <height>24</height> - <label>$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</label> + <label>$VAR[WatchedStatusVar]</label> <font>font20_title</font> <shadowcolor>text_shadow</shadowcolor> <align>right</align> @@ -195,7 +195,7 @@ <top>522</top> <width>292</width> <height>24</height> - <label>$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</label> + <label>$VAR[WatchedStatusVar]</label> <font>font20_title</font> <shadowcolor>text_shadow</shadowcolor> <align>right</align> diff --git a/addons/skin.estuary/xml/View_54_InfoWall.xml b/addons/skin.estuary/xml/View_54_InfoWall.xml index f014a5c6d9..9beacf1f95 100644 --- a/addons/skin.estuary/xml/View_54_InfoWall.xml +++ b/addons/skin.estuary/xml/View_54_InfoWall.xml @@ -321,7 +321,7 @@ <left>0</left> <top>340</top> <width>244</width> - <label>$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</label> + <label>$VAR[WatchedStatusVar]</label> <font>font20_title</font> <shadowcolor>text_shadow</shadowcolor> <align>right</align> |