From 30e495264d01797bfbd3d0e587e6dc013e41432e Mon Sep 17 00:00:00 2001 From: Kevin Goffe Date: Mon, 4 Feb 2019 17:11:24 +0000 Subject: [PATCH] [skin.confluence] v4.5.13 Fixed missing labels Removed audio dsp references --- 720p/DialogAddonInfo.xml | 8 ++++---- 720p/DialogAddonSettings.xml | 3 +-- 720p/DialogPVRInfo.xml | 2 +- 720p/DialogPVRRadioRDSInfo.xml | 12 ++++++------ 720p/DialogSettings.xml | 3 +-- 720p/MusicOSD.xml | 17 +++-------------- 720p/MusicVisualisation.xml | 3 +-- 720p/VideoFullScreen.xml | 2 +- 720p/VideoOSD.xml | 13 +++++-------- 720p/ViewsAddonBrowser.xml | 8 ++++---- 720p/ViewsMusicLibrary.xml | 2 +- 720p/ViewsVideoLibrary.xml | 14 +++++++------- addon.xml | 2 +- language/resource.language.en_gb/strings.po | 6 +++++- 14 files changed, 41 insertions(+), 54 deletions(-) diff --git a/720p/DialogAddonInfo.xml b/720p/DialogAddonInfo.xml index 44a2071..8182b63 100644 --- a/720p/DialogAddonInfo.xml +++ b/720p/DialogAddonInfo.xml @@ -65,7 +65,7 @@ 0 440 25 - + left center font13 @@ -89,7 +89,7 @@ 30 440 25 - + left center font13 @@ -113,7 +113,7 @@ 60 440 25 - + left center font13 @@ -137,7 +137,7 @@ 90 440 25 - + left center font13 diff --git a/720p/DialogAddonSettings.xml b/720p/DialogAddonSettings.xml index cbc0aa0..609457a 100644 --- a/720p/DialogAddonSettings.xml +++ b/720p/DialogAddonSettings.xml @@ -9,8 +9,7 @@ Conditional - Conditional - Conditional + Conditional diff --git a/720p/DialogPVRInfo.xml b/720p/DialogPVRInfo.xml index 68b37a3..8342792 100644 --- a/720p/DialogPVRInfo.xml +++ b/720p/DialogPVRInfo.xml @@ -173,7 +173,7 @@ font13 justify 60 - + 40 diff --git a/720p/DialogPVRRadioRDSInfo.xml b/720p/DialogPVRRadioRDSInfo.xml index 85569c7..1e15793 100644 --- a/720p/DialogPVRRadioRDSInfo.xml +++ b/720p/DialogPVRRadioRDSInfo.xml @@ -91,7 +91,7 @@ center font13 white - + false 2000 String.IsEmpty(RDS.Band) @@ -172,7 +172,7 @@ center font13 white - + false 2000 @@ -230,7 +230,7 @@ center font13 white - + false 2000 @@ -256,7 +256,7 @@ center font13 white - + false 2000 @@ -283,7 +283,7 @@ white left - + true String.IsEmpty(RDS.Band) + !String.IsEmpty(RDS.Artist) @@ -365,7 +365,7 @@ center font13 white - + false 2000 !String.IsEmpty(RDS.Conductor) diff --git a/720p/DialogSettings.xml b/720p/DialogSettings.xml index afa3a5b..1bb1142 100644 --- a/720p/DialogSettings.xml +++ b/720p/DialogSettings.xml @@ -9,8 +9,7 @@ Conditional - Conditional - Conditional + Conditional diff --git a/720p/MusicOSD.xml b/720p/MusicOSD.xml index 8a39836..c35b89c 100644 --- a/720p/MusicOSD.xml +++ b/720p/MusicOSD.xml @@ -23,7 +23,7 @@ DialogCloseButton.png VisibleChange conditional - system.getbool(input.enablemouse) + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)] + system.getbool(input.enablemouse) + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(Addon)] DepthOSD+ @@ -39,7 +39,7 @@ osd_slider_nibNF.png osd_slider_nib.png VisibleChange - ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(Addon)] 325 @@ -47,7 +47,7 @@ horizontal 0 VisibleChange - ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(Addon)] 55 55 @@ -257,7 +257,6 @@ 55 - !system.getbool(audiooutput.dspaddonsenabled) 55 @@ -278,16 +277,6 @@ OSDRateNF.png setrating - - 55 - 55 - - - OSDDSPAudioFO.png - OSDDSPAudioNF.png - ActivateWindow(OSDAudioDSPSettings) - system.getbool(audiooutput.dspaddonsenabled) - 55 55 diff --git a/720p/MusicVisualisation.xml b/720p/MusicVisualisation.xml index c007faf..a2ef59a 100644 --- a/720p/MusicVisualisation.xml +++ b/720p/MusicVisualisation.xml @@ -26,7 +26,7 @@ DepthOSD VisibleChange - [Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)] + [Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(Addon)] -20 -150 @@ -131,7 +131,6 @@ 35 5 horizontal - !system.getbool(audiooutput.dspaddonsenabled) auto 20 diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml index 96bde78..8de1aaf 100644 --- a/720p/VideoFullScreen.xml +++ b/720p/VideoFullScreen.xml @@ -53,7 +53,7 @@ DepthOSD - [Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(SliderDialog)] + [Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(SliderDialog)] VisibleChange -20 diff --git a/720p/VideoOSD.xml b/720p/VideoOSD.xml index afc514f..de40beb 100644 --- a/720p/VideoOSD.xml +++ b/720p/VideoOSD.xml @@ -23,7 +23,7 @@ DialogCloseButton.png conditional VisibleChange - system.getbool(input.enablemouse) + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks)] + system.getbool(input.enablemouse) + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)] DepthOSD+ @@ -39,7 +39,7 @@ osd_slider_nibNF.png osd_slider_nib.png VisibleChange - ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | VideoPlayer.Content(LiveTV)] + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | VideoPlayer.Content(LiveTV)] 325 @@ -47,7 +47,7 @@ horizontal 0 VisibleChange - ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] 55 55 @@ -216,16 +216,13 @@ OSDVideoNF.png ActivateWindow(OSDVideoSettings) - + 55 55 OSDAudioFO.png OSDAudioNF.png - system.getbool(audiooutput.dspaddonsenabled) - OSDDSPAudioFO.png - OSDDSPAudioNF.png ActivateWindow(OSDAudioSettings) @@ -293,7 +290,7 @@ DepthOSD+ - videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] + [Control.HasFocus(255) | ControlGroup(500).HasFocus | Control.HasFocus(520)] + videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] + [Control.HasFocus(255) | ControlGroup(500).HasFocus | Control.HasFocus(520)] VisibleChange Conditional Conditional diff --git a/720p/ViewsAddonBrowser.xml b/720p/ViewsAddonBrowser.xml index 34100a2..7ae52bd 100644 --- a/720p/ViewsAddonBrowser.xml +++ b/720p/ViewsAddonBrowser.xml @@ -168,7 +168,7 @@ 0 350 25 - + left center font13 @@ -193,7 +193,7 @@ 30 350 25 - + left center font13 @@ -400,7 +400,7 @@ 0 155 25 - + left center font13 @@ -425,7 +425,7 @@ 30 155 25 - + left center font13 diff --git a/720p/ViewsMusicLibrary.xml b/720p/ViewsMusicLibrary.xml index e8d5e12..0075428 100644 --- a/720p/ViewsMusicLibrary.xml +++ b/720p/ViewsMusicLibrary.xml @@ -845,7 +845,7 @@ 30 350 25 - + left center font13 diff --git a/720p/ViewsVideoLibrary.xml b/720p/ViewsVideoLibrary.xml index 1eed02c..253bafd 100644 --- a/720p/ViewsVideoLibrary.xml +++ b/720p/ViewsVideoLibrary.xml @@ -969,7 +969,7 @@ 120 360 25 - + left center font12 @@ -993,7 +993,7 @@ 145 360 25 - + left center font12 @@ -1017,7 +1017,7 @@ 170 360 25 - + left center font12 @@ -1436,7 +1436,7 @@ 335 340 25 - + left center font13 @@ -1460,7 +1460,7 @@ 360 340 25 - + left center font13 @@ -1542,7 +1542,7 @@ 335 340 25 - + left center font13 @@ -1566,7 +1566,7 @@ 360 340 25 - + left center font13 diff --git a/addon.xml b/addon.xml index 396c036..96e1da8 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index 8b214d7..a2c76a6 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -92,7 +92,11 @@ msgctxt "#31016" msgid "Elapsed time" msgstr "" -#empty strings from id 31017 to 31022 +msgctxt "#31017" +msgid "Unavailable" +msgstr "" + +#empty strings from id 31018 to 31022 msgctxt "#31023" msgid "Playing"