Skip to content
This repository
Browse code

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
Jezz authored October 13, 2012
25  addons/skin.confluence/720p/Home.xml
@@ -647,21 +647,40 @@
647 647
 						<texturefocus>OSDStopFO.png</texturefocus>
648 648
 						<texturenofocus>OSDStopNF.png</texturenofocus>
649 649
 						<onleft>602</onleft>
650  
-						<onright>606</onright>
  650
+						<onright>604</onright>
651 651
 						<onup>9003</onup>
652 652
 						<ondown>9000</ondown>
653 653
 						<onclick>down</onclick>
654 654
 						<onclick>XBMC.PlayerControl(Stop)</onclick>
655 655
 					</control>
  656
+					<control type="togglebutton" id="604">
  657
+						<posx>100</posx>
  658
+						<posy>2</posy>
  659
+						<width>30</width>
  660
+						<height>30</height>
  661
+						<label>-</label>
  662
+						<texturefocus>OSDPauseFO.png</texturefocus>
  663
+						<texturenofocus>OSDPauseNF.png</texturenofocus>
  664
+						<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
  665
+						<alttexturefocus>OSDPlayFO.png</alttexturefocus>
  666
+						<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
  667
+						<onleft>603</onleft>
  668
+						<onright>606</onright>
  669
+						<onup>9003</onup>
  670
+						<ondown>9000</ondown>
  671
+						<onclick>XBMC.PlayerControl(Play)</onclick>
  672
+						<enable>Player.PauseEnabled</enable>
  673
+						<animation effect="fade" start="100" end="30" time="100" condition="!Player.PauseEnabled">Conditional</animation>
  674
+					</control>
656 675
 					<control type="button" id="606">
657  
-						<posx>130</posx>
  676
+						<posx>160</posx>
658 677
 						<posy>2</posy>
659 678
 						<width>30</width>
660 679
 						<height>30</height>
661 680
 						<label>-</label>
662 681
 						<texturefocus>OSDRecordOffFO.png</texturefocus>
663 682
 						<texturenofocus>OSDRecordOffNF.png</texturenofocus>
664  
-						<onleft>603</onleft>
  683
+						<onleft>604</onleft>
665 684
 						<onright>607</onright>
666 685
 						<onup>9003</onup>
667 686
 						<ondown>9000</ondown>
5  addons/skin.confluence/720p/PlayerControls.xml
@@ -271,7 +271,7 @@
271 271
 				<ondown>200</ondown>
272 272
 				<onclick>XBMC.PlayerControl(Rewind)</onclick>
273 273
 				<visible>VideoPlayer.Content(LiveTV)</visible>
274  
-				<enable>false</enable>
  274
+				<enable>Player.SeekEnabled</enable>
275 275
 				<animation effect="fade" start="100" end="50" time="100" condition="true">Conditional</animation>
276 276
 			</control>
277 277
 			<control type="button" id="702">
@@ -308,6 +308,7 @@
308 308
 				<onclick>XBMC.PlayerControl(Play)</onclick>
309 309
 				<visible>VideoPlayer.Content(LiveTV)</visible>
310 310
 				<enable>false</enable>
  311
+				<enable>Player.PauseEnabled</enable>
311 312
 				<animation effect="fade" start="100" end="50" time="100" condition="true">Conditional</animation>
312 313
 			</control>
313 314
 			<control type="button" id="704">
@@ -324,7 +325,7 @@
324 325
 				<ondown>200</ondown>
325 326
 				<onclick>XBMC.PlayerControl(Forward)</onclick>
326 327
 				<visible>VideoPlayer.Content(LiveTV)</visible>
327  
-				<enable>false</enable>
  328
+				<enable>Player.SeekEnabled</enable>
328 329
 				<animation effect="fade" start="100" end="50" time="100" condition="true">Conditional</animation>
329 330
 			</control>
330 331
 			<control type="button" id="700">
24  addons/skin.confluence/720p/includes.xml
@@ -634,7 +634,27 @@
634 634
 				<onclick>down</onclick>
635 635
 				<onclick>XBMC.PlayerControl(Stop)</onclick>
636 636
 			</control>
637  
-			<control type="button" id="604">
  637
+			<control type="togglebutton" id="604">
  638
+				<posx>140</posx>
  639
+				<posy>2</posy>
  640
+				<width>39</width>
  641
+				<height>39</height>
  642
+				<label>-</label>
  643
+				<texturefocus>OSDPauseFO.png</texturefocus>
  644
+				<texturenofocus>OSDPauseNF.png</texturenofocus>
  645
+				<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
  646
+				<alttexturefocus>OSDPlayFO.png</alttexturefocus>
  647
+				<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
  648
+				<onleft>603</onleft>
  649
+				<onright>605</onright>
  650
+				<onup>610</onup>
  651
+				<ondown>606</ondown>
  652
+				<onback>50</onback>
  653
+				<onclick>XBMC.PlayerControl(Play)</onclick>
  654
+				<enable>Player.PauseEnabled</enable>
  655
+				<animation effect="fade" start="100" end="30" time="100" condition="!Player.PauseEnabled">Conditional</animation>
  656
+			</control>
  657
+			<control type="button" id="605">
638 658
 				<posx>180</posx>
639 659
 				<posy>2</posy>
640 660
 				<width>39</width>
@@ -642,7 +662,7 @@
642 662
 				<label>-</label>
643 663
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
644 664
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
645  
-				<onleft>603</onleft>
  665
+				<onleft>604</onleft>
646 666
 				<onright>50</onright>
647 667
 				<onup>610</onup>
648 668
 				<ondown>611</ondown>

0 notes on commit d807792

Please sign in to comment.
Something went wrong with that request. Please try again.