diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2018-03-13 12:03:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 12:03:55 +0100 |
| commit | 78aafccf8fcf45e1b38f0af8b6003bc511f20f9a (patch) | |
| tree | 007e7f6da4bbbf501c112a0d20cb207b12514ec5 /addons | |
| parent | 8897ae5fa3ed8c9af2ece99e1a42da76c42169f9 (diff) | |
| parent | ecbbd6ac8ac330ff97d457709fe205cd11cd029c (diff) | |
Merge pull request #13642 from ksooo/pvr-guiinfo
[PVR][guiinfo][Estuary] Bunch of PVR guiinfo fixes and improvements
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.estuary/xml/DialogSeekBar.xml | 16 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/Variables.xml | 1 |
2 files changed, 14 insertions, 3 deletions
diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml index c37eb5a4e0..75464e6dc9 100644 --- a/addons/skin.estuary/xml/DialogSeekBar.xml +++ b/addons/skin.estuary/xml/DialogSeekBar.xml @@ -176,7 +176,7 @@ <align>center</align> <aligny>center</aligny> <font>font30</font> - <label>[B]$LOCALIZE[31026][/B] $INFO[PVR.timeshiftcur]</label> + <label>[B]$LOCALIZE[31026][/B] $INFO[PVR.TimeshiftCur] (-$INFO[PVR.TimeshiftOffset])</label> </control> <control type="progress"> <left>0</left> @@ -217,7 +217,7 @@ <info>Player.Progress</info> <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg> <midtexture colordiffuse="button_focus">colors/white.png</midtexture> - <visible>!VideoPlayer.HasEpg</visible> + <visible>!VideoPlayer.HasEpg + !Player.ChannelPreviewActive</visible> </control> <control type="slider" id="401"> <left>5</left> @@ -227,7 +227,17 @@ <texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar> <textureslidernib colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernib> <textureslidernibfocus colordiffuse="button_focus">colors/white.png</textureslidernibfocus> - <visible>!VideoPlayer.HasEpg</visible> + <visible>Player.SeekEnabled + !VideoPlayer.HasEpg + !Player.ChannelPreviewActive</visible> + </control> + <control type="slider" id="402"> + <left>5</left> + <top>65</top> + <width>100%</width> + <height>25</height> + <texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar> + <textureslidernib colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernib> + <textureslidernibfocus colordiffuse="button_focus">colors/white.png</textureslidernibfocus> + <visible>Player.SeekEnabled + VideoPlayer.HasEpg + !Player.ChannelPreviewActive</visible> </control> </control> <control type="group"> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index dd62e8c1c4..7960bed892 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -199,6 +199,7 @@ </variable> <variable name="SeekTimeLabelVar"> <value condition="!String.IsEmpty(Player.SeekNumeric)">[B]$INFO[Player.SeekNumeric(hh:mm:ss)][/B]</value> + <value condition="Player.Seeking + VideoPlayer.HasEPG">$INFO[PVR.EpgEventSeekTime]$INFO[PVR.EpgEventDuration, / ]</value> <value condition="Player.Seeking">$INFO[Player.SeekTime]$INFO[Player.Duration, / ]</value> <value condition="VideoPlayer.HasEpg">$INFO[PVR.EpgEventElapsedTime]$INFO[PVR.EpgEventDuration, / ]</value> <value>$INFO[Player.Time]$INFO[Player.Duration, / ]</value> |