skin.estouchy 2.0.5

6 files changed, 131 insertions, 49 deletions

diff --git a/addons/skin.estouchy/addon.xml b/addons/skin.estouchy/addon.xml
index dc6df6dadd..46fe4739cb 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="2.0.4" name="Estouchy" provider-name="Team Kodi">
+<addon id="skin.estouchy" version="2.0.5" name="Estouchy" provider-name="Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.13.0"/>
 	</requires>
diff --git a/addons/skin.estouchy/media/DefaultAddonImageDecoder.png b/addons/skin.estouchy/media/DefaultAddonImageDecoder.png
new file mode 100644
index 0000000000..0339c9196e
--- /dev/null
+++ b/addons/skin.estouchy/media/DefaultAddonImageDecoder.png
diff --git a/addons/skin.estouchy/media/DefaultAddonVfs.png b/addons/skin.estouchy/media/DefaultAddonVfs.png
new file mode 100644
index 0000000000..eef731c043
--- /dev/null
+++ b/addons/skin.estouchy/media/DefaultAddonVfs.png
diff --git a/addons/skin.estouchy/xml/DialogAddonSettings.xml b/addons/skin.estouchy/xml/DialogAddonSettings.xml
index 7a2bd32119..693c7110d7 100644
--- a/addons/skin.estouchy/xml/DialogAddonSettings.xml
+++ b/addons/skin.estouchy/xml/DialogAddonSettings.xml
@@ -16,7 +16,7 @@
 			<height>60</height>
 			<texture border="5">dialog_header.png</texture>
 		</control>
-		<control type="label" id="20">
+		<control type="label" id="2">
 			<description>header label</description>
 			<posx>20</posx>
 			<posy>0</posy>
@@ -47,9 +47,9 @@
 				<height>40</height>
 				<texturefocus>arrow_left.png</texturefocus>
 				<texturenofocus>arrow_left.png</texturenofocus>
-				<onclick>Control.Move(9,-1)</onclick>
+				<onclick>Control.Move(3,-1)</onclick>
 				<include>VisibleFadeEffect</include>
-				<visible>Container(9).HasPrevious</visible>
+				<visible>Container(3).HasPrevious</visible>
 			</control>
 			<control type="button" id="11001">
 				<description>right Arrow</description>
@@ -59,12 +59,12 @@
 				<height>40</height>
 				<texturefocus>arrow_right.png</texturefocus>
 				<texturenofocus>arrow_right.png</texturenofocus>
-				<onclick>Control.Move(9,1)</onclick>
+				<onclick>Control.Move(3,1)</onclick>
 				<include>VisibleFadeEffect</include>
-				<visible>Container(9).HasNext</visible>
+				<visible>Container(3).HasNext</visible>
 			</control>
 		</control>
-		<control type="grouplist" id="9">
+		<control type="grouplist" id="3">
 			<description>button area</description>
 			<posx>60</posx>
 			<posy>70</posy>
@@ -74,10 +74,10 @@
 			<align>center</align>
 			<aligny>center</aligny>
 			<orientation>horizontal</orientation>
-			<onleft>9</onleft>
-			<onright>9</onright>
-			<onup>2</onup>
-			<ondown>2</ondown>
+			<onleft>3</onleft>
+			<onright>3</onright>
+			<onup>5</onup>
+			<ondown>5</ondown>
 		</control>
 		<control type="image">
 			<posx>0</posx>
@@ -86,7 +86,7 @@
 			<height>554</height>
 			<texture colordiffuse="40000000">panel.png</texture>
 		</control>
-		<control type="grouplist" id="2">
+		<control type="grouplist" id="5">
 			<description>control area</description>
 			<posx>0</posx>
 			<posy>140</posy>
@@ -94,31 +94,31 @@
 			<height>554</height>
 			<itemgap>-1</itemgap>
 			<pagecontrol>30</pagecontrol>
-			<onup>9</onup>
+			<onup>3</onup>
 			<ondown>9001</ondown>
-			<onleft>2</onleft>
+			<onleft>5</onleft>
 			<onright>30</onright>
 		</control>
-		<control type="button" id="13">
+		<control type="button" id="10">
 			<description>Default Category Button</description>
 			<width>200</width>
 			<include>ButtonInfoDialogsCommonValues</include>
 		</control>
-		<control type="button" id="3">
+		<control type="button" id="7">
 			<description>Default Button</description>
 			<posx>0</posx>
 			<posy>0</posy>
 			<height>70</height>
 			<font>font25</font>
 		</control>
-		<control type="radiobutton" id="4">
+		<control type="radiobutton" id="8">
 			<description>Default RadioButton</description>
 			<posx>0</posx>
 			<posy>0</posy>
 			<height>70</height>
 			<font>font25</font>
 		</control>
-		<control type="spincontrolex" id="5">
+		<control type="spincontrolex" id="9">
 			<description>Default SpinControlex</description>
 			<posx>0</posx>
 			<posy>0</posy>
@@ -127,12 +127,12 @@
 			<aligny>center</aligny>
 			<reverse>yes</reverse>
 		</control>
-		<control type="image" id="6">
+		<control type="image" id="11">
 			<description>separator image</description>
-			<height>2</height>
+			<height>5</height>
 			<texture border="2">separator.png</texture>
 		</control>
-		<control type="label" id="7">
+		<control type="label" id="14">
 			<posx>20</posx>
 			<height>50</height>
 			<font>font20_title</font>
@@ -140,11 +140,15 @@
 			<align>center</align>
 			<aligny>center</aligny>
 		</control>
-		<control type="sliderex" id="8">
+		<control type="sliderex" id="13">
 			<description>Default Slider</description>
 			<height>70</height>
 			<font>font25</font>
 		</control>
+		<control type="edit" id="12">
+			<height>70</height>
+			<font>font25</font>
+		</control>
 		<control type="grouplist" id="9001">
 			<posx>20</posx>
 			<posy>730</posy>
@@ -155,21 +159,21 @@
 			<orientation>horizontal</orientation>
 			<onleft>9001</onleft>
 			<onright>9001</onright>
-			<onup>2</onup>
-			<ondown>9</ondown>
-			<control type="button" id="10">
+			<onup>5</onup>
+			<ondown>3</ondown>
+			<control type="button" id="28">
 				<description>OK Button</description>
 				<width>200</width>
 				<include>ButtonInfoDialogsCommonValues</include>
 				<label>186</label>
 			</control>
-			<control type="button" id="11">
+			<control type="button" id="29">
 				<description>Cancel Button</description>
 				<width>200</width>
 				<include>ButtonInfoDialogsCommonValues</include>
 				<label>222</label>
 			</control>
-			<control type="button" id="12">
+			<control type="button" id="30">
 				<description>Defaults Button</description>
 				<width>200</width>
 				<include>ButtonInfoDialogsCommonValues</include>
diff --git a/addons/skin.estouchy/xml/DialogConfirm.xml b/addons/skin.estouchy/xml/DialogConfirm.xml
index 56c20005c3..84d938f75d 100644
--- a/addons/skin.estouchy/xml/DialogConfirm.xml
+++ b/addons/skin.estouchy/xml/DialogConfirm.xml
@@ -64,7 +64,6 @@
 			<onright>9000</onright>
 			<onup>9000</onup>
 			<ondown>9000</ondown>
-			<visible>!Window.IsVisible(yesnodialog)</visible>
 			<control type="button" id="10">
 				<description>OK button</description>
 				<width>200</width>
@@ -81,26 +80,5 @@
 				<include>ButtonInfoDialogsCommonValues</include>
 			</control>
 		</control>
-		<control type="group">
-			<posx>145</posx>
-			<posy>240</posy>
-			<width>660</width>
-			<height>60</height>
-			<visible>Window.IsVisible(yesnodialog)</visible>
-			<control type="button" id="11">
-				<description>Yes button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>200</width>
-				<include>ButtonInfoDialogsCommonValues</include>
-			</control>
-			<control type="button" id="10">
-				<description>No button</description>
-				<posx>210</posx>
-				<posy>0</posy>
-				<width>200</width>
-				<include>ButtonInfoDialogsCommonValues</include>
-			</control>
-		</control>
 	</controls>
 </window>
diff --git a/addons/skin.estouchy/xml/GameOSD.xml b/addons/skin.estouchy/xml/GameOSD.xml
new file mode 100644
index 0000000000..8c02d64598
--- /dev/null
+++ b/addons/skin.estouchy/xml/GameOSD.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+	<defaultcontrol always="true">11101</defaultcontrol>
+	<include>16x9_xPos_Relocation</include>
+	<include>Window_OpenClose_Animation_Zoom</include>
+	<coordinates>
+		<posx>445</posx>
+		<posy>245</posy>
+	</coordinates>
+	<controls>
+		<control type="group">
+			<visible>!Window.IsActive(GameVideoSettings) + !Window.IsActive(GameControllers)</visible>
+			<include>BehindDialogFadeOut</include>
+			<control type="image">
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>400</width>
+				<height>60</height>
+				<texture border="5">dialog_header.png</texture>
+			</control>
+			<control type="label">
+				<description>header label</description>
+				<posx>20</posx>
+				<posy>0</posy>
+				<include>WindowTitleCommons</include>
+				<width>300</width>
+				<label>$LOCALIZE[35221]</label>
+			</control>
+			<control type="image">
+				<description>background image</description>
+				<posx>0</posx>
+				<posy>60</posy>
+				<width>400</width>
+				<height>350</height>
+				<texture>dialog_back.png</texture>
+			</control>
+			<control type="group">
+				<posx>330</posx>
+				<posy>0</posy>
+				<include>DialogCloseButtonCommons</include>
+			</control>
+			<control type="grouplist" id="11101">
+				<description>grouplist for context buttons</description>
+				<posx>0</posx>
+				<posy>60</posy>
+				<width>400</width>
+				<height max="700">auto</height>
+				<itemgap>0</itemgap>
+				<control type="button" id="11102">
+					<width>400</width>
+					<height>70</height>
+					<font>font25</font>
+					<texturefocus>list_focus.png</texturefocus>
+					<texturenofocus></texturenofocus>
+					<label>$LOCALIZE[13404]</label>
+					<label2>Select + X</label2>
+					<onclick>Play</onclick>
+				</control>
+				<control type="button" id="11103">
+					<width>400</width>
+					<height>70</height>
+					<font>font25</font>
+					<texturefocus>list_focus.png</texturefocus>
+					<texturenofocus></texturenofocus>
+					<label>$LOCALIZE[10035]</label>
+					<label2>Select + B</label2>
+					<onclick>PlayerControl(Reset)</onclick>
+				</control>
+				<control type="button" id="11104">
+					<width>400</width>
+					<height>70</height>
+					<font>font25</font>
+					<texturefocus>list_focus.png</texturefocus>
+					<texturenofocus></texturenofocus>
+					<label>$LOCALIZE[35222]</label>
+					<label2>Select + Start</label2>
+					<onclick>Stop</onclick>
+				</control>
+				<control type="button" id="11107">
+					<width>400</width>
+					<height>70</height>
+					<font>font25</font>
+					<texturefocus>list_focus.png</texturefocus>
+					<texturenofocus></texturenofocus>
+					<label>$LOCALIZE[13395]</label>
+					<onclick>ActivateWindow(gamevideosettings)</onclick>
+				</control>
+				<control type="button" id="11109">
+					<width>400</width>
+					<height>70</height>
+					<font>font25</font>
+					<texturefocus>list_focus.png</texturefocus>
+					<texturenofocus></texturenofocus>
+					<label>$LOCALIZE[35223]</label>
+					<onclick>ActivateWindow(gamecontrollers)</onclick>
+				</control>
+			</control>
+		</control>
+	</controls>
+</window>