diff --git a/1080i/Custom_DialogCustomSettings.xml b/1080i/Custom_DialogCustomSettings.xml index 8a05dc9b8..01929b6ba 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(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) @@ -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(seekbarhighlightcolor.button,$INFO[ListItem.Property(seekbarhighlightcolor.name)],home) @@ -261,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 76c989cb4..6b0dab2ab 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(seekbarhighlightcolor.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(seekbarhighlightcolor.name.own,$INFO[Skin.String(seekbarhighlightcolor.name)]) Skin.SetString(color.preset.name.own) diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml index d5719bd6e..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/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 4fbf011af..3c9daf31f 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -2895,6 +2895,8 @@ + + Skin.HasSetting(cutlist.markers) 10 @@ -2906,8 +2908,9 @@ osd/progress-end.png Player.EditList + + - Progress Bar 100% 10 8 @@ -2918,22 +2921,38 @@ osd/progress-end.png !Pvr.IsPlayingTv - + + + Progress Bar 100% 10 8 Player.Progress - !Player.Seeking !Pvr.IsPlayingTv + + + + + + - Progress Bar 100% 10 8 - Player.Seeking - + progress/clear.png + osd/progress-end.png + osd/progress-end.png + osd/progress-end.png + Player.Seeking + !Pvr.IsPlayingTv + + + + + + + 0 10 @@ -2942,6 +2961,12 @@ PVR.EpgEventProgress Pvr.IsPlayingTv + + + + + + Skin.HasSetting(chapter.markers) 0 @@ -2955,6 +2980,8 @@ + + Skin.HasSetting(cutlist.markers) 10 @@ -2966,8 +2993,9 @@ osd/progress-end.png Player.EditList - - Progress Bar + + + 100% 10 8 @@ -2978,22 +3006,38 @@ osd/progress-end.png !Pvr.IsPlayingTv + + Progress Bar 100% 10 8 Player.Progress - !Player.Seeking !Pvr.IsPlayingTv + + + + + + - Progress Bar 100% 10 8 - Player.Seeking - + progress/clear.png + osd/progress-end.png + osd/progress-end.png + osd/progress-end.png + Player.Seeking + !Pvr.IsPlayingTv + + + + + + + 0 10 @@ -3002,6 +3046,12 @@ PVR.EpgEventProgress Pvr.IsPlayingTv + + + + + + Skin.HasSetting(chapter.markers) 0 @@ -3193,7 +3243,6 @@ $PARAM[left] SidePadNewOSD - $PARAM[visible] 20 Conditional 20 @@ -3283,13 +3332,18 @@ osd/progress-end.png osd/progress-end.png - + Progress Bar 100% 10 8 Player.Progress + + + + + @@ -5059,11 +5113,132 @@ 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-left.png + osd/progress-end.png + osd/progress-end.png + + + + + + + musicdb://songs/?songid=$INFO[MusicPlayer.DBID] videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22$INFO[Player.Title]%22%5D%7D%2C%7B%22field%22%3A%22filename%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22$INFO[Player.Filename]%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D videodb://tvshows/titles/-1/-1/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22$INFO[Player.Title]%22%5D%7D%2C%7B%22field%22%3A%22filename%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22$INFO[Player.Filename]%22%5D%7D%5D%7D%2C%22type%22%3A%22episodes%22%7D - diff --git a/1080i/Includes_Custom_Items.xml b/1080i/Includes_Custom_Items.xml index 57a92c2c9..0b387c093 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(seekbarhighlightcolor.name,cce6002e) cce6005b cce6005b cce6002e @@ -262,10 +264,12 @@ cce6005b cce6002e ColorUserrating - ColorRating + cce6005b cce6005b 00e8e8e8 Dark1 + cce6005b + cce6002e Close Item_Selected @@ -284,6 +288,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.Reset(seekbarcolor.name) + Skin.SetString(seekbarhighlightcolor.name,cc00b346) cc0385B5 cc0385B5 cc00b346 @@ -292,10 +298,12 @@ cc2d8dbe cc00b346 ColorUserrating - ColorRating + cc0385B5 cc0385B5 00e8e8e8 Dark1 + cc0385B5 + cc00b346 Close Item_Selected @@ -314,6 +322,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.SetString(seekbarcolor.name,ccfe0000) + Skin.SetString(seekbarhighlightcolor.name,cce65c01) ccfe0000 ccfe0000 cce65c01 @@ -322,10 +332,12 @@ ccfe0000 cce65c01 ColorUserrating - ColorRating + ccfe0000 ccfe0000 00e8e8e8 Dark1 + ccfe0000 + cce65c01 Close Item_Selected @@ -344,6 +356,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.SetString(seekbarcolor.name,ff43a0a0) + Skin.SetString(seekbarhighlightcolor.name,ff23729b) ff43a0a0 ff43a0a0 ff23729b @@ -352,10 +366,12 @@ ff43a0a0 ff23729b ColorUserrating - ColorRating + ff43a0a0 ff43a0a0 00e8e8e8 Dark1 + ff43a0a0 + ff23729b Close Item_Selected @@ -374,6 +390,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.SetString(seekbarcolor.name,cc4ab293) + Skin.SetString(seekbarhighlightcolor.name,cc00b36c) cc4ab293 cc4ab293 cc00b36c @@ -382,10 +400,12 @@ cc4ab293 cc00b36c ColorUserrating - ColorRating + cc4ab293 cc4ab293 00e8e8e8 Dark1 + cc4ab293 + cc00b36c Close Item_Selected @@ -404,6 +424,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.SetString(seekbarcolor.name,ff294b89) + Skin.SetString(seekbarhighlightcolor.name,ff23729b) ff345da9 ff345da9 ff23729b @@ -412,10 +434,12 @@ ff345da9 ff23729b ColorUserrating - ColorRating + ff345da9 ff345da9 00e8e8e8 Dark1 + ff294b89 + ff23729b Close Item_Selected @@ -434,6 +458,8 @@ Skin.Reset(ratingcolor.name) Skin.Reset(focuscolor2.name) Skin.Reset(selectbarcolor.name) + Skin.Reset(seekbarcolor.name) + Skin.SetString(seekbarhighlightcolor.name,ff575757) ff727272 ff575757 00e8e8e8 @@ -442,10 +468,12 @@ Dark2 00e8e8e8 ColorUserrating - ColorRating + ff727272 ff727272 00e8e8e8 Dark1 + ff727272 + ff575757 Close Item_Selected @@ -460,6 +488,8 @@ Skin.Reset(focuscolorotherbar.name) Skin.Reset(kodilogocolor.name) Skin.Reset(kodilogocolorgradient.name) + Skin.Reset(seekbarcolor.name) + 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)]) @@ -472,6 +502,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(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)] @@ -484,6 +516,8 @@ $VAR[starscolornew.name.own] $VAR[focuscolor2.name.own] $VAR[selectbarcolor.name.own] + $VAR[seekbarcolor.name.own] + $VAR[seekbarhighlightcolor.name.own] Close Item_Selected diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml index 3a706841c..90f03852c 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(seekbarhighlightcolor.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(seekbarhighlightcolor.name.own)] + $VAR[ColorHighlight] + + noop noop 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% - + - - + - diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index afa368ff5..6bf59abb9 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(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 ControlGroup(9100).HasFocus(9110) diff --git a/media/osd/progress-left.png b/media/osd/progress-left.png new file mode 100644 index 000000000..ad8a41f15 Binary files /dev/null and b/media/osd/progress-left.png differ diff --git a/media/progress/clear.png b/media/progress/clear.png new file mode 100644 index 000000000..2f8a57828 Binary files /dev/null and b/media/progress/clear.png differ diff --git a/media/progress/diffuse.png b/media/progress/diffuse.png new file mode 100644 index 000000000..af2b79d4d Binary files /dev/null and b/media/progress/diffuse.png differ