From 6c2fe94982d5c9d7b3faa938871bf63fa80db526 Mon Sep 17 00:00:00 2001
From: Kevin Goffe <HitcherUK@gmail.com>
Date: Tue, 4 Jul 2017 18:53:08 +0100
Subject: [PATCH] [skin.confluence] v4.1.4

- Added path to music info dialog
- Updated language files from Transifex
---
 720p/Includes.xml | 94 ++++++++++++++++++++++++++---------------------
 addon.xml         |  2 +-
 changelog.txt     |  7 +++-
 3 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/720p/Includes.xml b/720p/Includes.xml
index 0b8a4c7..cb52516 100644
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@@ -494,21 +494,21 @@
 		<value>$LOCALIZE[19199] - $LOCALIZE[19023]</value>
 	</variable>
 	<variable name="PVRTimerIcon">
-	  <value condition="ListItem.IsRecording">PVR-IsRecording.png</value>
-	  <value condition="ListItem.HasTimerSchedule + ListItem.TimerHasError">PVR-HasTimerScheduleError.png</value>
-	  <value condition="ListItem.HasTimer + ListItem.TimerHasError">PVR-HasTimerError.png</value>
-	  <value condition="ListItem.HasTimerSchedule + ListItem.TimerHasConflict">PVR-HasTimerScheduleConflict.png</value>
-	  <value condition="ListItem.HasTimer + ListItem.TimerHasConflict">PVR-HasTimerConflict.png</value>
-	  <value condition="ListItem.HasRecording">PVR-HasRecording.png</value>
-	  <value condition="ListItem.HasTimerSchedule + !ListItem.TimerIsActive">PVR-HasTimerScheduleDisabled.png</value>
-	  <value condition="ListItem.HasTimer + !ListItem.TimerIsActive">PVR-HasTimerDisabled.png</value>
-	  <value condition="ListItem.HasTimerSchedule">PVR-HasTimerSchedule.png</value>
-	  <value condition="ListItem.HasTimer">PVR-HasTimer.png</value>
+		<value condition="ListItem.IsRecording">PVR-IsRecording.png</value>
+		<value condition="ListItem.HasTimerSchedule + ListItem.TimerHasError">PVR-HasTimerScheduleError.png</value>
+		<value condition="ListItem.HasTimer + ListItem.TimerHasError">PVR-HasTimerError.png</value>
+		<value condition="ListItem.HasTimerSchedule + ListItem.TimerHasConflict">PVR-HasTimerScheduleConflict.png</value>
+		<value condition="ListItem.HasTimer + ListItem.TimerHasConflict">PVR-HasTimerConflict.png</value>
+		<value condition="ListItem.HasRecording">PVR-HasRecording.png</value>
+		<value condition="ListItem.HasTimerSchedule + !ListItem.TimerIsActive">PVR-HasTimerScheduleDisabled.png</value>
+		<value condition="ListItem.HasTimer + !ListItem.TimerIsActive">PVR-HasTimerDisabled.png</value>
+		<value condition="ListItem.HasTimerSchedule">PVR-HasTimerSchedule.png</value>
+		<value condition="ListItem.HasTimer">PVR-HasTimer.png</value>
 	</variable>
 	<variable name="PVRTimerLabel">
-	  <value condition="ListItem.IsRecording">$LOCALIZE[19043]</value>
-	  <value condition="ListItem.HasTimer + !ListItem.TimerIsActive">$LOCALIZE[19057]</value>
-	  <value condition="ListItem.HasTimer">$LOCALIZE[31510]</value>
+		<value condition="ListItem.IsRecording">$LOCALIZE[19043]</value>
+		<value condition="ListItem.HasTimer + !ListItem.TimerIsActive">$LOCALIZE[19057]</value>
+		<value condition="ListItem.HasTimer">$LOCALIZE[31510]</value>
 	</variable>
 	<!-- INCLUDES -->
 	<include name="MusicInfoPanel">
@@ -634,8 +634,8 @@
 			<top>15</top>
 			<width>64</width>
 			<height>32</height>
-			<label></label>
-			<font></font>
+			<label/>
+			<font/>
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -678,7 +678,7 @@
 		<aligny>center</aligny>
 		<font>font13</font>
 		<texturefocus border="5">button-focus.png</texturefocus>
-		<texturenofocus></texturenofocus>
+		<texturenofocus/>
 		<pulseonselect>false</pulseonselect>
 	</include>
 	<include name="ButtonMediaSubCommonValues">
@@ -742,10 +742,10 @@
 			<top>0</top>
 			<width>250</width>
 			<height>720</height>
-			<label></label>
-			<font></font>
-			<texturenofocus></texturenofocus>
-			<texturefocus></texturefocus>
+			<label/>
+			<font/>
+			<texturenofocus/>
+			<texturefocus/>
 			<visible>true</visible>
 		</control>
 		<control type="button" id="9001">
@@ -753,7 +753,7 @@
 			<top>260</top>
 			<width>42</width>
 			<height>128</height>
-			<font></font>
+			<font/>
 			<texturefocus>HasSub.png</texturefocus>
 			<texturenofocus>HasSub.png</texturenofocus>
 		</control>
@@ -788,7 +788,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>1036</label>
-				<font></font>
+				<font/>
 				<onclick>back</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
@@ -813,7 +813,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>31003</label>
-				<font></font>
+				<font/>
 				<onclick>ActivateWindow(home)</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
@@ -846,7 +846,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>31003</label>
-				<font></font>
+				<font/>
 				<onclick>ActivateWindow(PlayerControls)</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
@@ -1227,7 +1227,7 @@
 				<control type="button" id="600">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDChannelUPFO.png</texturefocus>
 					<texturenofocus>OSDChannelUPNF.png</texturenofocus>
 					<onclick>ChannelDown</onclick>
@@ -1235,7 +1235,7 @@
 				<control type="button" id="601">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDChannelDownFO.png</texturefocus>
 					<texturenofocus>OSDChannelDownNF.png</texturenofocus>
 					<onclick>ChannelUp</onclick>
@@ -1243,7 +1243,7 @@
 				<control type="button" id="603">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDStopFO.png</texturefocus>
 					<texturenofocus>OSDStopNF.png</texturenofocus>
 					<onclick>down</onclick>
@@ -1252,7 +1252,7 @@
 				<control type="togglebutton" id="604">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDPauseFO.png</texturefocus>
 					<texturenofocus>OSDPauseNF.png</texturenofocus>
 					<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -1265,7 +1265,7 @@
 				<control type="button" id="605">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDRecordOffFO.png</texturefocus>
 					<texturenofocus>OSDRecordOffNF.png</texturenofocus>
 					<onclick>PlayerControl(record)</onclick>
@@ -1275,7 +1275,7 @@
 				<control type="button" id="606">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<visible>RDS.HasRadiotextPlus</visible>
 					<texturefocus>OSDRadioRDSFO.png</texturefocus>
 					<texturenofocus>OSDRadioRDSNF.png</texturenofocus>
@@ -1284,7 +1284,7 @@
 				<control type="button" id="622">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<visible>!RDS.HasRadiotextPlus</visible>
 					<texturefocus>OSDChannelListFO.png</texturefocus>
 					<texturenofocus>OSDChannelListNF.png</texturenofocus>
@@ -1310,7 +1310,7 @@
 				<control type="button" id="700">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDPrevTrackFO.png</texturefocus>
 					<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
 					<onclick>PlayerControl(Previous)</onclick>
@@ -1318,7 +1318,7 @@
 				<control type="button" id="706">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDRewindFO.png</texturefocus>
 					<texturenofocus>OSDRewindNF.png</texturenofocus>
 					<onclick>PlayerControl(Rewind)</onclick>
@@ -1327,7 +1327,7 @@
 				<control type="togglebutton" id="703">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDPauseFO.png</texturefocus>
 					<texturenofocus>OSDPauseNF.png</texturenofocus>
 					<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -1338,7 +1338,7 @@
 				<control type="button" id="701">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDStopFO.png</texturefocus>
 					<texturenofocus>OSDStopNF.png</texturenofocus>
 					<onclick>down</onclick>
@@ -1347,7 +1347,7 @@
 				<control type="button" id="707">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDForwardFO.png</texturefocus>
 					<texturenofocus>OSDForwardNF.png</texturenofocus>
 					<onclick>PlayerControl(Forward)</onclick>
@@ -1356,7 +1356,7 @@
 				<control type="button" id="702">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDNextTrackFO.png</texturefocus>
 					<texturenofocus>OSDNextTrackNF.png</texturenofocus>
 					<onclick>PlayerControl(Next)</onclick>
@@ -1367,9 +1367,9 @@
 					<control type="button" id="704">
 						<width>39</width>
 						<height>39</height>
-						<label></label>
-						<texturefocus></texturefocus>
-						<texturenofocus></texturenofocus>
+						<label/>
+						<texturefocus/>
+						<texturenofocus/>
 						<onleft>702</onleft>
 						<onright>705</onright>
 						<onclick>PlayerControl(Repeat)</onclick>
@@ -1385,7 +1385,7 @@
 				<control type="togglebutton" id="705">
 					<width>39</width>
 					<height>39</height>
-					<label></label>
+					<label/>
 					<texturefocus>OSDRandomOffFO.png</texturefocus>
 					<texturenofocus>OSDRandomOffNF.png</texturenofocus>
 					<usealttexture>Playlist.IsRandom</usealttexture>
@@ -1474,7 +1474,7 @@
 		<top>190r</top>
 		<width>1280</width>
 		<height>200</height>
-		<pagecontrol></pagecontrol>
+		<pagecontrol/>
 		<scrolltime>300</scrolltime>
 		<focusposition>3</focusposition>
 		<movement>2</movement>
@@ -1908,6 +1908,11 @@
 			<label2>$INFO[ListItem.Year]</label2>
 			<visible>!String.IsEmpty(ListItem.Year)</visible>
 		</item>
+		<item>
+			<label>$LOCALIZE[15311]</label>
+			<label2>$INFO[ListItem.FilenameAndPath]</label2>
+			<visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible>
+		</item>
 	</include>
 	<include name="MusicInfoSongInfo">
 		<item>
@@ -2000,5 +2005,10 @@
 			<label2>$INFO[ListItem.Property(Role.Mixer)]</label2>
 			<visible>!String.IsEmpty(ListItem.Property(Role.Mixer))</visible>
 		</item>
+		<item>
+			<label>$LOCALIZE[15311]</label>
+			<label2>$INFO[ListItem.FilenameAndPath]</label2>
+			<visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible>
+		</item>
 	</include>
 </includes>
diff --git a/addon.xml b/addon.xml
index 5e361e2..9cda643 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.0.4" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.1.4" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.13.0"/>
 	</requires>
diff --git a/changelog.txt b/changelog.txt
index c4d588a..63bddc9 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
-[B]4.0.3[/B]
+[B]4.1.4[/B]
+
+- Added path to music info dialog
+- Updated language files from Transifex
+
+[B]4.0.4[/B]
 
 - Added fallbacks for home screen Recently Added items
 - Updated addon settings dialog