From 441c91cfd49ccdd674dab3df10c0df5f228422d7 Mon Sep 17 00:00:00 2001 From: realcopacetic Date: Mon, 13 Nov 2023 17:38:14 +0000 Subject: [PATCH] globalised custom background --- 16x9/Colors.xml | 9 +- 16x9/Components.xml | 124 +++++----- 16x9/Content_Settings.xml | 249 +++++++++----------- 16x9/Content_Settings_Sliders.xml | 47 +--- 16x9/Custom_1199_Test_Label.xml | 2 +- 16x9/Variables_Labels_Windows.xml | 19 +- 16x9/Variables_Paths_Media.xml | 8 +- 16x9/Variables_Textures_Artwork_Media.xml | 50 ++-- 16x9/Variables_Textures_Artwork_Widgets.xml | 2 +- README.md | 5 + language/resource.language.en_gb/strings.po | 12 +- 11 files changed, 238 insertions(+), 289 deletions(-) diff --git a/16x9/Colors.xml b/16x9/Colors.xml index 1f3704a6..2531ac2d 100755 --- a/16x9/Colors.xml +++ b/16x9/Colors.xml @@ -398,6 +398,11 @@ $VAR[Disabled_Color] + + $VAR[Light_Color] + $VAR[Unfocused_Color] + + $VAR[Light_Color] $VAR[Unfocused_Color] @@ -406,10 +411,6 @@ $VAR[Light_Color] $VAR[Unfocused_Color] - - $VAR[Light_Color] - $VAR[Unfocused_Color] - $VAR[Light_Color] $VAR[Unfocused_Color] diff --git a/16x9/Components.xml b/16x9/Components.xml index d6f6e381..e5fe1ffc 100644 --- a/16x9/Components.xml +++ b/16x9/Components.xml @@ -80,39 +80,6 @@ - - - - - - - true - - - - - - - - - - - - - - - @@ -136,6 +103,54 @@ + + + + + + + + !VideoPlayer.IsFullscreen + $PARAM[visible] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + @@ -148,22 +163,22 @@ - + - + - + - + - + - + @@ -190,36 +205,7 @@ - - - - - - - - !VideoPlayer.IsFullscreen + $PARAM[visible] - - - - - - - - - - - - - - - - - - - - - - + diff --git a/16x9/Content_Settings.xml b/16x9/Content_Settings.xml index e2ed011b..bd83b2fd 100644 --- a/16x9/Content_Settings.xml +++ b/16x9/Content_Settings.xml @@ -166,6 +166,12 @@ + + Background + + + + Home @@ -196,32 +202,26 @@ - - Experiments - - - - Look and feel - !ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16) + !ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16) + !ControlGroup(9).HasFocus(17) Conditional Themes screenshot - !ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16) + !ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16) + !ControlGroup(9).HasFocus(17) $VAR[skinsettings_Themes_Screenshots] Night / Light - !ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16) + !ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16) + !ControlGroup(9).HasFocus(17) $VAR[Theme_Label] !Skin.String(Theme,Light) @@ -249,15 +249,6 @@ Skin.SetString(User_Defined_Accent_Color,copacetic_accent_color) SetFocus(1004) - - - - - - - - - Recommended Kodi settings ControlGroup(9).HasFocus(10) @@ -302,29 +293,42 @@ Artwork ControlGroup(9).HasFocus(10) - + + Prefer keyart screenshot + ControlGroup(9).HasFocus(10) + + $VAR[skinsettings_Prefer_Keyart_Screenshots] + + + Prefer keyart for poster views + + Skin.ToggleSetting(Prefer_Keyart) + Skin.HasSetting(Prefer_Keyart) + ControlGroup(9).HasFocus(10) + + Themes screenshot ControlGroup(9).HasFocus(10) $VAR[skinsettings_Clearlogo_Cropper_Screenshots] - + Crop clearlogos ControlGroup(9).HasFocus(10) Skin.ToggleSetting(Crop_Clearlogos) Skin.HasSetting(Crop_Clearlogos) - + Clear cache ControlGroup(9).HasFocus(10) + System.AddonIsEnabled(script.copacetic.helper) $INFO[Window(home).Property(Addon_Data_Folder_Size)] RunScript(script.copacetic.helper,action=clear_cache) - + Colorise media flags ControlGroup(9).HasFocus(10) Skin.HasSetting(Crop_Clearlogos) @@ -339,68 +343,82 @@ - - - + + + + + + + Global + ControlGroup(9).HasFocus(16) + + + - - - - + + + + + + - Choose a custom path + + RunScript(script.skinshortcuts,type=shortcuts&custom=True&showNone=False&skinList=Background_Slideshow_Custom_Path) + ControlGroup(9).HasFocus(16) + [Skin.String(Background_Slideshow,Custom) | !$EXP[Library_Has_Content]] + - + - - - - + + + + - - Add movement - - Skin.ToggleSetting(Global_Ken_Burns_Effect) - Skin.HasSetting(Global_Ken_Burns_Effect) - ControlGroup(9).HasFocus(10) - - - Artwork - ControlGroup(9).HasFocus(10) + + + + + + + + + + + + + + + + + + + + Home + ControlGroup(9).HasFocus(16) - - - - Prefer keyart screenshot - ControlGroup(9).HasFocus(10) - - $VAR[skinsettings_Prefer_Keyart_Screenshots] + - - Prefer keyart for poster views - - Skin.ToggleSetting(Prefer_Keyart) - Skin.HasSetting(Prefer_Keyart) - ControlGroup(9).HasFocus(10) + + Override home menu backgrounds + + Skin.ToggleSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Home_Background_Override_Enabled) + ControlGroup(9).HasFocus(16) - - Widgets - ControlGroup(9).HasFocus(11) - - - Enable widgets ControlGroup(9).HasFocus(11) Skin.ToggleSetting(Widgets_Enabled) Skin.HasSetting(Widgets_Enabled) + Enable clearlogos for widgets @@ -408,57 +426,14 @@ Skin.ToggleSetting(Widgets_Clearlogos_Enabled) Skin.HasSetting(Widgets_Clearlogos_Enabled) + - Reset widgets RunScript(script.copacetic.helper,action=dialog_yesno,heading=$LOCALIZE[31430],message=$LOCALIZE[31431],yes_actions=SetFocus(4200)) ControlGroup(9).HasFocus(11) + Skin.HasSetting(Widgets_Enabled) + System.AddonIsEnabled(script.copacetic.helper) - - - Background - - ControlGroup(9).HasFocus(11) - - - Override home menu artwork - - Skin.ToggleSetting(Home_Background_Override_Enabled) - Skin.HasSetting(Home_Background_Override_Enabled) - ControlGroup(9).HasFocus(11) - - - - - - - - - - - - - - Choose a custom path - - RunScript(script.skinshortcuts,type=shortcuts&custom=True&showNone=False&skinList=Home_Background_Override_Path) - ControlGroup(9).HasFocus(11) + Skin.HasSetting(Home_Background_Override_Enabled) + [Skin.String(Home_Background_Override_Source,Custom) | !$EXP[Library_Has_Content]] - - - - - - - - - - - - Add movement - - Skin.ToggleSetting(Home_Ken_Burns_Effect) - Skin.HasSetting(Home_Ken_Burns_Effect) - ControlGroup(9).HasFocus(11) Enable screensaver @@ -466,6 +441,7 @@ Skin.ToggleSetting(Home_Screensaver_Enabled) Skin.HasSetting(Home_Screensaver_Enabled) ControlGroup(9).HasFocus(11) + - Show clearlogo @@ -473,6 +449,7 @@ Skin.ToggleSetting(Home_Screensaver_Clearlogo_Enabled) Skin.HasSetting(Home_Screensaver_Clearlogo_Enabled) ControlGroup(9).HasFocus(11) + Skin.HasSetting(Home_Screensaver_Enabled) + Hide clock @@ -480,6 +457,7 @@ Skin.ToggleSetting(Hide_Home_Clock) Skin.HasSetting(Hide_Home_Clock) ControlGroup(9).HasFocus(11) + @@ -762,48 +740,48 @@ - + - + Info screens ControlGroup(9).HasFocus(14) - + Disable star ratings Skin.ToggleSetting(Star_Ratings_Disabled) Skin.HasSetting(Star_Ratings_Disabled) ControlGroup(9).HasFocus(14) - + Video Player ControlGroup(9).HasFocus(14) - + Instantly hide progress bar on pause screen Skin.ToggleSetting(Player_Progress_Disabled) Skin.HasSetting(Player_Progress_Disabled) ControlGroup(9).HasFocus(14) - + Show info on pause screen Skin.ToggleSetting(Pause_Screen_Info_Enabled) Skin.HasSetting(Pause_Screen_Info_Enabled) ControlGroup(9).HasFocus(14) - + Music Player ControlGroup(9).HasFocus(14) - + Enable fanart background Skin.ToggleSetting(visualisation_Disable_Background) @@ -815,10 +793,30 @@ - - - + + + + + Experiments + ControlGroup(9).HasFocus(14) + + + + + Use unwatched count in info details + ControlGroup(9).HasFocus(14) + + Skin.ToggleSetting(Experiment_Unwatched_Info) + Skin.HasSetting(Experiment_Unwatched_Info) + + + Enable fanart display for Grid view in Pictures window + ControlGroup(9).HasFocus(14) + + Skin.ToggleSetting(Experiment_GridView_Fanart_Pictures) + Skin.HasSetting(Experiment_GridView_Fanart_Pictures) + @@ -959,21 +957,6 @@ ControlGroup(9).HasFocus(15) + Skin.HasSetting(Trailer_Autoplay) - - - Use unwatched count in info details - ControlGroup(9).HasFocus(16) - - Skin.ToggleSetting(Experiment_Unwatched_Info) - Skin.HasSetting(Experiment_Unwatched_Info) - - - Enable fanart display for Grid view in Pictures window - ControlGroup(9).HasFocus(16) - - Skin.ToggleSetting(Experiment_GridView_Fanart_Pictures) - Skin.HasSetting(Experiment_GridView_Fanart_Pictures) - diff --git a/16x9/Content_Settings_Sliders.xml b/16x9/Content_Settings_Sliders.xml index 9d20ba77..2f51c83e 100644 --- a/16x9/Content_Settings_Sliders.xml +++ b/16x9/Content_Settings_Sliders.xml @@ -25,6 +25,7 @@ + Skin.SetString(Background_Slideshow,Artists) Skin.SetString(Background_Slideshow,TVShows) Skin.SetString(Background_Slideshow,Movies) Skin.SetString(Background_Slideshow,Videos) @@ -33,18 +34,21 @@ Skin.SetString(Background_Slideshow,Movies) Skin.SetString(Background_Slideshow,TVShows) Skin.SetString(Background_Slideshow,Artists) + Skin.SetString(Background_Slideshow,Custom) - Conditional - Conditional - Conditional - Conditional + Conditional + Conditional + Conditional + Conditional + Conditional - Conditional - Conditional - Conditional - Conditional + Conditional + Conditional + Conditional + Conditional + Conditional @@ -89,33 +93,6 @@ Conditional - - Skin.SetString(Home_Background_Override_Source,Artists) - Skin.SetString(Home_Background_Override_Source,TVShows) - Skin.SetString(Home_Background_Override_Source,Movies) - Skin.SetString(Home_Background_Override_Source,Videos) - Skin.SetString(Home_Background_Override_Source,Global) - Skin.SetString(Home_Background_Override_Source,Videos) - Skin.SetString(Home_Background_Override_Source,Movies) - Skin.SetString(Home_Background_Override_Source,TVShows) - Skin.SetString(Home_Background_Override_Source,Artists) - Skin.SetString(Home_Background_Override_Source,Custom) - - - Conditional - Conditional - Conditional - Conditional - Conditional - - - Conditional - Conditional - Conditional - Conditional - Conditional - - Skin.SetString(Multiart_Interval,7) Skin.SetString(Multiart_Interval,5) diff --git a/16x9/Custom_1199_Test_Label.xml b/16x9/Custom_1199_Test_Label.xml index 03600191..7e0d22b2 100644 --- a/16x9/Custom_1199_Test_Label.xml +++ b/16x9/Custom_1199_Test_Label.xml @@ -5,7 +5,7 @@ right - + true diff --git a/16x9/Variables_Labels_Windows.xml b/16x9/Variables_Labels_Windows.xml index 379e902d..843f372c 100644 --- a/16x9/Variables_Labels_Windows.xml +++ b/16x9/Variables_Labels_Windows.xml @@ -207,8 +207,8 @@ $LOCALIZE[31567] $LOCALIZE[31568] - $LOCALIZE[31570] - $LOCALIZE[31571] + $LOCALIZE[31570] + $LOCALIZE[31571] @@ -217,7 +217,7 @@ 10 - $INFO[Skin.String(Background_Opacity),,%] + $INFO[Skin.String(Background_Opacity)] $LOCALIZE[31436] @@ -225,18 +225,11 @@ $LOCALIZE[20343] $LOCALIZE[31437] $LOCALIZE[133] + $LOCALIZE[31438] - - $LOCALIZE[31436] - $LOCALIZE[342] - $LOCALIZE[20343] - $LOCALIZE[31437] - $LOCALIZE[133] - $LOCALIZE[31438] - - + - $INFO[Skin.String(Home_Background_Override_Path)] + $INFO[Skin.String(Background_Slideshow_Custom_Path)] $LOCALIZE[31439] diff --git a/16x9/Variables_Paths_Media.xml b/16x9/Variables_Paths_Media.xml index 9f6bebc4..6ad2f614 100644 --- a/16x9/Variables_Paths_Media.xml +++ b/16x9/Variables_Paths_Media.xml @@ -23,7 +23,7 @@ - $INFO[Skin.String(Home_Background_Override_Path)] + $INFO[Skin.String(Background_Slideshow_Custom_Path)] $INFO[Container(3000).ListItem.Property(backgroundPlaylist)] @@ -42,7 +42,11 @@ videodb://movies/titles/ videodb://tvshows/titles/ musicdb://artists/?albumartistsonly=true - + + + + + $INFO[Skin.String(Background_Slideshow_Custom_Path)] diff --git a/16x9/Variables_Textures_Artwork_Media.xml b/16x9/Variables_Textures_Artwork_Media.xml index 169212d6..4668e2a0 100644 --- a/16x9/Variables_Textures_Artwork_Media.xml +++ b/16x9/Variables_Textures_Artwork_Media.xml @@ -23,14 +23,26 @@ $INFO[ListItem.Art(clearlogo)] + + $INFO[Container(3300).ListItem.Art(fanart)] + $INFO[Container(3300).ListItem.Art(fanart)] + $INFO[Window(home).Property(Background_Videos)] + $INFO[Window(home).Property(Background_Artists)] + $INFO[Window(home).Property(Background_Custom_Fanart)] + $INFO[Window(home).Property(Background_Global_Fanart)] + $INFO[Window(home).Property(Background_Videos_Fanart)] + $INFO[Window(home).Property(Background_Movies_Fanart)] + $INFO[Window(home).Property(Background_TVShows_Fanart)] + $INFO[Window(home).Property(Background_Artists_Fanart)] + + - $INFO[Window(home).Property(Background_Global_Fanart)] - $INFO[Window(home).Property(Background_Movies_Fanart)] - $INFO[Window(home).Property(Background_TVShows_Fanart)] - $INFO[Window(home).Property(Background_Videos_Fanart)] - $INFO[Window(home).Property(Background_Artists_Fanart)] - $INFO[Control.GetLabel(3401)] - $INFO[Container(3300).ListItem.Art(fanart)] + $INFO[Window(home).Property(Background_Custom_Fanart)] + $INFO[Window(home).Property(Background_Global_Fanart)] + $INFO[Window(home).Property(Background_Videos_Fanart)] + $INFO[Window(home).Property(Background_Movies_Fanart)] + $INFO[Window(home).Property(Background_TVShows_Fanart)] + $INFO[Window(home).Property(Background_Artists_Fanart)] $INFO[Control.GetLabel(3401)] $INFO[Container(3300).ListItem.Art(fanart)] $INFO[Container(3000).ListItem.Property(background)] @@ -39,29 +51,17 @@ - $INFO[Window(home).Property(Background_Global_Clearlogo)] - $INFO[Window(home).Property(Background_Movies_Clearlogo)] - $INFO[Window(home).Property(Background_TVShows_Clearlogo)] - $INFO[Window(home).Property(Background_Videos_Clearlogo)] - $INFO[Window(home).Property(Background_Artists_Clearlogo)] - $INFO[Container(3300).ListItem.Art(clearlogo)] + $INFO[Window(home).Property(Background_Custom_Clearlogo)] + $INFO[Window(home).Property(Background_Global_Clearlogo)] + $INFO[Window(home).Property(Background_Videos_Clearlogo)] + $INFO[Window(home).Property(Background_Movies_Clearlogo)] + $INFO[Window(home).Property(Background_TVShows_Clearlogo)] + $INFO[Window(home).Property(Background_Artists_Clearlogo)] $INFO[Container(3300).ListItem.Art(clearlogo)] $INFO[Container(3000).ListItem.Property(background)] $INFO[Container(3300).ListItem.Art(clearlogo)] - - $INFO[Container(3300).ListItem.Art(fanart)] - $INFO[Container(3300).ListItem.Art(fanart)] - $INFO[Window(home).Property(Background_Videos)] - $INFO[Window(home).Property(Background_Artists)] - $INFO[Window(home).Property(Background_Global_Fanart)] - $INFO[Window(home).Property(Background_Videos_Fanart)] - $INFO[Window(home).Property(Background_Movies_Fanart)] - $INFO[Window(home).Property(Background_TVShows_Fanart)] - $INFO[Window(home).Property(Background_Artists_Fanart)] - - $INFO[Control.GetLabel(3401)] $INFO[ListItem.Art(thumb)] diff --git a/16x9/Variables_Textures_Artwork_Widgets.xml b/16x9/Variables_Textures_Artwork_Widgets.xml index 020a74ef..db6ca8e6 100644 --- a/16x9/Variables_Textures_Artwork_Widgets.xml +++ b/16x9/Variables_Textures_Artwork_Widgets.xml @@ -742,7 +742,7 @@ $INFO[ListItem(-1).Art(fanart)] $INFO[ListItem(-1).Art(tvshow.keyart)] $INFO[ListItem(-1).Art(keyart)] - $INFO[ListItem(-1).Art(tvshow.poster)] + $INFO[ListItem(-1).Art(tvshow.poster)] $INFO[ListItem(-1).Art(poster)] $INFO[ListItem(-1).Icon] diff --git a/README.md b/README.md index a6d5cd67..eb454c21 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,11 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc - removal of ken burns effect - remove param animation - background not updating on some addonbrowser screens container animation between addonbrowser levels? (All repositories or add on repository (type)) +- clean up home background +- login background +- other window templates like addonbrowser? +- Update readmes +- Crop screensaver logo - Fixed bug causing dialogaddoninformation to lose focus on opening for some addons - Added fade effect to infoscreen thumbnail when shutdownmenu visible on top diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index 462efbeb..893a4492 100755 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -652,7 +652,7 @@ msgstr "" #: NEW #/16x9/Content_Settings.xml msgctxt "#31487" -msgid "Background panel opacity" +msgid "Background panel opacity (%)" msgstr "" #: NEW @@ -663,7 +663,7 @@ msgstr "" #/16x9/Content_Settings.xml msgctxt "#31412" -msgid "Recommended Kodi settings" +msgid "Recommended Kodi settings for Copacetic" msgstr "" #/16x9/Content_Settings.xml @@ -758,7 +758,7 @@ msgstr "" #/16x9/Content_Settings.xml msgctxt "#31425" -msgid "Enable background slideshows" +msgid "Global" msgstr "" #/16x9/Content_Settings.xml @@ -835,17 +835,17 @@ msgstr "" #/16x9/Content_Settings.xml msgctxt "#31433" -msgid "Override home menu backgrounds" +msgid "Override home background with global slideshow" msgstr "" #/16x9/Content_Settings.xml msgctxt "#31533" -msgid "Set a global override for all default home menu shortcut slideshows or any backgrounds you configured for individual shortcuts in 'Home menu' settings under General > Menus. Choose from the preselected or custom global overrides below." +msgid "EMPTY" msgstr "" #/16x9/Content_Settings.xml msgctxt "#31534" -msgid "Make sure to enable background slideshows in General > Background Service for more slideshow options to choose from, or select your own custom path/playlist below." +msgid "EMPTY" msgstr "" #/16x9/Content_Settings.xml