[skin.confluence] v4.1.5

Updated PVR code
This commit is contained in:
Kevin Goffe 2017-12-02 19:16:56 +00:00
parent ebf250e371
commit 08d9016d4e
7 changed files with 22 additions and 22 deletions

View File

@ -739,7 +739,7 @@
<onright>607</onright> <onright>607</onright>
<onup>9003</onup> <onup>9003</onup>
<ondown>9000</ondown> <ondown>9000</ondown>
<onclick>PlayerControl(record)</onclick> <onclick>PVR.ToggleRecordPlayingChannel</onclick>
</control> </control>
</control> </control>
</control> </control>

View File

@ -1273,9 +1273,9 @@
<label/> <label/>
<texturefocus>OSDRecordOffFO.png</texturefocus> <texturefocus>OSDRecordOffFO.png</texturefocus>
<texturenofocus>OSDRecordOffNF.png</texturenofocus> <texturenofocus>OSDRecordOffNF.png</texturenofocus>
<onclick>PlayerControl(record)</onclick> <onclick>PVR.ToggleRecordPlayingChannel</onclick>
<enable>Player.CanRecord</enable> <enable>PVR.CanRecordPlayingChannel</enable>
<animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation> <animation effect="fade" start="100" end="30" time="75" condition="!PVR.CanRecordPlayingChannel">Conditional</animation>
</control> </control>
<control type="button" id="606"> <control type="button" id="606">
<width>39</width> <width>39</width>

View File

@ -267,7 +267,7 @@
<control type="image" id="2600"> <control type="image" id="2600">
<width>55</width> <width>55</width>
<texture></texture> <texture></texture>
<visible>!Player.CanRecord</visible> <visible>!PVR.CanRecordPlayingChannel</visible>
</control> </control>
<control type="button" id="705"> <control type="button" id="705">
<width>55</width> <width>55</width>
@ -340,8 +340,8 @@
<font></font> <font></font>
<texturefocus>OSDRecordOffFO.png</texturefocus> <texturefocus>OSDRecordOffFO.png</texturefocus>
<texturenofocus>OSDRecordOffNF.png</texturenofocus> <texturenofocus>OSDRecordOffNF.png</texturenofocus>
<onclick>PlayerControl(record)</onclick> <onclick>PVR.ToggleRecordPlayingChannel</onclick>
<visible>Player.CanRecord</visible> <visible>PVR.CanRecordPlayingChannel</visible>
</control> </control>
</control> </control>
</controls> </controls>

View File

@ -126,9 +126,9 @@
<onright>607</onright> <onright>607</onright>
<onup>300</onup> <onup>300</onup>
<ondown>200</ondown> <ondown>200</ondown>
<onclick>PlayerControl(record)</onclick> <onclick>PVR.ToggleRecordPlayingChannel</onclick>
<enable>Player.CanRecord</enable> <enable>PVR.CanRecordPlayingChannel</enable>
<animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation> <animation effect="fade" start="100" end="30" time="75" condition="!PVR.CanRecordPlayingChannel">Conditional</animation>
<visible>!VideoPlayer.Content(LiveTV)</visible> <visible>!VideoPlayer.Content(LiveTV)</visible>
</control> </control>
<control type="group"> <control type="group">
@ -371,9 +371,9 @@
<onright>707</onright> <onright>707</onright>
<onup>300</onup> <onup>300</onup>
<ondown>200</ondown> <ondown>200</ondown>
<onclick>PlayerControl(record)</onclick> <onclick>PVR.ToggleRecordPlayingChannel</onclick>
<enable>Player.CanRecord</enable> <enable>PVR.CanRecordPlayingChannel</enable>
<animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation> <animation effect="fade" start="100" end="30" time="75" condition="!PVR.CanRecordPlayingChannel">Conditional</animation>
<visible>VideoPlayer.Content(LiveTV)</visible> <visible>VideoPlayer.Content(LiveTV)</visible>
</control> </control>
<control type="button" id="707"> <control type="button" id="707">

View File

@ -164,7 +164,7 @@
<label>$LOCALIZE[31040]</label> <label>$LOCALIZE[31040]</label>
<textcolor>white</textcolor> <textcolor>white</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<visible>![VideoPlayer.Content(LiveTV) + Player.Recording]</visible> <visible>![VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel]</visible>
<animation effect="slide" start="0,0" end="0,25" time="0" condition="!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes) + !VideoPlayer.Content(MusicVideos) + !VideoPlayer.Content(LiveTV) + !PVR.IsPlayingRecording">conditional</animation> <animation effect="slide" start="0,0" end="0,25" time="0" condition="!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes) + !VideoPlayer.Content(MusicVideos) + !VideoPlayer.Content(LiveTV) + !PVR.IsPlayingRecording">conditional</animation>
</control> </control>
<control type="image" id="1"> <control type="image" id="1">
@ -173,7 +173,7 @@
<height>25</height> <height>25</height>
<aspectratio align="center" aligny="center">keep</aspectratio> <aspectratio align="center" aligny="center">keep</aspectratio>
<texture>PVR-IsRecording.png</texture> <texture>PVR-IsRecording.png</texture>
<visible>VideoPlayer.Content(LiveTV) + Player.Recording + !Player.ChannelPreviewActive</visible> <visible>VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive</visible>
</control> </control>
<control type="label" id="1"> <control type="label" id="1">
<description>Heading label</description> <description>Heading label</description>
@ -187,7 +187,7 @@
<label>$LOCALIZE[19158]</label> <label>$LOCALIZE[19158]</label>
<textcolor>white</textcolor> <textcolor>white</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<visible>VideoPlayer.Content(LiveTV) + Player.Recording + !Player.ChannelPreviewActive</visible> <visible>VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive</visible>
</control> </control>
<control type="label" id="1"> <control type="label" id="1">
<description>Studio label</description> <description>Studio label</description>

View File

@ -256,12 +256,12 @@
<font></font> <font></font>
<texturefocus>OSDRecordOffFO.png</texturefocus> <texturefocus>OSDRecordOffFO.png</texturefocus>
<texturenofocus>OSDRecordOffNF.png</texturenofocus> <texturenofocus>OSDRecordOffNF.png</texturenofocus>
<usealttexture>Player.Recording</usealttexture> <usealttexture>PVR.IsRecordingPlayingChannel</usealttexture>
<alttexturefocus>OSDRecordOnFO.png</alttexturefocus> <alttexturefocus>OSDRecordOnFO.png</alttexturefocus>
<alttexturenofocus>OSDRecordOnNF.png</alttexturenofocus> <alttexturenofocus>OSDRecordOnNF.png</alttexturenofocus>
<onclick>PlayerControl(Record)</onclick> <onclick>PVR.ToggleRecordPlayingChannel</onclick>
<enable>Player.CanRecord</enable> <enable>PVR.CanRecordPlayingChannel</enable>
<animation effect="fade" start="100" end="50" time="75" condition="!Player.CanRecord">Conditional</animation> <animation effect="fade" start="100" end="50" time="75" condition="!PVR.CanRecordPlayingChannel">Conditional</animation>
<visible>VideoPlayer.Content(LiveTV)</visible> <visible>VideoPlayer.Content(LiveTV)</visible>
</control> </control>
</control> </control>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<addon id="skin.confluence" version="4.1.47" name="Confluence" provider-name="Jezz_X, Team Kodi"> <addon id="skin.confluence" version="4.1.5" name="Confluence" provider-name="Jezz_X, Team Kodi">
<requires> <requires>
<import addon="xbmc.gui" version="5.13.0"/> <import addon="xbmc.gui" version="5.13.0"/>
</requires> </requires>
@ -145,6 +145,6 @@
<screenshot>resources/screenshot-08.jpg</screenshot> <screenshot>resources/screenshot-08.jpg</screenshot>
<screenshot>resources/screenshot-09.jpg</screenshot> <screenshot>resources/screenshot-09.jpg</screenshot>
</assets> </assets>
<news>Updated Game dialogs</news> <news>Updated PVR code</news>
</extension> </extension>
</addon> </addon>