Skip to content

Commit 38bc902

Browse files
BigNoidBigNoid
committed
Merge pull request #595 from xhaggi/pvr
fixes for the pvr section + some improvements
2 parents 4e097d4 + 55850af commit 38bc902

File tree

4 files changed

+133
-129
lines changed

4 files changed

+133
-129
lines changed

‎1080i/DialogSeekBar.xml‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<window>
33
<defaultcontrol>1</defaultcontrol>
4-
<visible>[Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + ![VideoPlayer.Content(livetv) | Window.IsVisible(videoosd) | Window.IsVisible(fullscreeninfo) | Window.IsActive(script-XBMC-Subtitles-main.xml)] + Window.IsVisible(fullscreenvideo)</visible>
4+
<visible>[Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + ![Window.IsVisible(videoosd) | Window.IsVisible(fullscreeninfo) | Window.IsActive(script-XBMC-Subtitles-main.xml)] + Window.IsVisible(fullscreenvideo)</visible>
55
<coordinates>
66
<posx>0</posx>
77
<posy>0</posy>
@@ -537,6 +537,66 @@
537537
<include>FullScreenInfoBar</include>
538538
</control>
539539
</control>
540+
<control type="group">
541+
<visible>Skin.HasSetting(Show_Info_Paused) + VideoPlayer.Content(LiveTV)</visible>
542+
<control type="group">
543+
<animation type="WindowOpen">
544+
<effect type="fade" time="160" end="100" />
545+
<effect type="slide" time="160" start="0,-98" end="0,0" tween="cubic" />
546+
</animation>
547+
<animation type="WindowClose">
548+
<effect type="fade" time="160" start="100" end="0" />
549+
<effect type="slide" time="160" end="0,-98" easing="in" tween="cubic" />
550+
</animation>
551+
<animation type="Visible">
552+
<effect type="fade" time="160" end="100" />
553+
<effect type="slide" time="160" start="0,-98" end="0,0" tween="cubic" />
554+
</animation>
555+
<animation type="Hidden">
556+
<effect type="fade" time="160" start="100" end="0" />
557+
<effect type="slide" time="160" end="0,-98" easing="in" tween="cubic" />
558+
</animation>
559+
<visible>![Player.Forwarding|Player.Seeking]</visible>
560+
<control type="image">
561+
<posx>704</posx>
562+
<width>513</width>
563+
<height>87</height>
564+
<texture flipy="true">osd/osd_top_bar.png</texture>
565+
<visible>[[Player.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek] | [[Player.Paused + Player.Caching] + !Player.Seeking] | Player.Seeking|[Player.DisplayAfterSeek + ![player.forwarding | player.rewinding] + !IsEmpty(Player.SeekOffset)]</visible>
566+
</control>
567+
<control type="label">
568+
<posx>750</posx>
569+
<width>420</width>
570+
<height>42</height>
571+
<align>center</align>
572+
<label>$VAR[VideoPlayerSeekVar]</label>
573+
<font>Font_Reg33_Caps</font>
574+
<shadowcolor>88e5e5e5</shadowcolor>
575+
<textcolor>FF363636</textcolor>
576+
</control>
577+
</control>
578+
<control type="group" id="4001">
579+
<decscription>bottom bar</decscription>
580+
<visible>[Player.ShowInfo | [Player.Paused + !Player.Caching]] + ![Window.IsVisible(osdvideosettings) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(videobookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
581+
<animation type="Visible">
582+
<effect type="fade" time="320" end="100" />
583+
<effect type="slide" time="320" start="0,135" end="0,0" tween="cubic" />
584+
</animation>
585+
<animation type="Hidden">
586+
<effect type="fade" time="320" start="100" end="0" />
587+
<effect type="slide" time="320" end="0,135" easing="in" tween="cubic" />
588+
</animation>
589+
<animation type="WindowOpen">
590+
<effect type="fade" time="320" end="100" />
591+
<effect type="slide" time="320" start="0,135" end="0,0" tween="cubic" />
592+
</animation>
593+
<animation type="WindowClose">
594+
<effect type="fade" time="320" start="100" end="0" />
595+
<effect type="slide" time="320" end="0,135" easing="in" tween="cubic" />
596+
</animation>
597+
<include>FullScreenInfoBarLiveTV</include>
598+
</control>
599+
</control>
540600
<include>AlaskaPausedLabel</include>
541601
</controls>
542602
</window>

‎1080i/Includes_PVR.xml‎

Lines changed: 70 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -904,16 +904,16 @@
904904
<info>ListItem.Label</info>
905905
</control>
906906
<control type="image">
907-
<posx>8</posx>
908-
<posy>49</posy>
907+
<posx>5</posx>
908+
<posy>0</posy>
909909
<width>35</width>
910910
<height>35</height>
911911
<texture>pvr/PVR-IsRecording.png</texture>
912912
<visible>ListItem.IsRecording</visible>
913913
</control>
914914
<control type="image">
915-
<posx>8</posx>
916-
<posy>49</posy>
915+
<posx>5</posx>
916+
<posy>6</posy>
917917
<width>35</width>
918918
<height>35</height>
919919
<texture>pvr/PVR-HasTimer.png</texture>
@@ -943,16 +943,16 @@
943943
<info>ListItem.Label</info>
944944
</control>
945945
<control type="image">
946-
<posx>8</posx>
947-
<posy>49</posy>
946+
<posx>5</posx>
947+
<posy>0</posy>
948948
<width>35</width>
949949
<height>35</height>
950950
<texture>pvr/PVR-IsRecording.png</texture>
951951
<visible>ListItem.IsRecording</visible>
952952
</control>
953953
<control type="image">
954-
<posx>8</posx>
955-
<posy>49</posy>
954+
<posx>5</posx>
955+
<posy>6</posy>
956956
<width>35</width>
957957
<height>35</height>
958958
<texture>pvr/PVR-HasTimer.png</texture>
@@ -978,65 +978,68 @@
978978
<aspectratio aligny="bottom">keep</aspectratio>
979979
<texture>$INFO[ListItem.Icon]</texture>
980980
</control>
981-
<control type="grouplist">
982-
<posx>360</posx>
983-
<posy>-85</posy>
984-
<width>1400</width>
985-
<orientation>horizontal</orientation>
986-
<itemgap>10</itemgap>
987-
<control type="label">
988-
<width min="0" max="1000">auto</width>
989-
<height>40</height>
990-
<label>[COLOR $VAR[FontColorVar]]$LOCALIZE[31453][/COLOR] $INFO[ListItem.StartTime] - $INFO[ListItem.EndTime]</label>
991-
<font>Font_Reg32</font>
992-
<textcolor>white4</textcolor>
993-
</control>
994-
<control type="label">
995-
<width min="0" max="1000">auto</width>
996-
<height>40</height>
997-
<label>[COLOR $VAR[FontColorVar]]• $LOCALIZE[180]:[/COLOR] $INFO[ListItem.Duration]</label>
998-
<font>Font_Reg32</font>
999-
<textcolor>white4</textcolor>
1000-
</control>
1001-
</control>
1002-
<control type="grouplist">
1003-
<posx>360</posx>
1004-
<posy>-55</posy>
1005-
<width>1400</width>
1006-
<orientation>horizontal</orientation>
1007-
<control type="label">
1008-
<width min="0" max="1000">auto</width>
1009-
<height>40</height>
1010-
<label>[COLOR $VAR[FontColorVar]]$LOCALIZE[515]:[/COLOR] $INFO[ListItem.Genre]</label>
1011-
<font>Font_Reg32</font>
1012-
<textcolor>white4</textcolor>
1013-
</control>
1014-
</control>
1015-
<control type="label">
1016-
<posx>354</posx>
1017-
<posy>-112</posy>
1018-
<width>1500</width>
1019-
<height>20</height>
1020-
<label> $INFO[ListItem.Title]</label>
1021-
<font>Font_Bold40</font>
1022-
<shadowcolor>black</shadowcolor>
1023-
<textcolor>white2</textcolor>
1024-
<scroll>true</scroll>
1025-
</control>
1026-
<control type="textbox">
1027-
<description>Plot</description>
1028-
<posx>360</posx>
1029-
<posy>-17</posy>
1030-
<width>1500</width>
1031-
<height>140</height>
1032-
<align>justify</align>
1033-
<label>$INFO[ListItem.Plot]</label>
1034-
<font>Font_Reg29</font>
1035-
<shadowcolor>black</shadowcolor>
1036-
<textcolor>grey</textcolor>
1037-
<pagecontrol>-</pagecontrol>
1038-
<autoscroll time="4000" delay="5000" repeat="5000">true</autoscroll>
1039-
</control>
981+
<control type="group">
982+
<posx>378</posx>
983+
<control type="label">
984+
<posx>0</posx>
985+
<posy>-112</posy>
986+
<width>1500</width>
987+
<height>20</height>
988+
<label> $INFO[ListItem.Title]</label>
989+
<font>Font_Bold40</font>
990+
<shadowcolor>black</shadowcolor>
991+
<textcolor>white2</textcolor>
992+
<scroll>true</scroll>
993+
</control>
994+
<control type="grouplist">
995+
<posx>6</posx>
996+
<posy>-85</posy>
997+
<width>1400</width>
998+
<orientation>horizontal</orientation>
999+
<itemgap>10</itemgap>
1000+
<control type="label">
1001+
<width min="0" max="1000">auto</width>
1002+
<height>40</height>
1003+
<label>[COLOR $VAR[FontColorVar]]$LOCALIZE[31453][/COLOR] $INFO[ListItem.StartTime] - $INFO[ListItem.EndTime]</label>
1004+
<font>Font_Reg32</font>
1005+
<textcolor>white4</textcolor>
1006+
</control>
1007+
<control type="label">
1008+
<width min="0" max="1000">auto</width>
1009+
<height>40</height>
1010+
<label>[COLOR $VAR[FontColorVar]]• $LOCALIZE[180]:[/COLOR] $INFO[ListItem.Duration]</label>
1011+
<font>Font_Reg32</font>
1012+
<textcolor>white4</textcolor>
1013+
</control>
1014+
</control>
1015+
<control type="grouplist">
1016+
<posx>6</posx>
1017+
<posy>-55</posy>
1018+
<width>1400</width>
1019+
<orientation>horizontal</orientation>
1020+
<control type="label">
1021+
<width min="0" max="1000">auto</width>
1022+
<height>40</height>
1023+
<label>[COLOR $VAR[FontColorVar]]$LOCALIZE[515]:[/COLOR] $INFO[ListItem.Genre]</label>
1024+
<font>Font_Reg32</font>
1025+
<textcolor>white4</textcolor>
1026+
</control>
1027+
</control>
1028+
<control type="textbox">
1029+
<description>Plot</description>
1030+
<posx>6</posx>
1031+
<posy>-10</posy>
1032+
<width>1430</width>
1033+
<height>135</height>
1034+
<align>justify</align>
1035+
<label>$INFO[ListItem.Plot]</label>
1036+
<font>Font_Reg29</font>
1037+
<shadowcolor>black</shadowcolor>
1038+
<textcolor>grey</textcolor>
1039+
<pagecontrol>-</pagecontrol>
1040+
<autoscroll time="4000" delay="5000" repeat="5000">true</autoscroll>
1041+
</control>
1042+
</control>
10401043
</control>
10411044
</control>
10421045
</include>

‎1080i/VideoFullScreen.xml‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -275,64 +275,5 @@
275275
</control>
276276
</control>
277277
</control>
278-
<control type="group" id="1">
279-
<animation type="WindowOpen">
280-
<effect type="fade" time="160" end="100" />
281-
<effect type="slide" time="160" start="0,-98" end="0,0" tween="cubic" />
282-
</animation>
283-
<animation type="WindowClose">
284-
<effect type="fade" time="160" start="100" end="0" />
285-
<effect type="slide" time="160" end="0,-98" easing="in" tween="cubic" />
286-
</animation>
287-
<animation type="Visible">
288-
<effect type="fade" time="160" end="100" />
289-
<effect type="slide" time="160" start="0,-98" end="0,0" tween="cubic" />
290-
</animation>
291-
<animation type="Hidden">
292-
<effect type="fade" time="160" start="100" end="0" />
293-
<effect type="slide" time="160" end="0,-98" easing="in" tween="cubic" />
294-
</animation>
295-
<visible>![Player.Forwarding|Player.Seeking] + ![Window.IsVisible(seekbar) | Window.IsVisible(fullscreeninfo)]</visible>
296-
<visible>VideoPlayer.Content(LiveTV)</visible>
297-
<control type="image" id="1">
298-
<posx>704</posx>
299-
<width>513</width>
300-
<height>87</height>
301-
<texture flipy="true">osd/osd_top_bar.png</texture>
302-
<visible>[[Player.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek] | [[Player.Paused + Player.Caching] + !Player.Seeking] | Player.Seeking|[Player.DisplayAfterSeek + ![player.forwarding | player.rewinding] + !IsEmpty(Player.SeekOffset)]</visible>
303-
</control>
304-
<control type="label" id="1">
305-
<posx>750</posx>
306-
<width>420</width>
307-
<height>42</height>
308-
<align>center</align>
309-
<label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
310-
<font>Font_Reg33_Caps</font>
311-
<shadowcolor>88e5e5e5</shadowcolor>
312-
<textcolor>FF363636</textcolor>
313-
<visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
314-
</control>
315-
</control>
316-
<control type="group" id="1">
317-
<visible>[Player.ShowInfo] + ![Window.IsVisible(osdvideosettings) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(videobookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
318-
<visible>VideoPlayer.Content(LiveTV) + !IsEmpty(VideoPlayer.ChannelName)</visible>
319-
<animation type="Visible">
320-
<effect type="fade" time="320" end="100" />
321-
<effect type="slide" time="320" start="0,135" end="0,0" tween="cubic" />
322-
</animation>
323-
<animation type="Hidden">
324-
<effect type="fade" time="320" start="100" end="0" />
325-
<effect type="slide" time="320" end="0,135" easing="in" tween="cubic" />
326-
</animation>
327-
<animation type="WindowOpen">
328-
<effect type="fade" time="320" end="100" />
329-
<effect type="slide" time="320" start="0,135" end="0,0" tween="cubic" />
330-
</animation>
331-
<animation type="WindowClose">
332-
<effect type="fade" time="320" start="100" end="0" />
333-
<effect type="slide" time="320" end="0,135" easing="in" tween="cubic" />
334-
</animation>
335-
<include>FullScreenInfoBarLiveTV</include>
336-
</control>
337278
</controls>
338279
</window>

‎1080i/includes.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,7 @@
19801980
<control type="button" id="70020">
19811981
<width>100</width>
19821982
<height>100</height>
1983-
<texturefocus>special://skin/extras/BigIcons/ButtonFFW.png</texturefocus>
1983+
<texturefocus>special://skin/extras/BigIcons/ButtonFRW.png</texturefocus>
19841984
<texturenofocus>-</texturenofocus>
19851985
<label>31352</label>
19861986
<font>-</font>
@@ -2015,7 +2015,7 @@
20152015
<control type="button" id="70023">
20162016
<width>100</width>
20172017
<height>100</height>
2018-
<texturefocus>special://skin/extras/BigIcons/ButtonFRW.png</texturefocus>
2018+
<texturefocus>special://skin/extras/BigIcons/ButtonFFW.png</texturefocus>
20192019
<texturenofocus>-</texturenofocus>
20202020
<label>31352</label>
20212021
<font>-</font>

0 commit comments

Comments
 (0)