From 6d448b7b22a97252eafbd6241d27f8864e3c8aac Mon Sep 17 00:00:00 2001
From: Kevin Goffe <HitcherUK@gmail.com>
Date: Sun, 15 Dec 2019 14:01:41 +0000
Subject: [PATCH] [skin.confluence] v4.7.0

- Added chapter markers to progress bar
- Uppercase Season and Episode indicators on home Recently Added Episodes
---
 720p/IncludesHomeRecentlyAdded.xml |  20 ++++++++++----------
 720p/VideoFullScreen.xml           |  11 +++++++++++
 addon.xml                          |   4 ++--
 changelog.txt                      |   5 +++++
 media/OSDProgressNib.png           | Bin 0 -> 208 bytes
 5 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 media/OSDProgressNib.png

diff --git a/720p/IncludesHomeRecentlyAdded.xml b/720p/IncludesHomeRecentlyAdded.xml
index 2df7c32..e222c97 100644
--- a/720p/IncludesHomeRecentlyAdded.xml
+++ b/720p/IncludesHomeRecentlyAdded.xml
@@ -404,7 +404,7 @@
 					<content>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.1.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.1.ShowTitle)] - $INFO[Window.Property(LatestEpisode.1.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.1.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.1.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.1.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.1.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.1.Thumb)]</thumb>
@@ -412,7 +412,7 @@
 						</item>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.2.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.2.ShowTitle)] - $INFO[Window.Property(LatestEpisode.2.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.2.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.2.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.2.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.2.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.2.Thumb)]</thumb>
@@ -420,7 +420,7 @@
 						</item>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.3.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.3.ShowTitle)] - $INFO[Window.Property(LatestEpisode.3.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.3.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.3.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.3.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.3.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.3.Thumb)]</thumb>
@@ -428,7 +428,7 @@
 						</item>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.4.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.4.ShowTitle)] - $INFO[Window.Property(LatestEpisode.4.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.4.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.4.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.4.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.4.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.4.Thumb)]</thumb>
@@ -436,7 +436,7 @@
 						</item>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.5.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.5.ShowTitle)] - $INFO[Window.Property(LatestEpisode.5.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.5.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.5.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.5.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.5.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.5.Thumb)]</thumb>
@@ -444,7 +444,7 @@
 						</item>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.6.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.6.ShowTitle)] - $INFO[Window.Property(LatestEpisode.6.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.6.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.6.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.6.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.6.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.6.Thumb)]</thumb>
@@ -452,7 +452,7 @@
 						</item>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.7.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.7.ShowTitle)] - $INFO[Window.Property(LatestEpisode.7.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.7.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.7.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.7.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.7.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.7.Thumb)]</thumb>
@@ -460,7 +460,7 @@
 						</item>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.8.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.8.ShowTitle)] - $INFO[Window.Property(LatestEpisode.8.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.8.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.8.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.8.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.8.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.8.Thumb)]</thumb>
@@ -468,7 +468,7 @@
 						</item>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.9.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.9.ShowTitle)] - $INFO[Window.Property(LatestEpisode.9.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.9.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.9.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.9.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.9.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.9.Thumb)]</thumb>
@@ -476,7 +476,7 @@
 						</item>
 						<item>
 							<label>$INFO[Window.Property(LatestEpisode.10.EpisodeTitle)]</label>
-							<label2>$INFO[Window.Property(LatestEpisode.10.ShowTitle)] - $INFO[Window.Property(LatestEpisode.10.EpisodeNo)]</label2>
+							<label2>$INFO[Window.Property(LatestEpisode.10.ShowTitle)] - [UPPERCASE]$INFO[Window.Property(LatestEpisode.10.EpisodeNo)][/UPPERCASE]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.10.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestEpisode.10.Fanart)]</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.10.Thumb)]</thumb>
diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml
index d7cdb3e..ee711b0 100644
--- a/720p/VideoFullScreen.xml
+++ b/720p/VideoFullScreen.xml
@@ -461,6 +461,17 @@
 					<aligny>center</aligny>
 					<label>$INFO[VideoPlayer.EndTime]</label>
 				</control>
+				<control type="ranges" id="1">
+					<description>Chapters</description>
+					<left>100</left>
+					<top>15</top>
+					<width>720</width>
+					<height>16</height>
+					<info>Player.Chapters</info>
+					<texturebg border="6,0,6,0" colordiffuse="00FFFFFF">OSDProgressBack.png</texturebg>
+					<righttexture border="2,4,2,4">OSDProgressNib.png</righttexture>
+					<visible>true</visible>
+				</control>
 			</control>
 		</control>
 		<control type="label" id="1">
diff --git a/addon.xml b/addon.xml
index d7ac752..6584de7 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.6.12" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.7.0" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.14.0"/>
 	</requires>
@@ -143,6 +143,6 @@
 			<screenshot>resources/screenshot-08.jpg</screenshot>
 			<screenshot>resources/screenshot-09.jpg</screenshot>
 		</assets>
-		<news>Updated music artist info.</news>
+		<news>Added chapter markers to progress bar.</news>
 	</extension>
 </addon>
diff --git a/changelog.txt b/changelog.txt
index 24de29d..6c31435 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+[B]4.7.0[/B]
+
+- Added chapter markers to progress bar
+- Uppercase Season and Episode indicators on home Recently Added Episodes
+
 [B]4.6.9[/B]
 
 - Media flagging updates
diff --git a/media/OSDProgressNib.png b/media/OSDProgressNib.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d5afff1b99f808123df89916b3d3990f6d00eb8
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&4!3HD^x83^;q}Y<Y-Cck*5d3uBT@R!<3p^r=
z85p>QL70(Y)*K0-AbW|YuPggw9)2Ea`8S&xF93yNJzX3_BrYdkiTTsY$R{Bw86god
zBY;&RGLTim{_ijL=f;LcMh0zbexEKVyu9o`4-jmB#%`drvVGN}ZidJE>;F%XId$Sd
w(x#v4F%Rz7v$0LHxBs^&Bk|{d?obAXYoZd%xA8ui4z!5D)78&qol`;+089r#K>z>%

literal 0
HcmV?d00001