From c03cf242f5af9a5d6dc15b40c97e20e642808686 Mon Sep 17 00:00:00 2001 From: beatmasterRS Date: Fri, 31 Mar 2023 21:24:05 +0200 Subject: [PATCH 01/10] [Seekbar Gradients] added gradients to seekbar --- 1080i/Defaults.xml | 4 +- 1080i/DialogSeekBar.xml | 7 ++ 1080i/Includes.xml | 154 +++++++++++++++++++++++++++++++++++-- media/progress/diffuse.png | Bin 0 -> 2458 bytes 4 files changed, 155 insertions(+), 10 deletions(-) create mode 100644 media/progress/diffuse.png diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml index d5719bd6e..638e2d3f5 100644 --- a/1080i/Defaults.xml +++ b/1080i/Defaults.xml @@ -181,8 +181,8 @@ osd/progress-bg.png - osd/progress-end.png - osd/progress-end.png + osd/progress-end.png + osd/progress-end.png osd/progress-end.png diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml index c3113bf84..dadaa6688 100644 --- a/1080i/DialogSeekBar.xml +++ b/1080i/DialogSeekBar.xml @@ -14,5 +14,12 @@ Furniture_OSDClock + + + 100% + -50 + 8 + Player.Progress + \ No newline at end of file diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 8d1a378e7..4d5d9b021 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -2907,7 +2907,6 @@ Player.EditList - Progress Bar 100% 10 8 @@ -2916,17 +2915,20 @@ osd/progress-end.png osd/progress-end.png osd/progress-end.png - !Pvr.IsPlayingTv + [Player.Playing | Player.Paused | Player.Caching] + !Player.Seeking - + Progress Bar 100% 10 8 Player.Progress - !Player.Seeking !Pvr.IsPlayingTv + + + + Progress Bar 100% @@ -2934,6 +2936,10 @@ 8 Player.Seeking + + + + 0 10 @@ -2942,6 +2948,10 @@ PVR.EpgEventProgress Pvr.IsPlayingTv + + + + Skin.HasSetting(chapter.markers) 0 @@ -2966,8 +2976,7 @@ osd/progress-end.png Player.EditList - - Progress Bar + 100% 10 8 @@ -2976,7 +2985,7 @@ osd/progress-end.png osd/progress-end.png osd/progress-end.png - !Pvr.IsPlayingTv + [Player.Playing | Player.Paused | Player.Caching] + !Player.Seeking Progress Bar @@ -2984,9 +2993,12 @@ 10 8 Player.Progress - !Player.Seeking !Pvr.IsPlayingTv + + + + Progress Bar 100% @@ -2994,6 +3006,10 @@ 8 Player.Seeking + + + + 0 10 @@ -3002,6 +3018,10 @@ PVR.EpgEventProgress Pvr.IsPlayingTv + + + + Skin.HasSetting(chapter.markers) 0 @@ -5058,4 +5078,122 @@ plugin://plugin.program.autocompletion?info=autocomplete&&id=$INFO[Control.GetLabel(312).index(1)]&&limit=9 + + + 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 + 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 + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + Conditional + + + + + 100% + 10 + 8 + $PARAM[info] + $PARAM[visible] + osd/progress-end.png + osd/progress-end.png + + + + + diff --git a/media/progress/diffuse.png b/media/progress/diffuse.png new file mode 100644 index 0000000000000000000000000000000000000000..af2b79d4dc9ebf6f44397e29ff0d5c008d7dd21e GIT binary patch literal 2458 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 Date: Fri, 31 Mar 2023 21:32:12 +0200 Subject: [PATCH 02/10] Update Includes.xml --- 1080i/Includes.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 4d5d9b021..ae135a84e 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -2934,11 +2934,11 @@ 100% 10 8 - Player.Seeking + Player.Seeking + !Pvr.IsPlayingTv - + 0 @@ -3004,11 +3004,11 @@ 100% 10 8 - Player.Seeking + Player.Seeking + !Pvr.IsPlayingTv - + 0 From e576e98c5fb1d2e4fb8fefe3051cf476f69abf9c Mon Sep 17 00:00:00 2001 From: beatmasterRS Date: Fri, 31 Mar 2023 22:26:17 +0200 Subject: [PATCH 03/10] [Code] improvements --- 1080i/Includes.xml | 17 ++++++++++++----- 1080i/MusicVisualisation.xml | 12 +++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/1080i/Includes.xml b/1080i/Includes.xml index ae135a84e..f970c830d 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -2915,7 +2915,7 @@ osd/progress-end.png osd/progress-end.png osd/progress-end.png - [Player.Playing | Player.Paused | Player.Caching] + !Player.Seeking + [Player.Playing | Player.Paused | Player.Caching] + !Player.Seeking + !Pvr.IsPlayingTv Progress Bar @@ -2985,7 +2985,7 @@ osd/progress-end.png osd/progress-end.png osd/progress-end.png - [Player.Playing | Player.Paused | Player.Caching] + !Player.Seeking + [Player.Playing | Player.Paused | Player.Caching] + !Player.Seeking + !Pvr.IsPlayingTv Progress Bar @@ -3213,7 +3213,6 @@ $PARAM[left] SidePadNewOSD - $PARAM[visible] 20 Conditional 20 @@ -3303,13 +3302,18 @@ osd/progress-end.png osd/progress-end.png - + Progress Bar 100% 10 8 Player.Progress + + + + + @@ -5183,6 +5187,8 @@ + + 100% 10 @@ -5192,8 +5198,9 @@ osd/progress-end.png osd/progress-end.png - + + diff --git a/1080i/MusicVisualisation.xml b/1080i/MusicVisualisation.xml index 4046a911c..94a75936a 100644 --- a/1080i/MusicVisualisation.xml +++ b/1080i/MusicVisualisation.xml @@ -255,13 +255,17 @@ osd/progress-end.png osd/progress-end.png - + Progress Bar 100% 10 8 Player.Progress + + + + @@ -374,13 +378,11 @@ 110r 0 100% - + - - + - From ece6bdc512aeea25a3674f8f0c337979c9ee83ba Mon Sep 17 00:00:00 2001 From: beatmasterRS Date: Sat, 1 Apr 2023 16:13:58 +0200 Subject: [PATCH 04/10] [Code] improvements --- 1080i/Custom_SaveColorConfiguration.xml | 4 ++++ 1080i/Defaults.xml | 4 ++-- 1080i/Includes.xml | 3 ++- 1080i/Includes_Custom_Items.xml | 20 +++++++++++++++++++ 1080i/Includes_Defs.xml | 22 +++++++++++++++++++++ 1080i/SkinSettings.xml | 25 ++++++++++++++++++++++++ media/osd/progress-left.png | Bin 0 -> 127 bytes 7 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 media/osd/progress-left.png diff --git a/1080i/Custom_SaveColorConfiguration.xml b/1080i/Custom_SaveColorConfiguration.xml index 76c989cb4..8473ff20d 100644 --- a/1080i/Custom_SaveColorConfiguration.xml +++ b/1080i/Custom_SaveColorConfiguration.xml @@ -48,6 +48,8 @@ Skin.Reset(starscolornew.name.own) Skin.Reset(focuscolor2.name.own) Skin.Reset(selectbarcolor.name.own) + Skin.Reset(seekbarcolor.name.own) + Skin.Reset(colorseekbarhighlight.name.own) Skin.SetString(focuscolor.name.own,$INFO[Skin.String(focuscolor.name)]) @@ -62,6 +64,8 @@ Skin.SetString(starscolornew.name.own,$INFO[Skin.String(starscolornew.name)]) Skin.SetString(focuscolor2.name.own,$INFO[Skin.String(focuscolor2.name)]) Skin.SetString(selectbarcolor.name.own,$INFO[Skin.String(selectbarcolor.name)]) + Skin.SetString(seekbarcolor.name.own,$INFO[Skin.String(seekbarcolor.name)]) + Skin.SetString(colorseekbarhighlight.name.own,$INFO[Skin.String(colorseekbarhighlight.name)]) Skin.SetString(color.preset.name.own) diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml index 638e2d3f5..12ba12eda 100644 --- a/1080i/Defaults.xml +++ b/1080i/Defaults.xml @@ -181,8 +181,8 @@ osd/progress-bg.png - osd/progress-end.png - osd/progress-end.png + osd/progress-end.png + osd/progress-end.png osd/progress-end.png diff --git a/1080i/Includes.xml b/1080i/Includes.xml index f970c830d..6470c894b 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -5195,7 +5195,8 @@ 8 $PARAM[info] $PARAM[visible] - osd/progress-end.png + osd/progress-left.png + osd/progress-end.png osd/progress-end.png diff --git a/1080i/Includes_Custom_Items.xml b/1080i/Includes_Custom_Items.xml index 57a92c2c9..436214163 100644 --- a/1080i/Includes_Custom_Items.xml +++ b/1080i/Includes_Custom_Items.xml @@ -254,6 +254,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.SetString(seekbarcolor.name,cce6005b) + Skin.SetString(colorseekbarhighlight.name,cce6002e) cce6005b cce6005b cce6002e @@ -284,6 +286,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.Reset(seekbarcolor.name) + Skin.SetString(colorseekbarhighlight.name,cc00b346) cc0385B5 cc0385B5 cc00b346 @@ -314,6 +318,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.SetString(seekbarcolor.name,ccfe0000) + Skin.SetString(colorseekbarhighlight.name,cce65c01) ccfe0000 ccfe0000 cce65c01 @@ -344,6 +350,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.SetString(seekbarcolor.name,ff43a0a0) + Skin.SetString(colorseekbarhighlight.name,ff23729b) ff43a0a0 ff43a0a0 ff23729b @@ -374,6 +382,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.SetString(seekbarcolor.name,cc4ab293) + Skin.SetString(colorseekbarhighlight.name,cc00b36c) cc4ab293 cc4ab293 cc00b36c @@ -404,6 +414,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.SetString(seekbarcolor.name,ff294b89) + Skin.SetString(colorseekbarhighlight.name,ff23729b) ff345da9 ff345da9 ff23729b @@ -434,6 +446,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.Reset(seekbarcolor.name) + Skin.SetString(colorseekbarhighlight.name,ff575757) ff727272 ff575757 00e8e8e8 @@ -460,6 +474,8 @@ Skin.Reset(focuscolorotherbar.name) Skin.Reset(kodilogocolor.name) Skin.Reset(kodilogocolorgradient.name) + Skin.Reset(seekbarcolor.name) + Skin.Reset(colorseekbarhighlight.nameb) Skin.SetString(focuscolor.name,$INFO[Skin.String(focuscolor.name.own)]) Skin.SetString(squarecolor.name,$INFO[Skin.String(squarecolor.name.own)]) Skin.SetString(squarecolor2.name,$INFO[Skin.String(squarecolor2.name.own)]) @@ -472,6 +488,8 @@ Skin.SetString(starscolornew.name,$INFO[Skin.String(starscolornew.name.own)]) Skin.SetString(focuscolor2.name,$INFO[Skin.String(focuscolor2.name.own)]) Skin.SetString(selectbarcolor.name,$INFO[Skin.String(selectbarcolor.name.own)]) + Skin.SetString(seekbarcolor.name,$INFO[Skin.String(seekbarcolor.name.own)]) + Skin.SetString(colorseekbarhighlight.name,$INFO[Skin.String(colorseekbarhighlight.name.own)]) $INFO[Skin.String(focuscolor.name.own)] $INFO[Skin.String(squarecolor.name.own)] $INFO[Skin.String(squarecolor2.name.own)] @@ -484,6 +502,8 @@ $VAR[starscolornew.name.own] $VAR[focuscolor2.name.own] $VAR[selectbarcolor.name.own] + $VAR[seekbarcolor.name.own] + $VAR[colorseekbarhighlight.name.own] Close Item_Selected diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml index 3a706841c..98dfca252 100644 --- a/1080i/Includes_Defs.xml +++ b/1080i/Includes_Defs.xml @@ -73,6 +73,18 @@ $VAR[ColorSelectOtherBar] + + $VAR[ColorHighlight] + $INFO[Skin.String(seekbarcolor.name)] + $VAR[ColorHighlight] + + + + $VAR[ColorSelectOtherBar] + $INFO[Skin.String(colorseekbarhighlight.name)] + $VAR[ColorSelectOtherBar] + + FF294B89 $INFO[Skin.String(indicatorcolorbackgroundwatched.name)] @@ -134,6 +146,16 @@ Dark1 + + $INFO[Skin.String(seekbarcolor.name.own)] + $VAR[ColorHighlight] + + + + $INFO[Skin.String(colorseekbarhighlight.name.own)] + $VAR[ColorHighlight] + + noop noop diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index afa368ff5..ab8640278 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -1646,6 +1646,31 @@ SetProperty(colordesc,focuscolorotherbar.name,home) Skin.SetColor(focuscolorotherbar.name, $LOCALIZE[31695],,special://skin/extras/colors/$INFO[Skin.String(colorpalette)].xml) + + 1360 + ControlGroup(9100).HasFocus(9110) + + + + + $INFO[Skin.String(seekbarcolor.name)] + SetProperty(colorstring,$INFO[Skin.String(seekbarcolor.name)],home) + SetProperty(colordesc,seekbarcolor.name,home) + Skin.SetColor(seekbarcolor.name, $LOCALIZE[31695],,special://skin/extras/colors/$INFO[Skin.String(colorpalette)].xml) + + + 1360 + ControlGroup(9100).HasFocus(9110) + + + + + SetProperty(gradient,seekbar,home) + $INFO[Skin.String(colorseekbarhighlight.name)] + SetProperty(colorstring,$INFO[Skin.String(colorseekbarhighlight.name)],home) + SetProperty(colordesc,colorseekbarhighlight.name,home) + Skin.SetColor(colorseekbarhighlight.name, $LOCALIZE[31695],,special://skin/extras/colors/$INFO[Skin.String(colorpalette)].xml) + 1360 ControlGroup(9100).HasFocus(9110) diff --git a/media/osd/progress-left.png b/media/osd/progress-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ad8a41f1520da85989fea361fc79f3f7c3bef3e2 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^96&6byeFNaX=x? z0*}aI1_o{+5N5n|x9$&6kR{#G*O7r?V?XzwL{=c5&(p;*q~ca`f&}Yg21W)Z0S3ld T59N*lWf(kN{an^LB{Ts5!+jde literal 0 HcmV?d00001 From d0f9dbb4571bf5f8b07ca182f3455bc3690175b1 Mon Sep 17 00:00:00 2001 From: beatmasterRS Date: Sat, 1 Apr 2023 16:23:49 +0200 Subject: [PATCH 05/10] [Code] improvements --- 1080i/Custom_DialogCustomSettings.xml | 4 ++++ 1080i/Includes_Custom_Items.xml | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/1080i/Custom_DialogCustomSettings.xml b/1080i/Custom_DialogCustomSettings.xml index 8a05dc9b8..40ae4feda 100644 --- a/1080i/Custom_DialogCustomSettings.xml +++ b/1080i/Custom_DialogCustomSettings.xml @@ -115,6 +115,8 @@ ClearProperty(starscolor.button,home) ClearProperty(focuscolor2.button,home) ClearProperty(selectbarcolor.button,home) + ClearProperty(seekbarcolor.button,home) + ClearProperty(colorseekbarhighlight.button,home) SetProperty(focuscolor.button,$INFO[ListItem.Property(focuscolor.name)],home) SetProperty(squarecolor.button,$INFO[ListItem.Property(squarecolor.name)],home) SetProperty(squarecolor2.button,$INFO[ListItem.Property(squarecolor2.name)],home) @@ -127,6 +129,8 @@ SetProperty(starscolor.button,$INFO[ListItem.Property(starscolornew.name)],home) SetProperty(focuscolor2.button,$INFO[ListItem.Property(focuscolor2.name)],home) SetProperty(selectbarcolor.button,$INFO[ListItem.Property(selectbarcolor.name)],home) + SetProperty(seekbarcolor.button,$INFO[ListItem.Property(seekbarcolor.name)],home) + SetProperty(colorseekbarhighlight.button,$INFO[ListItem.Property(colorseekbarhighlight.name)],home) diff --git a/1080i/Includes_Custom_Items.xml b/1080i/Includes_Custom_Items.xml index 436214163..27634e03c 100644 --- a/1080i/Includes_Custom_Items.xml +++ b/1080i/Includes_Custom_Items.xml @@ -264,7 +264,7 @@ cce6005b cce6002e ColorUserrating - ColorRating + cce6005b cce6005b 00e8e8e8 Dark1 @@ -296,7 +296,7 @@ cc2d8dbe cc00b346 ColorUserrating - ColorRating + cc0385B5 cc0385B5 00e8e8e8 Dark1 @@ -328,7 +328,7 @@ ccfe0000 cce65c01 ColorUserrating - ColorRating + ccfe0000 ccfe0000 00e8e8e8 Dark1 @@ -360,7 +360,7 @@ ff43a0a0 ff23729b ColorUserrating - ColorRating + ff43a0a0 ff43a0a0 00e8e8e8 Dark1 @@ -392,7 +392,7 @@ cc4ab293 cc00b36c ColorUserrating - ColorRating + cc4ab293 cc4ab293 00e8e8e8 Dark1 @@ -424,7 +424,7 @@ ff345da9 ff23729b ColorUserrating - ColorRating + ff345da9 ff345da9 00e8e8e8 Dark1 @@ -456,7 +456,7 @@ Dark2 00e8e8e8 ColorUserrating - ColorRating + ff727272 ff727272 00e8e8e8 Dark1 From 38d4a8d3460f50c3ebfeb0193a4830b65adec962 Mon Sep 17 00:00:00 2001 From: beatmasterRS Date: Sat, 1 Apr 2023 20:54:39 +0200 Subject: [PATCH 06/10] [Code] improvements --- 1080i/Custom_DialogCustomSettings.xml | 22 ++++++++++++++-- 1080i/Custom_SaveColorConfiguration.xml | 4 +-- 1080i/Includes_Custom_Items.xml | 34 +++++++++++++++++-------- 1080i/Includes_Defs.xml | 8 +++--- 1080i/SkinSettings.xml | 8 +++--- 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/1080i/Custom_DialogCustomSettings.xml b/1080i/Custom_DialogCustomSettings.xml index 40ae4feda..01929b6ba 100644 --- a/1080i/Custom_DialogCustomSettings.xml +++ b/1080i/Custom_DialogCustomSettings.xml @@ -116,7 +116,7 @@ ClearProperty(focuscolor2.button,home) ClearProperty(selectbarcolor.button,home) ClearProperty(seekbarcolor.button,home) - ClearProperty(colorseekbarhighlight.button,home) + ClearProperty(seekbarhighlightcolor.button,home) SetProperty(focuscolor.button,$INFO[ListItem.Property(focuscolor.name)],home) SetProperty(squarecolor.button,$INFO[ListItem.Property(squarecolor.name)],home) SetProperty(squarecolor2.button,$INFO[ListItem.Property(squarecolor2.name)],home) @@ -130,7 +130,7 @@ SetProperty(focuscolor2.button,$INFO[ListItem.Property(focuscolor2.name)],home) SetProperty(selectbarcolor.button,$INFO[ListItem.Property(selectbarcolor.name)],home) SetProperty(seekbarcolor.button,$INFO[ListItem.Property(seekbarcolor.name)],home) - SetProperty(colorseekbarhighlight.button,$INFO[ListItem.Property(colorseekbarhighlight.name)],home) + SetProperty(seekbarhighlightcolor.button,$INFO[ListItem.Property(seekbarhighlightcolor.name)],home) @@ -265,6 +265,24 @@ + + 844 + horizontal + 284 + 300 + 2 + String.IsEqual(Window(Home).Property(includesetting),ColorSettings) + + + + + + + + + + + DialogSelectlabelInclude diff --git a/1080i/Custom_SaveColorConfiguration.xml b/1080i/Custom_SaveColorConfiguration.xml index 8473ff20d..6b0dab2ab 100644 --- a/1080i/Custom_SaveColorConfiguration.xml +++ b/1080i/Custom_SaveColorConfiguration.xml @@ -49,7 +49,7 @@ Skin.Reset(focuscolor2.name.own) Skin.Reset(selectbarcolor.name.own) Skin.Reset(seekbarcolor.name.own) - Skin.Reset(colorseekbarhighlight.name.own) + Skin.Reset(seekbarhighlightcolor.name.own) Skin.SetString(focuscolor.name.own,$INFO[Skin.String(focuscolor.name)]) @@ -65,7 +65,7 @@ Skin.SetString(focuscolor2.name.own,$INFO[Skin.String(focuscolor2.name)]) Skin.SetString(selectbarcolor.name.own,$INFO[Skin.String(selectbarcolor.name)]) Skin.SetString(seekbarcolor.name.own,$INFO[Skin.String(seekbarcolor.name)]) - Skin.SetString(colorseekbarhighlight.name.own,$INFO[Skin.String(colorseekbarhighlight.name)]) + Skin.SetString(seekbarhighlightcolor.name.own,$INFO[Skin.String(seekbarhighlightcolor.name)]) Skin.SetString(color.preset.name.own) diff --git a/1080i/Includes_Custom_Items.xml b/1080i/Includes_Custom_Items.xml index 27634e03c..0b387c093 100644 --- a/1080i/Includes_Custom_Items.xml +++ b/1080i/Includes_Custom_Items.xml @@ -255,7 +255,7 @@ Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) Skin.SetString(seekbarcolor.name,cce6005b) - Skin.SetString(colorseekbarhighlight.name,cce6002e) + Skin.SetString(seekbarhighlightcolor.name,cce6002e) cce6005b cce6005b cce6002e @@ -268,6 +268,8 @@ cce6005b 00e8e8e8 Dark1 + cce6005b + cce6002e Close Item_Selected @@ -287,7 +289,7 @@ Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) Skin.Reset(seekbarcolor.name) - Skin.SetString(colorseekbarhighlight.name,cc00b346) + Skin.SetString(seekbarhighlightcolor.name,cc00b346) cc0385B5 cc0385B5 cc00b346 @@ -300,6 +302,8 @@ cc0385B5 00e8e8e8 Dark1 + cc0385B5 + cc00b346 Close Item_Selected @@ -319,7 +323,7 @@ Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) Skin.SetString(seekbarcolor.name,ccfe0000) - Skin.SetString(colorseekbarhighlight.name,cce65c01) + Skin.SetString(seekbarhighlightcolor.name,cce65c01) ccfe0000 ccfe0000 cce65c01 @@ -332,6 +336,8 @@ ccfe0000 00e8e8e8 Dark1 + ccfe0000 + cce65c01 Close Item_Selected @@ -351,7 +357,7 @@ Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) Skin.SetString(seekbarcolor.name,ff43a0a0) - Skin.SetString(colorseekbarhighlight.name,ff23729b) + Skin.SetString(seekbarhighlightcolor.name,ff23729b) ff43a0a0 ff43a0a0 ff23729b @@ -364,6 +370,8 @@ ff43a0a0 00e8e8e8 Dark1 + ff43a0a0 + ff23729b Close Item_Selected @@ -383,7 +391,7 @@ Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) Skin.SetString(seekbarcolor.name,cc4ab293) - Skin.SetString(colorseekbarhighlight.name,cc00b36c) + Skin.SetString(seekbarhighlightcolor.name,cc00b36c) cc4ab293 cc4ab293 cc00b36c @@ -396,6 +404,8 @@ cc4ab293 00e8e8e8 Dark1 + cc4ab293 + cc00b36c Close Item_Selected @@ -415,7 +425,7 @@ Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) Skin.SetString(seekbarcolor.name,ff294b89) - Skin.SetString(colorseekbarhighlight.name,ff23729b) + Skin.SetString(seekbarhighlightcolor.name,ff23729b) ff345da9 ff345da9 ff23729b @@ -428,6 +438,8 @@ ff345da9 00e8e8e8 Dark1 + ff294b89 + ff23729b Close Item_Selected @@ -447,7 +459,7 @@ Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) Skin.Reset(seekbarcolor.name) - Skin.SetString(colorseekbarhighlight.name,ff575757) + Skin.SetString(seekbarhighlightcolor.name,ff575757) ff727272 ff575757 00e8e8e8 @@ -460,6 +472,8 @@ ff727272 00e8e8e8 Dark1 + ff727272 + ff575757 Close Item_Selected @@ -475,7 +489,7 @@ Skin.Reset(kodilogocolor.name) Skin.Reset(kodilogocolorgradient.name) Skin.Reset(seekbarcolor.name) - Skin.Reset(colorseekbarhighlight.nameb) + Skin.Reset(seekbarhighlightcolor.nameb) Skin.SetString(focuscolor.name,$INFO[Skin.String(focuscolor.name.own)]) Skin.SetString(squarecolor.name,$INFO[Skin.String(squarecolor.name.own)]) Skin.SetString(squarecolor2.name,$INFO[Skin.String(squarecolor2.name.own)]) @@ -489,7 +503,7 @@ Skin.SetString(focuscolor2.name,$INFO[Skin.String(focuscolor2.name.own)]) Skin.SetString(selectbarcolor.name,$INFO[Skin.String(selectbarcolor.name.own)]) Skin.SetString(seekbarcolor.name,$INFO[Skin.String(seekbarcolor.name.own)]) - Skin.SetString(colorseekbarhighlight.name,$INFO[Skin.String(colorseekbarhighlight.name.own)]) + Skin.SetString(seekbarhighlightcolor.name,$INFO[Skin.String(seekbarhighlightcolor.name.own)]) $INFO[Skin.String(focuscolor.name.own)] $INFO[Skin.String(squarecolor.name.own)] $INFO[Skin.String(squarecolor2.name.own)] @@ -503,7 +517,7 @@ $VAR[focuscolor2.name.own] $VAR[selectbarcolor.name.own] $VAR[seekbarcolor.name.own] - $VAR[colorseekbarhighlight.name.own] + $VAR[seekbarhighlightcolor.name.own] Close Item_Selected diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml index 98dfca252..90f03852c 100644 --- a/1080i/Includes_Defs.xml +++ b/1080i/Includes_Defs.xml @@ -80,8 +80,8 @@ - $VAR[ColorSelectOtherBar] - $INFO[Skin.String(colorseekbarhighlight.name)] + $VAR[ColorSelectOtherBar] + $INFO[Skin.String(seekbarhighlightcolor.name)] $VAR[ColorSelectOtherBar] @@ -151,8 +151,8 @@ $VAR[ColorHighlight] - - $INFO[Skin.String(colorseekbarhighlight.name.own)] + + $INFO[Skin.String(seekbarhighlightcolor.name.own)] $VAR[ColorHighlight] diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index ab8640278..6bf59abb9 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -1666,10 +1666,10 @@ SetProperty(gradient,seekbar,home) - $INFO[Skin.String(colorseekbarhighlight.name)] - SetProperty(colorstring,$INFO[Skin.String(colorseekbarhighlight.name)],home) - SetProperty(colordesc,colorseekbarhighlight.name,home) - Skin.SetColor(colorseekbarhighlight.name, $LOCALIZE[31695],,special://skin/extras/colors/$INFO[Skin.String(colorpalette)].xml) + $INFO[Skin.String(seekbarhighlightcolor.name)] + SetProperty(colorstring,$INFO[Skin.String(seekbarhighlightcolor.name)],home) + SetProperty(colordesc,seekbarhighlightcolor.name,home) + Skin.SetColor(seekbarhighlightcolor.name, $LOCALIZE[31695],,special://skin/extras/colors/$INFO[Skin.String(colorpalette)].xml) 1360 From 22344d0d615a39317dbcb6e0d62397a7eceede67 Mon Sep 17 00:00:00 2001 From: beatmasterRS Date: Sat, 1 Apr 2023 21:54:32 +0200 Subject: [PATCH 07/10] [Code] improvements --- 1080i/Includes.xml | 51 ++++++++++++++++------- media/osd/progress-square.png | Bin 0 -> 138 bytes media/other_textures/osd/slider_bg_3.png | Bin 0 -> 157 bytes 3 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 media/osd/progress-square.png create mode 100644 media/other_textures/osd/slider_bg_3.png diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 60fc0b380..408370061 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -2895,6 +2895,8 @@ + + Skin.HasSetting(cutlist.markers) 10 @@ -2906,6 +2908,8 @@ osd/progress-end.png Player.EditList + + 100% 10 @@ -2915,8 +2919,10 @@ osd/progress-end.png osd/progress-end.png osd/progress-end.png - [Player.Playing | Player.Paused | Player.Caching] + !Player.Seeking + !Pvr.IsPlayingTv + !Pvr.IsPlayingTv + + Progress Bar 100% @@ -2929,17 +2935,21 @@ - - Progress Bar + + + 100% 10 8 + horizontal + + + other_textures/osd/slider_bg_3.png + osd/progress-square.png Player.Seeking + !Pvr.IsPlayingTv - - - - + + 0 10 @@ -2952,6 +2962,8 @@ + + Skin.HasSetting(chapter.markers) 0 @@ -2965,6 +2977,7 @@ + Skin.HasSetting(cutlist.markers) 10 @@ -2976,6 +2989,8 @@ osd/progress-end.png Player.EditList + + 100% 10 @@ -2985,8 +3000,10 @@ osd/progress-end.png osd/progress-end.png osd/progress-end.png - [Player.Playing | Player.Paused | Player.Caching] + !Player.Seeking + !Pvr.IsPlayingTv + !Pvr.IsPlayingTv + + Progress Bar 100% @@ -2999,17 +3016,21 @@ - - Progress Bar + + + 100% 10 8 + horizontal + + + other_textures/osd/slider_bg_3.png + osd/progress-square.png Player.Seeking + !Pvr.IsPlayingTv - - - - + + 0 10 @@ -3022,6 +3043,8 @@ + + Skin.HasSetting(chapter.markers) 0 diff --git a/media/osd/progress-square.png b/media/osd/progress-square.png new file mode 100644 index 0000000000000000000000000000000000000000..51d3ce2f5fb5d288571a71b5d5769e97383e07b4 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|>?NMQuI$fQ7=?|vX68Jo1PXB$ zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6;%o-U3d6}OWA{Qqyytl7}1a&@tk en<WvY3H^TL^?1FWs&C0~BOQcl32+VA$Bt{U?zX$k*|7aSW-r_4XhmFOYX=!FT^$ fes&Qc6BGQA4xhllC}mp31d{V~^>bP0l+XkKDS{sB literal 0 HcmV?d00001 From bf259d0bc89d514ca502abf8dafe7a5b9a7f70f5 Mon Sep 17 00:00:00 2001 From: beatmasterRS Date: Sat, 1 Apr 2023 22:35:32 +0200 Subject: [PATCH 08/10] [Code] improvements --- 1080i/Includes.xml | 31 +++++++++++++++++++------------ media/progress/clear.png | Bin 0 -> 255 bytes 2 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 media/progress/clear.png diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 408370061..a8fd74184 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -2937,17 +2937,20 @@ - + 100% 10 8 - horizontal - - - other_textures/osd/slider_bg_3.png - osd/progress-square.png + progress/clear.png + osd/progress-end.png + osd/progress-end.png + osd/progress-end.png Player.Seeking + !Pvr.IsPlayingTv + + + + @@ -2977,6 +2980,7 @@ + Skin.HasSetting(cutlist.markers) @@ -3018,17 +3022,20 @@ - + 100% 10 8 - horizontal - - - other_textures/osd/slider_bg_3.png - osd/progress-square.png + progress/clear.png + osd/progress-end.png + osd/progress-end.png + osd/progress-end.png Player.Seeking + !Pvr.IsPlayingTv + + + + diff --git a/media/progress/clear.png b/media/progress/clear.png new file mode 100644 index 0000000000000000000000000000000000000000..2f8a5782881b3750455394ba847dc0e9f6726386 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0y~yU~d4j1vuD% Date: Sat, 1 Apr 2023 22:37:08 +0200 Subject: [PATCH 09/10] Update Includes.xml --- 1080i/Includes.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1080i/Includes.xml b/1080i/Includes.xml index a8fd74184..3c9daf31f 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -2949,7 +2949,7 @@ - + @@ -3034,7 +3034,7 @@ - + From 5ebf2d6d52d088e248fa953ff5bb01b7887b393c Mon Sep 17 00:00:00 2001 From: beatmasterRS Date: Sat, 1 Apr 2023 22:39:19 +0200 Subject: [PATCH 10/10] [Code] update --- media/osd/progress-square.png | Bin 138 -> 0 bytes media/other_textures/osd/slider_bg_3.png | Bin 157 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 media/osd/progress-square.png delete mode 100644 media/other_textures/osd/slider_bg_3.png diff --git a/media/osd/progress-square.png b/media/osd/progress-square.png deleted file mode 100644 index 51d3ce2f5fb5d288571a71b5d5769e97383e07b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|>?NMQuI$fQ7=?|vX68Jo1PXB$ zctjR6FmMZjFyp1Wb$@_@Ea{HEjtmSN`?>!lvI6;%o-U3d6}OWA{Qqyytl7}1a&@tk en<WvY3H^TL^?1FWs&C0~BOQcl32+VA$Bt{U?zX$k*|7aSW-r_4XhmFOYX=!FT^$ fes&Qc6BGQA4xhllC}mp31d{V~^>bP0l+XkKDS{sB