supersonic
/
skin.tributary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[skin.confluence] v3.0.32 

- Added DialogPlayerProcessInfo.xml
- Removed player process info from video OSD
- Added 'assets' to addon.xml
This commit is contained in:
HitcherUK 2016-07-31 18:34:26 +01:00
parent 964842d23e
commit 80b1a8a1a1
9 changed files with 715 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
720p/DialogAddonInfo.xml
View File

@ -112,7 +112,7 @@
<top>60</top>
<width>440</width>
<height>25</height>
<label fallback="416">$INFO[ListItem.Property(Addon.Version)]</label>
<label fallback="416">$INFO[ListItem.AddonVersion]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13</font>

563
720p/DialogPlayerProcessInfo.xml Normal file
View File

@ -0,0 +1,563 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">100</defaultcontrol>
<include>dialogeffect</include>
<depth>DepthOSD</depth>
<coordinates>
<left>0</left>
<top>0</top>
</coordinates>
<controls>
<control type="group">
<depth>DepthOSD+</depth>
<control type="image">
<description>media info background image</description>
<left>0</left>
<top>0</top>
<width>1280</width>
<height>325</height>
<texture>black-back.png</texture>
</control>
<control type="label">
<description>Header</description>
<left>50</left>
<top>10</top>
<width>565</width>
<height>25</height>
<label>$LOCALIZE[31007]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
<textcolor>blue</textcolor>
</control>
<control type="label">
<description>Hardware decoding</description>
<left>50</left>
<top>40</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[31010]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Hardware decoding value</description>
<left>220</left>
<top>40</top>
<width>345</width>
<height>25</height>
<label>$LOCALIZE[19074]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
<visible>Player.Process(videohwdecoder)</visible>
</control>
<control type="label">
<description>Hardware decoding value</description>
<left>220</left>
<top>40</top>
<width>345</width>
<height>25</height>
<label>$LOCALIZE[31011]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
<visible>!Player.Process(videohwdecoder)</visible>
</control>
<control type="label">
<description>Decoder</description>
<left>50</left>
<top>65</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[31012]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Decoder value</description>
<left>220</left>
<top>65</top>
<width>345</width>
<height>25</height>
<label fallback="1446">$INFO[Player.Process(videodecoder)]$INFO[Player.Process(pixformat),$COMMA ]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Deinterlace</description>
<left>50</left>
<top>90</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[16038]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Deinterlace value</description>
<left>220</left>
<top>90</top>
<width>345</width>
<height>25</height>
<label fallback="1446">$INFO[Player.Process(deintmethod)]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Resolution</description>
<left>50</left>
<top>115</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[169]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Resolution value</description>
<left>220</left>
<top>115</top>
<width>345</width>
<height>25</height>
<label fallback="1446">$INFO[Player.Process(videowidth),,x]$INFO[Player.Process(videoheight),, px]$INFO[Player.Process(videodar),$COMMA , AR]$INFO[Player.Process(videofps),$COMMA , FPS]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Header</description>
<left>50</left>
<top>145</top>
<width>565</width>
<height>25</height>
<label>$LOCALIZE[31013]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
<textcolor>blue</textcolor>
</control>
<control type="label">
<description>Decoder</description>
<left>50</left>
<top>175</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[31012]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Decoder value</description>
<left>220</left>
<top>175</top>
<width>345</width>
<height>25</height>
<label fallback="1446">$INFO[Player.Process(audiodecoder)]$INFO[Player.Process(audiobitspersample),$COMMA , bit]$INFO[Player.Process(audiosamplerate),$COMMA , Hz]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Channels</description>
<left>50</left>
<top>200</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19019]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Channels value</description>
<left>220</left>
<top>200</top>
<width>345</width>
<height>25</height>
<label fallback="1446">$INFO[Player.Process(audiochannels)]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Header</description>
<left>50</left>
<top>230</top>
<width>565</width>
<height>25</height>
<label>$LOCALIZE[138]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
<textcolor>blue</textcolor>
</control>
<control type="label">
<description>CPU</description>
<left>50</left>
<top>260</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[13271]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>CPU value</description>
<left>220</left>
<top>260</top>
<width>345</width>
<height>25</height>
<label>$INFO[System.CpuUsage]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Memory</description>
<left>50</left>
<top>285</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[31014]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Memory value</description>
<left>220</left>
<top>285</top>
<width>345</width>
<height>25</height>
<label>$INFO[System.Memory(used.percent)]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
</control>
<control type="group">
<depth>DepthOSD+</depth>
<visible>VideoPlayer.Content(LiveTV) + system.getbool(pvrplayback.signalquality)</visible>
<left>640</left>
<control type="label">
<description>Header</description>
<left>50</left>
<top>10</top>
<width>565</width>
<height>25</height>
<label>$LOCALIZE[19005]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
<textcolor>blue</textcolor>
</control>
<control type="label">
<description>Backend</description>
<left>50</left>
<top>40</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19012]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Backend value</description>
<left>220</left>
<top>40</top>
<width>345</width>
<height>25</height>
<label>$INFO[PVR.ActStreamClient]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Device</description>
<left>50</left>
<top>65</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19006]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Device value</description>
<left>220</left>
<top>65</top>
<width>345</width>
<height>25</height>
<label>$INFO[PVR.ActStreamDevice]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Status</description>
<left>50</left>
<top>90</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19007]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Status value</description>
<left>220</left>
<top>90</top>
<width>345</width>
<height>25</height>
<label>$INFO[PVR.ActStreamStatus]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Signal</description>
<left>50</left>
<top>115</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19008]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="progress">
<description>Progressbar</description>
<left>220</left>
<top>122</top>
<width>275</width>
<height>14</height>
<info>PVR.ActStreamProgrSignal</info>
</control>
<control type="label">
<description>Signal value</description>
<left>545</left>
<top>115</top>
<width>180</width>
<height>25</height>
<label>$INFO[PVR.ActStreamSignal]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>SNR</description>
<left>50</left>
<top>140</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19009]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="progress">
<description>Progressbar</description>
<left>220</left>
<top>147</top>
<width>275</width>
<height>14</height>
<overlaytexture>-</overlaytexture>
<info>PVR.ActStreamProgrSNR</info>
</control>
<control type="label">
<description>SNR value</description>
<left>545</left>
<top>140</top>
<width>180</width>
<height>25</height>
<label>$INFO[PVR.ActStreamSNR]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>BER</description>
<left>50</left>
<top>165</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19010]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>BER value</description>
<left>220</left>
<top>165</top>
<width>345</width>
<height>25</height>
<label>$INFO[PVR.ActStreamBER]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>UNC</description>
<left>50</left>
<top>190</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19011]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>UNC value</description>
<left>220</left>
<top>190</top>
<width>345</width>
<height>25</height>
<label>$INFO[PVR.ActStreamUNC]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Service</description>
<left>50</left>
<top>215</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19099]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Service value</description>
<left>220</left>
<top>215</top>
<width>345</width>
<height>25</height>
<label>$INFO[PVR.ActStreamServiceName]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Encryption</description>
<left>50</left>
<top>240</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19015]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Encryption value</description>
<left>220</left>
<top>240</top>
<width>345</width>
<height>25</height>
<label>$INFO[PVR.ActStreamEncryptionName]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Provider</description>
<left>50</left>
<top>265</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19101]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Provider value</description>
<left>220</left>
<top>265</top>
<width>345</width>
<height>25</height>
<label>$INFO[PVR.ActStreamProviderName]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<description>Mux</description>
<left>50</left>
<top>290</top>
<width>165</width>
<height>25</height>
<label>$LOCALIZE[19100]:</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey2</textcolor>
</control>
<control type="label">
<description>Mux value</description>
<left>220</left>
<top>290</top>
<width>345</width>
<height>25</height>
<label>$INFO[PVR.ActStreamMux]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
</control>
</control>
</controls>
</window>

22
720p/VideoOSD.xml
View File

@ -167,17 +167,17 @@
<visible>VideoPlayer.Content(LiveTV)</visible>
</control>
<control type="image" id="2200">
<width>215</width>
<width>270</width>
<texture>-</texture>
<visible>VideoPlayer.HasMenu + !VideoPlayer.Content(LiveTV)</visible>
</control>
<control type="image" id="2300">
<width>105</width>
<width>160</width>
<texture>-</texture>
<visible>VideoPlayer.Content(LiveTV)</visible>
</control>
<control type="image" id="2600">
<width>270</width>
<width>325</width>
<texture>-</texture>
<visible>!VideoPlayer.Content(LiveTV) + !VideoPlayer.HasMenu</visible>
</control>
@ -201,14 +201,6 @@
<texturenofocus>OSDSubtitlesNF.png</texturenofocus>
<onup>404</onup>
</control>
<control type="button" id="256">
<width>55</width>
<height>55</height>
<label>14116</label>
<font>-</font>
<texturefocus>OSDInfoFO.png</texturefocus>
<texturenofocus>OSDInfoNF.png</texturenofocus>
</control>
<control type="button" id="251">
<width>55</width>
<height>55</height>
@ -269,7 +261,7 @@
</control>
<control type="button" id="410">
<description>Fake button for mouse control</description>
<right>200</right>
<right>145</right>
<bottom>60</bottom>
<width>256</width>
<height>250</height>
@ -288,7 +280,7 @@
<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>200</right>
<right>145</right>
<bottom>45</bottom>
<width>256</width>
<height>260</height>
@ -392,7 +384,7 @@
</control>
<control type="button" id="520">
<description>Fake button for mouse control</description>
<right>255</right>
<right>200</right>
<bottom>60</bottom>
<width>256</width>
<height>210</height>
@ -409,7 +401,7 @@
<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>
<right>255</right>
<right>200</right>
<bottom>45</bottom>
<width>256</width>
<height>220</height>

19
addon.xml
View File

@ -1,16 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="skin.confluence"
version="3.0.31"
name="Confluence"
provider-name="Jezz_X, Team Kodi">
<addon id="skin.confluence" version="3.0.32" name="Confluence" provider-name="Jezz_X, Team Kodi">
<requires>
<import addon="xbmc.gui" version="5.12.0"/>
</requires>
<extension
point="xbmc.gui.skin"
debugging="false"
effectslowdown="1.0">
<extension point="xbmc.gui.skin" debugging="false" effectslowdown="1.0">
<res width="1280" height="720" aspect="16:9" default="true" folder="720p" />
</extension>
<extension point="xbmc.addon.metadata">
@ -136,8 +129,12 @@
<platform>all</platform>
<license>GNU General Public License version 2</license>
<forum>http://forum.kodi.tv/forumdisplay.php?fid=125</forum>
<website></website>
<email></email>
<website/>
<email/>
<source>https://github.com/xbmc/skin.confluence</source>
<assets>
<icon>resources/icon.png</icon>
<fanart>resources/fanart.jpg</fanart>
</assets>
</extension>
</addon>

6
changelog.txt
View File

@ -1,3 +1,9 @@
[B]3.0.32[/B]
- Added DialogPlayerProcessInfo.xml
- Removed player process info from video OSD
- Added 'assets' to addon.xml
[B]3.0.31[/B]
- Updated language files from Transifex

BIN
media/OSDInfoFO.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
media/OSDInfoNF.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

0
fanart.jpg → resources/fanart.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

0
icon.png → resources/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB