From 0ebecafa6755427a312cfd6f63247275f52a7a91 Mon Sep 17 00:00:00 2001 From: Christian Gade Date: Tue, 14 Jan 2020 16:21:56 +0100 Subject: [PATCH] [skin.confluence] PVR updates and fixes (#73) * Update DialogPVRGroupmanager.xml * Add PVR reminders and other PVR related changes --- 720p/DialogPVRGroupManager.xml | 62 ++++++++++++++++++++++++--------- 720p/DialogPVRInfo.xml | 11 ++++-- 720p/Includes.xml | 1 + 720p/VideoFullScreen.xml | 6 ++-- 720p/VideoOSD.xml | 2 +- addon.xml | 4 +-- changelog.txt | 6 ++++ media/PVR-HasReminder.png | Bin 0 -> 3157 bytes 8 files changed, 68 insertions(+), 24 deletions(-) create mode 100644 media/PVR-HasReminder.png diff --git a/720p/DialogPVRGroupManager.xml b/720p/DialogPVRGroupManager.xml index 4b29952..1556497 100644 --- a/720p/DialogPVRGroupManager.xml +++ b/720p/DialogPVRGroupManager.xml @@ -84,14 +84,14 @@ 0 75 310 - 460 + 550 button-nofocus.png 5 80 300 - 450 + 540 13 13 9000 @@ -106,10 +106,18 @@ 40 button-nofocus.png + + 32 + 32 + 5 + 4 + $INFO[ListItem.Icon] + keep + - 10 + 40 0 - 280 + 250 40 font12 left @@ -136,10 +144,18 @@ button-focus2.png Control.HasFocus(13) + + 32 + 32 + 5 + 4 + $INFO[ListItem.Icon] + keep + - 10 + 40 0 - 280 + 250 40 font12 left @@ -154,7 +170,7 @@ 305 75 25 - 460 + 550 ScrollBarV.png ScrollBarV_bar.png ScrollBarV_bar_focus.png @@ -187,14 +203,14 @@ 0 75 310 - 460 + 550 button-nofocus.png 5 85 300 - 450 + 540 11 11 73 @@ -273,7 +289,7 @@ 305 75 25 - 460 + 550 ScrollBarV.png ScrollBarV_bar.png ScrollBarV_bar_focus.png @@ -306,14 +322,14 @@ 0 75 310 - 460 + 550 button-nofocus.png 5 85 300 - 450 + 540 12 12 71 @@ -392,7 +408,7 @@ 305 75 25 - 460 + 550 ScrollBarV.png ScrollBarV_bar.png ScrollBarV_bar_focus.png @@ -410,9 +426,8 @@ 1070 165 200 - 225 + 315 5 - center vertical 12 13 @@ -442,6 +457,12 @@ ButtonInfoDialogsCommonValues + + Regenerate Group Thumbnails + 200 + ButtonInfoDialogsCommonValues + + TV/Radio toggle 200 @@ -459,7 +480,7 @@ 1065 - 405 + 495 0 0 @@ -485,6 +506,15 @@ $INFO[Container(12).ListItem.Icon] Control.HasFocus(12) | Control.HasFocus(72) + + 5 + 5 + 200 + 200 + keep + $INFO[Container(13).ListItem.Icon] + Control.HasFocus(13) | Control.HasFocus(73) + diff --git a/720p/DialogPVRInfo.xml b/720p/DialogPVRInfo.xml index 6b47813..e87682d 100644 --- a/720p/DialogPVRInfo.xml +++ b/720p/DialogPVRInfo.xml @@ -191,12 +191,13 @@ Timer ButtonInfoDialogsCommonValues + Window.IsActive(PVRGuideInfo) Find similar ButtonInfoDialogsCommonValues - Window.IsActive(PVRGuideInfo) + Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRGuideInfo) Play programme @@ -214,7 +215,7 @@ Play recording ButtonInfoDialogsCommonValues - Window.IsActive(PVRGuideInfo) + Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRGuideInfo) Record @@ -222,6 +223,12 @@ + + Set reminder + ButtonInfoDialogsCommonValues + + Window.IsActive(PVRGuideInfo) + OK ButtonInfoDialogsCommonValues diff --git a/720p/Includes.xml b/720p/Includes.xml index a5caafd..ec79d3b 100644 --- a/720p/Includes.xml +++ b/720p/Includes.xml @@ -555,6 +555,7 @@ PVR-IsRecording.png + PVR-HasReminder.png PVR-HasTimerScheduleError.png PVR-HasTimerError.png PVR-HasTimerScheduleConflict.png diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml index ee711b0..1ec1341 100644 --- a/720p/VideoFullScreen.xml +++ b/720p/VideoFullScreen.xml @@ -164,7 +164,7 @@ white black - ![VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel] + ![VideoPlayer.Content(LiveTV) + [PVR.IsRecordingPlayingChannel | PVR.IsPlayingActiveRecording]] conditional @@ -173,7 +173,7 @@ 25 keep PVR-IsRecording.png - VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive + VideoPlayer.Content(LiveTV) + [[PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive] | PVR.IsPlayingActiveRecording] Heading label @@ -187,7 +187,7 @@ white black - VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive + VideoPlayer.Content(LiveTV) + [[PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive] | PVR.IsPlayingActiveRecording] Studio label diff --git a/720p/VideoOSD.xml b/720p/VideoOSD.xml index d2bc98e..ffadd98 100644 --- a/720p/VideoOSD.xml +++ b/720p/VideoOSD.xml @@ -253,7 +253,7 @@ OSDRecordOffFO.png OSDRecordOffNF.png - PVR.IsRecordingPlayingChannel + PVR.IsRecordingPlayingChannel | PVR.IsPlayingActiveRecording OSDRecordOnFO.png OSDRecordOnNF.png PVR.ToggleRecordPlayingChannel diff --git a/addon.xml b/addon.xml index 6584de7..182474c 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -143,6 +143,6 @@ resources/screenshot-08.jpg resources/screenshot-09.jpg - Added chapter markers to progress bar. + - Add support for PVR reminders.[CR]- Fix / add new buttons in PVR information window.[CR]- Update PVR group manager dialog with latest changes. diff --git a/changelog.txt b/changelog.txt index 6c31435..c8d5fc9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +[B]4.7.1[/B] + +- Add support for PVR reminders +- Fix / add new buttons in PVR information window +- Update PVR group manager dialog with latest changes + [B]4.7.0[/B] - Added chapter markers to progress bar diff --git a/media/PVR-HasReminder.png b/media/PVR-HasReminder.png new file mode 100644 index 0000000000000000000000000000000000000000..4f14e7664a7a4d05134c7c77e95c1902a82fec19 GIT binary patch literal 3157 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 literal 0 HcmV?d00001