From cb88b8d4642cfdd481870e3bf0a15941e757f2ef Mon Sep 17 00:00:00 2001 From: beatmasterRS Date: Mon, 6 Mar 2023 12:06:10 +0100 Subject: [PATCH] [OSD] added option to show detailed info on osd --- 1080i/Includes.xml | 4 +-- 1080i/Includes_OSD.xml | 35 +++++++++++---------- 1080i/SkinSettings.xml | 8 +++++ language/resource.language.en_gb/strings.po | 4 +++ 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/1080i/Includes.xml b/1080i/Includes.xml index d03320919..3f3b91eae 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -85,8 +85,8 @@ Player.HasAudio + VideoPlayer.Content(livetv) Player.HasAudio + !VideoPlayer.Content(livetv) Player.HasVideo + !VideoPlayer.Content(livetv) - !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdinfo))] | [Window.IsVisible(videoosd) + Window.IsVisible(DialogFullScreenInfo.xml)] - String.IsEmpty(Window(home).Property(osdshowinfo)) + String.IsEmpty(Window(home).Property(osdinfo)) + !Player.ShowInfo + ![Window.IsVisible(videoosd) + Window.IsVisible(DialogFullScreenInfo.xml)] + !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdinfo))] | [Window.IsVisible(videoosd) + Window.IsVisible(DialogFullScreenInfo.xml)] | Skin.HasSetting(show.info.on.osd) + String.IsEmpty(Window(home).Property(osdshowinfo)) + String.IsEmpty(Window(home).Property(osdinfo)) + !Player.ShowInfo + ![Window.IsVisible(videoosd) + Window.IsVisible(DialogFullScreenInfo.xml)] + !Skin.HasSetting(show.info.on.osd) Skin.HasSetting(home.netflix.autoplay.trailer) + [[Window.IsVisible(Home.xml) + [$EXP[HomeIsModernMultiWidgetsNetflix] | $EXP[HomeIsCleanMinimal] | $EXP[HomeIsVerticalMultiWidgetsNetflix]]] | Control.IsVisible(521) | Control.IsVisible(522) | Control.IsVisible(510)] + !Window.IsVisible(DialogVideoInfo.xml) + String.IsEqual(Window(home).Property(TrailerPath2),Player.FileNameAndPath) + !String.IsEmpty(Player.FileNameAndPath) Skin.HasSetting(home.netflix.autoplay.trailer) + [Window.IsVisible(Home.xml) | Window.IsVisible(MyVideoNav.xml) | $EXP[InGameMode]] + !Control.HasFocus(300) + !Player.HasMedia + !String.IsEmpty(Window(home).Property(listitem.trailer)) + !System.HasVisibleModalDialog + !Window.IsVisible(script-globalsearch.xml) + !String.IsEqual(Window(home).Property(TrailerPath),Window(home).Property(listitem.trailer)) + !System.IdleTime(30) !String.IsEmpty(Window(home).Property(TrailerPath2)) + !String.IsEmpty(Window(home).Property(TrailerPath)) + String.IsEmpty(Player.FileNameAndPath) diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml index 2c8bedded..406d49429 100644 --- a/1080i/Includes_OSD.xml +++ b/1080i/Includes_OSD.xml @@ -2612,11 +2612,11 @@ 9003 DefOSDUpDown - Conditional - Conditional + Conditional + Conditional - Conditional - Conditional + Conditional + Conditional true @@ -2682,11 +2682,11 @@ - Conditional - Conditional + Conditional + Conditional - Conditional - Conditional + Conditional + Conditional 0 13 @@ -2840,9 +2840,9 @@ - Conditional - Conditional - Conditional + Conditional + Conditional + Conditional Visible @@ -2882,7 +2882,7 @@ 180r 200 - Window.IsVisible(fullscreeninfo) | !String.IsEmpty(Window(home).Property(osdinfo)) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] + Window.IsVisible(fullscreeninfo) | !String.IsEmpty(Window(home).Property(osdinfo)) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] | Skin.HasSetting(show.info.on.osd) @@ -2921,7 +2921,7 @@ 180r 200 - Window.IsVisible(fullscreeninfo) | !String.IsEmpty(Window(home).Property(osdinfo)) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] + Window.IsVisible(fullscreeninfo) | !String.IsEmpty(Window(home).Property(osdinfo)) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] | Skin.HasSetting(show.info.on.osd) @@ -3027,6 +3027,7 @@ + !Skin.HasSetting(show.info.on.osd) !Player.Paused | !Skin.HasSetting(osd.showinfoonpause) !Window.IsVisible(fullscreeninfo) + !Player.ShowInfo + String.IsEmpty(Window(home).Property(osdinfo)) + String.IsEmpty(Window(home).Property(osdshowinfo)) Player.Seeking | Player.HasPerformedSeek(3) | Player.Paused | Player.Forwarding | Player.Rewinding | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(PVR.ChannelNumberInput) | Window.IsVisible(videoosd) @@ -3175,7 +3176,7 @@ 0 100% 200 - Window.IsVisible(fullscreeninfo) | !String.IsEmpty(Window(home).Property(osdinfo)) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] + Window.IsVisible(fullscreeninfo) | !String.IsEmpty(Window(home).Property(osdinfo)) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] | Skin.HasSetting(show.info.on.osd) Visible WindowOpen Hidden @@ -3329,6 +3330,7 @@ + !Skin.HasSetting(show.info.on.osd) !Player.Paused | !Skin.HasSetting(osd.showinfoonpause) !Window.IsVisible(fullscreeninfo) + String.IsEmpty(Window(home).Property(osdinfo)) + !Player.ShowInfo + String.IsEmpty(Window(home).Property(osdshowinfo)) Player.Seeking | Player.HasPerformedSeek(3) | Player.Paused | Player.Forwarding | Player.Rewinding | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(PVR.ChannelNumberInput) | Window.IsVisible(videoosd) @@ -3455,7 +3457,7 @@ - Window.IsVisible(videoosd) | !String.IsEmpty(Window(home).Property(osdinfo)) | Window.IsVisible(fullscreeninfo) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] + Window.IsVisible(videoosd) | !String.IsEmpty(Window(home).Property(osdinfo)) | Window.IsVisible(fullscreeninfo) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] | Skin.HasSetting(show.info.on.osd) @@ -3498,7 +3500,7 @@ 0 640 1020 - Window.IsVisible(videoosd) | !String.IsEmpty(Window(home).Property(osdinfo)) | Window.IsVisible(fullscreeninfo) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] + Window.IsVisible(videoosd) | !String.IsEmpty(Window(home).Property(osdinfo)) | Window.IsVisible(fullscreeninfo) | Player.ShowInfo | !String.IsEmpty(Window(home).Property(osdshowinfo)) | [Player.Paused + Skin.HasSetting(osd.showinfoonpause)] | Skin.HasSetting(show.info.on.osd) @@ -3605,6 +3607,7 @@ + !Skin.HasSetting(show.info.on.osd) !Window.IsVisible(videoosd) !Player.Paused | !Skin.HasSetting(osd.showinfoonpause) !Window.IsVisible(fullscreeninfo) + String.IsEmpty(Window(home).Property(osdinfo)) + !Player.ShowInfo + String.IsEmpty(Window(home).Property(osdshowinfo)) diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index 644b3f33f..816f09aa0 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -1168,6 +1168,14 @@ Skin.HasSetting(osd.showinfoonpause) Skin.ToggleSetting(osd.showinfoonpause) + + 1360 + ControlGroup(9100).HasFocus(9103) + DefSettingsButtonGradientSkinSettings + + Skin.HasSetting(show.info.on.osd) + Skin.ToggleSetting(show.info.on.osd) + 1360 ControlGroup(9100).HasFocus(9103) diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index a8cc8047b..b9976d46f 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -2591,4 +2591,8 @@ msgstr "" msgctxt "#31705" msgid "Small poster fanart" +msgstr "" + +msgctxt "#31706" +msgid "Show detailed info on osd" msgstr "" \ No newline at end of file