From 3d41ace9152c209affedd522706a5f5f53790310 Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Tue, 27 Feb 2018 21:07:40 +0000
Subject: [PATCH] subtitles update

---
 1080i/DialogSettings.xml    | 28 ++++++++++++-------------
 1080i/DialogSubtitles.xml   | 36 +++++++++++++++----------------
 1080i/VideoOSD.xml          | 42 +++----------------------------------
 changelog.txt               |  5 +++--
 language/English/strings.po |  2 +-
 5 files changed, 38 insertions(+), 75 deletions(-)

diff --git a/1080i/DialogSettings.xml b/1080i/DialogSettings.xml
index 47d98b2..a7673cf 100644
--- a/1080i/DialogSettings.xml
+++ b/1080i/DialogSettings.xml
@@ -6,7 +6,7 @@
         <!--background-->
         <include condition="!Player.HasVideo">globalBackground</include>
         <control type="group">
-            <animation type="conditional" condition="Window.IsVisible(sliderdialog) | window.isvisible(selectdialog)" reversible="false">
+            <animation type="conditional" condition="Window.IsVisible(sliderdialog) | window.isvisible(selectdialog) | window.isactive(subtitlesearch)" reversible="false">
                 <effect type="fade" start="100" end="0" time="200"/>
             </animation>
             <posx>col-5-begin</posx>
@@ -17,35 +17,35 @@
                 <posx>0</posx>
                 <posy>0</posy>
                 <width>16-col</width>
-                <height>2-row</height>
-                <texture>colors/white.png</texture>
-                <colordiffuse>highlight</colordiffuse>
+                <height>20-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
+			<control type="image">
                 <visible>player.hasvideo</visible>
                 <posx>0</posx>
-                <posy>2-row</posy>
+                <posy>0</posy>
                 <width>16-col</width>
-                <height>19-row</height>
+                <height>20-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>99FFFFFF</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
+			<control type="image">
                 <posx>0</posx>
-                <posy>2-row</posy>
+                <posy>0</posy>
                 <width>16-col</width>
-                <height>19-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
+                <height>71</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
                 <width>12-col</width>
-                <height>19-row</height>
+                <height>18-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -65,7 +65,7 @@
                 <posx>0</posx>
                 <posy>2-row</posy>
                 <width>12-col</width>
-                <height>19-row</height>
+                <height>18-row</height>
                 <onright>9000</onright>
                 <onup>5</onup>
                 <ondown>5</ondown>
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 407e80e..fb696db 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol>160</defaultcontrol>
-    
     <controls>
-        <control type="image">
-            <posx>0</posx>
-            <posy>0</posy>
-            <width>fullscreenWidth</width>
-            <height>fullscreenHeight</height>
-            <aspectratio>stretch</aspectratio>
-            <texture>colors/black.png</texture>
-            <colordiffuse>eeFFFFFF</colordiffuse>
-            <include>fadeInOut</include>
-        </control>
         <control type="group" id="250">
             <posx>col-3-begin</posx>
             <posy>row-3-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
+			<control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>20-col</width>
+                <height>23-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>99FFFFFF</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
                 <width>20-col</width>
-                <height>2-row</height>
+                <height>71</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -66,7 +64,7 @@
                     <height>2-row</height>
                     <aligny>center</aligny>
                     <font>itemTitle</font>
-                    <textcolor>highlight</textcolor>
+                    <textcolor>textActive</textcolor>
                     <wrapmultiline>true</wrapmultiline>
                 </control>
                 <!--subtitle file selection-->
@@ -165,7 +163,7 @@
                 <label>31134</label>
                 <ondown>150</ondown>
                 <onright>120</onright>
-                <textoffsetx>12</textoffsetx>
+                <textoffsetx>24</textoffsetx>
             </control>
             <!--subtitle service choice-->
             <control type="group">
@@ -179,9 +177,9 @@
                     <scrolltime>200</scrolltime>
                     <itemlayout width="4-col" height="2-row">
                         <control type="label">
-                            <posx>12</posx>
+                            <posx>24</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
+                            <width>252</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
@@ -192,7 +190,7 @@
                             <visible>!ListItem.property(man)</visible>
                         </control>
                         <control type="label">
-                            <posx>12</posx>
+                            <posx>24</posx>
                             <posy>0</posy>
                             <width>4-col-gutter</width>
                             <height>2-row</height>
@@ -231,7 +229,7 @@
                         <control type="label">
                             <posx>12</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
+                            <width>252</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
@@ -244,7 +242,7 @@
                         <control type="label">
                             <posx>12</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
+                            <width>252</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 3d2c841..319252c 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -7,7 +7,7 @@
 			<posx>col-1-begin</posx>
             <posy>row-22-begin</posy>
 			<!--fade out if audio / video menu active-->
-            <animation type="Conditional" condition="Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels) | window.isactive(subtitlesearch)">
+            <animation type="Conditional" condition="Window.IsActive(osdsubtitlesettings) | Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels) | window.isactive(subtitlesearch)">
                 <effect type="fade" start="100" end="0" time="350"/>
                 <effect type="slide" start="0" end="0,300" tween="cubic" easing="out" time="400"/>
             </animation>
@@ -114,7 +114,7 @@
                     <onclick>PVR.ToggleRecordPlayingChannel</onclick>
 		        </control>
 				<control type="button" id="1">
-					<description>Download subtitles</description>		            
+					<description>subtitles</description>		            
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
 					<textcolor>black</textcolor>
@@ -122,43 +122,7 @@
 					<height>45</height>
 					<font>itemSubtitle</font>
 					<label>31154</label>
-					<onclick>ActivateWindow(SubtitleSearch)</onclick>
-		        </control>
-				<control type="button" id="2">
-					<description>Enable Subtitles</description>
-					<visible>VideoPlayer.HasSubtitles + !VideoPlayer.SubtitlesEnabled</visible>		            
-					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-		            <focusedcolor>textActive</focusedcolor>
-					<textcolor>black</textcolor>
-					<font>itemSubtitle</font>
-		            <width>auto</width>
-					<height>45</height>
-					<label>24012</label>
-					<onclick>ShowSubtitles</onclick>
-		        </control>
-				<control type="button" id="3">
-                    <description>Disable Subtitles</description>
-                    <visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
-					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-		            <focusedcolor>textActive</focusedcolor>
-					<textcolor>black</textcolor>
-					<font>itemSubtitle</font>
-		            <width>auto</width>
-					<height>45</height>
-                    <label>31161</label>
-					<onclick>ShowSubtitles</onclick>
-		        </control>
-				<control type="button" id="4">
-                    <description>Adjust subtitle offset</description>
-                    <visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
-					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-		            <focusedcolor>textActive</focusedcolor>
-					<textcolor>black</textcolor>
-					<font>itemSubtitle</font>
-		            <width>auto</width>
-					<height>45</height>
-                    <label>31202</label>
-                    <onclick>SubtitleDelay</onclick>
+					<onclick>ActivateWindow(osdsubtitlesettings)</onclick>
 		        </control>
 				<control type="button" id="5">
                     <description>Video Settings</description>
diff --git a/changelog.txt b/changelog.txt
index 2180487..386f838 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -25,19 +25,20 @@
 - [COMPLETE] DialogPVRGroupManager.xml updated
 - [COMPLETE] DialogPVRChannelManager.xml updated
 - [COMPLETE] MyMusicPlaylistEditor.xml updated
+- [COMPLETE] Subtitle Update
 
 [ADDON BROWSER.XML cleanup]
 
+- global search needs updating
 - check controls for new window: MyGames.xml
 - new dialog: GameOSD.xml
-- new dialog: Subtitles update
 - musicvideos
 
 
 
 - Screenshots etc need updating
 
-- global search needs updating
+
 
 
 
diff --git a/language/English/strings.po b/language/English/strings.po
index 8c570f4..1882302 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -642,7 +642,7 @@ msgid "Playlist saved"
 msgstr ""
 
 msgctxt "#31154"
-msgid "Search for Subtitles"
+msgid "Subtitles"
 msgstr ""
 
 msgctxt "#31155"