Merge pull request #18373 from ronie/estouchy-pvr

[Estouchy] a few improvements

12 files changed, 192 insertions, 43 deletions

diff --git a/addons/skin.estouchy/addon.xml b/addons/skin.estouchy/addon.xml
index 90d37a7cff..8fd9faed93 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="3.0.2" name="Estouchy" provider-name="Team Kodi">
+<addon id="skin.estouchy" version="3.0.3" name="Estouchy" provider-name="Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.15.0"/>
 	</requires>
diff --git a/addons/skin.estouchy/changelog.txt b/addons/skin.estouchy/changelog.txt
index 17636e74ee..97d21c3578 100644
--- a/addons/skin.estouchy/changelog.txt
+++ b/addons/skin.estouchy/changelog.txt
@@ -1,3 +1,16 @@
+V3.0.3
+- Add chapter indicators to the progress bar
+- Add sort method / sort order / Channel group options to the PVR sections
+- Larger progress and volume bar 
+
+V3.0.2
+- Updated language files from Transifex
+
+V3.0.1
+- Updated language files from Transifex
+
+V3.0.0
+- Kodi v19 Matrix
 
 V2.0.0
 - Kodi v18 Leia
diff --git a/addons/skin.estouchy/xml/CustomVolume.xml b/addons/skin.estouchy/xml/CustomVolume.xml
index 4a94a1a8e8..65176fd712 100644
--- a/addons/skin.estouchy/xml/CustomVolume.xml
+++ b/addons/skin.estouchy/xml/CustomVolume.xml
@@ -14,17 +14,15 @@
 			<visible>![Window.IsVisible(Notification) | Window.IsVisible(VolumeBar) | Window.IsVisible(SeekBar)]</visible>
 		</control>
 		<control type="group">
-			<posx>430</posx>
-			<posy>0</posy>
-			<width>420</width>
-			<height>78</height>
+			<posx>364</posx>
+			<posy>10</posy>
 			<include>16x9_xPos_Relocation</include>
 			<visible>![Window.IsVisible(Notification) | Window.IsVisible(VolumeBar) | Window.IsVisible(SeekBar)]</visible>
 			<control type="label">
 				<description>label</description>
-				<posx>20</posx>
-				<posy>10</posy>
-				<height>58</height>
+				<posx>0</posx>
+				<posy>0</posy>
+				<height>32</height>
 				<width>400</width>
 				<label>13376</label>
 				<font>font20_title</font>
@@ -32,10 +30,10 @@
 			</control>
 			<control type="label">
 				<description>Volumelabel</description>
-				<posx>400</posx>
-				<posy>10</posy>
-				<height>58</height>
-				<width>400</width>
+				<posx>552</posx>
+				<posy>0</posy>
+				<width>180</width>
+				<height>32</height>
 				<label>$INFO[Control.GetLabel(1)]</label>
 				<font>font20_title</font>
 				<align>right</align>
@@ -44,9 +42,9 @@
 			<control type="progress" id="2">
 				<description>Volume</description>
 				<posx>0</posx>
-				<posy>68</posy>
-				<width>420</width>
-				<height>10</height>
+				<posy>34</posy>
+				<width>552</width>
+				<height>24</height>
 				<texturebg colordiffuse="grey3">white.png</texturebg>
 				<midtexture colordiffuse="blue">white.png</midtexture>
 				<info>Player.Volume</info>
@@ -54,9 +52,9 @@
 			<control type="slider" id="1">
 				<description>Volume Slider</description>
 				<posx>0</posx>
-				<posy>10</posy>
-				<width>420</width>
-				<height>80</height>
+				<posy>30</posy>
+				<width>552</width>
+				<height>32</height>
  				<info>Player.Volume</info>
 				<action>Volume</action>
 				<texturesliderbar></texturesliderbar>
diff --git a/addons/skin.estouchy/xml/DialogPVRInfo.xml b/addons/skin.estouchy/xml/DialogPVRInfo.xml
index 897595647f..aafa2f920e 100644
--- a/addons/skin.estouchy/xml/DialogPVRInfo.xml
+++ b/addons/skin.estouchy/xml/DialogPVRInfo.xml
@@ -213,11 +213,11 @@
 				<label>19003</label>
 				<visible>Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo)</visible>
 			</control>
-			<control type="button" id="7">
-				<description>OK</description>
+			<control type="button" id="11">
+				<description>Reminders</description>
 				<width>230</width>
 				<include>ButtonInfoDialogsCommonValues</include>
-				<label>186</label>
+				<label>826</label>
 			</control>
 		</control>
 	</controls>
diff --git a/addons/skin.estouchy/xml/DialogVolumeBar.xml b/addons/skin.estouchy/xml/DialogVolumeBar.xml
index 8da9fd21c0..bd8c8c0e9d 100644
--- a/addons/skin.estouchy/xml/DialogVolumeBar.xml
+++ b/addons/skin.estouchy/xml/DialogVolumeBar.xml
@@ -3,28 +3,26 @@
 	<include>dialogeffect</include>
 	<controls>
 		<control type="group">
-			<posx>390</posx>
-			<posy>0</posy>
-			<width>500</width>
-			<height>78</height>
+			<posx>364</posx>
+			<posy>10</posy>
 			<include>16x9_xPos_Relocation</include>
 			<visible>![Window.IsVisible(Notification)]</visible>
 			<control type="label">
 				<description>label</description>
 				<posx>0</posx>
-				<posy>10</posy>
-				<height>58</height>
-				<width>500</width>
+				<posy>0</posy>
+				<height>32</height>
+				<width>400</width>
 				<label>13376</label>
 				<font>font20_title</font>
 				<aligny>center</aligny>
 			</control>
 			<control type="label">
 				<description>Volumelabel</description>
-				<posx>500</posx>
-				<posy>10</posy>
-				<height>58</height>
-				<width>500</width>
+				<posx>552</posx>
+				<posy>0</posy>
+				<width>180</width>
+				<height>32</height>
 				<label>$INFO[Control.GetLabel(1)]</label>
 				<font>font20_title</font>
 				<align>right</align>
@@ -33,9 +31,9 @@
 			<control type="progress" id="2">
 				<description>Volume</description>
 				<posx>0</posx>
-				<posy>72</posy>
-				<width>500</width>
-				<height>6</height>
+				<posy>34</posy>
+				<width>552</width>
+				<height>24</height>
 				<texturebg colordiffuse="grey3">white.png</texturebg>
 				<midtexture colordiffuse="blue">white.png</midtexture>
 				<info>Player.Volume</info>
@@ -43,9 +41,9 @@
 			<control type="slider" id="1">
 				<description>Volume Slider</description>
 				<posx>0</posx>
-				<posy>72</posy>
-				<width>500</width>
-				<height>6</height>
+				<posy>30</posy>
+				<width>552</width>
+				<height>32</height>
  				<info>Player.Volume</info>
 				<texturesliderbar></texturesliderbar>
 				<textureslidernib></textureslidernib>
diff --git a/addons/skin.estouchy/xml/Includes.xml b/addons/skin.estouchy/xml/Includes.xml
index bdf8f64b3b..52c036bd01 100644
--- a/addons/skin.estouchy/xml/Includes.xml
+++ b/addons/skin.estouchy/xml/Includes.xml
@@ -16,6 +16,7 @@
 	</variable>
 	<variable name="OSDImage">
 		<value condition="Window.IsVisible(MusicOSD)">$INFO[MusicPlayer.Cover]</value>
+		<value condition="Window.IsVisible(VideoOSD) + !String.IsEmpty(Player.Art(poster))">$INFO[Player.Art(poster)]</value>
 		<value condition="Window.IsVisible(VideoOSD)">$INFO[VideoPlayer.Cover]</value>
 	</variable>
 	<variable name="OSDLabel1">
@@ -410,6 +411,13 @@
 					<visible>![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch) | Window.IsVisible(MusicOSD) | Window.IsVisible(VideoOSD) | Window.IsVisible(MusicPlaylist) | Window.IsVisible(VideoPlaylist) | Window.IsVisible(MusicPlaylistEditor)]</visible>
 				</item>
 				<item>
+					<label>31202</label>
+					<onclick condition="String.IsEmpty(Window(Home).Property(ViewMenuVisible))">SetProperty(ViewMenuVisible,Show,Home)</onclick>
+					<onclick condition="!String.IsEmpty(Window(Home).Property(ViewMenuVisible))">ClearProperty(ViewMenuVisible,Home)</onclick>
+					<icon>icon_button_view.png</icon>
+					<visible>Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch)</visible>
+				</item>
+				<item>
 					<label>5</label>
 					<onclick condition="String.IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick>
 					<onclick condition="!String.IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick>
@@ -951,6 +959,55 @@
 		<align>center</align>
 		<aligny>center</aligny>
 	</include>
+	<include name="ViewMenu">
+		<control type="group">
+			<visible>!String.IsEmpty(Window(Home).Property(ViewMenuVisible))</visible>
+			<include>VisibleFadeEffect</include>
+			<animation effect="fade" time="250">WindowClose</animation>
+			<control type="button">
+				<description>Hidden button to close the sort when its focused</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<include>ScreenWidth</include>
+				<height>960</height>
+				<texturenofocus></texturenofocus>
+				<texturefocus></texturefocus>
+				<onclick>ClearProperty(ViewMenuVisible,Home)</onclick>
+			</control>
+			<control type="group">
+				<posx>360r</posx>
+				<posy>685r</posy>
+				<control type="image">
+					<description>Panel image</description>
+					<posx>0</posx>
+					<posy>$PARAM[panel-posy]</posy>
+					<width>350</width>
+					<height>$PARAM[panel-height]</height>
+					<texture>dialog_back.png</texture>
+				</control>
+				<control type="grouplist">
+					<posx>0</posx>
+					<posy>$PARAM[panel-posy]</posy>
+					<width>350</width>
+					<height>640</height>
+					<onleft>9000</onleft>
+					<onright>50</onright>
+					<onup>9000</onup>
+					<ondown>9000</ondown>
+					<itemgap>0</itemgap>
+					<include condition="Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels) | Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide) | Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings) | Window.IsVisible(TVTimers) | Window.IsVisible(RadioTimers) | Window.IsVisible(TVTimerRules) | Window.IsVisible(RadioTimerRules) | Window.IsVisible(TVSearch) | Window.IsVisible(RadioSearch)">PVRViews</include>
+				</control>
+				<control type="image">
+					<description>Panel Arrow image</description>
+					<posx>225r</posx>
+					<posy>122r</posy>
+					<width>75</width>
+					<height>41</height>
+					<texture>arrow_up.png</texture>
+				</control>
+			</control>
+		</control>
+	</include>
 	<include name="PopupMenu">
 		<control type="group">
 			<visible>!String.IsEmpty(Window(Home).Property(PopupMenuVisible))</visible>
@@ -1438,7 +1495,7 @@
 			<colordiffuse>blue</colordiffuse>
 		</control>
 	</include>
-	<include name="PVRMenu">
+	<include name="PVRViews">
 		<control type="button" id="201">
 			<include>MenuButtonCommonValues</include>
 			<label>19019</label>
@@ -1496,6 +1553,55 @@
 			<visible>Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings)</visible>
 		</control>
 	</include>
+	<include name="PVRMenu">
+		<control type="button" id="28">
+			<description>Group button</description>
+			<include>MenuButtonCommonValues</include>
+			<label>19141</label>
+			<visible>Window.IsActive(MyPVRChannels.xml) | Window.IsActive(MyPVRGuide.xml)</visible>
+		</control>
+		<control type="button" id="3">
+			<description>Sort by button</description>
+			<include>MenuButtonCommonValues</include>
+			<label>103</label>
+		</control>
+		<control type="togglebutton" id="4">
+			<description>Sort asc</description>
+			<include>MenuButtonCommonValues</include>
+			<alttexturefocus>list_focus.png</alttexturefocus>
+			<alttexturenofocus></alttexturenofocus>
+			<label>31051</label>
+			<altlabel>31050</altlabel>
+			<usealttexture>Container.SortDirection(Ascending)</usealttexture>
+		</control>
+		<control type="button" id="10">
+			<description>Watched button</description>
+			<include>MenuButtonCommonValues</include>
+			<label>20367</label>
+			<visible>Window.IsActive(MyPVRRecordings.xml)</visible>
+		</control>
+		<control type="radiobutton" id="5">
+			<description>Group items Toggle</description>
+			<textwidth>240</textwidth>
+			<include>MenuButtonCommonValues</include>
+			<label>19270</label>
+			<visible>Window.IsActive(MyPVRRecordings.xml)</visible>
+		</control>
+		<control type="radiobutton" id="7">
+			<description>Deleted items Toggle</description>
+			<textwidth>240</textwidth>
+			<include>MenuButtonCommonValues</include>
+			<label>19184</label>
+			<visible>Window.IsActive(MyPVRRecordings.xml)</visible>
+		</control>
+		<control type="radiobutton" id="8">
+			<description>Hide disabled items Toggle</description>
+			<textwidth>240</textwidth>
+			<include>MenuButtonCommonValues</include>
+			<label>19077</label>
+			<visible>Window.IsActive(MyPVRTimers.xml)</visible>
+		</control>
+	</include>
 	<include name="SettingsContent">
 		<control type="image">
 			<posx>390</posx>
diff --git a/addons/skin.estouchy/xml/IncludesPlayerControls.xml b/addons/skin.estouchy/xml/IncludesPlayerControls.xml
index 589379f087..7aa98cab65 100644
--- a/addons/skin.estouchy/xml/IncludesPlayerControls.xml
+++ b/addons/skin.estouchy/xml/IncludesPlayerControls.xml
@@ -84,9 +84,9 @@
 				<control type="progress">
 					<description>Progressbar</description>
 					<posx>0</posx>
-					<posy>40</posy>
+					<posy>34</posy>
 					<width>552</width>
-					<height>12</height>
+					<height>24</height>
 					<info>Player.ProgressCache</info>
 					<midtexture colordiffuse="grey2">white.png</midtexture>
 					<texturebg colordiffuse="grey3">white.png</texturebg>
@@ -94,12 +94,21 @@
 				<control type="progress">
 					<description>Progressbar</description>
 					<posx>0</posx>
-					<posy>40</posy>
+					<posy>34</posy>
 					<width>552</width>
-					<height>12</height>
+					<height>24</height>
 					<info>Player.Progress</info>
 					<texturebg colordiffuse="002C2C2C">white.png</texturebg>
 				</control>
+				<control type="ranges">
+					<description>Chapters</description>
+					<posx>0</posx>
+					<posy>50</posy>
+					<width>552</width>
+					<height>8</height>
+					<info>Player.Chapters</info>
+					<righttexture>white.png</righttexture>
+				</control>
 				<control type="slider" id="87">
 					<description>Seek Slider</description>
 					<posx>0</posx>
diff --git a/addons/skin.estouchy/xml/MyPVRChannels.xml b/addons/skin.estouchy/xml/MyPVRChannels.xml
index 1197c295bf..59025e4cc1 100644
--- a/addons/skin.estouchy/xml/MyPVRChannels.xml
+++ b/addons/skin.estouchy/xml/MyPVRChannels.xml
@@ -3,6 +3,7 @@
 	<defaultcontrol always="true">50</defaultcontrol>
 	<views>50</views>
 	<onunload>ClearProperty(PopupMenuVisible,Home)</onunload>
+	<onunload>ClearProperty(ViewMenuVisible,Home)</onunload>
 	<controls>
 		<include>CommonBackground</include>
 		<include>SideMenu</include>
@@ -46,6 +47,10 @@
 		</control>
 		<include>ScrollBarCommons</include>
 		<include>BottomMenu</include>
+		<include content="ViewMenu">
+			<param name="panel-posy">-80</param>
+			<param name="panel-height">640</param>
+		</include>
 		<include content="PopupMenu">
 			<param name="panel-posy">-80</param>
 			<param name="panel-height">640</param>
diff --git a/addons/skin.estouchy/xml/MyPVRGuide.xml b/addons/skin.estouchy/xml/MyPVRGuide.xml
index 2a64ceaf65..e09815ec75 100644
--- a/addons/skin.estouchy/xml/MyPVRGuide.xml
+++ b/addons/skin.estouchy/xml/MyPVRGuide.xml
@@ -3,6 +3,7 @@
 	<defaultcontrol always="true">10</defaultcontrol>
 	<views>10</views>
 	<onunload>ClearProperty(PopupMenuVisible,Home)</onunload>
+	<onunload>ClearProperty(ViewMenuVisible,Home)</onunload>
 	<controls>
 		<include>CommonBackground</include>
 		<include>SideMenu</include>
@@ -39,6 +40,10 @@
 		</control>
 		<include>ScrollBarCommons</include>
 		<include>BottomMenu</include>
+		<include content="ViewMenu">
+			<param name="panel-posy">-80</param>
+			<param name="panel-height">640</param>
+		</include>
 		<include content="PopupMenu">
 			<param name="panel-posy">0</param>
 			<param name="panel-height">560</param>
diff --git a/addons/skin.estouchy/xml/MyPVRRecordings.xml b/addons/skin.estouchy/xml/MyPVRRecordings.xml
index 0fb79048c3..75a69ec2af 100644
--- a/addons/skin.estouchy/xml/MyPVRRecordings.xml
+++ b/addons/skin.estouchy/xml/MyPVRRecordings.xml
@@ -3,6 +3,7 @@
 	<defaultcontrol always="true">50</defaultcontrol>
 	<views>50</views>
 	<onunload>ClearProperty(PopupMenuVisible,Home)</onunload>
+	<onunload>ClearProperty(ViewMenuVisible,Home)</onunload>
 	<controls>
 		<include>CommonBackground</include>
 		<include>SideMenu</include>
@@ -43,6 +44,10 @@
 		</control>
 		<include>ScrollBarCommons</include>
 		<include>BottomMenu</include>
+		<include content="ViewMenu">
+			<param name="panel-posy">-80</param>
+			<param name="panel-height">640</param>
+		</include>
 		<include content="PopupMenu">
 			<param name="panel-posy">-80</param>
 			<param name="panel-height">640</param>
diff --git a/addons/skin.estouchy/xml/MyPVRSearch.xml b/addons/skin.estouchy/xml/MyPVRSearch.xml
index 5c792473ad..350c30f984 100644
--- a/addons/skin.estouchy/xml/MyPVRSearch.xml
+++ b/addons/skin.estouchy/xml/MyPVRSearch.xml
@@ -3,6 +3,7 @@
 	<defaultcontrol always="true">50</defaultcontrol>
 	<views>50</views>
 	<onunload>ClearProperty(PopupMenuVisible,Home)</onunload>
+	<onunload>ClearProperty(ViewMenuVisible,Home)</onunload>
 	<controls>
 		<include>CommonBackground</include>
 		<include>SideMenu</include>
@@ -43,6 +44,10 @@
 		</control>
 		<include>ScrollBarCommons</include>
 		<include>BottomMenu</include>
+		<include content="ViewMenu">
+			<param name="panel-posy">-80</param>
+			<param name="panel-height">640</param>
+		</include>
 		<include content="PopupMenu">
 			<param name="panel-posy">0</param>
 			<param name="panel-height">560</param>
diff --git a/addons/skin.estouchy/xml/MyPVRTimers.xml b/addons/skin.estouchy/xml/MyPVRTimers.xml
index b4279f0eb0..c3fc1d7d5e 100644
--- a/addons/skin.estouchy/xml/MyPVRTimers.xml
+++ b/addons/skin.estouchy/xml/MyPVRTimers.xml
@@ -3,6 +3,7 @@
 	<defaultcontrol always="true">50</defaultcontrol>
 	<views>50</views>
 	<onunload>ClearProperty(PopupMenuVisible,Home)</onunload>
+	<onunload>ClearProperty(ViewMenuVisible,Home)</onunload>
 	<controls>
 		<include>CommonBackground</include>
 		<include>SideMenu</include>
@@ -43,6 +44,10 @@
 		</control>
 		<include>ScrollBarCommons</include>
 		<include>BottomMenu</include>
+		<include content="ViewMenu">
+			<param name="panel-posy">-80</param>
+			<param name="panel-height">640</param>
+		</include>
 		<include content="PopupMenu">
 			<param name="panel-posy">0</param>
 			<param name="panel-height">560</param>