[skins] improvement & cosmetics

8 files changed, 187 insertions, 129 deletions

diff --git a/addons/skin.estouchy/xml/Defaults.xml b/addons/skin.estouchy/xml/Defaults.xml
index d78f8a413f..9e37196f6a 100644
--- a/addons/skin.estouchy/xml/Defaults.xml
+++ b/addons/skin.estouchy/xml/Defaults.xml
@@ -94,9 +94,9 @@
 	<default type="slider">
 		<controloffsetx>75</controloffsetx>
 		<controloffsety>0</controloffsety>
-		<texturesliderbar></texturesliderbar>
-		<textureslidernib></textureslidernib>
-		<textureslidernibfocus></textureslidernibfocus>
+		<texturesliderbar>slider.png</texturesliderbar>
+		<textureslidernib>slider_nofocus.png</textureslidernib>
+		<textureslidernibfocus>slider_focus.png</textureslidernibfocus>
 		<orientation>horizontal</orientation>
 	</default>
 	<default type="sliderex">
diff --git a/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml b/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml
index 886b8d6353..b3b5496cbe 100644
--- a/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml
+++ b/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml
@@ -30,7 +30,6 @@
 				<aligny>center</aligny>
 				<scrollout>false</scrollout>
 				<pauseatend>2000</pauseatend>
-				<haspath>true</haspath>
 			</control>
 			<control type="progress" id="32">
 				<description>progress control</description>
diff --git a/addons/skin.estouchy/xml/DialogNumeric.xml b/addons/skin.estouchy/xml/DialogNumeric.xml
index 43028e29de..2297bbd2e2 100644
--- a/addons/skin.estouchy/xml/DialogNumeric.xml
+++ b/addons/skin.estouchy/xml/DialogNumeric.xml
@@ -49,7 +49,6 @@
 				<height>70</height>
 				<font>font25</font>
 				<textcolor>selected</textcolor>
-				<disabledcolor>grey2</disabledcolor>
 				<align>center</align>
 				<aligny>center</aligny>
 			</control>
diff --git a/addons/skin.estouchy/xml/DialogSeekBar.xml b/addons/skin.estouchy/xml/DialogSeekBar.xml
index 97193c2f90..83a7b4e0f2 100644
--- a/addons/skin.estouchy/xml/DialogSeekBar.xml
+++ b/addons/skin.estouchy/xml/DialogSeekBar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<visible>[Window.IsActive(FullscreenVideo) | Window.IsActive(Visualisation)] + ![Window.IsActive(VideoOSD) | Window.IsActive(MusicOSD)] + [Player.Seeking | Player.DisplayAfterSeek]</visible>
+	<visible>[Window.IsActive(FullscreenVideo) | Window.IsActive(Visualisation)] + ![Window.IsActive(VideoOSD) | Window.IsActive(MusicOSD) | Window.IsActive(SliderDialog)] + [Player.Seeking | Player.DisplayAfterSeek]</visible>
 	<controls>
 		<control type="group">
 			<posx>364</posx>
diff --git a/addons/skin.estouchy/xml/DialogSettings.xml b/addons/skin.estouchy/xml/DialogSettings.xml
index 90541ef3dd..55f613e9d3 100644
--- a/addons/skin.estouchy/xml/DialogSettings.xml
+++ b/addons/skin.estouchy/xml/DialogSettings.xml
@@ -8,133 +8,136 @@
 		<posy>80</posy>
 	</coordinates>
 	<controls>
-		<include>BehindDialogFadeOut</include>
-		<control type="image">
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>1000</width>
-			<height>60</height>
-			<texture border="5">dialog_header.png</texture>
-		</control>
-		<control type="image">
-			<posx>0</posx>
-			<posy>60</posy>
-			<width>1000</width>
-			<height>740</height>
-			<texture>dialog_back.png</texture>
-		</control>
-		<control type="label" id="2">
-			<posx>20</posx>
-			<posy>0</posy>
-			<include>WindowTitleCommons</include>
-			<width>910</width>
-			<label></label>
-		</control>
 		<control type="group">
-			<posx>930</posx>
-			<posy>0</posy>
-			<include>DialogCloseButtonCommons</include>
-		</control>
-		<control type="grouplist" id="5">
-			<posx>0</posx>
-			<posy>60</posy>
-			<width>1000</width>
-			<height>630</height>
-			<itemgap>-1</itemgap>
-			<pagecontrol>60</pagecontrol>
-			<onleft>60</onleft>
-			<onright>60</onright>
-			<onup>5</onup>
-			<ondown>9000</ondown>
-		</control>
-		<control type="scrollbar" id="60">
-			<posx>762</posx>
-			<posy>90</posy>
-			<width>26</width>
-			<height>570</height>
-			<texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground>
-			<texturesliderbar colordiffuse="grey">white.png</texturesliderbar>
-			<texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus>
-			<textureslidernib>blank.png</textureslidernib>
-			<textureslidernibfocus>blank.png</textureslidernibfocus>
-			<onleft>5</onleft>
-			<onright>5</onright>
-			<showonepage>false</showonepage>
-			<orientation>vertical</orientation>
-			<animation effect="fade" time="150">Visible</animation>
-			<animation effect="fade" time="150">Hidden</animation>
-		</control>
-		<control type="button" id="7">
-			<posx>0</posx>
-			<posy>0</posy>
-			<height>70</height>
-			<font>font25</font>
-		</control>
-		<control type="radiobutton" id="8">
-			<posx>0</posx>
-			<posy>0</posy>
-			<height>70</height>
-			<font>font25</font>
-		</control>
-		<control type="spincontrolex" id="9">
-			<posx>0</posx>
-			<posy>0</posy>
-			<height>70</height>
-			<font>font25</font>
-			<aligny>center</aligny>
-			<reverse>yes</reverse>
-		</control>
-		<control type="image" id="11">
-			<height>2</height>
-			<texture border="2">separator.png</texture>
-		</control>
-		<control type="edit" id="12">
-			<height>70</height>
-			<font>font25</font>
-		</control>
-		<control type="sliderex" id="13">
-			<height>70</height>
-			<font>font25</font>
-			<textwidth>400</textwidth>
-		</control>
-		<control type="label" id="14">
-			<posx>0</posx>
-			<posy>0</posy>
-			<height>70</height>
-			<font>font25</font>
-			<align>center</align>
-			<aligny>center</aligny>
-		</control>
-		<control type="grouplist" id="9000">
-			<posx>0</posx>
-			<posy>720</posy>
-			<width>1000</width>
-			<height>60</height>
-			<itemgap>5</itemgap>
-			<align>center</align>
-			<orientation>horizontal</orientation>
-			<onleft>9000</onleft>
-			<onright>9000</onright>
-			<onup>5</onup>
-			<ondown>5</ondown>
-			<control type="button" id="28">
-				<description>OK Button</description>
-				<width>200</width>
-				<include>ButtonInfoDialogsCommonValues</include>
-				<label></label>
+			<include>BehindDialogFadeOut</include>
+			<visible>!Window.IsVisible(sliderdialog)</visible>
+			<control type="image">
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>1000</width>
+				<height>60</height>
+				<texture border="5">dialog_header.png</texture>
 			</control>
-			<control type="button" id="29">
-				<description>Cancel Button</description>
-				<width>200</width>
-				<include>ButtonInfoDialogsCommonValues</include>
-				<label></label>
+			<control type="image">
+				<posx>0</posx>
+				<posy>60</posy>
+				<width>1000</width>
+				<height>740</height>
+				<texture>dialog_back.png</texture>
 			</control>
-			<control type="button" id="30">
-				<description>Custom Button</description>
-				<width>200</width>
-				<include>ButtonInfoDialogsCommonValues</include>
+			<control type="label" id="2">
+				<posx>20</posx>
+				<posy>0</posy>
+				<include>WindowTitleCommons</include>
+				<width>910</width>
 				<label></label>
 			</control>
+			<control type="group">
+				<posx>930</posx>
+				<posy>0</posy>
+				<include>DialogCloseButtonCommons</include>
+			</control>
+			<control type="grouplist" id="5">
+				<posx>0</posx>
+				<posy>60</posy>
+				<width>974</width>
+				<height>630</height>
+				<itemgap>-1</itemgap>
+				<pagecontrol>60</pagecontrol>
+				<onleft>60</onleft>
+				<onright>60</onright>
+				<onup>5</onup>
+				<ondown>9000</ondown>
+			</control>
+			<control type="scrollbar" id="60">
+				<posx>974</posx>
+				<posy>90</posy>
+				<width>26</width>
+				<height>570</height>
+				<texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground>
+				<texturesliderbar colordiffuse="grey">white.png</texturesliderbar>
+				<texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus>
+				<textureslidernib>blank.png</textureslidernib>
+				<textureslidernibfocus>blank.png</textureslidernibfocus>
+				<onleft>5</onleft>
+				<onright>5</onright>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+				<animation effect="fade" time="150">Visible</animation>
+				<animation effect="fade" time="150">Hidden</animation>
+			</control>
+			<control type="button" id="7">
+				<posx>0</posx>
+				<posy>0</posy>
+				<height>70</height>
+				<font>font25</font>
+			</control>
+			<control type="radiobutton" id="8">
+				<posx>0</posx>
+				<posy>0</posy>
+				<height>70</height>
+				<font>font25</font>
+			</control>
+			<control type="spincontrolex" id="9">
+				<posx>0</posx>
+				<posy>0</posy>
+				<height>70</height>
+				<font>font25</font>
+				<aligny>center</aligny>
+				<reverse>yes</reverse>
+			</control>
+			<control type="image" id="11">
+				<height>2</height>
+				<texture border="2">separator.png</texture>
+			</control>
+			<control type="edit" id="12">
+				<height>70</height>
+				<font>font25</font>
+			</control>
+			<control type="sliderex" id="13">
+				<height>70</height>
+				<font>font25</font>
+				<textwidth>400</textwidth>
+			</control>
+			<control type="label" id="14">
+				<posx>0</posx>
+				<posy>0</posy>
+				<height>70</height>
+				<font>font25</font>
+				<align>center</align>
+				<aligny>center</aligny>
+			</control>
+			<control type="grouplist" id="9000">
+				<posx>0</posx>
+				<posy>720</posy>
+				<width>1000</width>
+				<height>60</height>
+				<itemgap>5</itemgap>
+				<align>center</align>
+				<orientation>horizontal</orientation>
+				<onleft>9000</onleft>
+				<onright>9000</onright>
+				<onup>5</onup>
+				<ondown>5</ondown>
+				<control type="button" id="28">
+					<description>OK Button</description>
+					<width>200</width>
+					<include>ButtonInfoDialogsCommonValues</include>
+					<label></label>
+				</control>
+				<control type="button" id="29">
+					<description>Cancel Button</description>
+					<width>200</width>
+					<include>ButtonInfoDialogsCommonValues</include>
+					<label></label>
+				</control>
+				<control type="button" id="30">
+					<description>Custom Button</description>
+					<width>200</width>
+					<include>ButtonInfoDialogsCommonValues</include>
+					<label></label>
+				</control>
+			</control>
 		</control>
 	</controls>
 </window>
diff --git a/addons/skin.estouchy/xml/DialogSlider.xml b/addons/skin.estouchy/xml/DialogSlider.xml
new file mode 100644
index 0000000000..6b8e5f6a7b
--- /dev/null
+++ b/addons/skin.estouchy/xml/DialogSlider.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+	<defaultcontrol>11</defaultcontrol>
+	<include>16x9_xPos_Relocation</include>
+	<include>Window_OpenClose_Animation_Zoom</include>
+	<coordinates>
+		<posx>140</posx>
+		<posy>20</posy>
+	</coordinates>
+	<controls>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>1000</width>
+			<height>130</height>
+			<texture>back.png</texture>
+		</control>
+		<control type="group">
+			<posx>930</posx>
+			<posy>0</posy>
+			<include>DialogCloseButtonCommons</include>
+		</control>
+		<control type="label" id="10">
+			<description>Dialog header</description>
+			<left>40</left>
+			<top>10</top>
+			<width>880</width>
+			<height>20</height>
+			<aligny>center</aligny>
+			<font>font30</font>
+		</control>
+		<control type="label" id="12">
+			<description>Slider Value</description>
+			<left>40</left>
+			<top>10</top>
+			<width>880</width>
+			<height>20</height>
+			<align>right</align>
+			<aligny>center</aligny>
+			<font>font30</font>
+		</control>
+		<control type="slider" id="11">
+			<description>Slider</description>
+			<left>40</left>
+			<top>65</top>
+			<width>880</width>
+			<height>60</height>
+			<onup>11</onup>
+			<ondown>11</ondown>
+			<onleft>11</onleft>
+			<onright>11</onright>
+		</control>
+	</controls>
+</window>
diff --git a/addons/skin.estouchy/xml/IncludesPlayerControls.xml b/addons/skin.estouchy/xml/IncludesPlayerControls.xml
index 981f86ace7..5c4c7a5d66 100644
--- a/addons/skin.estouchy/xml/IncludesPlayerControls.xml
+++ b/addons/skin.estouchy/xml/IncludesPlayerControls.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
 	<include name="PlayerControlCommons">
+		<visible>!Window.IsVisible(SliderDialog)</visible>
 		<include>VisibleFadeEffect</include>
 		<control type="image">
 			<posx>0</posx>
diff --git a/addons/skin.estouchy/xml/VideoOSD.xml b/addons/skin.estouchy/xml/VideoOSD.xml
index a4c542ed5b..9aec7ae5ad 100644
--- a/addons/skin.estouchy/xml/VideoOSD.xml
+++ b/addons/skin.estouchy/xml/VideoOSD.xml
@@ -7,6 +7,8 @@
 		<posy>0</posy>
 	</coordinates>
 	<controls>
-		<include>PlayerControlCommons</include>
+		<control type="group">
+			<include>PlayerControlCommons</include>
+		</control>
 	</controls>
 </window>