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

[skin.confluence] Fix LiveTV with EPG elapsed time and duration (#36) 

* [skin.confluence] Fix LiveTV with EPG elapsed time and duration

* [skin.confluence] Add 'Play Programme' button to the PVR Info dialog

* [skin.confluence] Fix missing cover image when playing from EPG

* [skin.confluence] Add Timeshift information label
This commit is contained in:
Arthur Liberman 2018-10-04 11:14:19 +03:00 committed by Kevin Goffe
parent 00745d82c6
commit 2cc0e9adff
6 changed files with 218 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
720p/DialogPVRInfo.xml
View File

@ -198,6 +198,12 @@
<label>19003</label>
<visible>Window.IsActive(PVRGuideInfo)</visible>
</control>
<control type="button" id="10">
<description>Play programme</description>
<include>ButtonInfoDialogsCommonValues</include>
<label>19190</label>
<visible>Window.IsActive(PVRGuideInfo)</visible>
</control>
<control type="button" id="5">
<description>Switch to Channel</description>
<include>ButtonInfoDialogsCommonValues</include>

170
720p/DialogSeekBar.xml
View File

@ -250,61 +250,123 @@
<textcolor>blue</textcolor>
<label>$VAR[SeekLabel]</label>
</control>
<control type="label">
<description>Elapsed Time Label</description>
<left>20</left>
<top>23</top>
<width>240</width>
<height>20</height>
<font>font13_title</font>
<textcolor>white</textcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[Player.Time] - $INFO[Player.Duration]</label>
<visible>!Player.Seeking</visible>
<control type="group">
<visible>[VideoPlayer.Content(LiveTV) + VideoPlayer.HasEpg]</visible>
<control type="label">
<description>Elapsed Time Label</description>
<left>20</left>
<top>23</top>
<width>240</width>
<height>20</height>
<font>font13_title</font>
<textcolor>white</textcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[PVR.EpgEventElapsedTime] - $INFO[PVR.EpgEventDuration]</label>
<visible>!Player.Seeking</visible>
</control>
<control type="label">
<description>Seek Time Label</description>
<left>20</left>
<top>23</top>
<width>240</width>
<height>20</height>
<font>font13_title</font>
<textcolor>white</textcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[PVR.EpgEventSeekTime] - $INFO[PVR.EpgEventDuration]</label>
<visible>Player.Seeking</visible>
</control>
<control type="progress">
<description>ProgressbarTimeshift</description>
<left>20</left>
<top>45</top>
<width>240</width>
<height>15</height>
<info>PVR.TimeshiftProgressBufferEnd </info>
<midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture>
<visible>PVR.IsTimeShift</visible>
</control>
<control type="progress" id="23">
<description>Progressbar</description>
<left>20</left>
<top>45</top>
<width>240</width>
<height>15</height>
<info>PVR.EpgEventProgress</info>
<visible>true</visible>
</control>
<control type="slider" id="403">
<description>Seek Slider</description>
<left>20</left>
<top>42</top>
<width>240</width>
<height>12</height>
<texturesliderbar>seekslider.png</texturesliderbar>
<textureslidernib>osd_slider_nib.png</textureslidernib>
<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
<visible>Player.Seeking</visible>
</control>
</control>
<control type="label">
<description>Seek Time Label</description>
<left>20</left>
<top>23</top>
<width>240</width>
<height>20</height>
<font>font13_title</font>
<textcolor>white</textcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[Player.SeekTime] - $INFO[Player.Duration]</label>
<visible>Player.Seeking</visible>
</control>
<control type="progress">
<description>ProgressbarCache</description>
<left>20</left>
<top>45</top>
<width>240</width>
<height>15</height>
<info>Player.ProgressCache</info>
<midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture>
<visible>true</visible>
</control>
<control type="progress" id="23">
<description>Progressbar</description>
<left>20</left>
<top>45</top>
<width>240</width>
<height>15</height>
<info>Player.Progress</info>
<visible>true</visible>
</control>
<control type="slider" id="401">
<description>Seek Slider</description>
<left>20</left>
<top>42</top>
<width>240</width>
<height>12</height>
<texturesliderbar>seekslider.png</texturesliderbar>
<textureslidernib>osd_slider_nib.png</textureslidernib>
<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
<visible>Player.Seeking</visible>
<control type="group">
<visible>![VideoPlayer.Content(LiveTV) + VideoPlayer.HasEpg]</visible>
<control type="label">
<description>Elapsed Time Label</description>
<left>20</left>
<top>23</top>
<width>240</width>
<height>20</height>
<font>font13_title</font>
<textcolor>white</textcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[Player.Time] - $INFO[Player.Duration]</label>
<visible>!Player.Seeking</visible>
</control>
<control type="label">
<description>Seek Time Label</description>
<left>20</left>
<top>23</top>
<width>240</width>
<height>20</height>
<font>font13_title</font>
<textcolor>white</textcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[Player.SeekTime] - $INFO[Player.Duration]</label>
<visible>Player.Seeking</visible>
</control>
<control type="progress">
<description>ProgressbarCache</description>
<left>20</left>
<top>45</top>
<width>240</width>
<height>15</height>
<info>Player.ProgressCache</info>
<midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture>
<visible>true</visible>
</control>
<control type="progress" id="23">
<description>Progressbar</description>
<left>20</left>
<top>45</top>
<width>240</width>
<height>15</height>
<info>Player.Progress</info>
<visible>true</visible>
</control>
<control type="slider" id="401">
<description>Seek Slider</description>
<left>20</left>
<top>42</top>
<width>240</width>
<height>12</height>
<texturesliderbar>seekslider.png</texturesliderbar>
<textureslidernib>osd_slider_nib.png</textureslidernib>
<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
<visible>Player.Seeking</visible>
</control>
</control>
</control>
</controls>

15
720p/Home.xml
View File

@ -361,6 +361,21 @@
<font>font12</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<visible>!VideoPlayer.HasEpg</visible>
</control>
<control type="label">
<description>Time Label</description>
<left>160</left>
<top>310</top>
<height>30</height>
<width>300</width>
<label>$INFO[PVR.EpgEventElapsedTime]$INFO[PVR.EpgEventDuration,[COLOR=blue] / [/COLOR]]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<visible>VideoPlayer.HasEpg</visible>
</control>
</control>
<control type="group">

19
720p/Includes.xml
View File

@ -451,6 +451,11 @@
<value condition="!String.IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value>
<value>$INFO[ListItem.Icon]</value>
</variable>
<variable name="NowPlayingThumb">
<value condition="!String.IsEmpty(Player.Art(poster))">$INFO[Player.Art(poster)]</value>
<value condition="!String.IsEmpty(Player.Art(tvshow.poster))">$INFO[Player.Art(tvshow.poster)]</value>
<value>$INFO[Player.Icon]</value>
</variable>
<variable name="MusicInfoPanelLabel">
<value condition="Container.Content(Artists)">$INFO[ListItem.Label]</value>
<value condition="Container.Content(Songs)">$INFO[ListItem.Label,[COLOR=selected][B],[/B][/COLOR] - ]$INFO[ListItem.Label2]</value>
@ -894,6 +899,20 @@
<font>font12</font>
<textcolor>grey</textcolor>
<shadowcolor>black</shadowcolor>
<visible>!VideoPlayer.HasEpg | !VideoPlayer.Content(LiveTV)</visible>
</control>
<control type="label">
<left>85</left>
<top>53r</top>
<width>700</width>
<height>20</height>
<label>$INFO[Player.Title] - ([COLOR=blue]$INFO[PVR.EpgEventElapsedTime] / $INFO[PVR.EpgEventDuration,][/COLOR])</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey</textcolor>
<shadowcolor>black</shadowcolor>
<visible>VideoPlayer.HasEpg + VideoPlayer.Content(LiveTV)</visible>
</control>
<control type="label">
<left>85</left>

78
720p/VideoFullScreen.xml
View File

@ -119,7 +119,7 @@
<top>260r</top>
<width>300</width>
<height>230</height>
<texture fallback="DefaultVideoCover.png">$INFO[Player.Art(thumb)]</texture>
<texture fallback="DefaultVideoCover.png">$VAR[NowPlayingThumb]</texture>
<aspectratio aligny="bottom">keep</aspectratio>
<bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize>
@ -363,7 +363,7 @@
<top>120</top>
<width>910</width>
<height>25</height>
<label>$INFO[VideoPlayer.NextTitle,$LOCALIZE[19031]: ]</label>
<label>$INFO[VideoPlayer.NextTitle,[B]$LOCALIZE[19031]: [/B]]</label>
<align>center</align>
<aligny>center</aligny>
<font>font12</font>
@ -372,6 +372,20 @@
<visible>!Window.IsVisible(VideoOSD) + VideoPlayer.Content(LiveTV)</visible>
<animation effect="fade" time="150">VisibleChange</animation>
</control>
<control type="label" id="1">
<left>0</left>
<top>150</top>
<width>910</width>
<height>25</height>
<label>[B]$LOCALIZE[31961][/B] $INFO[PVR.TimeshiftCur] (-$INFO[PVR.TimeshiftOffset])</label>
<align>center</align>
<aligny>center</aligny>
<font>font12</font>
<textcolor>grey</textcolor>
<scroll>true</scroll>
<visible>!Window.IsVisible(VideoOSD) + VideoPlayer.Content(LiveTV) + PVR.IsTimeShift</visible>
<animation effect="fade" time="150">VisibleChange</animation>
</control>
</control>
<control type="group" id="1">
<left>330</left>
@ -397,25 +411,49 @@
<font>font13</font>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[Player.StartTime(hh:mm)]</label>
<label>$INFO[VideoPlayer.StartTime]</label>
</control>
<control type="progress" id="1">
<description>ProgressbarCache</description>
<left>100</left>
<top>15</top>
<width>720</width>
<height>16</height>
<info>Player.ProgressCache</info>
<midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture>
<visible>!Player.ChannelPreviewActive</visible>
<control type="group" id="1">
<visible>VideoPlayer.Content(LiveTV)</visible>
<control type="progress" id="1">
<description>ProgressbarTimeshift</description>
<left>100</left>
<top>15</top>
<width>720</width>
<height>16</height>
<info>PVR.TimeshiftProgressBufferEnd</info>
<midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture>
<visible>PVR.IsTimeShift</visible>
</control>
<control type="progress" id="1">
<description>Progressbar</description>
<left>100</left>
<top>15</top>
<width>720</width>
<height>16</height>
<info>PVR.EpgEventProgress</info>
</control>
</control>
<control type="progress" id="1">
<description>Progressbar</description>
<left>100</left>
<top>15</top>
<width>720</width>
<height>16</height>
<info>Player.Progress</info>
<control type="group" id="1">
<visible>!VideoPlayer.Content(LiveTV)</visible>
<control type="progress" id="1">
<description>ProgressbarCache</description>
<left>100</left>
<top>15</top>
<width>720</width>
<height>16</height>
<info>Player.ProgressCache</info>
<midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture>
<visible>!Player.ChannelPreviewActive</visible>
</control>
<control type="progress" id="1">
<description>Progressbar</description>
<left>100</left>
<top>15</top>
<width>720</width>
<height>16</height>
<info>Player.Progress</info>
</control>
</control>
<control type="label" id="1">
<visible>!VideoPlayer.Content(LiveTV)</visible>
@ -437,7 +475,7 @@
<font>font13</font>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[Player.FinishTime(hh:mm)]</label>
<label>$INFO[VideoPlayer.EndTime]</label>
</control>
</control>
</control>

4
language/resource.language.en_gb/strings.po
View File

@ -693,3 +693,7 @@ msgstr ""
msgctxt "#31960"
msgid "RADIO"
msgstr ""
msgctxt "#31961"
msgid "Timeshift"
msgstr ""