[estouchy] update

6 files changed, 82 insertions, 59 deletions

diff --git a/addons/skin.estouchy/addon.xml b/addons/skin.estouchy/addon.xml
index 03d809cbbd..cc99f4ec77 100644
--- a/addons/skin.estouchy/addon.xml
+++ b/addons/skin.estouchy/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.estouchy" version="1.0.22" name="Estouchy" provider-name="Team Kodi">
+<addon id="skin.estouchy" version="1.0.23" name="Estouchy" provider-name="Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.12.0"/>
 	</requires>
diff --git a/addons/skin.estouchy/xml/Includes.xml b/addons/skin.estouchy/xml/Includes.xml
index 35a8c997b8..a146dd1960 100644
--- a/addons/skin.estouchy/xml/Includes.xml
+++ b/addons/skin.estouchy/xml/Includes.xml
@@ -1024,14 +1024,14 @@
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<icon>icon_menu_livetv.png</icon>
 			<thumb></thumb>
-			<visible>Skin.HasSetting(ShowHomeButtonLiveTV)</visible>
+			<visible>System.HasPVRAddon + !Skin.HasSetting(HideHomeButtonLiveTV)</visible>
 		</item>
 		<item id="2">
 			<label>19021</label>
 			<onclick>ActivateWindow(RadioChannels)</onclick>
 			<icon>icon_menu_radio.png</icon>
 			<thumb></thumb>
-			<visible>Skin.HasSetting(ShowHomeButtonRadio)</visible>
+			<visible>System.HasPVRAddon + !Skin.HasSetting(HideHomeButtonRadio)</visible>
 		</item>
 		<item id="3">
 			<label>20342</label>
@@ -1240,7 +1240,7 @@
 			<alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus>
 			<label>653</label>
 			<altlabel>13353</altlabel>
-			<usealttexture>library.isscanningmusic</usealttexture> 
+			<usealttexture>library.isscanningmusic</usealttexture>
 		</control>
 		<control type="radiobutton" id="16">
 			<description>PartyMode</description>
@@ -1496,7 +1496,7 @@
 			<alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus>
 			<label>653</label>
 			<altlabel>13353</altlabel>
-			<usealttexture>library.isscanningvideo</usealttexture> 
+			<usealttexture>library.isscanningvideo</usealttexture>
 		</control>
 		<control type="radiobutton" id="16">
 			<description>PartyMode</description>
diff --git a/addons/skin.estouchy/xml/IncludesPlayerControls.xml b/addons/skin.estouchy/xml/IncludesPlayerControls.xml
index 9a72eb6830..b7c594cd93 100644
--- a/addons/skin.estouchy/xml/IncludesPlayerControls.xml
+++ b/addons/skin.estouchy/xml/IncludesPlayerControls.xml
@@ -18,6 +18,7 @@
 			<font></font>
 			<texturenofocus></texturenofocus>
 			<texturefocus></texturefocus>
+			<onclick>Dialog.Close(all)</onclick>
 			<onclick>ActivateWindow(Home)</onclick>
 		</control>
 		<control type="image">
diff --git a/addons/skin.estouchy/xml/SkinSettings.xml b/addons/skin.estouchy/xml/SkinSettings.xml
index 0271f7b10f..fd5309daf8 100644
--- a/addons/skin.estouchy/xml/SkinSettings.xml
+++ b/addons/skin.estouchy/xml/SkinSettings.xml
@@ -127,8 +127,9 @@
 					<texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus>
 					<pulseonselect>false</pulseonselect>
 					<label>$LOCALIZE[31556]</label>
-					<onclick>Skin.ToggleSetting(ShowHomeButtonLiveTV)</onclick>
-					<selected>Skin.HasSetting(ShowHomeButtonLiveTV)</selected>
+					<onclick>Skin.ToggleSetting(HideHomeButtonLiveTV)</onclick>
+					<selected>!Skin.HasSetting(HideHomeButtonLiveTV)</selected>
+					<enable>System.HasPVRAddon</enable>
 					<textoffsetx>20</textoffsetx>
 				</control>
 				<control type="radiobutton" id="103">
@@ -142,8 +143,9 @@
 					<texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus>
 					<pulseonselect>false</pulseonselect>
 					<label>$LOCALIZE[19021]</label>
-					<onclick>Skin.ToggleSetting(ShowHomeButtonRadio)</onclick>
-					<selected>Skin.HasSetting(ShowHomeButtonRadio)</selected>
+					<onclick>Skin.ToggleSetting(HideHomeButtonRadio)</onclick>
+					<selected>!Skin.HasSetting(HideHomeButtonRadio)</selected>
+					<enable>System.HasPVRAddon</enable>
 					<textoffsetx>20</textoffsetx>
 				</control>
 				<control type="radiobutton" id="104">
diff --git a/addons/skin.estouchy/xml/SmartPlaylistEditor.xml b/addons/skin.estouchy/xml/SmartPlaylistEditor.xml
index 639c6bf180..52b4dbde62 100644
--- a/addons/skin.estouchy/xml/SmartPlaylistEditor.xml
+++ b/addons/skin.estouchy/xml/SmartPlaylistEditor.xml
@@ -43,7 +43,7 @@
 			<height>70</height>
 			<texture colordiffuse="40000000">panel.png</texture>
 		</control>
-		<control type="spincontrolex" id="22">
+		<control type="button" id="22">
 			<description>Set Playlist type</description>
 			<posx>0</posx>
 			<posy>60</posy>
@@ -74,7 +74,7 @@
 			<height>70</height>
 			<texture colordiffuse="40000000">panel.png</texture>
 		</control>
-		<control type="edit" id="12">
+		<control type="button" id="12">
 			<description>Name Button</description>
 			<posx>0</posx>
 			<posy>170</posy>
@@ -99,14 +99,14 @@
 			<posx>0</posx>
 			<posy>242</posy>
 			<width>760</width>
-			<height>260</height>
+			<height>195</height>
 			<texture colordiffuse="40000000">panel.png</texture>
 		</control>
 		<control type="list" id="10">
 			<posx>0</posx>
 			<posy>242</posy>
 			<width>760</width>
-			<height>260</height>
+			<height>195</height>
 			<onup>9001</onup>
 			<onleft>9000</onleft>
 			<onright>60</onright>
@@ -166,28 +166,10 @@
 		<control type="group" id="9000">
 			<posx>780</posx>
 			<posy>272</posy>
-			<control type="button" id="13">
-				<description>Add Rule Button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>200</width>
-				<height>60</height>
-				<label>15019</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font18_title</font>
-				<texturefocus>list_focus.png</texturefocus>
-				<texturenofocus>button_nofocus.png</texturenofocus>
-				<pulseonselect>false</pulseonselect>
-				<onup>18</onup>
-				<onleft>60</onleft>
-				<onright>10</onright>
-				<ondown>13</ondown>
-			</control>
 			<control type="button" id="14">
 				<description>Remove Rule Button</description>
 				<posx>0</posx>
-				<posy>70</posy>
+				<posy>0</posy>
 				<width>200</width>
 				<height>60</height>
 				<label>1210</label>
@@ -205,7 +187,7 @@
 			<control type="button" id="15">
 				<description>Edit Rule Button</description>
 				<posx>0</posx>
-				<posy>140</posy>
+				<posy>70</posy>
 				<width>200</width>
 				<height>60</height>
 				<label>21435</label>
@@ -223,21 +205,21 @@
 		</control>
 		<control type="image">
 			<posx>0</posx>
-			<posy>502</posy>
+			<posy>437</posy>
 			<width>1000</width>
 			<height>2</height>
 			<texture border="2">separator.png</texture>
 		</control>
 		<control type="image">
 			<posx>0</posx>
-			<posy>504</posy>
+			<posy>437</posy>
 			<width>1000</width>
 			<height>140</height>
 			<texture colordiffuse="40000000">panel.png</texture>
 		</control>
-		<control type="spincontrolex" id="16">
+		<control type="button" id="16">
 			<posx>0</posx>
-			<posy>504</posy>
+			<posy>439</posy>
 			<width>1000</width>
 			<height>70</height>
 			<label>21424</label>
@@ -247,9 +229,9 @@
 			<onup>10</onup>
 			<ondown>17</ondown>
 		</control>
-		<control type="spincontrolex" id="17">
+		<control type="button" id="17">
 			<posx>0</posx>
-			<posy>574</posy>
+			<posy>509</posy>
 			<width>1000</width>
 			<height>70</height>
 			<label>21427</label>
@@ -261,15 +243,15 @@
 		</control>
 		<control type="image">
 			<posx>0</posx>
-			<posy>644</posy>
-			<width>760</width>
+			<posy>579</posy>
+			<width>490</width>
 			<height>70</height>
 			<texture colordiffuse="40000000">panel.png</texture>
 		</control>
-		<control type="spincontrolex" id="18">
+		<control type="button" id="18">
 			<posx>0</posx>
-			<posy>644</posy>
-			<width>760</width>
+			<posy>579</posy>
+			<width>490</width>
 			<height>70</height>
 			<label>21429</label>
 			<font>font25</font>
@@ -278,20 +260,58 @@
 			<onup>17</onup>
 			<ondown>9001</ondown>
 		</control>
-		<control type="togglebutton" id="19">
-			<posx>780</posx>
+		<control type="image">
+			<posx>510</posx>
+			<posy>579</posy>
+			<width>490</width>
+			<height>70</height>
+			<texture colordiffuse="40000000">panel.png</texture>
+		</control>
+		<control type="button" id="19">
+			<posx>510</posx>
+			<posy>579</posy>
+			<width>490</width>
+			<height>70</height>
+			<label>580</label>
+			<font>font25</font>
+			<onright>18</onright>
+			<onleft>18</onleft>
+			<onup>17</onup>
+			<ondown>9001</ondown>
+		</control>
+		<control type="image">
+			<posx>0</posx>
 			<posy>649</posy>
-			<width>200</width>
-			<height>60</height>
-			<font>font18_title</font>
-			<align>center</align>
-			<aligny>center</aligny>
-			<texturefocus>list_focus.png</texturefocus>
-			<texturenofocus>button_nofocus.png</texturenofocus>
-			<alttexturefocus>list_focus.png</alttexturefocus>
-			<alttexturenofocus>button_nofocus.png</alttexturenofocus>
-			<label>21431</label>
-			<altlabel>21430</altlabel>
+			<width>490</width>
+			<height>70</height>
+			<texture colordiffuse="40000000">panel.png</texture>
+		</control>
+		<control type="button" id="23">
+			<posx>0</posx>
+			<posy>649</posy>
+			<width>490</width>
+			<height>70</height>
+			<label>21458</label>
+			<font>font25</font>
+			<onright>19</onright>
+			<onleft>19</onleft>
+			<onup>17</onup>
+			<ondown>9001</ondown>
+		</control>
+		<control type="image">
+			<posx>510</posx>
+			<posy>649</posy>
+			<width>490</width>
+			<height>70</height>
+			<texture colordiffuse="40000000">panel.png</texture>
+		</control>
+		<control type="radiobutton" id="24">
+			<posx>510</posx>
+			<posy>649</posy>
+			<width>490</width>
+			<height>70</height>
+			<label>$LOCALIZE[467]: $LOCALIZE[21459]</label>
+			<font>font25</font>
 			<onright>18</onright>
 			<onleft>18</onleft>
 			<onup>17</onup>
diff --git a/addons/skin.estouchy/xml/SmartPlaylistRule.xml b/addons/skin.estouchy/xml/SmartPlaylistRule.xml
index 6a204271f1..1c7be79467 100644
--- a/addons/skin.estouchy/xml/SmartPlaylistRule.xml
+++ b/addons/skin.estouchy/xml/SmartPlaylistRule.xml
@@ -55,7 +55,7 @@
 			<texture colordiffuse="40000000">panel.png</texture>
 		</control>
 		<control type="group" id="9001">
-			<control type="spincontrolex" id="15">
+			<control type="button" id="15">
 				<description>Rule Field</description>
 				<posx>0</posx>
 				<posy>100</posy>
@@ -85,7 +85,7 @@
 				<height>70</height>
 				<texture border="2">separator.png</texture>
 			</control>
-			<control type="spincontrolex" id="16">
+			<control type="button" id="16">
 				<description>Rule operator</description>
 				<posx>500</posx>
 				<posy>100</posy>