aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorKai Sommerfeld <kai.sommerfeld@gmx.com>2022-10-02 10:57:46 +0200
committerGitHub <noreply@github.com>2022-10-02 10:57:46 +0200
commitc1f29394b73c8c2f04bd15ac0087ca38b04bbb9a (patch)
tree3db523b6d130f0c0bd8ba5855f296744828258f1 /addons
parentdf6b6535a6bbfcd4f7dfa1c03e9a0de497355a56 (diff)
parentcaedc190c8883e62c57b611fc62cf4a3058719e4 (diff)
Merge pull request #21948 from ksooo/estuary-rework-pvr-osd
[Estuary] Rework channel number / name visualisation in PVR OSD
Diffstat (limited to 'addons')
-rw-r--r--addons/skin.estuary/xml/DialogSeekBar.xml15
-rw-r--r--addons/skin.estuary/xml/Variables.xml2
2 files changed, 12 insertions, 5 deletions
diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml
index 72b5d8c117..bd09157678 100644
--- a/addons/skin.estuary/xml/DialogSeekBar.xml
+++ b/addons/skin.estuary/xml/DialogSeekBar.xml
@@ -292,14 +292,21 @@
<height>380</height>
<control type="label">
<left>20</left>
+ <width>80%</width>
+ <top>-200</top>
+ <height>25</height>
+ <label>$INFO[VideoPlayer.ChannelName]</label>
+ <shadowcolor>text_shadow</shadowcolor>
+ <font>font45_title</font>
+ </control>
+ <control type="label">
+ <left>20</left>
<width>290</width>
- <top>-80</top>
+ <top>-160</top>
<height>25</height>
<label>$INFO[VideoPlayer.ChannelNumberLabel]</label>
- <shadowcolor>black</shadowcolor>
- <align>center</align>
+ <shadowcolor>text_shadow</shadowcolor>
<font>WeatherTemp</font>
- <aligny>center</aligny>
</control>
<control type="image">
<left>0</left>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index 6b3da75b96..94200b646d 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -352,7 +352,7 @@
<value condition="VideoPlayer.Content(musicvideos)">$VAR[NowPlayingSublabelVar,,[CR]]$INFO[player.chapter,[COLOR button_focus]$LOCALIZE[21396]: [/COLOR]]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ]</value>
<value condition="VideoPlayer.Content(episodes) + !player.chaptercount">$INFO[VideoPlayer.Season,[COLOR button_focus][CAPITALIZE]$LOCALIZE[36906][/CAPITALIZE]:[/COLOR] S]$INFO[VideoPlayer.Episode,E,: ]$INFO[VideoPlayer.Title]</value>
<value condition="VideoPlayer.Content(episodes) + player.chaptercount">$INFO[VideoPlayer.Season,[COLOR button_focus][CAPITALIZE]$LOCALIZE[36906][/CAPITALIZE]:[/COLOR] S]$INFO[VideoPlayer.Episode,E, - ]$INFO[VideoPlayer.Title,,[CR]]$INFO[player.chapter,[COLOR button_focus]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ]</value>
- <value condition="VideoPlayer.Content(LiveTV) | PVR.IsPlayingRecording | PVR.IsPlayingEpgTag">$INFO[VideoPlayer.ChannelNumberLabel,([COLOR button_focus],[/COLOR]) ]$INFO[VideoPlayer.ChannelName] $INFO[VideoPlayer.EpisodeName, - ]</value>
+ <value condition="VideoPlayer.Content(LiveTV) | PVR.IsPlayingRecording | PVR.IsPlayingEpgTag">$INFO[VideoPlayer.Season,[COLOR button_focus][CAPITALIZE]$LOCALIZE[36906][/CAPITALIZE]:[/COLOR] S]$INFO[VideoPlayer.Episode,E, - ]$INFO[VideoPlayer.EpisodeName]</value>
<value condition="player.chaptercount + [!VideoPlayer.Content(episodes) + !VideoPlayer.Content(LiveTV)]">$INFO[player.chapter,[COLOR button_focus]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount,/]$INFO[Player.ChapterName, - ]</value>
<value>$INFO[VideoPlayer.Genre]</value>
</variable>