From b5890734f3b1ae9e62e8730b0a943022953fbc7b Mon Sep 17 00:00:00 2001 From: Kevin Goffe Date: Sun, 2 Feb 2025 16:15:35 +0000 Subject: [PATCH] Redesign of OSD settings --- language/resource.language.en_gb/strings.po | 15 +- ...ptions.xml => Custom_1114_OSD_Options.xml} | 77 ++++++++ xml/DialogMusicInfo.xml | 2 +- ...ludes_Dialog_Default_Video_Information.xml | 2 +- xml/Includes_Dialog_Video_Information.xml | 2 +- xml/MusicOSD.xml | 171 ++---------------- xml/MusicVisualisation.xml | 2 +- xml/SkinSettings.xml | 22 --- xml/VideoOSD.xml | 27 ++- 9 files changed, 121 insertions(+), 199 deletions(-) rename xml/{Custom_1114_Video_OSD_Options.xml => Custom_1114_OSD_Options.xml} (65%) diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index a8109873..01f04530 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -217,7 +217,7 @@ msgid "Turn Off Shuffle All" msgstr "" msgctxt "#31047" -msgid "Visualisation Presets" +msgid "Visualisation presets" msgstr "" msgctxt "#31048" @@ -625,7 +625,7 @@ msgid "hours" msgstr "" msgctxt "#31149" -msgid "Hide OSD controls" +msgid "Lyrics settings" msgstr "" msgctxt "#31150" @@ -940,7 +940,9 @@ msgctxt "#31227" msgid "Air time" msgstr "" -#empty string with id 31228 +msgctxt "#31228" +msgid "Visualisation settings" +msgstr "" msgctxt "#31229" msgid "Cancel Next Up" @@ -965,13 +967,12 @@ msgid "Browse Addons" msgstr "" msgctxt "#31235" -msgid "Your Rating" +msgid "Your rating" msgstr "" -#Must match #31235 without the space - +#: Must match #31235 but with an underscore instead of the space msgctxt "#31236" -msgid "Your_Rating" +msgid "Your_rating" msgstr "" msgctxt "#31237" diff --git a/xml/Custom_1114_Video_OSD_Options.xml b/xml/Custom_1114_OSD_Options.xml similarity index 65% rename from xml/Custom_1114_Video_OSD_Options.xml rename to xml/Custom_1114_OSD_Options.xml index 57bed3f4..6196ec9b 100644 --- a/xml/Custom_1114_Video_OSD_Options.xml +++ b/xml/Custom_1114_OSD_Options.xml @@ -102,6 +102,7 @@ [B]$VAR[StreamSubtitleLabel]$VAR[StreamOriginal]$VAR[StreamForced]$VAR[StreamVisualImpaired]$VAR[StreamHearingImpaired][/B] SetProperty(VideoOSDSelect,1,home) DialogSelectSubtitle + Window.IsVisible(fullscreenvideo) @@ -109,6 +110,7 @@ [B]$VAR[StreamAudioLanguage]$VAR[AudioCodec, | ]$VAR[AudioChannels, | ][/B] SetProperty(VideoOSDSelect,1,home) DialogSelectAudio + Window.IsVisible(fullscreenvideo) @@ -116,41 +118,48 @@ [B]$VAR[VideoCodec]$INFO[Player.Process(VideoWidth), | ]x$INFO[Player.Process(VideoHeight)]$INFO[Player.Process(VideoScanType)][/B] SetProperty(VideoOSDSelect,1,home) DialogSelectVideo + Window.IsVisible(fullscreenvideo) ActivateWindow(videobookmarks) + Window.IsVisible(fullscreenvideo) SetProperty(VideoOSDSelect,1,home) ActivateWindow(osdsubtitlesettings) + Window.IsVisible(fullscreenvideo) SetProperty(VideoOSDSelect,1,home) ActivateWindow(osdaudiosettings) + Window.IsVisible(fullscreenvideo) SetProperty(VideoOSDSelect,1,home) ActivateWindow(osdvideosettings) + Window.IsVisible(fullscreenvideo) ActivateWindow(osdcmssettings) System.HasCMS + Window.IsVisible(fullscreenvideo) PlayerResolutionSelect Player.HasResolutions + Window.IsVisible(fullscreenvideo) @@ -158,18 +167,21 @@ Close StereoMode VideoPlayer.IsStereoscopic + Window.IsVisible(fullscreenvideo) PlayerControl(ShowVideoMenu) VideoPlayer.HasMenu + Window.IsVisible(fullscreenvideo) PlayerControl(Next) Window.IsVisible(VideoFullScreen.xml) + system.getbool(videoplayer.autoplaynextitem) + Window.IsVisible(fullscreenvideo) @@ -178,6 +190,71 @@ Dialog.Close(all) ActivateWindow(1111) Player.TempoEnabled + Window.IsVisible(fullscreenvideo) + + + + + [B]$INFO[Skin.String(LyricScript_Path)][/B] + Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics) + Window.IsVisible(visualisation) + + + + + Addon.OpenSettings($INFO[Skin.String(LyricScript_Path)]) + !String.IsEmpty(Skin.String(LyricScript_Path)) + Window.IsVisible(visualisation) + + + + + Dialog.Close(all) + ActivateWindow(MusicPlaylist) + Window.IsVisible(visualisation) + + + + + [B]$INFO[Playlist.Repeat][/B] + PlayerControl(Repeat) + Window.IsVisible(visualisation) + + + + + [B]$INFO[Playlist.Random][/B] + PlayerControl(Random) + Window.IsVisible(visualisation) + + + + + [B]$INFO[MusicPlayer.UserRating,,/10][/B] + SetProperty(SetUserRating,music,home) + setrating + Window.IsVisible(visualisation) + + + + + [B]$INFO[Visualisation.Name][/B] + Close + SendClick(500) + Window.IsVisible(visualisation) + + + + + Addon.Default.OpenSettings(xbmc.player.musicviz) + Window.IsVisible(visualisation) + + + + + ActivateWindow(visualisationpresetlist) + Visualisation.HasPresets + Window.IsVisible(visualisation) diff --git a/xml/DialogMusicInfo.xml b/xml/DialogMusicInfo.xml index 0ca028ee..b2e61dd8 100644 --- a/xml/DialogMusicInfo.xml +++ b/xml/DialogMusicInfo.xml @@ -334,7 +334,7 @@ SetProperty(SetUserRating,music,home) SendClick(7) Med24 - + 56 ffdadada ff222222 diff --git a/xml/Includes_Dialog_Default_Video_Information.xml b/xml/Includes_Dialog_Default_Video_Information.xml index 56a956da..daf96f83 100644 --- a/xml/Includes_Dialog_Default_Video_Information.xml +++ b/xml/Includes_Dialog_Default_Video_Information.xml @@ -389,7 +389,7 @@ SetProperty(UserRatingIcon,$INFO[ListItem.Icon],home) SendClick(7) Med24 - + 56 ffdadada ff222222 diff --git a/xml/Includes_Dialog_Video_Information.xml b/xml/Includes_Dialog_Video_Information.xml index ff83e2a2..6c261084 100644 --- a/xml/Includes_Dialog_Video_Information.xml +++ b/xml/Includes_Dialog_Video_Information.xml @@ -428,7 +428,7 @@ SetProperty(UserRatingIcon,$INFO[ListItem.Icon],home) SendClick(7) Med24 - + 56 ffdadada ff222222 diff --git a/xml/MusicOSD.xml b/xml/MusicOSD.xml index c9b09853..615ffe51 100644 --- a/xml/MusicOSD.xml +++ b/xml/MusicOSD.xml @@ -1,11 +1,14 @@ - SetFocus(304) - SetFocus(11) + 304 + + + HiddenControl + - Conditional + Conditional 3840 420 @@ -79,7 +82,7 @@ auto - 68 + 60 OSD32 fff3f3f3 @@ -87,7 +90,7 @@ auto - 68 + 60 OSD32 ff696969 @@ -96,7 +99,7 @@ auto - 68 + 60 OSD32 ff696969 @@ -108,11 +111,10 @@ 1600 128 11 - 0 + -14 center horizontal - 204 - !Skin.HasSetting(HideOSDControls) + 304 128 @@ -140,6 +142,15 @@ osd/osd_stop.png PlayerControl(Stop) + + + 128 + 128 + + osd/osd_settings.png + osd/osd_settings.png + ActivateWindow(1114) + 128 @@ -182,148 +193,6 @@ fff3f3f3 - - - 184 - 256 - 1200 - 1200 - right - 0 - noop - 200 - 304 - vertical - !Player.Forwarding + !Player.Rewinding - - - 1200 - 116 - OSD32 - ffffffff - ShadowColour - ffffc04b - - - - Close - RunScript($INFO[Skin.String(LyricScript_Path)]) - Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics) - Close - RunScript($INFO[Skin.String(LyricScript_Path)]) - - - - 1200 - 116 - OSD32 - ffffffff - ShadowColour - ffffc04b - - - - Close - ActivateWindow(MusicPlaylist) - - - - 1200 - 116 - OSD32 - ffffffff - ShadowColour - ffffc04b - - - - PlayerControl(Repeat) - - - - 1200 - 116 - OSD32 - ffffffff - ShadowColour - ffffc04b - - - - PlayerControl(Random) - - - - - 184 - 256 - 1200 - 1200 - right - 0 - 100 - noop - 304 - vertical - !Player.Forwarding + !Player.Rewinding - - - 1200 - 116 - OSD32 - right - ffffffff - ShadowColour - ffffc04b - - - - SetProperty(SetUserRating,music,home) - setrating - - - - 1200 - 116 - OSD32 - right - ffffffff - ShadowColour - ffffc04b - - - - - - - 1200 - 116 - OSD32 - right - ffffffff - ShadowColour - ffffc04b - - - - ActivateWindow(visualisationpresetlist) - Visualisation.HasPresets - - - - 1200 - 116 - OSD32 - right - ffffffff - ShadowColour - ffffc04b - - - - Addon.Default.OpenSettings(xbmc.player.musicviz) - - diff --git a/xml/MusicVisualisation.xml b/xml/MusicVisualisation.xml index eb6c0a28..562369bd 100644 --- a/xml/MusicVisualisation.xml +++ b/xml/MusicVisualisation.xml @@ -28,7 +28,7 @@ String.IsEmpty(Visualisation.Enabled) - !Window.IsActive(seekbar) + !Window.IsActive(musicosd) + Player.ShowInfo + !Window.IsActive(seekbar) + !Window.IsActive(musicosd) + Player.ShowInfo + !Window.IsVisble(1114) 396 diff --git a/xml/SkinSettings.xml b/xml/SkinSettings.xml index b1972c34..90170e7b 100644 --- a/xml/SkinSettings.xml +++ b/xml/SkinSettings.xml @@ -431,28 +431,6 @@ settings/button_no_focus.png Skin.SelectBool(31135, 31001|US, 31002|UK, 31003|Germany) - - 1916 - 168 - Light32 - - 80 - NotFocusedColour - FocusedColour - 250 - 106 - 1626 - settings/radio_on_focus.png - settings/radio_on_no_focus.png - settings/radio_on_disabled.png - settings/radio_off_focus.png - settings/radio_off_no_focus.png - settings/radio_off_disabled.png - settings/button_focus.png - settings/button_no_focus.png - Skin.ToggleSetting(HideOSDControls) - Skin.HasSetting(HideOSDControls) - 1916 168 diff --git a/xml/VideoOSD.xml b/xml/VideoOSD.xml index 066017d8..dd6c4e02 100644 --- a/xml/VideoOSD.xml +++ b/xml/VideoOSD.xml @@ -1,11 +1,10 @@ - SetFocus(304) - SetFocus(16) - SetFocus(15) + 304 + Conditional 3840 420 @@ -86,8 +85,7 @@ -14 center horizontal - 204 - !Skin.HasSetting(HideOSDControls) + 304 128 @@ -118,6 +116,15 @@ osd/osd_stop.png PlayerControl(Stop) + + + 128 + 128 + + osd/osd_settings.png + osd/osd_settings.png + ActivateWindow(1114) + 128 @@ -130,16 +137,6 @@ osd/osd_play.png PlayerControl(Play) - - - 128 - 128 - - osd/osd_settings.png - osd/osd_settings.png - Close - ActivateWindow(1114) - 128