From 786aa21d01c32604e52662ecdff4325c47a3974a Mon Sep 17 00:00:00 2001 From: Bas Rieter Date: Sun, 24 Feb 2019 09:09:15 +0100 Subject: [PATCH] Added: changes for a very simple 'kids/master' profile (#49) Added, thanks. --- 720p/Home.xml | 34 +-- 720p/IncludesBackgroundBuilding.xml | 11 +- 720p/IncludesHomeRecentlyAdded.xml | 6 +- 720p/SkinSettings.xml | 236 ++++++++++++++++++++ language/resource.language.en_gb/strings.po | 32 ++- 5 files changed, 297 insertions(+), 22 deletions(-) diff --git a/720p/Home.xml b/720p/Home.xml index a1a6738..f69758b 100644 --- a/720p/Home.xml +++ b/720p/Home.xml @@ -817,7 +817,7 @@ HomeSubMenuCommonValues 9016 9016 - Container(9000).HasFocus(10) + !String.IsEmpty(Container(90160).ListItemNoWrap(0).Label) + Container(9000).HasFocus(10) + !String.IsEmpty(Container(90160).ListItemNoWrap(0).Label) + [System.IsMaster | !Skin.HasSetting(HomeMenuMovieUsePlaylist)] HomeSubMenuMovies @@ -825,7 +825,7 @@ HomeSubMenuCommonValues 9017 9017 - Container(9000).HasFocus(11) + !String.IsEmpty(Container(90170).ListItemNoWrap(0).Label) + Container(9000).HasFocus(11) + !String.IsEmpty(Container(90170).ListItemNoWrap(0).Label) + [System.IsMaster | !Skin.HasSetting(HomeMenuTVShowUsePlaylist)] HomeSubMenuTVShows @@ -833,7 +833,7 @@ HomeSubMenuCommonValues 9011 9011 - Container(9000).HasFocus(3) + !String.IsEmpty(Container(90110).ListItemNoWrap(0).Label) + Container(9000).HasFocus(3) + !String.IsEmpty(Container(90110).ListItemNoWrap(0).Label) + [System.IsMaster | !Skin.HasSetting(HomeMenuMusicUsePlaylist)] HomeSubMenuMusic @@ -981,21 +981,21 @@ ActivateWindow(servicesettings,weather) - !Skin.HasSetting(HomeMenuNoWeatherButton) + [!Skin.HasSetting(HomeMenuNoWeatherButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoWeatherButton) + System.IsMaster] ActivateWindow(Pictures) - !Skin.HasSetting(HomeMenuNoPicturesButton) + [!Skin.HasSetting(HomeMenuNoPicturesButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoPicturesButton) + System.IsMaster] ActivateWindow(Games) - !Skin.HasSetting(HomeMenuNoGamesButton) + [!Skin.HasSetting(HomeMenuNoGamesButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoGamesButton) + System.IsMaster] @@ -1017,29 +1017,32 @@ ActivateWindow(Videos,root) - !Skin.HasSetting(HomeMenuNoVideosButton) + [!Skin.HasSetting(HomeMenuNoVideosButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoVideosButton) + System.IsMaster] - ActivateWindow(Videos,MovieTitles,return) + ActivateWindow(Videos,MovieTitles,return) + ActivateWindow(Videos,$INFO[Skin.String(HomeMenuMoviePlaylist)],return) - !Skin.HasSetting(HomeMenuNoMovieButton) + Library.HasContent(Movies) + [[!Skin.HasSetting(HomeMenuNoMovieButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoMovieButton) + System.IsMaster]] + Library.HasContent(Movies) - ActivateWindow(Videos,TVShowTitles,return) + ActivateWindow(Videos,TVShowTitles,return) + ActivateWindow(Videos,$INFO[Skin.String(HomeMenuTVShowPlaylist)],return) - !Skin.HasSetting(HomeMenuNoTVShowButton) + Library.HasContent(TVShows) + [[!Skin.HasSetting(HomeMenuNoTVShowButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoTVShowButton) + System.IsMaster]] + Library.HasContent(TVShows) - ActivateWindow(Music) - ActivateWindow(Music,root) + ActivateWindow(Music) + ActivateWindow(Music,root) + ActivateWindow(Music,$INFO[Skin.String(HomeMenuMusicPlaylist)],return) - !Skin.HasSetting(HomeMenuNoMusicButton) + [!Skin.HasSetting(HomeMenuNoMusicButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoMusicButton) + System.IsMaster] @@ -1047,7 +1050,7 @@ ActivateWindow(Programs) - !Skin.HasSetting(HomeMenuNoProgramsButton) + [!Skin.HasSetting(HomeMenuNoProgramsButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoProgramsButton) + System.IsMaster] @@ -1061,6 +1064,7 @@ ActivateWindow(Settings) + [!Skin.HasSetting(HomeMenuNoSystemButton) + !System.IsMaster] | System.IsMaster diff --git a/720p/IncludesBackgroundBuilding.xml b/720p/IncludesBackgroundBuilding.xml index 43ceb65..1a1a849 100644 --- a/720p/IncludesBackgroundBuilding.xml +++ b/720p/IncludesBackgroundBuilding.xml @@ -16,7 +16,16 @@ BackgroundDimensions scale $INFO[Skin.String(CustomBackgroundPath)] - Skin.HasSetting(UseCustomBackground) + !String.IsEmpty(Skin.String(CustomBackgroundPath)) + !System.IsMaster + Skin.HasSetting(UseCustomBackground) + !String.IsEmpty(Skin.String(CustomBackgroundPath)) + VisibleFadeEffect + + + DepthBackground + User Set Background Image Master + BackgroundDimensions + scale + $INFO[Skin.String(MasterCustomBackgroundPath)] + System.IsMaster + Skin.HasSetting(UseCustomBackground) + !String.IsEmpty(Skin.String(MasterCustomBackgroundPath)) VisibleFadeEffect diff --git a/720p/IncludesHomeRecentlyAdded.xml b/720p/IncludesHomeRecentlyAdded.xml index fbf9e3c..2df7c32 100644 --- a/720p/IncludesHomeRecentlyAdded.xml +++ b/720p/IncludesHomeRecentlyAdded.xml @@ -14,7 +14,7 @@ 190 50 Library.HasContent(Movies) - Container(9000).Hasfocus(10) + !Skin.HasSetting(HomepageHideRecentlyAddedVideo) + Container(9000).Hasfocus(10) + !Skin.HasSetting(HomepageHideRecentlyAddedVideo) + !Skin.HasSetting(HomeMenuMovieUsePlaylist) VisibleFadeEffect Title label @@ -251,7 +251,7 @@ 160 50 Library.HasContent(TVShows) - Container(9000).Hasfocus(11) + !Skin.HasSetting(HomepageHideRecentlyAddedVideo) + Container(9000).Hasfocus(11) + !Skin.HasSetting(HomepageHideRecentlyAddedVideo) + !Skin.HasSetting(HomeMenuTVShowUsePlaylist) VisibleFadeEffect Title label @@ -513,7 +513,7 @@ 240 50 Library.HasContent(Music) - Container(9000).Hasfocus(3) + !Skin.HasSetting(HomepageHideRecentlyAddedAlbums) + Container(9000).Hasfocus(3) + !Skin.HasSetting(HomepageHideRecentlyAddedAlbums) + !Skin.HasSetting(HomeMenuMusicUsePlaylist) VisibleFadeEffect Title label diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml index 98c894f..59b8cca 100644 --- a/720p/SkinSettings.xml +++ b/720p/SkinSettings.xml @@ -502,6 +502,229 @@ MenuItemFO.png MenuItemNF.png + + Hide Settings Button + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(HomeMenuNoSystemButton) + Skin.HasSetting(HomeMenuNoSystemButton) + MenuItemFO.png + MenuItemNF.png + + + + + 750 + 45 + font13_title + + blue + black + left + center + + + Use Movies playlist + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(HomeMenuMovieUsePlaylist) + Skin.HasSetting(HomeMenuMovieUsePlaylist) + MenuItemFO.png + MenuItemNF.png + Library.HasContent(Movies) + + + 750 + 40 + font13 + + [COLOR=selected]$INFO[Skin.String(HomeMenuMoviePlaylist)][/COLOR] + grey2 + white + MenuItemFO.png + MenuItemNF.png + Skin.SetFile(HomeMenuMoviePlaylist,*.xsp,special://profile/playlists/) + Skin.HasSetting(HomeMenuMovieUsePlaylist) + + + Use TV Shows playlist + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(HomeMenuTVShowUsePlaylist) + Skin.HasSetting(HomeMenuTVShowUsePlaylist) + MenuItemFO.png + MenuItemNF.png + Library.HasContent(Movies) + + + 750 + 40 + font13 + + [COLOR=selected]$INFO[Skin.String(HomeMenuTVShowPlaylist)][/COLOR] + grey2 + white + MenuItemFO.png + MenuItemNF.png + Skin.SetFile(HomeMenuTVShowPlaylist,*.xsp,special://profile/playlists/) + Skin.HasSetting(HomeMenuTVShowUsePlaylist) + + + Use Music playlist + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(HomeMenuMusicUsePlaylist) + Skin.HasSetting(HomeMenuMusicUsePlaylist) + MenuItemFO.png + MenuItemNF.png + + + 750 + 40 + font13 + + [COLOR=selected]$INFO[Skin.String(HomeMenuMusicPlaylist)][/COLOR] + grey2 + white + MenuItemFO.png + MenuItemNF.png + Skin.SetFile(HomeMenuMusicPlaylist,*.xsp,special://profile/playlists/) + Skin.HasSetting(HomeMenuMusicUsePlaylist) + + + + + 750 + 45 + font13_title + + blue + black + left + center + + + Hide Videos Button + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(MasterHomeMenuNoVideosButton) + Skin.HasSetting(MasterHomeMenuNoVideosButton) + MenuItemFO.png + MenuItemNF.png + + + Hide Movies Button + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(MasterHomeMenuNoMovieButton) + Skin.HasSetting(MasterHomeMenuNoMovieButton) + MenuItemFO.png + MenuItemNF.png + Library.HasContent(Movies) + + + Hide TV Shows Button + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(MasterHomeMenuNoTVShowButton) + Skin.HasSetting(MasterHomeMenuNoTVShowButton) + MenuItemFO.png + MenuItemNF.png + Library.HasContent(TVShows) + + + Hide Music Button + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(MasterHomeMenuNoMusicButton) + Skin.HasSetting(MasterHomeMenuNoMusicButton) + MenuItemFO.png + MenuItemNF.png + + + Hide Pictures Button + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(MasterHomeMenuNoPicturesButton) + Skin.HasSetting(MasterHomeMenuNoPicturesButton) + MenuItemFO.png + MenuItemNF.png + + + Hide Programs Button + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(MasterHomeMenuNoProgramsButton) + Skin.HasSetting(MasterHomeMenuNoProgramsButton) + MenuItemFO.png + MenuItemNF.png + + + Hide Weather Button + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(MasterHomeMenuNoWeatherButton) + Skin.HasSetting(MasterHomeMenuNoWeatherButton) + MenuItemFO.png + MenuItemNF.png + + + Hide Games Button + 750 + 40 + font13 + grey2 + white + + Skin.ToggleSetting(MasterHomeMenuNoGamesButton) + Skin.HasSetting(MasterHomeMenuNoGamesButton) + MenuItemFO.png + MenuItemNF.png + 1060 @@ -624,6 +847,19 @@ Skin.SetImage(CustomBackgroundPath) Skin.HasSetting(UseCustomBackground) + + 750 + 40 + font13 + + [COLOR=selected]$INFO[Skin.String(MasterCustomBackgroundPath)][/COLOR] + grey2 + white + MenuItemFO.png + MenuItemNF.png + Skin.SetImage(MasterCustomBackgroundPath) + Skin.HasSetting(UseCustomBackground) + diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index a2c76a6..9a9aeaa 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -272,7 +272,17 @@ msgctxt "#31112" msgid "Options" msgstr "" -#empty strings from id 31113 to 31115 +msgctxt "#31113" +msgid "Background path Master:" +msgstr "" + +msgctxt "#31114" +msgid "System" +msgstr "" + +msgctxt "#31115" +msgid "Main button playlists" +msgstr "" msgctxt "#31116" msgid "Show recently added albums" @@ -357,7 +367,19 @@ msgctxt "#31142" msgid "Settings level" msgstr "" -#empty strings from id 31143 to 31199 +msgctxt "#31143" +msgid "Use" +msgstr "" + +msgctxt "#31144" +msgid "playlist" +msgstr "" + +msgctxt "#31145" +msgid "playlist path" +msgstr "" + +#empty strings from id 31146 to 31199 #Script labels msgctxt "#31200" @@ -388,7 +410,11 @@ msgctxt "#31208" msgid "Upcoming episodes" msgstr "" -#empty strings from id 31209 to 31299 +msgctxt "#31209" +msgid "Hide Master profile main menu buttons" +msgstr "" + +#empty strings from id 31210 to 31299 #Extra labels msgctxt "#31300"