diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2017-06-17 08:34:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-17 08:34:30 +0200 |
| commit | c7e5df591e585b8f587b254e84c38fd15f9f499d (patch) | |
| tree | 57f29fa2f2edb9459118e2d2a70781d7939d58a6 /addons | |
| parent | 6f39d557e6f4433ec23edf164928e84e7c0bef2c (diff) | |
| parent | 8decbfc5d0f7b70a2161040cb28411da2543221e (diff) | |
Merge pull request #12306 from ksooo/pvr-estuary-osdsublabelvar
[Estuary] Add episodename to live tv and recordings osd sub label, cleanup seek bar for live tv.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.estuary/xml/DialogSeekBar.xml | 14 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/Variables.xml | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml index 2aa39510b5..e537889152 100644 --- a/addons/skin.estuary/xml/DialogSeekBar.xml +++ b/addons/skin.estuary/xml/DialogSeekBar.xml @@ -209,21 +209,11 @@ <aligny>center</aligny> <visible>VideoPlayer.HasEpg</visible> </control> - <control type="label"> - <left>260</left> - <right>50</right> - <top>20</top> - <height>25</height> - <label>$INFO[VideoPlayer.Title]$INFO[VideoPlayer.EpisodeName, (,)]</label> - <align>left</align> - <font>font36_title</font> - <aligny>center</aligny> - </control> <control type="textbox"> <left>260</left> - <top>55</top> + <top>20</top> <right>50</right> - <height>120</height> + <height>155</height> <label fallback="416">$INFO[VideoPlayer.Plot]</label> <align>justify</align> <autoscroll delay="5000" repeat="7500" time="5000"></autoscroll> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index 3871668898..c5b4a693e7 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -264,7 +264,7 @@ <value condition="Window.IsActive(visualisation) + Integer.IsGreater(Playlist.Length,1)">$LOCALIZE[554] $INFO[Playlist.Position] / $INFO[Playlist.Length]</value> <value condition="VideoPlayer.Content(musicvideos)">$INFO[VideoPlayer.Artist]$INFO[VideoPlayer.Album, - ]</value> <value condition="VideoPlayer.Content(episodes)">$INFO[VideoPlayer.Season,[COLOR button_focus]S,[/COLOR]]$INFO[VideoPlayer.Episode,[COLOR button_focus]E,: [/COLOR]]$INFO[VideoPlayer.TVShowTitle]</value> - <value condition="VideoPlayer.Content(LiveTV) | PVR.IsPlayingRecording">$INFO[VideoPlayer.ChannelNumberLabel,([COLOR=blue],[/COLOR]) ]$INFO[VideoPlayer.ChannelName]</value> + <value condition="VideoPlayer.Content(LiveTV) | PVR.IsPlayingRecording">$INFO[VideoPlayer.ChannelNumberLabel,([COLOR=blue],[/COLOR]) ]$INFO[VideoPlayer.ChannelName] $INFO[VideoPlayer.EpisodeName, - ]</value> <value>$INFO[VideoPlayer.Genre]</value> </variable> <variable name="AddonsFanartVar"> |