Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed: [Confluence] Re-added back the Live TV Pause button to the sid…

…e bar and home player controls and also fixed the live tv controls in PlayerControls.xml that were missed in 4300026
  • Loading branch information...
commit d80779289859943041a141633ddb749b393308c9 1 parent dd23b01
@JezzX JezzX authored
View
25 addons/skin.confluence/720p/Home.xml
@@ -647,21 +647,40 @@
<texturefocus>OSDStopFO.png</texturefocus>
<texturenofocus>OSDStopNF.png</texturenofocus>
<onleft>602</onleft>
- <onright>606</onright>
+ <onright>604</onright>
<onup>9003</onup>
<ondown>9000</ondown>
<onclick>down</onclick>
<onclick>XBMC.PlayerControl(Stop)</onclick>
</control>
+ <control type="togglebutton" id="604">
+ <posx>100</posx>
+ <posy>2</posy>
+ <width>30</width>
+ <height>30</height>
+ <label>-</label>
+ <texturefocus>OSDPauseFO.png</texturefocus>
+ <texturenofocus>OSDPauseNF.png</texturenofocus>
+ <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
+ <alttexturefocus>OSDPlayFO.png</alttexturefocus>
+ <alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
+ <onleft>603</onleft>
+ <onright>606</onright>
+ <onup>9003</onup>
+ <ondown>9000</ondown>
+ <onclick>XBMC.PlayerControl(Play)</onclick>
+ <enable>Player.PauseEnabled</enable>
+ <animation effect="fade" start="100" end="30" time="100" condition="!Player.PauseEnabled">Conditional</animation>
+ </control>
<control type="button" id="606">
- <posx>130</posx>
+ <posx>160</posx>
<posy>2</posy>
<width>30</width>
<height>30</height>
<label>-</label>
<texturefocus>OSDRecordOffFO.png</texturefocus>
<texturenofocus>OSDRecordOffNF.png</texturenofocus>
- <onleft>603</onleft>
+ <onleft>604</onleft>
<onright>607</onright>
<onup>9003</onup>
<ondown>9000</ondown>
View
5 addons/skin.confluence/720p/PlayerControls.xml
@@ -271,7 +271,7 @@
<ondown>200</ondown>
<onclick>XBMC.PlayerControl(Rewind)</onclick>
<visible>VideoPlayer.Content(LiveTV)</visible>
- <enable>false</enable>
+ <enable>Player.SeekEnabled</enable>
<animation effect="fade" start="100" end="50" time="100" condition="true">Conditional</animation>
</control>
<control type="button" id="702">
@@ -308,6 +308,7 @@
<onclick>XBMC.PlayerControl(Play)</onclick>
<visible>VideoPlayer.Content(LiveTV)</visible>
<enable>false</enable>
+ <enable>Player.PauseEnabled</enable>
<animation effect="fade" start="100" end="50" time="100" condition="true">Conditional</animation>
</control>
<control type="button" id="704">
@@ -324,7 +325,7 @@
<ondown>200</ondown>
<onclick>XBMC.PlayerControl(Forward)</onclick>
<visible>VideoPlayer.Content(LiveTV)</visible>
- <enable>false</enable>
+ <enable>Player.SeekEnabled</enable>
<animation effect="fade" start="100" end="50" time="100" condition="true">Conditional</animation>
</control>
<control type="button" id="700">
View
24 addons/skin.confluence/720p/includes.xml
@@ -634,7 +634,27 @@
<onclick>down</onclick>
<onclick>XBMC.PlayerControl(Stop)</onclick>
</control>
- <control type="button" id="604">
+ <control type="togglebutton" id="604">
+ <posx>140</posx>
+ <posy>2</posy>
+ <width>39</width>
+ <height>39</height>
+ <label>-</label>
+ <texturefocus>OSDPauseFO.png</texturefocus>
+ <texturenofocus>OSDPauseNF.png</texturenofocus>
+ <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
+ <alttexturefocus>OSDPlayFO.png</alttexturefocus>
+ <alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
+ <onleft>603</onleft>
+ <onright>605</onright>
+ <onup>610</onup>
+ <ondown>606</ondown>
+ <onback>50</onback>
+ <onclick>XBMC.PlayerControl(Play)</onclick>
+ <enable>Player.PauseEnabled</enable>
+ <animation effect="fade" start="100" end="30" time="100" condition="!Player.PauseEnabled">Conditional</animation>
+ </control>
+ <control type="button" id="605">
<posx>180</posx>
<posy>2</posy>
<width>39</width>
@@ -642,7 +662,7 @@
<label>-</label>
<texturefocus>OSDRecordOffFO.png</texturefocus>
<texturenofocus>OSDRecordOffNF.png</texturenofocus>
- <onleft>603</onleft>
+ <onleft>604</onleft>
<onright>50</onright>
<onup>610</onup>
<ondown>611</ondown>
Please sign in to comment.
Something went wrong with that request. Please try again.