From 669554b814cf897c61bf133c89231f82e36d916e Mon Sep 17 00:00:00 2001
From: Kevin Goffe <HitcherUK@gmail.com>
Date: Tue, 20 Feb 2018 19:33:49 +0000
Subject: [PATCH] [skin.confluence] v4.3.0

Updated subtitle selection
---
 720p/VideoFullScreen.xml |   2 +-
 720p/VideoOSD.xml        | 120 ++-------------------------------------
 addon.xml                |   2 +-
 3 files changed, 7 insertions(+), 117 deletions(-)

diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml
index 0d84a4d..f821a4b 100644
--- a/720p/VideoFullScreen.xml
+++ b/720p/VideoFullScreen.xml
@@ -53,7 +53,7 @@
 		<!-- media infos -->
 		<control type="group" id="1">
 			<depth>DepthOSD</depth>
-			<visible>[Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(SliderDialog)]</visible>
+			<visible>[Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(SliderDialog)]</visible>
 			<animation effect="fade" time="150">VisibleChange</animation>
 			<control type="image" id="1">
 				<left>-20</left>
diff --git a/720p/VideoOSD.xml b/720p/VideoOSD.xml
index 7a70425..afc514f 100644
--- a/720p/VideoOSD.xml
+++ b/720p/VideoOSD.xml
@@ -23,7 +23,7 @@
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
 			<animation effect="slide" start="0,0" end="-30,0" time="0" condition="Player.Muted">conditional</animation>
 			<animation effect="fade" time="150">VisibleChange</animation>
-			<visible>system.getbool(input.enablemouse) + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks)]</visible>
+			<visible>system.getbool(input.enablemouse) + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks)]</visible>
 		</control>
 		<control type="slider" id="87">
 			<depth>DepthOSD+</depth>
@@ -39,7 +39,7 @@
 			<textureslidernib>osd_slider_nibNF.png</textureslidernib>
 			<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
 			<animation effect="fade" time="150">VisibleChange</animation>
-			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | VideoPlayer.Content(LiveTV)]</visible>
+			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | VideoPlayer.Content(LiveTV)]</visible>
 		</control>
 		<control type="grouplist" id="100">
 			<left>325</left>
@@ -47,7 +47,7 @@
 			<orientation>horizontal</orientation>
 			<itemgap>0</itemgap>
 			<animation effect="fade" time="150">VisibleChange</animation>
-			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)]</visible>
+			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)]</visible>
 			<control type="button" id="300">
 				<width>55</width>
 				<height>55</height>
@@ -205,7 +205,7 @@
 				<font></font>
 				<texturefocus>OSDSubtitlesFO.png</texturefocus>
 				<texturenofocus>OSDSubtitlesNF.png</texturenofocus>
-				<onup>404</onup>
+				<onclick>ActivateWindow(OSDSubtitleSettings)</onclick>
 			</control>
 			<control type="button" id="251">
 				<width>55</width>
@@ -278,116 +278,6 @@
 			<animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation>
 			<visible>Control.HasFocus(410) | Control.HasFocus(250) | ControlGroup(400).HasFocus</visible>
 		</control>
-		<control type="grouplist" id="400">
-			<depth>DepthOSD+</depth>
-			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks)]</visible>
-			<animation effect="fade" time="150">VisibleChange</animation>
-			<animation effect="slide" start="0,0" end="0,80" time="0" condition="![VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled]">Conditional</animation>
-			<animation effect="slide" start="0,0" end="0,40" time="0" condition="!VideoPlayer.HasSubtitles">Conditional</animation>
-			<animation effect="slide" start="0,0" end="55,0" time="0" condition="![VideoPlayer.HasMenu | VideoPlayer.Content(LiveTV)]">Conditional</animation>
-			<animation effect="slide" start="0,0" end="55,0" time="0" condition="!VideoPlayer.HasMenu + VideoPlayer.Content(LiveTV)">Conditional</animation>
-			<right>145</right>
-			<bottom>45</bottom>
-			<width>256</width>
-			<height>260</height>
-			<itemgap>0</itemgap>
-			<onleft>400</onleft>
-			<onright>400</onright>
-			<onup>250</onup>
-			<ondown>250</ondown>
-			<orientation>vertical</orientation>
-			<visible>Control.HasFocus(410) | Control.HasFocus(250) | ControlGroup(400).HasFocus</visible>
-			<include>VisibleFadeEffect</include>
-			<control type="group">
-				<description>Header</description>
-				<width>256</width>
-				<height>40</height>
-				<control type="image">
-					<description>Header</description>
-					<left>0</left>
-					<top>0</top>
-					<width>256</width>
-					<height>40</height>
-					<texture border="20,18,20,0">SubMenuBack-Header.png</texture>
-				</control>
-				<control type="label">
-					<left>30</left>
-					<top>20</top>
-					<width>196</width>
-					<height>15</height>
-					<font>font12</font>
-					<label>24012</label>
-					<textcolor>blue</textcolor>
-					<align>center</align>
-					<aligny>center</aligny>
-				</control>
-			</control>
-			<control type="togglebutton" id="401">
-				<description>Download with Subtitles script</description>
-				<height>40</height>
-				<width>256</width>
-				<font>font13</font>
-				<label>33003</label>
-				<textoffsetx>30</textoffsetx>
-				<aligny>center</aligny>
-				<texturefocus border="25,5,25,5">SubMenuBack-MiddleFO.png</texturefocus>
-				<texturenofocus border="25,5,25,5">SubMenuBack-MiddleNF.png</texturenofocus>
-				<alttexturefocus border="25,5,25,5">SubMenuBack-MiddleFO.png</alttexturefocus>
-				<alttexturenofocus border="25,5,25,5">SubMenuBack-MiddleNF.png</alttexturenofocus>
-				<onclick>Close</onclick>
-				<onclick>Dialog.Close(VideoOSD)</onclick>
-				<onclick>ActivateWindow(SubtitleSearch)</onclick>
-				<!-- no point in downloading subtitles for live programs -->
-				<enable>!VideoPlayer.Content(LiveTV)</enable>
-			</control>
-			<control type="button" id="402">
-				<height>40</height>
-				<width>256</width>
-				<aligny>center</aligny>
-				<font>font13</font>
-				<textoffsetx>30</textoffsetx>
-				<texturefocus border="25,5,25,5">SubMenuBack-MiddleFO.png</texturefocus>
-				<texturenofocus border="25,5,25,5">SubMenuBack-MiddleNF.png</texturenofocus>
-				<pulseonselect>false</pulseonselect>
-				<label>22006</label>
-				<onclick>SubtitleDelay</onclick>
-				<visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
-			</control>
-			<control type="button" id="403">
-				<height>40</height>
-				<width>256</width>
-				<aligny>center</aligny>
-				<font>font13</font>
-				<textoffsetx>30</textoffsetx>
-				<texturefocus border="25,5,25,5">SubMenuBack-MiddleFO.png</texturefocus>
-				<texturenofocus border="25,5,25,5">SubMenuBack-MiddleNF.png</texturenofocus>
-				<pulseonselect>false</pulseonselect>
-				<label>209</label>
-				<onclick>CycleSubtitle</onclick>
-				<visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
-			</control>
-			<control type="radiobutton" id="404">
-				<height>40</height>
-				<width>256</width>
-				<textoffsetx>30</textoffsetx>
-				<aligny>center</aligny>
-				<font>font13</font>
-				<label>449</label>
-				<radioposx>200</radioposx>
-				<texturefocus border="25,5,25,5">SubMenuBack-MiddleFO.png</texturefocus>
-				<texturenofocus border="25,5,25,5">SubMenuBack-MiddleNF.png</texturenofocus>
-				<onclick>ShowSubtitles</onclick>
-				<selected>VideoPlayer.SubtitlesEnabled</selected>
-				<visible>VideoPlayer.HasSubtitles</visible>
-				<pulseonselect>false</pulseonselect>
-			</control>
-			<control type="image" id="440">
-				<description>Footer</description>
-				<width>256</width>
-				<height>52</height>
-				<texture border="20,0,20,50">SubMenuBack-Footer.png</texture>
-			</control>
-		</control>
 		<control type="button" id="520">
 			<description>Fake button for mouse control</description>
 			<right>200</right>
@@ -403,7 +293,7 @@
 		</control>
 		<control type="grouplist" id="500">
 			<depth>DepthOSD+</depth>
-			<visible>videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] + [Control.HasFocus(255) | ControlGroup(500).HasFocus | Control.HasFocus(520)]</visible>
+			<visible>videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] + [Control.HasFocus(255) | ControlGroup(500).HasFocus | Control.HasFocus(520)]</visible>
 			<animation effect="fade" time="150">VisibleChange</animation>
 			<animation effect="slide" start="0,0" end="55,0" time="0" condition="![VideoPlayer.HasMenu | VideoPlayer.Content(LiveTV)]">Conditional</animation>
 			<animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation>
diff --git a/addon.xml b/addon.xml
index ec901e8..4592a92 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.2.1" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.3.0" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.13.0"/>
 	</requires>