option to disable pvr genre colours

jeroenpardon · Mar 17, 2018 · e20b663 · e20b663
1 parent 17c3d81
commit e20b663
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
@@ -862,6 +862,10 @@ msgctxt "#31391"
 msgid "Library shortcuts position"
 msgstr ""
 
+msgctxt "#31392"
+msgid "Disable genre colours in TV / Radio Guide"
+msgstr ""
+
 
 
 #: osd / player

diff --git a/xml/SkinSettings.xml b/xml/SkinSettings.xml
@@ -740,7 +740,7 @@
 							<onclick condition="System.HasAddon(script.skin.helper.colorpicker)">RunScript(script.skin.helper.colorpicker,action=colorpicker,skinstring=setcolor.main)</onclick>
 							<include>install_ColorPicker</include>
 							<include>radio_Settings</include>
-							<onup>9696</onup>
+							<onup>9697</onup>
 							<ondown>9660</ondown>
 						</control>
 						<control type="image">
@@ -828,7 +828,7 @@
 							<include>install_ColorPicker</include>
 							<include>radio_Settings</include>
 							<onup>9680</onup>
-							<ondown>9696</ondown>
+							<ondown>9693</ondown>
 						</control>
 						<control type="image">
 							<right>0</right>
@@ -840,6 +840,20 @@
 						</control>
 					</control>
 
+					<!-- PVR Genre colours-->
+					<control type="group" id="9693">
+						<height>90</height>
+						<control type="radiobutton" id="9694">
+							<label>$LOCALIZE[31392]</label>
+							<onleft>9001</onleft>
+							<onclick>Skin.ToggleSetting(genrecolours.disable)</onclick>
+							<selected>Skin.HasSetting(genrecolours.disable)</selected>
+							<include>radio_Settings</include>
+							<onup>9691</onup>
+							<ondown>9696</ondown>
+						</control>
+					</control>
+
 					<!-- Options -->
 					<control type="label">
 						<label>$LOCALIZE[33063]</label>
@@ -856,7 +870,7 @@
 							<onclick condition="System.HasAddon(script.skin.helper.service)">RunScript(script.skin.helper.service,action=colorthemes)</onclick>
 							<include>install_HelperService</include>
 							<include>radio_Settings</include>
-							<onup>9690</onup>
+							<onup>9693</onup>
 							<ondown>9697</ondown>
 						</control>
 					</control>
@@ -875,7 +889,7 @@
 							<onup>9696</onup>
 							<ondown>9650</ondown>
 						</control>
-					</control>		
+					</control>
 				</control>
 
 

diff --git a/xml/Variables.xml b/xml/Variables.xml
@@ -1403,6 +1403,11 @@
 		<value>$INFO[ListItem.Genre]</value>
 	</variable>
 
+	<variable name="pvr:TimeBlock">
+		<value condition="!Skin.HasSetting(genrecolours.disable)">$INFO[ListItem.Property(GenreType),pvr/genres/,.png]</value>
+		<value></value>
+	</variable>
+
 
 <!-- Setup -->
 	<variable name="setup:Accept">

diff --git a/xml/ViewGuide.xml b/xml/ViewGuide.xml
@@ -146,7 +146,7 @@
 							<left>10</left>
 							<width>$PARAM[ItemTextureWidth]</width>
 							<height>$PARAM[ItemTextureHeight]</height>
-							<texture fallback="pvr/genres/0.png" border="5">$INFO[ListItem.Property(GenreType),pvr/genres/,.png]</texture>
+							<texture fallback="pvr/genres/0.png" border="5">$VAR[pvr:TimeBlock]</texture>
 						</control>
 						<control type="label" id="1">
 							<left>32</left>
@@ -180,7 +180,7 @@
 							<left>10</left>
 							<width>$PARAM[ItemTextureWidth]</width>
 							<height>$PARAM[ItemTextureHeight]</height>
-							<texture fallback="pvr/genres/0.png" border="5">$INFO[ListItem.Property(GenreType),pvr/genres/,.png]</texture>
+							<texture fallback="pvr/genres/0.png" border="5">$VAR[pvr:TimeBlock]</texture>
 							<bordertexture>colorize/100.png</bordertexture>
 							<bordersize>6</bordersize>
 						</control>