aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Stenvall <Jalle19@users.noreply.github.com>2015-01-30 18:24:12 +0200
committerSam Stenvall <Jalle19@users.noreply.github.com>2015-01-30 18:24:12 +0200
commitf66038b5e55037bbcd6434f92479da0c48f56e8c (patch)
treead376cae738063091c0cefc5cc9e5dc5b526f468
parent599d480cde1d90266fa77d5ee4c6d2926dffdb94 (diff)
parenta7e994ce72ac6ab143156ea4e24435b6df0421da (diff)
Merge pull request #6296 from Jalle19/pvr-subtitles-button
[confluence] show the subtitles OSD button in live TV too
-rw-r--r--addons/skin.confluence/720p/VideoOSD.xml22
1 files changed, 17 insertions, 5 deletions
diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml
index 55e2f3fd90..3eb7490a48 100644
--- a/addons/skin.confluence/720p/VideoOSD.xml
+++ b/addons/skin.confluence/720p/VideoOSD.xml
@@ -280,8 +280,17 @@
<onclick>ActivateWindow(PVROSDGuide)</onclick>
<onclick>Dialog.Close(VideoOSD)</onclick>
</control>
+ <control type="button" id="350">
+ <width>55</width>
+ <height>55</height>
+ <label>31356</label>
+ <font>-</font>
+ <texturefocus>OSDTeleTextFO.png</texturefocus>
+ <texturenofocus>OSDTeleTextNF.png</texturenofocus>
+ <onclick>ActivateWindow(Teletext)</onclick>
+ </control>
<control type="image" id="2300">
- <width>215</width>
+ <width>165</width>
<texture>-</texture>
</control>
<control type="button" id="354">
@@ -295,14 +304,15 @@
<texturenofocus>OSDStereoscopicNF.png</texturenofocus>
<onup>551</onup>
</control>
- <control type="button" id="350">
+ <control type="button" id="250">
<width>55</width>
<height>55</height>
<label>31356</label>
<font>-</font>
- <texturefocus>OSDTeleTextFO.png</texturefocus>
- <texturenofocus>OSDTeleTextNF.png</texturenofocus>
- <onclick>ActivateWindow(Teletext)</onclick>
+ <texturefocus>OSDSubtitlesFO.png</texturefocus>
+ <texturenofocus>OSDSubtitlesNF.png</texturenofocus>
+ <onup>404</onup>
+ <ondown>1000</ondown>
</control>
<control type="button" id="351">
<width>55</width>
@@ -407,6 +417,8 @@
<onclick>Close</onclick>
<onclick>Dialog.Close(VideoOSD)</onclick>
<onclick>ActivateWindow(SubtitleSearch)</onclick>
+ <!-- no point in downloading subtitles for live programs -->
+ <enable>!VideoPlayer.Content(LiveTV)</enable>
</control>
<control type="button" id="402">
<height>40</height>