From ecf80450914b3654d81bf3f67a19008c19889765 Mon Sep 17 00:00:00 2001 From: realcopacetic Date: Mon, 7 Oct 2024 14:43:29 +0100 Subject: [PATCH] backgrounds and seek labels --- 16x9/Animations.xml | 19 +- 16x9/Colors.xml | 9 + 16x9/Components.xml | 20 ++ 16x9/Components_OSD.xml | 33 +-- 16x9/Content_Settings.xml | 35 ++- 16x9/Content_Settings_Sliders.xml | 276 +++++++++++++++++++- 16x9/Variables_Labels_Media.xml | 5 +- 16x9/Variables_Labels_Windows.xml | 62 ++--- 16x9/Variables_Paths_Media.xml | 2 + 16x9/Variables_Textures_Artwork_Media.xml | 20 +- README.md | 7 +- language/resource.language.af_za/strings.po | 12 +- language/resource.language.en_gb/strings.po | 35 ++- 13 files changed, 465 insertions(+), 70 deletions(-) diff --git a/16x9/Animations.xml b/16x9/Animations.xml index 9f188a88..64290c9e 100644 --- a/16x9/Animations.xml +++ b/16x9/Animations.xml @@ -360,11 +360,6 @@ Hidden - - Visible - Hidden - - Visible Visible @@ -382,6 +377,20 @@ + + + + + + + + + + + + + + Conditional Conditional diff --git a/16x9/Colors.xml b/16x9/Colors.xml index b03141c9..73a80b4c 100644 --- a/16x9/Colors.xml +++ b/16x9/Colors.xml @@ -445,6 +445,14 @@ $VAR[Light_Color] $VAR[Unfocused_Color] + + $VAR[Light_Color] + $VAR[Unfocused_Color] + + + $VAR[Light_Color] + $VAR[Unfocused_Color] + $VAR[Light_Color] $VAR[Unfocused_Color] @@ -952,6 +960,7 @@ $VAR[Accent_Color] + $VAR[Accent_Color] $VAR[Dark_Color] $VAR[Light_Color] diff --git a/16x9/Components.xml b/16x9/Components.xml index cb1c0b39..30af8531 100644 --- a/16x9/Components.xml +++ b/16x9/Components.xml @@ -238,6 +238,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/16x9/Components_OSD.xml b/16x9/Components_OSD.xml index 42907971..3f0f839f 100644 --- a/16x9/Components_OSD.xml +++ b/16x9/Components_OSD.xml @@ -24,17 +24,6 @@ views/white_100.png views/white_100.png - - - Player.HasPerformedSeek(2) - 50% - $PARAM[progress_bar_padding] - $PARAM[progress_bar_padding] - 6 - Player.SeekBar - views/white_100.png - views/white_100.png - @@ -46,10 +35,22 @@ $PARAM[progress_bar_padding] $PARAM[progress_bar_padding] 6 - Player.Progress + + Player.SeekBar views/white_100.png views/white_100.png + + @@ -138,7 +139,7 @@ - Control.HasFocus(60) + [Window.IsVisible(videoosd) + !System.IdleTime(3)] Conditional 20 $PARAM[left] @@ -301,8 +302,8 @@ - Player.Rewinding | Player.Forwarding | Player.HasPerformedSeek(2) | [Window.Is(videoosd) + VideoPlayer.Content(livetv) + !String.IsEmpty(PVR.TimeShiftOffset)] - + Player.Rewinding | Player.Forwarding | !String.IsEmpty(Player.SeekStepSize) | [!String.IsEmpty(Player.SeekOffset) + Player.HasPerformedSeek(3)] | [Window.Is(videoosd) + VideoPlayer.Content(livetv) + !String.IsEmpty(PVR.TimeShiftOffset)] + 360 50% center @@ -399,7 +400,7 @@ - Conditional + Conditional diff --git a/16x9/Content_Settings.xml b/16x9/Content_Settings.xml index ca7e8475..23f0e4fa 100644 --- a/16x9/Content_Settings.xml +++ b/16x9/Content_Settings.xml @@ -381,12 +381,45 @@ 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]] + + Enable second background slideshow + ControlGroup(9).HasFocus(16) + + Skin.ToggleSetting(Background_Slideshow2) + Skin.HasSetting(Background_Slideshow2) + + + + + + + + + + + + - Choose a custom path + + RunScript(script.skinshortcuts,type=shortcuts&custom=True&showNone=False&skinList=Background_Slideshow2_Custom_Path) + ControlGroup(9).HasFocus(16) + Skin.HasSetting(Background_Slideshow2) + [Skin.String(Background_Slideshow2,Custom) | !$EXP[Library_Has_Content]] + + + + + + + + + + + + - + diff --git a/16x9/Content_Settings_Sliders.xml b/16x9/Content_Settings_Sliders.xml index 6504db9b..51d2d4f9 100644 --- a/16x9/Content_Settings_Sliders.xml +++ b/16x9/Content_Settings_Sliders.xml @@ -110,6 +110,11 @@ + Skin.SetString(Background_Interval,900) + Skin.SetString(Background_Interval,600) + Skin.SetString(Background_Interval,300) + Skin.SetString(Background_Interval,60) + Skin.SetString(Background_Interval,30) Skin.SetString(Background_Interval,25) Skin.SetString(Background_Interval,20) Skin.SetString(Background_Interval,15) @@ -120,20 +125,35 @@ Skin.SetString(Background_Interval,20) Skin.SetString(Background_Interval,25) Skin.SetString(Background_Interval,30) + Skin.SetString(Background_Interval,60) + Skin.SetString(Background_Interval,300) + Skin.SetString(Background_Interval,600) + Skin.SetString(Background_Interval,900) + Skin.SetString(Background_Interval,1800) - Conditional - Conditional - Conditional - Conditional - Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional - Conditional - Conditional - Conditional - Conditional - Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional @@ -265,6 +285,242 @@ Conditional + + Skin.SetString(Background_Slideshow_Timer,22) + Skin.SetString(Background_Slideshow_Timer,21) + Skin.SetString(Background_Slideshow_Timer,20) + Skin.SetString(Background_Slideshow_Timer,19) + Skin.SetString(Background_Slideshow_Timer,18) + Skin.SetString(Background_Slideshow_Timer,17) + Skin.SetString(Background_Slideshow_Timer,16) + Skin.SetString(Background_Slideshow_Timer,15) + Skin.SetString(Background_Slideshow_Timer,14) + Skin.SetString(Background_Slideshow_Timer,13) + Skin.SetString(Background_Slideshow_Timer,12) + Skin.SetString(Background_Slideshow_Timer,11) + Skin.SetString(Background_Slideshow_Timer,10) + Skin.SetString(Background_Slideshow_Timer,09) + Skin.SetString(Background_Slideshow_Timer,08) + Skin.SetString(Background_Slideshow_Timer,07) + Skin.SetString(Background_Slideshow_Timer,06) + Skin.SetString(Background_Slideshow_Timer,05) + Skin.SetString(Background_Slideshow_Timer,04) + Skin.SetString(Background_Slideshow_Timer,03) + Skin.SetString(Background_Slideshow_Timer,02) + Skin.SetString(Background_Slideshow_Timer,01) + Skin.SetString(Background_Slideshow_Timer,00) + Skin.SetString(Background_Slideshow_Timer,01) + Skin.SetString(Background_Slideshow_Timer,02) + Skin.SetString(Background_Slideshow_Timer,03) + Skin.SetString(Background_Slideshow_Timer,04) + Skin.SetString(Background_Slideshow_Timer,05) + Skin.SetString(Background_Slideshow_Timer,06) + Skin.SetString(Background_Slideshow_Timer,07) + Skin.SetString(Background_Slideshow_Timer,08) + Skin.SetString(Background_Slideshow_Timer,09) + Skin.SetString(Background_Slideshow_Timer,10) + Skin.SetString(Background_Slideshow_Timer,11) + Skin.SetString(Background_Slideshow_Timer,12) + Skin.SetString(Background_Slideshow_Timer,13) + Skin.SetString(Background_Slideshow_Timer,14) + Skin.SetString(Background_Slideshow_Timer,15) + Skin.SetString(Background_Slideshow_Timer,16) + Skin.SetString(Background_Slideshow_Timer,17) + Skin.SetString(Background_Slideshow_Timer,18) + Skin.SetString(Background_Slideshow_Timer,19) + Skin.SetString(Background_Slideshow_Timer,20) + Skin.SetString(Background_Slideshow_Timer,21) + Skin.SetString(Background_Slideshow_Timer,22) + Skin.SetString(Background_Slideshow_Timer,23) + + + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + + + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + + + + Skin.SetString(Background_Slideshow2,Artists) + Skin.SetString(Background_Slideshow2,TVShows) + Skin.SetString(Background_Slideshow2,Movies) + Skin.SetString(Background_Slideshow2,TVShows) + Skin.SetString(Background_Slideshow2,Movies) + Skin.SetString(Background_Slideshow2,Movies) + Skin.SetString(Background_Slideshow2,Videos) + Skin.SetString(Background_Slideshow2,Global) + Skin.SetString(Background_Slideshow2,Videos) + Skin.SetString(Background_Slideshow2,Artists) + Skin.SetString(Background_Slideshow2,Custom) + Skin.SetString(Background_Slideshow2,Movies) + Skin.SetString(Background_Slideshow2,TVShows) + Skin.SetString(Background_Slideshow2,Artists) + Skin.SetString(Background_Slideshow2,Custom) + Skin.SetString(Background_Slideshow2,TVShows) + Skin.SetString(Background_Slideshow2,Artists) + Skin.SetString(Background_Slideshow2,Custom) + Skin.SetString(Background_Slideshow2,Artists) + Skin.SetString(Background_Slideshow2,Custom) + Skin.SetString(Background_Slideshow2,Custom) + + + Conditional + Conditional + Conditional + Conditional + Conditional + + + Conditional + Conditional + Conditional + Conditional + Conditional + + + + Skin.SetString(Background_Slideshow2_Timer,22) + Skin.SetString(Background_Slideshow2_Timer,21) + Skin.SetString(Background_Slideshow2_Timer,20) + Skin.SetString(Background_Slideshow2_Timer,19) + Skin.SetString(Background_Slideshow2_Timer,18) + Skin.SetString(Background_Slideshow2_Timer,17) + Skin.SetString(Background_Slideshow2_Timer,16) + Skin.SetString(Background_Slideshow2_Timer,15) + Skin.SetString(Background_Slideshow2_Timer,14) + Skin.SetString(Background_Slideshow2_Timer,13) + Skin.SetString(Background_Slideshow2_Timer,12) + Skin.SetString(Background_Slideshow2_Timer,11) + Skin.SetString(Background_Slideshow2_Timer,10) + Skin.SetString(Background_Slideshow2_Timer,09) + Skin.SetString(Background_Slideshow2_Timer,08) + Skin.SetString(Background_Slideshow2_Timer,07) + Skin.SetString(Background_Slideshow2_Timer,06) + Skin.SetString(Background_Slideshow2_Timer,05) + Skin.SetString(Background_Slideshow2_Timer,04) + Skin.SetString(Background_Slideshow2_Timer,03) + Skin.SetString(Background_Slideshow2_Timer,02) + Skin.SetString(Background_Slideshow2_Timer,01) + Skin.SetString(Background_Slideshow2_Timer,00) + Skin.SetString(Background_Slideshow2_Timer,01) + Skin.SetString(Background_Slideshow2_Timer,02) + Skin.SetString(Background_Slideshow2_Timer,03) + Skin.SetString(Background_Slideshow2_Timer,04) + Skin.SetString(Background_Slideshow2_Timer,05) + Skin.SetString(Background_Slideshow2_Timer,06) + Skin.SetString(Background_Slideshow2_Timer,07) + Skin.SetString(Background_Slideshow2_Timer,08) + Skin.SetString(Background_Slideshow2_Timer,09) + Skin.SetString(Background_Slideshow2_Timer,10) + Skin.SetString(Background_Slideshow2_Timer,11) + Skin.SetString(Background_Slideshow2_Timer,12) + Skin.SetString(Background_Slideshow2_Timer,13) + Skin.SetString(Background_Slideshow2_Timer,14) + Skin.SetString(Background_Slideshow2_Timer,15) + Skin.SetString(Background_Slideshow2_Timer,16) + Skin.SetString(Background_Slideshow2_Timer,17) + Skin.SetString(Background_Slideshow2_Timer,18) + Skin.SetString(Background_Slideshow2_Timer,19) + Skin.SetString(Background_Slideshow2_Timer,20) + Skin.SetString(Background_Slideshow2_Timer,21) + Skin.SetString(Background_Slideshow2_Timer,22) + Skin.SetString(Background_Slideshow2_Timer,23) + + + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + + + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + + Skin.SetString(GridView_Size,Large) Skin.SetString(GridView_Size,Small) diff --git a/16x9/Variables_Labels_Media.xml b/16x9/Variables_Labels_Media.xml index 8242cc0c..039fe0f8 100644 --- a/16x9/Variables_Labels_Media.xml +++ b/16x9/Variables_Labels_Media.xml @@ -580,6 +580,8 @@ + $INFO[Player.SeekStepSize] + $INFO[Player.SeekOffset] [UPPERCASE]$INFO[PVR.TimeShiftOffset, -, $LOCALIZE[31308]][/UPPERCASE] x2 x4 @@ -591,8 +593,7 @@ x8 x16 x32 - $INFO[Player.SeekOffset] - $INFO[Player.SeekStepSize] + diff --git a/16x9/Variables_Labels_Windows.xml b/16x9/Variables_Labels_Windows.xml index 0073c06a..9ffa300f 100644 --- a/16x9/Variables_Labels_Windows.xml +++ b/16x9/Variables_Labels_Windows.xml @@ -94,40 +94,17 @@ - $INFO[PVR.EPGEventElapsedTime] - $VAR[seekbar_Chapter_Label]$VAR[seekbar_Chapter_Count_Label,/][CR]$INFO[Player.Time] + $INFO[Player.Time] + $INFO[PVR.EPGEventElapsedTime] + $INFO[Player.Time] $INFO[Player.Time] - $INFO[PVR.EPGEventRemainingTime,-] - $INFO[PVR.EPGEventDuration] + $INFO[PVR.EPGEventRemainingTime,-] + $INFO[PVR.EPGEventDuration] $INFO[Player.TimeRemaining,-] $INFO[Player.Duration] - - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - $INFO[Player.Chapter] - - - 9 - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - $INFO[Player.ChapterCount] - $INFO[ListItem.VideoVersionName] @@ -253,8 +230,12 @@ - $INFO[Skin.String(Background_Interval)] - 10 + 30 $LOCALIZE[31733] + 15 $LOCALIZE[31733] + 10 $LOCALIZE[31733] + 5 $LOCALIZE[31733] + $INFO[Skin.String(Background_Interval),, $LOCALIZE[31732]] + 10 $LOCALIZE[31732] $INFO[Skin.String(Background_Opacity)] @@ -267,11 +248,32 @@ $LOCALIZE[133] $LOCALIZE[31438] + + $LOCALIZE[31436] + $LOCALIZE[342] + $LOCALIZE[20343] + $LOCALIZE[31437] + $LOCALIZE[133] + $LOCALIZE[31438] + $INFO[Skin.String(Background_Slideshow_Custom_Path)] $LOCALIZE[31439] + + $INFO[Skin.String(Background_Slideshow_Timer),,:00] + 06:00 + + + + $INFO[Skin.String(Background_Slideshow2_Custom_Path)] + $LOCALIZE[31439] + + + $INFO[Skin.String(Background_Slideshow2_Timer),,:00] + 20:00 + $LOCALIZE[31415] diff --git a/16x9/Variables_Paths_Media.xml b/16x9/Variables_Paths_Media.xml index 7af78120..92f7d120 100644 --- a/16x9/Variables_Paths_Media.xml +++ b/16x9/Variables_Paths_Media.xml @@ -23,6 +23,7 @@ + $INFO[Skin.String(Background_Slideshow2_Custom_Path)] $INFO[Skin.String(Background_Slideshow_Custom_Path)] $INFO[Container(3000).ListItem.Property(backgroundPlaylist)] @@ -55,6 +56,7 @@ + $INFO[Skin.String(Background_Slideshow2_Custom_Path)] $INFO[Skin.String(Background_Slideshow_Custom_Path)] diff --git a/16x9/Variables_Textures_Artwork_Media.xml b/16x9/Variables_Textures_Artwork_Media.xml index be084127..82d45694 100644 --- a/16x9/Variables_Textures_Artwork_Media.xml +++ b/16x9/Variables_Textures_Artwork_Media.xml @@ -6,6 +6,12 @@ $INFO[Container(3300).ListItem.Art(fanart)] $INFO[Window(home).Property(background_videos_fanart)] $INFO[Window(home).Property(background_artists_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[Window(home).Property(background_custom_fanart)] $INFO[Window(home).Property(background_global_fanart)] $INFO[Window(home).Property(background_videos_fanart)] @@ -15,6 +21,12 @@ + $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_custom_fanart)] $INFO[Window(home).Property(background_global_fanart)] $INFO[Window(home).Property(background_videos_fanart)] @@ -28,7 +40,13 @@ $INFO[Container(3300).ListItem.Art(fanart)] - + + $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[Window(home).Property(background_custom_clearlogo)] $INFO[Window(home).Property(background_global_clearlogo)] $INFO[Window(home).Property(background_videos_clearlogo)] diff --git a/README.md b/README.md index ee7f7160..c1c31b93 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,12 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc ### Changelog --- **2.6.6** +- Added second slideshow, configurable in Copacetic skin settings with option to set timers for both so you can switch between slideshows at different times of day. Useful e.g. for having kid-friendly slideshow in the daytime then switching to a different slideshow in the evening. +- Added more slideshow interval lengths (60 seconds, 5 minutes, 10 minutes, 15 minutes) +- Fixed bug that displayed empty player duration and player time when playing a network stream https://github.com/realcopacetic/skin.copacetic/issues/200 +- Fixed bug causing seek labels not to display properly during playback https://github.com/realcopacetic/skin.copacetic/issues/198 +- Fixed bug causing seekbar not to display properly during seek https://github.com/realcopacetic/skin.copacetic/issues/198 + To do: - pvr switching from windows to fullscreen there's a transition animation but it should be instant - detailed list @@ -43,7 +49,6 @@ To do: - favourites all viewtype options (omega only) - infoscreen bug - infoscreen widget navigation for music widgets + music videos (songvideourl) -- check to see the player status labels - Evaluate Container.NumItems for scrollbars in each view / layout - autoscroll bar - multiart on autoscroll diff --git a/language/resource.language.af_za/strings.po b/language/resource.language.af_za/strings.po index d824991a..503a2e0c 100644 --- a/language/resource.language.af_za/strings.po +++ b/language/resource.language.af_za/strings.po @@ -759,7 +759,17 @@ msgstr "" # /16x9/Content_Settings.xml msgctxt "#31427" -msgid "Background slideshow speed (seconds)" +msgid "Background slideshow speed" +msgstr "" + +# /16x9/Content_Settings.xml +msgctxt "#31728" +msgid "Make persistent across entire home screen, including widgets" +msgstr "" + +# /16x9/Content_Settings.xml +msgctxt "#31728" +msgid "Make persistent across entire home screen, including widgets" msgstr "" # /16x9/Content_Settings.xml diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index db81ec88..e07e89de 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -574,8 +574,8 @@ msgstr "" ######################################################################################################### -#: SETTINGS 314XX, 318 -#: SETTINGS HINTS 315XX +#: SETTINGS 314XX, 317XX +#: SETTINGS HINTS 315XX, 318XX ######################################################################################################### @@ -903,7 +903,17 @@ msgstr "" #/16x9/Content_Settings.xml msgctxt "#31427" -msgid "Background slideshow speed (seconds)" +msgid "Background slideshow speed" +msgstr "" + +# /16x9/Content_Settings.xml +msgctxt "#31732" +msgid "seconds" +msgstr "" + +# /16x9/Content_Settings.xml +msgctxt "#31733" +msgid "minutes" msgstr "" #/16x9/Content_Settings.xml @@ -1111,6 +1121,25 @@ msgctxt "#31728" msgid "Make persistent across entire home screen, including widgets" msgstr "" +#: NEW +#/16x9/Content_Settings.xml +msgctxt "#31729" +msgid "Enable second background slideshow" +msgstr "" + +#: NEW +#/16x9/Content_Settings.xml +msgctxt "#31730" +msgid "Limit second background slideshow to..." +msgstr "" + +#: NEW +#/16x9/Content_Settings.xml +msgctxt "#31731" +msgid "Start times" +msgstr "" + + # Widgets