Skip to content

Commit

Permalink
[StarRating] match osd star rating color (beatmasterRS#955)
Browse files Browse the repository at this point in the history 
* [StarRating] patch 4

* [StarRating] reset star color

* [Strings] update
  • Loading branch information
@beatmasterRS
beatmasterRS authored Mar 27, 2023
1 parent ba7bfa3 commit ceb4567
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 57 deletions.
2 changes: 1 addition & 1 deletion 1080i/Custom_DialogCustomSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<onfocus>SetProperty(kodilogocolorgradient.button,$INFO[ListItem.Property(kodilogocolorgradient.name)],home)</onfocus>
<onfocus>SetProperty(userratingcolor.button,$INFO[ListItem.Property(userratingcolor.name)],home)</onfocus>
<onfocus>SetProperty(ratingcolor.button,$INFO[ListItem.Property(ratingcolor.name)],home)</onfocus>
<onfocus>SetProperty(starscolor.button,$INFO[ListItem.Property(starscolor.name)],home)</onfocus>
<onfocus>SetProperty(starscolor.button,$INFO[ListItem.Property(starscolornew.name)],home)</onfocus>
<onfocus>SetProperty(focuscolor2.button,$INFO[ListItem.Property(focuscolor2.name)],home)</onfocus>
<onfocus>SetProperty(selectbarcolor.button,$INFO[ListItem.Property(selectbarcolor.name)],home)</onfocus>
</control>
Expand Down
2 changes: 1 addition & 1 deletion 1080i/Custom_ResetColors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<texturefocus colordiffuse="$VAR[ColorHighlight]" border="5">common/box.png</texturefocus>
<texturenofocus colordiffuse="Black12" border="5">common/box.png</texturenofocus>
<onclick>Skin.Reset(focuscolor.name)</onclick>
<onclick>Skin.Reset(starscolor.name)</onclick>
<onclick>Skin.Reset(starscolornew.name)</onclick>
<onclick>Skin.Reset(ratingcolor.name)</onclick>
<onclick>Skin.Reset(squarecolor.name)</onclick>
<onclick>Skin.Reset(userratingcolor.name)</onclick>
Expand Down
4 changes: 2 additions & 2 deletions 1080i/Custom_SaveColorConfiguration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<onclick>Skin.Reset(kodilogocolorgradient.name.own)</onclick>
<onclick>Skin.Reset(userratingcolor.name.own)</onclick>
<onclick>Skin.Reset(ratingcolor.name.own)</onclick>
<onclick>Skin.Reset(starscolor.name.own)</onclick>
<onclick>Skin.Reset(starscolornew.name.own)</onclick>
<onclick>Skin.Reset(focuscolor2.name.own)</onclick>
<onclick>Skin.Reset(selectbarcolor.name.own)</onclick>

Expand All @@ -59,7 +59,7 @@
<onclick condition="!String.IsEmpty(Skin.String(kodilogocolorgradient.name))">Skin.SetString(kodilogocolorgradient.name.own,$INFO[Skin.String(kodilogocolorgradient.name)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(userratingcolor.name))">Skin.SetString(userratingcolor.name.own,$INFO[Skin.String(userratingcolor.name)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(ratingcolor.name))">Skin.SetString(ratingcolor.name.own,$INFO[Skin.String(ratingcolor.name)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(starscolor.name))">Skin.SetString(starscolor.name.own,$INFO[Skin.String(starscolor.name)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(starscolornew.name))">Skin.SetString(starscolornew.name.own,$INFO[Skin.String(starscolornew.name)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(focuscolor2.name))">Skin.SetString(focuscolor2.name.own,$INFO[Skin.String(focuscolor2.name)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(selectbarcolor.name))">Skin.SetString(selectbarcolor.name.own,$INFO[Skin.String(selectbarcolor.name)])</onclick>

Expand Down
32 changes: 16 additions & 16 deletions 1080i/Includes_Custom_Items.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@
<onclick>Skin.SetString(focuscolorotherbar.name,cce6002e)</onclick>
<onclick>Skin.SetString(kodilogocolor.name,cce6005b)</onclick>
<onclick>Skin.SetString(kodilogocolorgradient.name,cce6002e)</onclick>
<onclick>Skin.SetString(starscolornew.name,cce6005b)</onclick>
<onclick>Skin.Reset(userratingcolor.name)</onclick>
<onclick>Skin.Reset(ratingcolor.name)</onclick>
<onclick>Skin.Reset(starscolor.name)</onclick>
<onclick>Skin.Reset(focuscolor2.name)</onclick>
<onclick>Skin.Reset(selectbarcolor.name)</onclick>
<property name="focuscolor.name">cce6005b</property>
Expand All @@ -263,7 +263,7 @@
<property name="kodilogocolorgradient.name">cce6002e</property>
<property name="userratingcolor.name">ColorUserrating</property>
<property name="ratingcolor.name">ColorRating</property>
<property name="starscolor.name">ffd402aa</property>
<property name="starscolornew.name">cce6005b</property>
<property name="focuscolor2.name">00e8e8e8</property>
<property name="selectbarcolor.name">Dark1</property>
<onclick>Close</onclick>
Expand All @@ -279,9 +279,9 @@
<onclick>Skin.SetString(focuscolorotherbar.name,cc00b346)</onclick>
<onclick>Skin.SetString(kodilogocolor.name,cc2d8dbe)</onclick>
<onclick>Skin.SetString(kodilogocolorgradient.name,cc00b346)</onclick>
<onclick>Skin.SetString(starscolornew.name,cc0385B5)</onclick>
<onclick>Skin.Reset(userratingcolor.name)</onclick>
<onclick>Skin.Reset(ratingcolor.name)</onclick>
<onclick>Skin.Reset(starscolor.name)</onclick>
<onclick>Skin.Reset(focuscolor2.name)</onclick>
<onclick>Skin.Reset(selectbarcolor.name)</onclick>
<property name="focuscolor.name">cc0385B5</property>
Expand All @@ -293,7 +293,7 @@
<property name="kodilogocolorgradient.name">cc00b346</property>
<property name="userratingcolor.name">ColorUserrating</property>
<property name="ratingcolor.name">ColorRating</property>
<property name="starscolor.name">ffd402aa</property>
<property name="starscolornew.name">cc0385B5</property>
<property name="focuscolor2.name">00e8e8e8</property>
<property name="selectbarcolor.name">Dark1</property>
<onclick>Close</onclick>
Expand All @@ -309,9 +309,9 @@
<onclick>Skin.SetString(focuscolorotherbar.name,cce65c01)</onclick>
<onclick>Skin.SetString(kodilogocolor.name,ccfe0000)</onclick>
<onclick>Skin.SetString(kodilogocolorgradient.name,cce65c01)</onclick>
<onclick>Skin.SetString(starscolornew.name,ccfe0000)</onclick>
<onclick>Skin.Reset(userratingcolor.name)</onclick>
<onclick>Skin.Reset(ratingcolor.name)</onclick>
<onclick>Skin.Reset(starscolor.name)</onclick>
<onclick>Skin.Reset(focuscolor2.name)</onclick>
<onclick>Skin.Reset(selectbarcolor.name)</onclick>
<property name="focuscolor.name">ccfe0000</property>
Expand All @@ -323,7 +323,7 @@
<property name="kodilogocolorgradient.name">cce65c01</property>
<property name="userratingcolor.name">ColorUserrating</property>
<property name="ratingcolor.name">ColorRating</property>
<property name="starscolor.name">ffd402aa</property>
<property name="starscolornew.name">ccfe0000</property>
<property name="focuscolor2.name">00e8e8e8</property>
<property name="selectbarcolor.name">Dark1</property>
<onclick>Close</onclick>
Expand All @@ -339,9 +339,9 @@
<onclick>Skin.SetString(focuscolorotherbar.name,ff23729b)</onclick>
<onclick>Skin.SetString(kodilogocolor.name,ff43a0a0)</onclick>
<onclick>Skin.SetString(kodilogocolorgradient.name,ff23729b)</onclick>
<onclick>Skin.SetString(starscolornew.name,ff43a0a0)</onclick>
<onclick>Skin.Reset(userratingcolor.name)</onclick>
<onclick>Skin.Reset(ratingcolor.name)</onclick>
<onclick>Skin.Reset(starscolor.name)</onclick>
<onclick>Skin.Reset(focuscolor2.name)</onclick>
<onclick>Skin.Reset(selectbarcolor.name)</onclick>
<property name="focuscolor.name">ff43a0a0</property>
Expand All @@ -353,7 +353,7 @@
<property name="kodilogocolorgradient.name">ff23729b</property>
<property name="userratingcolor.name">ColorUserrating</property>
<property name="ratingcolor.name">ColorRating</property>
<property name="starscolor.name">ffd402aa</property>
<property name="starscolornew.name">ff43a0a0</property>
<property name="focuscolor2.name">00e8e8e8</property>
<property name="selectbarcolor.name">Dark1</property>
<onclick>Close</onclick>
Expand All @@ -369,9 +369,9 @@
<onclick>Skin.SetString(focuscolorotherbar.name,cc00b36c)</onclick>
<onclick>Skin.SetString(kodilogocolor.name,cc4ab293)</onclick>
<onclick>Skin.SetString(kodilogocolorgradient.name,cc00b36c)</onclick>
<onclick>Skin.SetString(starscolornew.name,cc4ab293)</onclick>
<onclick>Skin.Reset(userratingcolor.name)</onclick>
<onclick>Skin.Reset(ratingcolor.name)</onclick>
<onclick>Skin.Reset(starscolor.name)</onclick>
<onclick>Skin.Reset(focuscolor2.name)</onclick>
<onclick>Skin.Reset(selectbarcolor.name)</onclick>
<property name="focuscolor.name">cc4ab293</property>
Expand All @@ -383,7 +383,7 @@
<property name="kodilogocolorgradient.name">cc00b36c</property>
<property name="userratingcolor.name">ColorUserrating</property>
<property name="ratingcolor.name">ColorRating</property>
<property name="starscolor.name">ccd402aa</property>
<property name="starscolornew.name">cc4ab293</property>
<property name="focuscolor2.name">00e8e8e8</property>
<property name="selectbarcolor.name">Dark1</property>
<onclick>Close</onclick>
Expand All @@ -399,9 +399,9 @@
<onclick>Skin.SetString(focuscolorotherbar.name,ff23729b)</onclick>
<onclick>Skin.SetString(kodilogocolor.name,ff294b89)</onclick>
<onclick>Skin.SetString(kodilogocolorgradient.name,ff23729b)</onclick>
<onclick>Skin.SetString(starscolornew.name,ff345da9)</onclick>
<onclick>Skin.Reset(userratingcolor.name)</onclick>
<onclick>Skin.Reset(ratingcolor.name)</onclick>
<onclick>Skin.Reset(starscolor.name)</onclick>
<onclick>Skin.Reset(focuscolor2.name)</onclick>
<onclick>Skin.Reset(selectbarcolor.name)</onclick>
<property name="focuscolor.name">ff345da9</property>
Expand All @@ -413,7 +413,7 @@
<property name="kodilogocolorgradient.name">ff23729b</property>
<property name="userratingcolor.name">ColorUserrating</property>
<property name="ratingcolor.name">ColorRating</property>
<property name="starscolor.name">ffd402aa</property>
<property name="starscolornew.name">ff345da9</property>
<property name="focuscolor2.name">00e8e8e8</property>
<property name="selectbarcolor.name">Dark1</property>
<onclick>Close</onclick>
Expand All @@ -426,12 +426,12 @@
<onclick>Skin.SetString(squarecolor.name,ff575757)</onclick>
<onclick>Skin.Reset(squarecolor2.name)</onclick>
<onclick>Skin.SetString(selectotherbarcolor.name,ff575757)</onclick>
<onclick>Skin.SetString(starscolornew.name,ff727272)</onclick>
<onclick>Skin.Reset(focuscolorotherbar.name)</onclick>
<onclick>Skin.Reset(kodilogocolor.name)</onclick>
<onclick>Skin.Reset(kodilogocolorgradient.name)</onclick>
<onclick>Skin.Reset(userratingcolor.name)</onclick>
<onclick>Skin.Reset(ratingcolor.name)</onclick>
<onclick>Skin.Reset(starscolor.name)</onclick>
<onclick>Skin.Reset(focuscolor2.name)</onclick>
<onclick>Skin.Reset(selectbarcolor.name)</onclick>
<property name="focuscolor.name">ff727272</property>
Expand All @@ -443,7 +443,7 @@
<property name="kodilogocolorgradient.name">00e8e8e8</property>
<property name="userratingcolor.name">ColorUserrating</property>
<property name="ratingcolor.name">ColorRating</property>
<property name="starscolor.name">ffd402aa</property>
<property name="starscolornew.name">ff727272</property>
<property name="focuscolor2.name">00e8e8e8</property>
<property name="selectbarcolor.name">Dark1</property>
<onclick>Close</onclick>
Expand All @@ -469,7 +469,7 @@
<onclick condition="!String.IsEmpty(Skin.String(kodilogocolorgradient.name.own))">Skin.SetString(kodilogocolorgradient.name,$INFO[Skin.String(kodilogocolorgradient.name.own)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(userratingcolor.name.own))">Skin.SetString(userratingcolor.name,$INFO[Skin.String(userratingcolor.name.own)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(ratingcolor.name.own))">Skin.SetString(ratingcolor.name,$INFO[Skin.String(ratingcolor.name.own)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(starscolor.name.own))">Skin.SetString(starscolor.name,$INFO[Skin.String(starscolor.name.own)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(starscolornew.name.own))">Skin.SetString(starscolornew.name,$INFO[Skin.String(starscolornew.name.own)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(focuscolor2.name.own))">Skin.SetString(focuscolor2.name,$INFO[Skin.String(focuscolor2.name.own)])</onclick>
<onclick condition="!String.IsEmpty(Skin.String(selectbarcolor.name.own))">Skin.SetString(selectbarcolor.name,$INFO[Skin.String(selectbarcolor.name.own)])</onclick>
<property name="focuscolor.name">$INFO[Skin.String(focuscolor.name.own)]</property>
Expand All @@ -481,7 +481,7 @@
<property name="kodilogocolorgradient.name">$INFO[Skin.String(kodilogocolorgradient.name.own)]</property>
<property name="userratingcolor.name">$VAR[userratingcolor.name.own]</property>
<property name="ratingcolor.name">$VAR[ratingcolor.name.own]</property>
<property name="starscolor.name">$VAR[starscolor.name.own]</property>
<property name="starscolornew.name">$VAR[starscolornew.name.own]</property>
<property name="focuscolor2.name">$VAR[focuscolor2.name.own]</property>
<property name="selectbarcolor.name">$VAR[selectbarcolor.name.own]</property>
<onclick>Close</onclick>
Expand Down
27 changes: 20 additions & 7 deletions 1080i/Includes_Defs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,21 @@
</variable>

<variable name="ColorStars">
<value condition="String.IsEqual(Skin.String(starscolor.name),none)">ColoredStars</value>
<value condition="!String.IsEmpty(Skin.String(starscolor.name))">$INFO[Skin.String(starscolor.name)]</value>
<value>ColoredStars</value>
<value condition="String.IsEqual(Skin.String(starscolornew.name),none)">$VAR[ColorHighlight]</value>
<value condition="!String.IsEmpty(Skin.String(starscolornew.name))">$INFO[Skin.String(starscolornew.name)]</value>
<value>$VAR[ColorHighlight]</value>
</variable>

<variable name="ColorKodiLogo">
<value condition="String.IsEqual(Skin.String(kodilogocolor.name),none)">Dark2</value>
<value condition="!String.IsEmpty(Skin.String(kodilogocolor.name))">$INFO[Skin.String(kodilogocolor.name)]</value>
<value>Dark2</value>
</variable>

<variable name="ColorKodiLogoGradient">
<value condition="String.IsEqual(Skin.String(kodilogocolorgradient.name),none) | String.IsEmpty(Skin.String(kodilogocolorgradient.name))">00e8e8e8</value>
<value condition="!String.IsEmpty(Skin.String(kodilogocolorgradient.name))">$INFO[Skin.String(kodilogocolorgradient.name)]</value>
<value>$VAR[ColorKodiLogo]</value>
</variable>

<variable name="ColorRating">
Expand Down Expand Up @@ -107,8 +119,8 @@
<value>ColorRating</value>
</variable>

<variable name="starscolor.name.own">
<value condition="!String.IsEmpty(Skin.String(starscolor.name.own))">$INFO[Skin.String(starscolor.name.own)]</value>
<variable name="starscolornew.name.own">
<value condition="!String.IsEmpty(Skin.String(starscolornew.name.own))">$INFO[Skin.String(starscolornew.name.own)]</value>
<value>ffd402aa</value>
</variable>

Expand Down Expand Up @@ -3417,13 +3429,14 @@
<param name="left" value="$PARAM[left]" default="0"/>
<param name="visible" value="$PARAM[visible]" default="true"/>
<param name="width" value="$PARAM[width]" default="37"/>
<param name="color" value="$PARAM[color]" default="$VAR[ColorStars]"/>
<definition>
<control type="image">
<left>$PARAM[left]</left>
<width>$PARAM[width]</width>
<height>$PARAM[width]</height>
<centertop>50%</centertop>
<texture colordiffuse="$VAR[ColorHighlight]">misc/$VAR[$PARAM[Star]].png</texture>
<texture colordiffuse="$PARAM[color]">misc/$VAR[$PARAM[Star]].png</texture>
<visible>$PARAM[visible]</visible>
</control>
</definition>
Expand Down Expand Up @@ -3837,7 +3850,7 @@
<width>$PARAM[height]</width>
<height>$PARAM[height]</height>
<centertop>50%</centertop>
<texture colordiffuse="$VAR[ColorHighlight]">misc/$VAR[FlagstarMusic$PARAM[Flagstar]].png</texture>
<texture colordiffuse="$VAR[ColorStars]">misc/$VAR[FlagstarMusic$PARAM[Flagstar]].png</texture>
<visible>Integer.IsGreater(MusicPlayer.Time,0)</visible>
<visible>$PARAM[visible]</visible>
<animation type="Visible" condition="Integer.IsGreater(MusicPlayer.UserRating,$PARAM[IsGreater]) | [Integer.IsGreater(MusicPlayer.Rating,$PARAM[IsGreater]) + !Integer.IsGreater(MusicPlayer.UserRating,0)]">
Expand Down
Loading

0 comments on commit ceb4567

Please sign in to comment.