[Patch] (#1068)

* [Patch] * [Testing] * [Testing] * Update Includes.xml * Revert "Update Includes.xml" This reverts commit 7fa3a73. * Revert "[Testing]" This reverts commit aae4f78. * [Indicators Patch] (#1069) * [Testing] * Update Includes_Labels.xml
beatmasterRS · Mar 25, 2024 · d834208 · d834208
1 parent 4a5c779
commit d834208
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
@@ -131,7 +131,7 @@
     </expression>
 
     <expression name="IsTVShowInProgress">
-        [Container.Content(tvshows) | String.IsEqual(ListItem.DBTYPE,tvshow) | Container.Content(season) | String.IsEqual(ListItem.DBTYPE,season)] + !String.IsEqual(ListItem.Overlay,OverlayWatched.png) + Integer.IsGreater(ListItem.Property(WatchedEpisodes),0) + !$EXP[IsNewTVShow]
+        [Container.Content(tvshows) | String.IsEqual(ListItem.DBTYPE,tvshow) | Container.Content(season) | String.IsEqual(ListItem.DBTYPE,season)] + !String.IsEqual(ListItem.Overlay,OverlayWatched.png) + !$EXP[IsNewTVShow] + [!String.IsEqual(ListItem.Property(WatchedEpisodes),ListItem.Property(TotalEpisodes)) | Integer.IsGreater(ListItem.Property(WatchedEpisodes),0)]
     </expression>
 
     <expression name="IsTVShowInProgress301">

diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml
@@ -3496,7 +3496,7 @@
                  <width>100</width>
                  <height>100</height>
                  <texture colordiffuse="$VAR[ColorIndicatorBackgroundInprogress]" background="true">misc/overlaywatched.png</texture>
-                 <visible>[ListItem.IsResumable | $EXP[IsTVShowInProgress]] + !ListItem.IsPlaying + !Skin.HasSetting(hide.markers.inprogress)</visible>
+                 <visible>ListItem.IsResumable + !ListItem.IsPlaying + !Skin.HasSetting(hide.markers.inprogress)</visible>
             </control>
             <control type="image">
                  <right>8</right>
@@ -3512,7 +3512,7 @@
                  <width>100</width>
                  <height>100</height>
                  <texture colordiffuse="$VAR[ColorIndicatorBackgroundNew]" background="true">misc/overlaywatched.png</texture>
-                 <visible>!ListItem.IsResumable + !$EXP[IsTVShowInProgress] + !ListItem.IsPlaying + [[String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie] | $EXP[IsNewTVShow] | $EXP[IsNewEpisode]]]] + !Skin.HasSetting(hide.markers.newcontent)</visible>
+                 <visible>[!ListItem.IsResumable | $EXP[IsNewTVShow]] + !$EXP[IsTVShowInProgress] + !ListItem.IsPlaying + [[String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie] | $EXP[IsNewTVShow] | $EXP[IsNewEpisode]]]] + !Skin.HasSetting(hide.markers.newcontent)</visible>
             </control>
             <control type="image">
                  <right>8</right>

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -141,23 +141,24 @@
     <variable name="IndicatorFlagLabel">
         <value condition="Skin.HasSetting(hide.markers) | [ListItem.IsPlaying + !Skin.HasSetting(hide.markers.isplaying)]"></value>
         <value condition="[ListItem.IsResumable | $EXP[IsTVShowInProgress]] + Skin.HasSetting(hide.markers.inprogress)"></value>
-        <value condition="ListItem.IsResumable">$VAR[IndicatorFlagLabelIsResumable]</value>
-        <value condition="$EXP[IsTVShowInProgress]">$VAR[IndicatorFlagLabelIsTVShowInProgress]</value>
+        <value condition="ListItem.IsResumable + !$EXP[IsNewTVShow]">$VAR[IndicatorFlagLabelIsResumable]</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + Skin.HasSetting(hide.markers.watched)"></value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png)">$LOCALIZE[31493]</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + [$EXP[IsNewMovie] | $EXP[IsNewTVShow] | $EXP[IsNewEpisode]] + !Skin.HasSetting(hide.markers.newcontent)">$LOCALIZE[31494]</value>
         <value condition="ListItem.HasVideoVersions + !Skin.HasSetting(hide.markers.versions)">$LOCALIZE[40000]</value>
     </variable>
 
     <variable name="IndicatorFlagLabelIsResumable">
-        <value condition="Skin.HasSetting(markers.inprogress.percentage) + !String.IsEmpty(ListItem.PercentPlayed)">$INFO[ListItem.PercentPlayed,,%]</value>
+        <value condition="$EXP[IsTVShowInProgress]">$VAR[IndicatorFlagLabelIsTVShowInProgress]</value>
+        <value condition="Skin.HasSetting(markers.inprogress.percentage) + !String.IsEmpty(ListItem.PercentPlayed) + !String.IsEqual(ListItem.PercentPlayed,0)">$INFO[ListItem.PercentPlayed,,%]</value>
         <value>$LOCALIZE[31492]</value>
     </variable>
 
     <variable name="IndicatorFlagLabelIsTVShowInProgress">
+        <value condition="Skin.HasSetting(markers.inprogress.percentage) + !String.IsEmpty(ListItem.Property(WatchedEpisodePercent)) + !String.IsEqual(ListItem.Property(WatchedEpisodePercent),0)">$INFO[ListItem.Property(WatchedEpisodePercent),,%]</value>
         <value condition="Skin.HasSetting(markers.inprogress.tvshow.label)">$LOCALIZE[31492]</value>
-        <value condition="Skin.HasSetting(markers.inprogress.percentage) + !String.IsEmpty(ListItem.Property(WatchedEpisodePercent))">$INFO[ListItem.Property(WatchedEpisodePercent),,%]</value>
-        <value>$INFO[ListItem.Property(WatchedEpisodes)]/$INFO[ListItem.Property(TotalEpisodes)]</value>
+        <value condition="!Skin.HasSetting(markers.inprogress.tvshow.label) + !String.IsEqual(ListItem.Property(WatchedEpisodes),0)">$INFO[ListItem.Property(WatchedEpisodes)]/$INFO[ListItem.Property(TotalEpisodes)]</value>
+        <value>$LOCALIZE[31492]</value>
     </variable>
 
     <variable name="WatchedLabelPoster301">