Update master (#270)

* Fix syntax error

* Fix multiple font tags

* Add 'Check Previous Episode' layout (#262)

* Add 'Check Previous Episode' layout

* Bump version

1080p/DialogPVRRadioRDSInfo.xml

@@ -893,7 +893,6 @@
 				<font>font13</font>
 				<textcolor>white</textcolor>
 				<aligny>center</aligny>
-				<font />
 				<textoffsetx>15</textoffsetx>
 				<onright>21</onright>
 				<onleft>21</onleft>

1080p/DialogSelect.xml

@@ -4,9 +4,10 @@
 	<include>dialogeffect</include>
 	<depth>DepthDialog+</depth>
 	<controls>
-		<include condition="![Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DialogDefaultSelectLayout</include>
+		<include condition="String.IsEmpty(Window(home).Property(CheckPreviousEpisode)) + ![Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DialogDefaultSelectLayout</include>
 		<include condition="Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)">DialogGameSelectLayout</include>
 		<include condition="Window.IsActive(gamesaves)">DialogGameSelectSaveLayout</include>
 		<include condition="Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra)">DialogVideoSelectLayout</include>
+		<include condition="!String.IsEmpty(Window(home).Property(CheckPreviousEpisode))">DialogCheckPreviousEpisodeLayout</include>
 	</controls>
 </window>

1080p/IncludesDialogSelect.xml

@@ -1,5 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
+	<include name="DialogCheckPreviousEpisodeLayout">
+		<control type="group">
+			<left>440</left>
+			<top>240</top>
+			<include content="DialogBackgroundCommons">
+				<param name="DialogBackgroundWidth" value="1040"/>
+				<param name="DialogBackgroundHeight" value="612"/>
+				<param name="DialogHeaderWidth" value="908"/>
+				<param name="DialogHeaderId" value="1"/>
+				<param name="CloseButtonLeft" value="905"/>
+				<param name="CloseButtonNav" value="10"/>
+			</include>
+			<control type="group">
+				<left>30</left>
+				<top>101</top>
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>321</width>
+					<height>465</height>
+					<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
+					<bordersize>5</bordersize>
+					<texture background="true">$INFO[Player.Art(tvshow.poster)]</texture>
+					<aspectratio align="left" aligny="top">keep</aspectratio>
+				</control>
+				<control type="image">
+					<left>6</left>
+					<top>6</top>
+					<width>216</width>
+					<height>240</height>
+					<aspectratio>stretch</aspectratio>
+					<texture>GlassOverlay.png</texture>
+					<colordiffuse>AAFFFFFF</colordiffuse>
+				</control>
+				<control type="list" id="6">
+				</control>
+				<control type="list" id="3">
+					<left>351</left>
+					<width>625</width>
+					<height>552</height>
+					<onup>3</onup>
+					<ondown>3</ondown>
+					<onleft>3</onleft>
+					<onright>3</onright>
+					<scrolltime>200</scrolltime>
+					<itemlayout height="138" width="625">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>625</width>
+							<height>129</height>
+							<texture border="5">button-nofocus.png</texture>
+						</control>
+						<control type="textbox">
+							<left>25</left>
+							<top>0</top>
+							<width>575</width>
+							<height>129</height>
+							<font>font14</font>
+							<textcolor>grey</textcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>left</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label]</label>
+						</control>
+					</itemlayout>
+					<focusedlayout height="138" width="625">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>625</width>
+							<height>129</height>
+							<texture border="5">button-nofocus.png</texture>
+							<visible>!Control.HasFocus(3)</visible>
+							<include>VisibleFadeEffect</include>
+						</control>
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>625</width>
+							<height>129</height>
+							<texture border="5">button-focus2.png</texture>
+							<visible>Control.HasFocus(3)</visible>
+							<include>VisibleFadeEffect</include>
+						</control>
+						<control type="textbox">
+							<left>25</left>
+							<top>0</top>
+							<width>575</width>
+							<height>129</height>
+							<font>font14</font>
+							<textcolor>grey</textcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>left</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label]</label>
+						</control>
+					</focusedlayout>
+				</control>
+			</control>
+		</control>
+	</include>
 	<include name="DialogVideoSelectLayout">
 		<control type="group">
 			<left>256</left>

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="5.0.3" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="5.0.4" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.17.0"/>
 	</requires>

changelog.txt

@@ -1,3 +1,7 @@
+[B]5.0.4[/B]
+
+- Add 'Check Previous Episode' addon layout
+
 [B]5.0.3[/B]
 
 - Add video version/extra select dialog

language/resource.language.en_gb/strings.po

@@ -423,7 +423,7 @@ msgstr ""
 
 msgctxt "#31147"
 msgid "Hide - Favourites"
-msgstr ""\
+msgstr ""
 
 msgctxt "#31148"
 msgid "Hide - Search"