From f8ddae3dd578de5fcf64b8d0718f383c4d89f5c9 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 22 Nov 2022 23:29:52 +0100 Subject: [PATCH 1/4] Replace PVR Artwork Poster by Fanart in OSD & Fallback to EPGEventIcon --- 1080i/Includes.xml | 5 ++++- 1080i/Includes_OSD.xml | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 7194fdfbf..a272f978b 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -537,6 +537,7 @@ $INFO[Window(Home).Property(PVR.Artwork.fanart)] + $INFO[Container(30111).ListItem.EpgEventIcon] $INFO[Container(9988).ListItem.Art(fanart)] $INFO[Container(300).ListItem.Property(Background)] $INFO[Skin.String(home.slideshowpath)] @@ -546,8 +547,10 @@ $INFO[Container(301).ListItem.Property(Background)] common/null.png pvr/background.jpg - $INFO[Window(Home).Property(PVR.Artwork.Fanart)] + $INFO[Window(Home).Property(PVR.Artwork.Fanart)] + $INFO[ListItem.EpgEventIcon] $INFO[Window(Home).Property(PVR.Artwork.Fanart)] + $INFO[ListItem.EpgEventIcon] $INFO[Window(Home).Property(SkinHelper.ExtraFanArtPath)] $INFO[ListItem.Art(fanart)] $INFO[Container(9500).ListItem.Art(fanart)] diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml index a83d77bfc..9ed92212e 100644 --- a/1080i/Includes_OSD.xml +++ b/1080i/Includes_OSD.xml @@ -2980,7 +2980,7 @@ scale - [!VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(tvshow.poster)) | !String.IsEmpty(Player.Art(poster))]] | [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)] + [!VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(tvshow.poster)) | !String.IsEmpty(Player.Art(poster))]] | [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)] -51 -241 272 @@ -3010,8 +3010,8 @@ 270 390 scale - $INFO[Window(Home).Property(PVR.Artwork.poster)] - VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork) + $INFO[Window(Home).Property(PVR.Artwork.fanart)] + VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork) 230 @@ -3020,7 +3020,7 @@ 20 keep $INFO[Player.Art(thumb)] - VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + !Skin.HasSetting(Skin_enablePvrArtwork) + VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) @@ -3265,17 +3265,17 @@ !Skin.hasSetting(osd.disableposter) + [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb))] + !Skin.HasSetting(osd.disable.icon.background.pvr) - !Skin.hasSetting(osd.disableposter) + [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)] + !Skin.hasSetting(osd.disableposter) + [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)] 220 33 220 -11 keep - $INFO[Window(Home).Property(PVR.Artwork.poster)] + $INFO[Window(Home).Property(PVR.Artwork.fanart)] Conditional - !Skin.hasSetting(osd.disableposter) + [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + !Skin.HasSetting(Skin_enablePvrArtwork)] + !Skin.hasSetting(osd.disableposter) + [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart))] 220 33 220 @@ -3541,8 +3541,8 @@ 20 230 keep - $INFO[Window(Home).Property(PVR.Artwork.poster)] - VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(enable_PvrArtwork) + $INFO[Window(Home).Property(PVR.Artwork.fanart)] + VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(enable_PvrArtwork) 230 @@ -3551,7 +3551,7 @@ 230 keep $INFO[Player.Art(thumb)] - VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + !Skin.HasSetting(enable_PvrArtwork) + VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) 270 From ae7a897b644777be2dbd5501efa71bc062fb4f59 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 1 Feb 2023 21:38:09 +0100 Subject: [PATCH 2/4] Up Next support for PVR --- 1080i/Custom_1134_PVRNextUp.xml | 63 +++++++++++++++++++++ 1080i/Includes_Images.xml | 7 ++- 1080i/SkinSettings.xml | 9 +++ language/resource.language.en_gb/strings.po | 6 +- 4 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 1080i/Custom_1134_PVRNextUp.xml diff --git a/1080i/Custom_1134_PVRNextUp.xml b/1080i/Custom_1134_PVRNextUp.xml new file mode 100644 index 000000000..80fd7e7d8 --- /dev/null +++ b/1080i/Custom_1134_PVRNextUp.xml @@ -0,0 +1,63 @@ + + RunScript(script.module.pvr.artwork,get_artwork,prefix=PVR.Nextup&title=$INFO[VideoPlayer.NextTitle]&genre=$INFO[VideoPlayer.NextGenre]&channel=$INFO[VideoPlayer.ChannelName]) + RunScript(script.module.pvr.artwork,clear_artwork,prefix=PVR.Nextup) + Window.IsActive(fullscreenvideo) + VideoPlayer.Content(livetv) + !Skin.HasSetting(disable_PVRNextUp) + !Window.IsVisible(VideoOSD.xml) + !Window.IsVisible(DialogPVRChannelsOSD.xml) + !Window.IsVisible(DialogPVRChannelGuide.xml) + !Window.IsVisible(DialogFullScreenInfo.xml) + !Window.IsVisible(Custom_1135_PVROverlay.xml) + 3012 + 10 + + + false + + + false + + + !Window.IsVisible(videoosd) + Window.IsVisible(fullscreenvideo) + [Integer.IsEqual(PVR.EpgEventRemainingTime(hh),0) + Integer.IsEqual(PVR.EpgEventRemainingTime(mm),0) + Integer.IsLess(PVR.EpgEventRemainingTime(ss),36) + Integer.IsGreater(PVR.EpgEventRemainingTime(ss),4)] + Animation.FadeIn.Slide + Animation.FadeOut + 64 + 64 + 480 + 270 + + -64 + 0 + 20 + 64 + center + Small + + ffededed + bf000000 + + + 100% + 100% + 350 + scale + $VAR[PVRUpNextImage] + + + 100% + 64 + 0 + diffuse/blackline_nextup.png + + + 20 + 120 + 64 + 2 + center + Small + + PanelWhite100 + + + common/box21.png + !Skin.HasSetting(thumbnails.white) + + + + diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml index 4e0c6b31e..b75a5337a 100644 --- a/1080i/Includes_Images.xml +++ b/1080i/Includes_Images.xml @@ -338,6 +338,11 @@ $INFO[ListItem.Icon] + + $INFO[Window(10000).Property(PVR.Nextup.fanart)] + $INFO[Player.Art(thumb)] + + $INFO[Window(Home).Property(PVR.Artwork.fanart)] $INFO[Window(Home).Property(PVR.Artwork.poster)] @@ -471,4 +476,4 @@ dialog/on.png dialog/off.png - \ No newline at end of file + diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index 8d8064224..d8228c5fb 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -3051,6 +3051,15 @@ Skin.HasSetting(addon.upnext.use.thumbnail) Skin.ToggleSetting(addon.upnext.use.thumbnail) + + 1360 + ControlGroup(9100).HasFocus(9107) + DefSettingsButtonGradientSkinSettings + + Skin.HasSetting(disable_PVRNextUp) + Skin.ToggleSetting(disable_PVRNextUp) + System.AddonIsEnabled(script.module.pvr.artwork) + ControlGroup(9100).HasFocus(9107) horizontal diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index e2773b336..4ce189a03 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -2575,4 +2575,8 @@ msgstr "" msgctxt "#31701" msgid "Color palette" -msgstr "" \ No newline at end of file +msgstr "" + +msgctxt "#31534" +msgid "Disable Up Next for PVR" +msgstr "" From 283c53e32b0d6ff3de940d11d175d0b1d7681c82 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 2 Feb 2023 20:13:12 +0100 Subject: [PATCH 3/4] PVR Artwork: showing thumb instead of poster in EPG --- 1080i/Includes_Images.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml index b75a5337a..5ad1adf7f 100644 --- a/1080i/Includes_Images.xml +++ b/1080i/Includes_Images.xml @@ -332,7 +332,7 @@ $INFO[Window(Home).Property(PVR.Artwork.fanart)] - $INFO[Window(Home).Property(PVR.Artwork.poster)] + $INFO[Window(Home).Property(PVR.Artwork.thumb)] $INFO[Window(Home).Property(SkinHelper.ListItem.Art.Fanart)] $INFO[ListItem.Icon] $INFO[ListItem.Icon] @@ -345,7 +345,7 @@ $INFO[Window(Home).Property(PVR.Artwork.fanart)] - $INFO[Window(Home).Property(PVR.Artwork.poster)] + $INFO[Window(Home).Property(PVR.Artwork.thumb)] $INFO[ListItem.EpgEventIcon] $INFO[ListItem.Icon] From 4655e88f7f2ffe041b24e002279ce26fe582e5fd Mon Sep 17 00:00:00 2001 From: kalle2000 Date: Fri, 3 Feb 2023 22:37:18 +0100 Subject: [PATCH 4/4] PVR artwork fix for homescreen --- 1080i/Includes.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/1080i/Includes.xml b/1080i/Includes.xml index a95740568..2ccaaa82e 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -536,8 +536,23 @@ $INFO[Container(301152).ListItem.Art(fanart)] - $INFO[Window(Home).Property(PVR.Artwork.fanart)] + $INFO[Window(Home).Property(PVR.Artwork.fanart)] + $INFO[Window(Home).Property(PVR.Artwork.thumb)] $INFO[Container(30111).ListItem.EpgEventIcon] + $INFO[Container(30121).ListItem.EpgEventIcon] + $INFO[Container(30131).ListItem.EpgEventIcon] + $INFO[Container(30141).ListItem.EpgEventIcon] + $INFO[Container(30151).ListItem.EpgEventIcon] + $INFO[Container(30161).ListItem.EpgEventIcon] + $INFO[Container(30171).ListItem.EpgEventIcon] + $INFO[Container(30181).ListItem.EpgEventIcon] + $INFO[Container(30191).ListItem.EpgEventIcon] + $INFO[Container(301101).ListItem.EpgEventIcon] + $INFO[Container(301111).ListItem.EpgEventIcon] + $INFO[Container(301121).ListItem.EpgEventIcon] + $INFO[Container(301131).ListItem.EpgEventIcon] + $INFO[Container(301141).ListItem.EpgEventIcon] + $INFO[Container(301151).ListItem.EpgEventIcon] $INFO[Container(9988).ListItem.Art(fanart)] $INFO[Container(300).ListItem.Property(Background)] $INFO[Skin.String(home.slideshowpath)]