diff options
| author | Kai Sommerfeld <3226626+ksooo@users.noreply.github.com> | 2023-11-04 20:04:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 20:04:46 +0100 |
| commit | 042175cf51e86d68cd97c99f7c8979d47fe9b25b (patch) | |
| tree | a9e52cfd038d97695b9f91a788e597111e1b9b81 /addons | |
| parent | 7e77667be143188b4935ed400239e0237d58ede0 (diff) | |
| parent | 712cdeb2add6b62e2b0f8263a5b55780b5b20cc8 (diff) | |
Merge pull request #24059 from ksooo/pvr-fix-hardcoded-watchedstatus-label2
[PVR][Estuary] PVR core should not set label2 for PVR recording folde…
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.estuary/xml/MyPVRRecordings.xml | 2 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/Variables.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/addons/skin.estuary/xml/MyPVRRecordings.xml b/addons/skin.estuary/xml/MyPVRRecordings.xml index 67b4de541a..020f1ff093 100644 --- a/addons/skin.estuary/xml/MyPVRRecordings.xml +++ b/addons/skin.estuary/xml/MyPVRRecordings.xml @@ -28,7 +28,7 @@ <param name="info_icon" value="$VAR[ListPVRRecordingsIconVar]" /> <param name="has_info_icon" value="true" /> <param name="label1" value="$INFO[ListItem.Label]" /> - <param name="label2" value="$INFO[ListItem.Label2]" /> + <param name="label2" value="$VAR[ListLabel2Var]" /> </include> </control> </control> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index 5263e9f482..45c387e892 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -89,6 +89,7 @@ <value condition="String.IsEmpty(Container.PluginName) + Container.Content(tvshows) + Container.SortMethod(29)">$VAR[WatchedStatusVar]</value> <value condition="String.IsEmpty(Container.PluginName) + String.IsEqual(ListItem.DBType,season) + Container.SortMethod(29)">$VAR[WatchedStatusVar]</value> <value condition="String.IsEmpty(Container.PluginName) + String.IsEqual(ListItem.DBType,set) + Container.SortMethod(1)">$VAR[WatchedStatusVar]</value> + <value condition="ListItem.IsFolder + [Window.IsActive(TVRecordings) | Window.IsActive(RadioRecordings)]">$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> @@ -289,6 +290,7 @@ <variable name="WatchedStatusVar"> <value condition="String.IsEqual(Listitem.DBType,tvshow) | String.IsEqual(Listitem.DBType,season)">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value> <value condition="String.IsEqual(Listitem.DBType,set)">$INFO[ListItem.Property(Watched)]$INFO[ListItem.Property(Total), / ,]</value> + <value condition="ListItem.IsFolder + [Window.IsActive(TVRecordings) | Window.IsActive(RadioRecordings)]">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value> </variable> <variable name="VideoPlayerForwardRewindVar"> <value condition="Player.Forwarding2x | Player.Rewinding2x">2x</value> |