Update v5.0.6 (#276)

- Fix video player media info alignment - Increase list width in video version dialog
xbmc · May 21, 2024 · 26b3196 · 26b3196
1 parent 04f80a0
commit 26b3196
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 52 deletions.
diff --git a/1080p/Includes.xml b/1080p/Includes.xml
@@ -541,10 +541,6 @@
 		<value condition="String.Contains(Listitem.mpaa,Rated NR)">mpaa_notrated</value>
 		<value condition="String.Contains(Listitem.mpaa,Not Rated)">mpaa_notrated</value>
 	</variable>
-	<variable name="audiocodec">
-		<value condition="String.StartsWith(ListItem.AudioCodec,mp3)">mp3</value>
-		<value>$INFO[ListItem.AudioCodec]</value>
-	</variable>
 	<variable name="videocodec">
 		<value condition="[String.StartsWith(ListItem.VideoCodec,div) | String.IsEqual(ListItem.VideoCodec,dx50)]">divx</value>
 		<value condition="String.Contains(ListItem.VideoCodec,mpeg4)">mpeg4</value>
@@ -626,8 +622,8 @@
 		<value>$INFO[ListItem.Label]</value>
 	</variable>
 	<variable name="VideoManagerLabel2">
-		<value condition="ListItem.IsStereoscopic">$INFO[ListItem.Duration,$LOCALIZE[180]: ][CR]$VAR[videocodec,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDR,| , ]| 3D $INFO[ListItem.VideoAspect,| ,:1 ]$VAR[audiocodec,| , ]$VAR[AudioChannels]</value>
-		<value>$INFO[ListItem.Duration,$LOCALIZE[180]: ][CR]$VAR[videocodec,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDR,| , ]$INFO[ListItem.VideoAspect,| ,:1 ]$VAR[audiocodec,| , ]$VAR[AudioChannels]</value>
+		<value condition="ListItem.IsStereoscopic">$INFO[ListItem.Duration,$LOCALIZE[180]: ][CR]$VAR[videocodec,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$INFO[ListItem.HdrType,| , ]| 3D $INFO[ListItem.VideoAspect,| ,:1 ]$VAR[audiocodec,| , ]$VAR[AudioChannels]</value>
+		<value>$INFO[ListItem.Duration,$LOCALIZE[180]: ][CR]$VAR[videocodec,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$INFO[ListItem.HdrType,| , ]$INFO[ListItem.VideoAspect,| ,:1 ]$INFO[ListItem.AudioCodec,| , ]$VAR[AudioChannels]</value>
 	</variable>
 	<variable name="AudioChannels">
 		<value condition="String.IsEqual(ListItem.AudioChannels,0)">0.0</value>
@@ -642,12 +638,6 @@
 		<value condition="String.IsEqual(ListItem.AudioChannels,10)">9.1</value>
 		<value>$INFO[ListItem.AudioChannels]</value>
 	</variable>
-	<variable name="VideoHDR">
-		<value condition="String.IsEqual(ListItem.HdrType,dolbyvision)">Dolby Vision</value>
-		<value condition="String.IsEqual(ListItem.HdrType,hdr10)">HDR10</value>
-		<value condition="String.IsEqual(ListItem.HdrType,hlg)">HLG</value>
-		<value>$INFO[ListItem.HdrType]</value>
-	</variable>
 	<variable name="VersionsExtrasOverlay">
 		<value condition="ListItem.HasVideoVersions + ListItem.HasVideoExtras">flagging/video/overlay_versions_extras.png</value>
 		<value condition="ListItem.HasVideoVersions">flagging/video/overlay_versions.png</value>

diff --git a/1080p/IncludesCodecFlagging.xml b/1080p/IncludesCodecFlagging.xml
@@ -59,7 +59,7 @@
 			<width>120</width>
 			<height>53</height>
 			<aspectratio align="right">keep</aspectratio>
-			<texture>$VAR[audiocodec,flagging/audio/,.png]</texture>
+			<texture>$INFO[ListItem.AudioCodec,flagging/audio/,.png]</texture>
 		</control>
 	</include>
 	<include name="AudioChannelsFlaggingConditions">

diff --git a/1080p/IncludesDialogSelect.xml b/1080p/IncludesDialogSelect.xml
@@ -104,14 +104,14 @@
 	</include>
 	<include name="DialogVideoSelectLayout">
 		<control type="group">
-			<left>256</left>
+			<left>206</left>
 			<top>180</top>
 			<include content="DialogBackgroundCommons">
-				<param name="DialogBackgroundWidth" value="1408"/>
+				<param name="DialogBackgroundWidth" value="1508"/>
 				<param name="DialogBackgroundHeight" value="720"/>
-				<param name="DialogHeaderWidth" value="1288"/>
+				<param name="DialogHeaderWidth" value="1388"/>
 				<param name="DialogHeaderId" value="1"/>
-				<param name="CloseButtonLeft" value="1273"/>
+				<param name="CloseButtonLeft" value="1373"/>
 				<param name="CloseButtonNav" value="10"/>
 			</include>
 			<control type="group">
@@ -140,19 +140,19 @@
 				</control>
 				<control type="list" id="6">
 					<left>351</left>
-					<width>625</width>
+					<width>725</width>
 					<height>552</height>
 					<onup>50</onup>
 					<ondown>50</ondown>
 					<onleft>7</onleft>
 					<onright>60</onright>
 					<pagecontrol>60</pagecontrol>
 					<scrolltime>200</scrolltime>
-					<itemlayout height="138" width="625">
+					<itemlayout height="138" width="725">
 						<control type="image">
 							<left>0</left>
 							<top>0</top>
-							<width>625</width>
+							<width>725</width>
 							<height>129</height>
 							<texture border="5">button-nofocus.png</texture>
 						</control>
@@ -169,7 +169,7 @@
 						<control type="label">
 							<left>135</left>
 							<top>3</top>
-							<width>475</width>
+							<width>575</width>
 							<height>45</height>
 							<font>font13</font>
 							<textcolor>grey</textcolor>
@@ -181,7 +181,7 @@
 						<control type="textbox">
 							<left>135</left>
 							<top>51</top>
-							<width>475</width>
+							<width>575</width>
 							<height>68</height>
 							<font>font12</font>
 							<textcolor>grey</textcolor>
@@ -190,11 +190,11 @@
 							<label>$VAR[VideoManagerLabel2]</label>
 						</control>
 					</itemlayout>
-					<focusedlayout height="138" width="625">
+					<focusedlayout height="138" width="725">
 						<control type="image">
 							<left>0</left>
 							<top>0</top>
-							<width>625</width>
+							<width>725</width>
 							<height>129</height>
 							<texture border="5">button-nofocus.png</texture>
 							<visible>!Control.HasFocus(6)</visible>
@@ -203,7 +203,7 @@
 						<control type="image">
 							<left>0</left>
 							<top>0</top>
-							<width>625</width>
+							<width>725</width>
 							<height>129</height>
 							<texture border="5">button-focus2.png</texture>
 							<visible>Control.HasFocus(6)</visible>
@@ -222,7 +222,7 @@
 						<control type="label">
 							<left>135</left>
 							<top>3</top>
-							<width>475</width>
+							<width>575</width>
 							<height>45</height>
 							<font>font13</font>
 							<textcolor>white</textcolor>
@@ -234,7 +234,7 @@
 						<control type="textbox">
 							<left>135</left>
 							<top>51</top>
-							<width>475</width>
+							<width>575</width>
 							<height>68</height>
 							<font>font12</font>
 							<textcolor>grey</textcolor>
@@ -246,7 +246,7 @@
 				</control>
 				<control type="label">
 					<description>number of files/pages in list text label</description>
-					<left>1006</left>
+					<left>1106</left>
 					<top>496</top>
 					<width>360</width>
 					<height>53</height>
@@ -257,7 +257,7 @@
 					<label>([COLOR=blue]$INFO[Container(6).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages][/COLOR])</label>
 				</control>
 				<control type="scrollbar" id="60">
-					<left>976</left>
+					<left>1076</left>
 					<top>-6</top>
 					<width>38</width>
 					<height>558</height>
@@ -274,7 +274,7 @@
 					<orientation>vertical</orientation>
 				</control>
 				<control type="grouplist" id="90">
-					<left>1036</left>
+					<left>1136</left>
 					<top>48</top>
 					<onleft>6</onleft>
 					<onright>6</onright>
@@ -301,7 +301,7 @@
 				</control>
 				<control type="label">
 					<top>552</top>
-					<width>1348</width>
+					<width>1448</width>
 					<height>45</height>
 					<font>font10</font>
 					<align>left</align>

diff --git a/1080p/VideoFullScreen.xml b/1080p/VideoFullScreen.xml
@@ -249,7 +249,7 @@
 					<itemgap>8</itemgap>
 					<orientation>horizontal</orientation>
 					<control type="label" id="1">
-						<width min="15" max="780">auto</width>
+						<width min="15" max="720">auto</width>
 						<height>45</height>
 						<font>font30</font>
 						<align>left</align>
@@ -260,51 +260,50 @@
 					</control>
 					<control type="image" id="1">
 						<description>Video Resolution Image</description>
-						<width>75</width>
+						<width>70</width>
 						<height>53</height>
 						<aspectratio align="center">keep</aspectratio>
 						<texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
-						<visible>!Player.ChannelPreviewActive</visible>
+						<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.VideoResolution)</visible>
 					</control>
 					<control type="image" id="1">
 						<description>Codec Image</description>
 						<width>110</width>
 						<height>53</height>
 						<aspectratio align="left">keep</aspectratio>
 						<texture>$INFO[VideoPlayer.HdrType,flagging/video/,.png]</texture>
-						<visible>!String.IsEmpty(VideoPlayer.HdrType)</visible>
+						<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.HdrType)</visible>
 					</control>
 					<control type="image" id="1">
 						<description>Audio Codec Image</description>
-						<width>128</width>
+						<width>110</width>
 						<height>53</height>
 						<aspectratio align="center">keep</aspectratio>
-						<visible>!Player.ChannelPreviewActive</visible>
 						<texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
+						<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.AudioCodec)</visible>
 					</control>
 					<control type="image" id="1">
 						<description>Audio Channels Image</description>
-						<width>75</width>
+						<width>70</width>
 						<height>53</height>
 						<aspectratio align="center">keep</aspectratio>
 						<texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
-						<visible>!Player.ChannelPreviewActive</visible>
+						<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.AudioChannels)</visible>
 					</control>
 					<control type="group" id="1">
-						<width>128</width>
+						<width>110</width>
 						<height>53</height>
-						<visible>![String.IsEmpty(VideoPlayer.AudioLanguage) | Player.ChannelPreviewActive]</visible>
+						<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.AudioLanguage)</visible>
 						<control type="image" id="1">
-							<left>8</left>
 							<top>0</top>
 							<description>Audio Language Image</description>
-							<width>120</width>
+							<width>110</width>
 							<height>53</height>
 							<texture>flagging/AudioLang.png</texture>
 						</control>
 						<control type="label" id="1">
-							<left>57</left>
-							<top>3</top>
+							<left>49</left>
+							<top>5</top>
 							<width>71</width>
 							<height>53</height>
 							<font>font13</font>
@@ -314,19 +313,18 @@
 						</control>
 					</control>
 					<control type="group" id="1">
-						<width>128</width>
+						<width>110</width>
 						<height>53</height>
-						<visible>![String.IsEmpty(VideoPlayer.SubtitlesLanguage) | Player.ChannelPreviewActive] + VideoPlayer.SubtitlesEnabled</visible>
+						<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.SubtitlesLanguage) + VideoPlayer.SubtitlesEnabled</visible>
 						<control type="image" id="1">
-							<left>8</left>
 							<top>0</top>
-							<width>120</width>
+							<width>110</width>
 							<height>53</height>
 							<texture>flagging/SubLang.png</texture>
 						</control>
 						<control type="label" id="1">
-							<left>57</left>
-							<top>3</top>
+							<left>49</left>
+							<top>5</top>
 							<width>71</width>
 							<height>53</height>
 							<font>font13</font>

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

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+[B]5.0.6[/B]
+
+- Fix video player media info alignment
+- Increase list width in video version dialog
+
 [B]5.0.5[/B]
 
 - Fix wrong header id