add timer icon for isresumeable when progress is 0 - #22

jurialmunkey · Jun 7, 2022 · 65d5881 · 65d5881
1 parent bcc2628
commit 65d5881
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/1080i/Objects.xml b/1080i/Objects.xml
@@ -541,7 +541,7 @@
                     <visible>String.IsEqual($PARAM[listitem].Overlay,OverlayWatched.png) | [!String.IsEmpty($PARAM[listitem].PlayCount) + !Integer.IsEqual($PARAM[listitem].PlayCount,0) + !String.IsEqual($PARAM[listitem].DBType,song) + !String.IsEqual($PARAM[listitem].DBType,album) + !String.IsEqual($PARAM[listitem].DBType,artist) + !String.IsEqual($PARAM[listitem].DBType,image) + !String.IsEqual($PARAM[listitem].DBType,addon)]</visible>
                     <visible>Integer.IsEqual($PARAM[listitem].Property(UnWatchedEpisodes),0) | Skin.HasSetting(DisableIndicator.Episodes)</visible>
                     <visible>!$PARAM[listitem].IsRecording + !$PARAM[listitem].HasTimer</visible>
-                    <visible>!$PARAM[listitem].IsResumable | Skin.HasSetting(DisableIndicator.Progress) | Integer.IsEqual($PARAM[listitem].PercentPlayed,0)</visible>
+                    <visible>!$PARAM[listitem].IsResumable | Skin.HasSetting(DisableIndicator.Progress)</visible>
                 </control>
                 <control type="label">
                     <font>font_unwatched</font>

diff --git a/1080i/script-skinvariables-includes.xml b/1080i/script-skinvariables-includes.xml
@@ -13,12 +13,12 @@
     </variable>
     <variable name="Defs_PercentPlayed_C50">
         <value condition="Window.IsVisible(AddonBrowser.xml) + String.EndsWith(Container(50).ListItem.Label2,%)">$INFO[Container(50).ListItem.Label2]</value>
-        <value condition="!String.IsEmpty(Container(50).ListItem.PercentPlayed) + !Integer.IsEqual(Container(50).ListItem.PercentPlayed,0)">$INFO[Container(50).ListItem.PercentPlayed]</value>
+        <value condition="!String.IsEmpty(Container(50).ListItem.PercentPlayed) + [!Integer.IsEqual(Container(50).ListItem.PercentPlayed,0) | Container(50).ListItem.IsResumable]">$INFO[Container(50).ListItem.PercentPlayed]</value>
         <value condition="String.IsEqual(Container(50).ListItem.Overlay,OverlayWatched.png) + !Skin.HasSetting(DisableIndicator.Watched)">100</value>
     </variable>
     <variable name="Defs_PercentPlayed">
         <value condition="Window.IsVisible(AddonBrowser.xml) + String.EndsWith(ListItem.Label2,%)">$INFO[ListItem.Label2]</value>
-        <value condition="!String.IsEmpty(ListItem.PercentPlayed) + !Integer.IsEqual(ListItem.PercentPlayed,0)">$INFO[ListItem.PercentPlayed]</value>
+        <value condition="!String.IsEmpty(ListItem.PercentPlayed) + [!Integer.IsEqual(ListItem.PercentPlayed,0) | ListItem.IsResumable]">$INFO[ListItem.PercentPlayed]</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + !Skin.HasSetting(DisableIndicator.Watched)">100</value>
     </variable>
     <variable name="Image_CropLogo_C301">
@@ -353,7 +353,7 @@
         <value condition="[String.IsEqual(Container(50).ListItem.DBType,tvshow) | String.IsEqual(Container(50).ListItem.DBType,season)] + !Integer.IsEqual(Container(50).ListItem.Property(UnWatchedEpisodes),0) + !Skin.HasSetting(DisableIndicator.Episodes)">common/null.png</value>
         <value condition="Container(50).ListItem.IsRecording">indicator/record.png</value>
         <value condition="Container(50).ListItem.HasTimer">indicator/timer.png</value>
-        <value condition="Container(50).ListItem.IsResumable + !Skin.HasSetting(DisableIndicator.Progress) + !Integer.IsEqual(Container(50).ListItem.PercentPlayed,0)">indicator/timer.png</value>
+        <value condition="Container(50).ListItem.IsResumable + !Skin.HasSetting(DisableIndicator.Progress)">indicator/timer.png</value>
         <value condition="String.IsEqual(Container(50).ListItem.Overlay,OverlayWatched.png) + !Skin.HasSetting(DisableIndicator.Watched)">common/null.png</value>
         <value condition="Integer.IsGreater(Container(50).ListItem.PlayCount,0) + !String.IsEqual(Container(50).ListItem.DBType,song) + !String.IsEqual(Container(50).ListItem.DBType,album) + !String.IsEqual(Container(50).ListItem.DBType,artist) + !String.IsEqual(Container(50).ListItem.DBType,image) + !String.IsEqual(Container(50).ListItem.DBType,addon) + !Skin.HasSetting(DisableIndicator.Watched)">common/null.png</value>
         <value condition="String.IsEqual(Container(50).ListItem.Overlay,OverlayUnwatched.png) + String.IsEqual(Container(50).ListItem.DBType,movie) + [String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.1.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.2.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.3.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.4.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.5.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.6.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.7.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.8.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.9.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.10.Title))] + !Skin.HasSetting(DisableIndicator.New)">indicator/new.png</value>
@@ -371,7 +371,7 @@
         <value condition="[String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,season)] + !Integer.IsEqual(ListItem.Property(UnWatchedEpisodes),0) + !Skin.HasSetting(DisableIndicator.Episodes)">common/null.png</value>
         <value condition="ListItem.IsRecording">indicator/record.png</value>
         <value condition="ListItem.HasTimer">indicator/timer.png</value>
-        <value condition="ListItem.IsResumable + !Skin.HasSetting(DisableIndicator.Progress) + !Integer.IsEqual(ListItem.PercentPlayed,0)">indicator/timer.png</value>
+        <value condition="ListItem.IsResumable + !Skin.HasSetting(DisableIndicator.Progress)">indicator/timer.png</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + !Skin.HasSetting(DisableIndicator.Watched)">common/null.png</value>
         <value condition="Integer.IsGreater(ListItem.PlayCount,0) + !String.IsEqual(ListItem.DBType,song) + !String.IsEqual(ListItem.DBType,album) + !String.IsEqual(ListItem.DBType,artist) + !String.IsEqual(ListItem.DBType,image) + !String.IsEqual(ListItem.DBType,addon) + !Skin.HasSetting(DisableIndicator.Watched)">common/null.png</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + String.IsEqual(ListItem.DBType,movie) + [String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.1.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.2.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.3.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.4.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.5.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.6.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.7.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.8.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.9.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.10.Title))] + !Skin.HasSetting(DisableIndicator.New)">indicator/new.png</value>
@@ -389,7 +389,7 @@
         <value condition="[String.IsEqual(Container(50).ListItem.DBType,tvshow) | String.IsEqual(Container(50).ListItem.DBType,season)] + !Integer.IsEqual(Container(50).ListItem.Property(UnWatchedEpisodes),0) + !Skin.HasSetting(DisableIndicator.Episodes)">indicator/circle</value>
         <value condition="Container(50).ListItem.IsRecording">indicator/circle</value>
         <value condition="Container(50).ListItem.HasTimer">indicator/circle</value>
-        <value condition="Container(50).ListItem.IsResumable + !Skin.HasSetting(DisableIndicator.Progress) + !Integer.IsEqual(Container(50).ListItem.PercentPlayed,0)">indicator/circle</value>
+        <value condition="Container(50).ListItem.IsResumable + !Skin.HasSetting(DisableIndicator.Progress)">indicator/circle</value>
         <value condition="String.IsEqual(Container(50).ListItem.Overlay,OverlayWatched.png) + !Skin.HasSetting(DisableIndicator.Watched)">indicator/circle</value>
         <value condition="Integer.IsGreater(Container(50).ListItem.PlayCount,0) + !String.IsEqual(Container(50).ListItem.DBType,song) + !String.IsEqual(Container(50).ListItem.DBType,album) + !String.IsEqual(Container(50).ListItem.DBType,artist) + !String.IsEqual(Container(50).ListItem.DBType,image) + !String.IsEqual(Container(50).ListItem.DBType,addon) + !Skin.HasSetting(DisableIndicator.Watched)">indicator/circle</value>
         <value condition="String.IsEqual(Container(50).ListItem.Overlay,OverlayUnwatched.png) + String.IsEqual(Container(50).ListItem.DBType,movie) + [String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.1.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.2.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.3.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.4.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.5.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.6.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.7.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.8.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.9.Title)) | String.IsEqual(Container(50).ListItem.Title,Window(Home).Property(LatestMovie.10.Title))] + !Skin.HasSetting(DisableIndicator.New)">indicator/circle</value>
@@ -407,7 +407,7 @@
         <value condition="[String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,season)] + !Integer.IsEqual(ListItem.Property(UnWatchedEpisodes),0) + !Skin.HasSetting(DisableIndicator.Episodes)">indicator/circle</value>
         <value condition="ListItem.IsRecording">indicator/circle</value>
         <value condition="ListItem.HasTimer">indicator/circle</value>
-        <value condition="ListItem.IsResumable + !Skin.HasSetting(DisableIndicator.Progress) + !Integer.IsEqual(ListItem.PercentPlayed,0)">indicator/circle</value>
+        <value condition="ListItem.IsResumable + !Skin.HasSetting(DisableIndicator.Progress)">indicator/circle</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + !Skin.HasSetting(DisableIndicator.Watched)">indicator/circle</value>
         <value condition="Integer.IsGreater(ListItem.PlayCount,0) + !String.IsEqual(ListItem.DBType,song) + !String.IsEqual(ListItem.DBType,album) + !String.IsEqual(ListItem.DBType,artist) + !String.IsEqual(ListItem.DBType,image) + !String.IsEqual(ListItem.DBType,addon) + !Skin.HasSetting(DisableIndicator.Watched)">indicator/circle</value>
         <value condition="String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + String.IsEqual(ListItem.DBType,movie) + [String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.1.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.2.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.3.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.4.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.5.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.6.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.7.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.8.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.9.Title)) | String.IsEqual(ListItem.Title,Window(Home).Property(LatestMovie.10.Title))] + !Skin.HasSetting(DisableIndicator.New)">indicator/circle</value>

diff --git a/addon.xml b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.13">
+<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.14">
     <requires>
         <import addon="xbmc.gui" version="5.15.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />

diff --git a/shortcuts/skinvariables.xml b/shortcuts/skinvariables.xml
@@ -9,7 +9,7 @@
 
     <variable name="Defs_PercentPlayed" containers="50">
         <value condition="Window.IsVisible(AddonBrowser.xml) + String.EndsWith({listitemposition}.Label2,%)">$INFO[{listitemposition}.Label2]</value>
-        <value condition="!String.IsEmpty({listitemposition}.PercentPlayed) + !Integer.IsEqual({listitemposition}.PercentPlayed,0)">$INFO[{listitemposition}.PercentPlayed]</value>
+        <value condition="!String.IsEmpty({listitemposition}.PercentPlayed) + [!Integer.IsEqual({listitemposition}.PercentPlayed,0) | {listitemposition}.IsResumable]">$INFO[{listitemposition}.PercentPlayed]</value>
         <value condition="String.IsEqual({listitemposition}.Overlay,OverlayWatched.png) + !Skin.HasSetting(DisableIndicator.Watched)">100</value>
     </variable>
 
@@ -102,7 +102,7 @@
         <value condition="{listitemposition}.HasTimer">indicator/timer.png</value>
 
         <!-- Progress / Resume -->
-        <value condition="{listitemposition}.IsResumable + !Skin.HasSetting(DisableIndicator.Progress) + !Integer.IsEqual({listitemposition}.PercentPlayed,0)">indicator/timer.png</value>
+        <value condition="{listitemposition}.IsResumable + !Skin.HasSetting(DisableIndicator.Progress)">indicator/timer.png</value>
 
         <!-- Watched -->
         <value condition="String.IsEqual({listitemposition}.Overlay,OverlayWatched.png) + !Skin.HasSetting(DisableIndicator.Watched)">common/null.png</value>
@@ -139,7 +139,7 @@
         <value condition="{listitemposition}.HasTimer">indicator/circle</value>
 
         <!-- Progress / Resume -->
-        <value condition="{listitemposition}.IsResumable + !Skin.HasSetting(DisableIndicator.Progress) + !Integer.IsEqual({listitemposition}.PercentPlayed,0)">indicator/circle</value>
+        <value condition="{listitemposition}.IsResumable + !Skin.HasSetting(DisableIndicator.Progress)">indicator/circle</value>
 
         <!-- Watched -->
         <value condition="String.IsEqual({listitemposition}.Overlay,OverlayWatched.png) + !Skin.HasSetting(DisableIndicator.Watched)">indicator/circle</value>