Skip to content

Commit 26b3196

Browse files
HitcherHitcher
authored
Update v5.0.6 (#276)
- Fix video player media info alignment - Increase list width in video version dialog
1 parent 04f80a0 commit 26b3196

6 files changed

+45
-52
lines changed

‎1080p/Includes.xml

+2-12
Original file line numberDiff line numberDiff line change
@@ -541,10 +541,6 @@
541541
<value condition="String.Contains(Listitem.mpaa,Rated NR)">mpaa_notrated</value>
542542
<value condition="String.Contains(Listitem.mpaa,Not Rated)">mpaa_notrated</value>
543543
</variable>
544-
<variable name="audiocodec">
545-
<value condition="String.StartsWith(ListItem.AudioCodec,mp3)">mp3</value>
546-
<value>$INFO[ListItem.AudioCodec]</value>
547-
</variable>
548544
<variable name="videocodec">
549545
<value condition="[String.StartsWith(ListItem.VideoCodec,div) | String.IsEqual(ListItem.VideoCodec,dx50)]">divx</value>
550546
<value condition="String.Contains(ListItem.VideoCodec,mpeg4)">mpeg4</value>
@@ -626,8 +622,8 @@
626622
<value>$INFO[ListItem.Label]</value>
627623
</variable>
628624
<variable name="VideoManagerLabel2">
629-
<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>
630-
<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>
625+
<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>
626+
<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>
631627
</variable>
632628
<variable name="AudioChannels">
633629
<value condition="String.IsEqual(ListItem.AudioChannels,0)">0.0</value>
@@ -642,12 +638,6 @@
642638
<value condition="String.IsEqual(ListItem.AudioChannels,10)">9.1</value>
643639
<value>$INFO[ListItem.AudioChannels]</value>
644640
</variable>
645-
<variable name="VideoHDR">
646-
<value condition="String.IsEqual(ListItem.HdrType,dolbyvision)">Dolby Vision</value>
647-
<value condition="String.IsEqual(ListItem.HdrType,hdr10)">HDR10</value>
648-
<value condition="String.IsEqual(ListItem.HdrType,hlg)">HLG</value>
649-
<value>$INFO[ListItem.HdrType]</value>
650-
</variable>
651641
<variable name="VersionsExtrasOverlay">
652642
<value condition="ListItem.HasVideoVersions + ListItem.HasVideoExtras">flagging/video/overlay_versions_extras.png</value>
653643
<value condition="ListItem.HasVideoVersions">flagging/video/overlay_versions.png</value>

‎1080p/IncludesCodecFlagging.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<width>120</width>
6060
<height>53</height>
6161
<aspectratio align="right">keep</aspectratio>
62-
<texture>$VAR[audiocodec,flagging/audio/,.png]</texture>
62+
<texture>$INFO[ListItem.AudioCodec,flagging/audio/,.png]</texture>
6363
</control>
6464
</include>
6565
<include name="AudioChannelsFlaggingConditions">

‎1080p/IncludesDialogSelect.xml

+18-18
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@
104104
</include>
105105
<include name="DialogVideoSelectLayout">
106106
<control type="group">
107-
<left>256</left>
107+
<left>206</left>
108108
<top>180</top>
109109
<include content="DialogBackgroundCommons">
110-
<param name="DialogBackgroundWidth" value="1408"/>
110+
<param name="DialogBackgroundWidth" value="1508"/>
111111
<param name="DialogBackgroundHeight" value="720"/>
112-
<param name="DialogHeaderWidth" value="1288"/>
112+
<param name="DialogHeaderWidth" value="1388"/>
113113
<param name="DialogHeaderId" value="1"/>
114-
<param name="CloseButtonLeft" value="1273"/>
114+
<param name="CloseButtonLeft" value="1373"/>
115115
<param name="CloseButtonNav" value="10"/>
116116
</include>
117117
<control type="group">
@@ -140,19 +140,19 @@
140140
</control>
141141
<control type="list" id="6">
142142
<left>351</left>
143-
<width>625</width>
143+
<width>725</width>
144144
<height>552</height>
145145
<onup>50</onup>
146146
<ondown>50</ondown>
147147
<onleft>7</onleft>
148148
<onright>60</onright>
149149
<pagecontrol>60</pagecontrol>
150150
<scrolltime>200</scrolltime>
151-
<itemlayout height="138" width="625">
151+
<itemlayout height="138" width="725">
152152
<control type="image">
153153
<left>0</left>
154154
<top>0</top>
155-
<width>625</width>
155+
<width>725</width>
156156
<height>129</height>
157157
<texture border="5">button-nofocus.png</texture>
158158
</control>
@@ -169,7 +169,7 @@
169169
<control type="label">
170170
<left>135</left>
171171
<top>3</top>
172-
<width>475</width>
172+
<width>575</width>
173173
<height>45</height>
174174
<font>font13</font>
175175
<textcolor>grey</textcolor>
@@ -181,7 +181,7 @@
181181
<control type="textbox">
182182
<left>135</left>
183183
<top>51</top>
184-
<width>475</width>
184+
<width>575</width>
185185
<height>68</height>
186186
<font>font12</font>
187187
<textcolor>grey</textcolor>
@@ -190,11 +190,11 @@
190190
<label>$VAR[VideoManagerLabel2]</label>
191191
</control>
192192
</itemlayout>
193-
<focusedlayout height="138" width="625">
193+
<focusedlayout height="138" width="725">
194194
<control type="image">
195195
<left>0</left>
196196
<top>0</top>
197-
<width>625</width>
197+
<width>725</width>
198198
<height>129</height>
199199
<texture border="5">button-nofocus.png</texture>
200200
<visible>!Control.HasFocus(6)</visible>
@@ -203,7 +203,7 @@
203203
<control type="image">
204204
<left>0</left>
205205
<top>0</top>
206-
<width>625</width>
206+
<width>725</width>
207207
<height>129</height>
208208
<texture border="5">button-focus2.png</texture>
209209
<visible>Control.HasFocus(6)</visible>
@@ -222,7 +222,7 @@
222222
<control type="label">
223223
<left>135</left>
224224
<top>3</top>
225-
<width>475</width>
225+
<width>575</width>
226226
<height>45</height>
227227
<font>font13</font>
228228
<textcolor>white</textcolor>
@@ -234,7 +234,7 @@
234234
<control type="textbox">
235235
<left>135</left>
236236
<top>51</top>
237-
<width>475</width>
237+
<width>575</width>
238238
<height>68</height>
239239
<font>font12</font>
240240
<textcolor>grey</textcolor>
@@ -246,7 +246,7 @@
246246
</control>
247247
<control type="label">
248248
<description>number of files/pages in list text label</description>
249-
<left>1006</left>
249+
<left>1106</left>
250250
<top>496</top>
251251
<width>360</width>
252252
<height>53</height>
@@ -257,7 +257,7 @@
257257
<label>([COLOR=blue]$INFO[Container(6).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(6).CurrentPage]/$INFO[Container(6).NumPages][/COLOR])</label>
258258
</control>
259259
<control type="scrollbar" id="60">
260-
<left>976</left>
260+
<left>1076</left>
261261
<top>-6</top>
262262
<width>38</width>
263263
<height>558</height>
@@ -274,7 +274,7 @@
274274
<orientation>vertical</orientation>
275275
</control>
276276
<control type="grouplist" id="90">
277-
<left>1036</left>
277+
<left>1136</left>
278278
<top>48</top>
279279
<onleft>6</onleft>
280280
<onright>6</onright>
@@ -301,7 +301,7 @@
301301
</control>
302302
<control type="label">
303303
<top>552</top>
304-
<width>1348</width>
304+
<width>1448</width>
305305
<height>45</height>
306306
<font>font10</font>
307307
<align>left</align>

‎1080p/VideoFullScreen.xml

+18-20
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
<itemgap>8</itemgap>
250250
<orientation>horizontal</orientation>
251251
<control type="label" id="1">
252-
<width min="15" max="780">auto</width>
252+
<width min="15" max="720">auto</width>
253253
<height>45</height>
254254
<font>font30</font>
255255
<align>left</align>
@@ -260,51 +260,50 @@
260260
</control>
261261
<control type="image" id="1">
262262
<description>Video Resolution Image</description>
263-
<width>75</width>
263+
<width>70</width>
264264
<height>53</height>
265265
<aspectratio align="center">keep</aspectratio>
266266
<texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
267-
<visible>!Player.ChannelPreviewActive</visible>
267+
<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.VideoResolution)</visible>
268268
</control>
269269
<control type="image" id="1">
270270
<description>Codec Image</description>
271271
<width>110</width>
272272
<height>53</height>
273273
<aspectratio align="left">keep</aspectratio>
274274
<texture>$INFO[VideoPlayer.HdrType,flagging/video/,.png]</texture>
275-
<visible>!String.IsEmpty(VideoPlayer.HdrType)</visible>
275+
<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.HdrType)</visible>
276276
</control>
277277
<control type="image" id="1">
278278
<description>Audio Codec Image</description>
279-
<width>128</width>
279+
<width>110</width>
280280
<height>53</height>
281281
<aspectratio align="center">keep</aspectratio>
282-
<visible>!Player.ChannelPreviewActive</visible>
283282
<texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
283+
<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.AudioCodec)</visible>
284284
</control>
285285
<control type="image" id="1">
286286
<description>Audio Channels Image</description>
287-
<width>75</width>
287+
<width>70</width>
288288
<height>53</height>
289289
<aspectratio align="center">keep</aspectratio>
290290
<texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
291-
<visible>!Player.ChannelPreviewActive</visible>
291+
<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.AudioChannels)</visible>
292292
</control>
293293
<control type="group" id="1">
294-
<width>128</width>
294+
<width>110</width>
295295
<height>53</height>
296-
<visible>![String.IsEmpty(VideoPlayer.AudioLanguage) | Player.ChannelPreviewActive]</visible>
296+
<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.AudioLanguage)</visible>
297297
<control type="image" id="1">
298-
<left>8</left>
299298
<top>0</top>
300299
<description>Audio Language Image</description>
301-
<width>120</width>
300+
<width>110</width>
302301
<height>53</height>
303302
<texture>flagging/AudioLang.png</texture>
304303
</control>
305304
<control type="label" id="1">
306-
<left>57</left>
307-
<top>3</top>
305+
<left>49</left>
306+
<top>5</top>
308307
<width>71</width>
309308
<height>53</height>
310309
<font>font13</font>
@@ -314,19 +313,18 @@
314313
</control>
315314
</control>
316315
<control type="group" id="1">
317-
<width>128</width>
316+
<width>110</width>
318317
<height>53</height>
319-
<visible>![String.IsEmpty(VideoPlayer.SubtitlesLanguage) | Player.ChannelPreviewActive] + VideoPlayer.SubtitlesEnabled</visible>
318+
<visible>!Player.ChannelPreviewActive + !String.IsEmpty(VideoPlayer.SubtitlesLanguage) + VideoPlayer.SubtitlesEnabled</visible>
320319
<control type="image" id="1">
321-
<left>8</left>
322320
<top>0</top>
323-
<width>120</width>
321+
<width>110</width>
324322
<height>53</height>
325323
<texture>flagging/SubLang.png</texture>
326324
</control>
327325
<control type="label" id="1">
328-
<left>57</left>
329-
<top>3</top>
326+
<left>49</left>
327+
<top>5</top>
330328
<width>71</width>
331329
<height>53</height>
332330
<font>font13</font>

‎addon.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<addon id="skin.confluence" version="5.0.5" name="Confluence" provider-name="Jezz_X, Team Kodi">
2+
<addon id="skin.confluence" version="5.0.6" name="Confluence" provider-name="Jezz_X, Team Kodi">
33
<requires>
44
<import addon="xbmc.gui" version="5.17.0"/>
55
</requires>

‎changelog.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
[B]5.0.6[/B]
2+
3+
- Fix video player media info alignment
4+
- Increase list width in video version dialog
5+
16
[B]5.0.5[/B]
27

38
- Fix wrong header id

0 commit comments

Comments
 (0)