aboutsummaryrefslogtreecommitdiff
path: root/addons/skin.confluence
diff options
context:
space:
mode:
authorAlwin Esch <alwin.esch@web.de>2015-09-11 18:45:14 +0200
committerAlwin Esch <alwin.esch@web.de>2015-09-11 18:45:14 +0200
commit8e18a4803ebea1cd8d84786a5f26f034069b2054 (patch)
tree987564290cd58e44e7c0943be0e517c1c6046fab /addons/skin.confluence
parent65df135e8e200382e89dbd94aff2fc4d5f8aaac6 (diff)
parente878546be0e42eaeb3b38a2c58c8578736c24a5e (diff)
Merge pull request #6174 from AlwinEsch/radio-rds-support
[pvr] Radio RDS support
Diffstat (limited to 'addons/skin.confluence')
-rw-r--r--addons/skin.confluence/720p/DialogPVRRadioRDSInfo.xml949
-rw-r--r--addons/skin.confluence/720p/Home.xml19
-rw-r--r--addons/skin.confluence/720p/MusicOSD.xml19
-rw-r--r--addons/skin.confluence/720p/MusicVisualisation.xml4
-rw-r--r--addons/skin.confluence/720p/MyPVRChannels.xml893
-rw-r--r--addons/skin.confluence/720p/PlayerControls.xml17
-rw-r--r--addons/skin.confluence/720p/SkinSettings.xml12
-rw-r--r--addons/skin.confluence/720p/includes.xml44
-rw-r--r--addons/skin.confluence/language/resource.language.en_gb/strings.po10
-rw-r--r--addons/skin.confluence/media/OSDRadioRDSFO.pngbin0 -> 5776 bytes
-rw-r--r--addons/skin.confluence/media/OSDRadioRDSNF.pngbin0 -> 1419 bytes
-rw-r--r--addons/skin.confluence/media/flagging/rds/rds-logo.pngbin0 -> 22082 bytes
-rw-r--r--addons/skin.confluence/media/flagging/rds/rds-radiotext-logo.pngbin0 -> 29924 bytes
-rw-r--r--addons/skin.confluence/media/flagging/rds/rds-radiotext-plus-logo.pngbin0 -> 32031 bytes
14 files changed, 1711 insertions, 256 deletions
diff --git a/addons/skin.confluence/720p/DialogPVRRadioRDSInfo.xml b/addons/skin.confluence/720p/DialogPVRRadioRDSInfo.xml
new file mode 100644
index 0000000000..a7b936aa55
--- /dev/null
+++ b/addons/skin.confluence/720p/DialogPVRRadioRDSInfo.xml
@@ -0,0 +1,949 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+ <defaultcontrol always="true">10</defaultcontrol>
+ <coordinates>
+ <left>200</left>
+ <top>20</top>
+ </coordinates>
+ <include>dialogeffect</include>
+ <controls>
+ <control type="image">
+ <description>background image</description>
+ <left>0</left>
+ <top>0</top>
+ <width>880</width>
+ <height>680</height>
+ <texture border="40">DialogBack2.png</texture>
+ <visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
+ </control>
+ <control type="image">
+ <description>background image</description>
+ <left>0</left>
+ <top>0</top>
+ <width>880</width>
+ <height>680</height>
+ <texture border="40">DialogBack.png</texture>
+ <visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
+ </control>
+ <control type="image">
+ <description>Dialog Header image</description>
+ <left>40</left>
+ <top>16</top>
+ <width>880</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
+ </control>
+ <control type="label">
+ <description>header label</description>
+ <left>40</left>
+ <top>20</top>
+ <width>800</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <label>$LOCALIZE[29900]</label>
+ <align>center</align>
+ <aligny>center</aligny>
+ <textcolor>selected</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="button">
+ <description>Close Window button</description>
+ <left>800</left>
+ <top>15</top>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <onclick>PreviousMenu</onclick>
+ <texturefocus>DialogCloseButton-focus.png</texturefocus>
+ <texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ <visible>system.getbool(input.enablemouse)</visible>
+ </control>
+ <control type="group">
+ <description>Normal song info group</description>
+ <left>0</left>
+ <top>70</top>
+ <visible>IsEmpty(RDS.IsClassical)</visible>
+ <control type="label">
+ <description>Artist Title</description>
+ <left>10</left>
+ <top>0</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[557]:</label>
+ <visible>IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Artist Value</description>
+ <left>160</left>
+ <top>0</top>
+ <width>704</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label fallback="161">$INFO[RDS.Artist]</label>
+ <scrollout>false</scrollout>
+ <pauseatend>2000</pauseatend>
+ <visible>IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="label">
+ <description>Band Title</description>
+ <left>10</left>
+ <top>0</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29901]:</label>
+ <visible>!IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Band Value</description>
+ <left>160</left>
+ <top>0</top>
+ <width>292</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.Band]</label>
+ <scrollout>false</scrollout>
+ <pauseatend>2000</pauseatend>
+ <visible>!IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="label">
+ <description>Artist Name (alt pos)</description>
+ <left>385</left>
+ <top>0</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[557]:</label>
+ <visible>!IsEmpty(RDS.Artist)+!IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Artist Value (alt pos)</description>
+ <left>535</left>
+ <top>0</top>
+ <width>328</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.Artist]</label>
+ <visible>!IsEmpty(RDS.Artist)+!IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="label">
+ <description>Song Title</description>
+ <left>10</left>
+ <top>35</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[556]:</label>
+ </control>
+ <control type="fadelabel">
+ <description>Song Value</description>
+ <left>160</left>
+ <top>35</top>
+ <width>704</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label fallback="161">$INFO[RDS.Title]</label>
+ <scrollout>false</scrollout>
+ <pauseatend>2000</pauseatend>
+ </control>
+ <control type="label">
+ <description>Programme style Name</description>
+ <left>10</left>
+ <top>70</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29902]:</label>
+ <visible>!IsEmpty(RDS.ProgStyle)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Programme style Value</description>
+ <left>160</left>
+ <top>70</top>
+ <width>704</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.ProgStyle]</label>
+ <visible>!IsEmpty(RDS.ProgStyle)</visible>
+ </control>
+ </control>
+ <control type="group">
+ <description>Classic concert music group</description>
+ <left>0</left>
+ <top>70</top>
+ <visible>!IsEmpty(RDS.IsClassical)</visible>
+ <control type="label">
+ <description>Composer Title</description>
+ <left>10</left>
+ <top>0</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29903]:</label>
+ </control>
+ <control type="fadelabel">
+ <description>Composer Value</description>
+ <left>160</left>
+ <top>0</top>
+ <width>704</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label fallback="161">$INFO[RDS.Composer]</label>
+ <scrollout>false</scrollout>
+ <pauseatend>2000</pauseatend>
+ </control>
+ <control type="label">
+ <description>Song Title</description>
+ <left>10</left>
+ <top>35</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[556]:</label>
+ </control>
+ <control type="fadelabel">
+ <description>Song Value</description>
+ <left>160</left>
+ <top>35</top>
+ <width>704</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label fallback="161">$INFO[RDS.Title]</label>
+ <scrollout>false</scrollout>
+ <pauseatend>2000</pauseatend>
+ </control>
+ <control type="label">
+ <description>Artist Title</description>
+ <left>10</left>
+ <top>70</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29904]:</label>
+ <visible>IsEmpty(RDS.Band)+!IsEmpty(RDS.Artist)</visible>
+ </control>
+ <control type="textbox">
+ <description>Artist Value</description>
+ <left>160</left>
+ <top>66</top>
+ <width>704</width>
+ <height>29</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <align>left</align>
+ <pagecontrol>-</pagecontrol>
+ <label fallback="161">$INFO[RDS.Artist]</label>
+ <autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
+ <visible>IsEmpty(RDS.Band)+!IsEmpty(RDS.Artist)</visible>
+ </control>
+ <control type="label">
+ <description>Band Title</description>
+ <left>10</left>
+ <top>70</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29901]:</label>
+ <visible>!IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Band Value</description>
+ <left>160</left>
+ <top>70</top>
+ <width>292</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.Band]</label>
+ <scrollout>false</scrollout>
+ <pauseatend>2000</pauseatend>
+ <visible>!IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="label">
+ <description>Artist Name (alt pos)</description>
+ <left>385</left>
+ <top>70</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29904]:</label>
+ <visible>!IsEmpty(RDS.Artist)+!IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="textbox">
+ <description>Artist Value (alt pos)</description>
+ <left>535</left>
+ <top>70</top>
+ <width>328</width>
+ <height>100</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <align>left</align>
+ <pagecontrol>-</pagecontrol>
+ <label>$INFO[RDS.Artist]</label>
+ <autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
+ <visible>!IsEmpty(RDS.Artist)+!IsEmpty(RDS.Band)</visible>
+ </control>
+ <control type="label">
+ <description>Conductor Title</description>
+ <left>10</left>
+ <top>105</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29905]:</label>
+ <visible>!IsEmpty(RDS.Conductor)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Conductor Value</description>
+ <left>160</left>
+ <top>105</top>
+ <width>300</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label fallback="161">$INFO[RDS.Conductor]</label>
+ <scrollout>false</scrollout>
+ <pauseatend>2000</pauseatend>
+ <visible>!IsEmpty(RDS.Conductor)</visible>
+ </control>
+ <control type="label">
+ <description>Programme style Name</description>
+ <left>10</left>
+ <top>105</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29902]:</label>
+ <visible>IsEmpty(RDS.Conductor)+!IsEmpty(RDS.ProgStyle)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Programme style Value</description>
+ <left>160</left>
+ <top>105</top>
+ <width>704</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.ProgStyle]</label>
+ <visible>IsEmpty(RDS.Conductor)+!IsEmpty(RDS.ProgStyle)</visible>
+ </control>
+ <control type="label">
+ <description>Programme style Name</description>
+ <left>385</left>
+ <top>105</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29902]:</label>
+ <visible>!IsEmpty(RDS.Conductor)+!IsEmpty(RDS.ProgStyle)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Programme style Value</description>
+ <left>535</left>
+ <top>105</top>
+ <width>328</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>INFO[RDS.ProgStyle]</label>
+ <visible>!IsEmpty(RDS.Conductor)+!IsEmpty(RDS.ProgStyle)</visible>
+ </control>
+ </control>
+ <control type="label">
+ <description>Album Title</description>
+ <left>385</left>
+ <top>175</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[558]:</label>
+ <visible>!IsEmpty(RDS.Album)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Album Value</description>
+ <left>535</left>
+ <top>175</top>
+ <width>328</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.Album]</label>
+ <scrollout>false</scrollout>
+ <pauseatend>2000</pauseatend>
+ <visible>!IsEmpty(RDS.Album)</visible>
+ </control>
+ <control type="label">
+ <description>Programme host Name</description>
+ <left>10</left>
+ <top>210</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29906]:</label>
+ <visible>!IsEmpty(RDS.ProgHost)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Programme host Value</description>
+ <left>160</left>
+ <top>210</top>
+ <width>235</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.ProgHost]</label>
+ <visible>!IsEmpty(RDS.ProgHost)</visible>
+ </control>
+ <control type="label">
+ <description>Comment Title</description>
+ <left>385</left>
+ <top>210</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[569]:</label>
+ <visible>!IsEmpty(RDS.Comment)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Comment Value</description>
+ <left>535</left>
+ <top>210</top>
+ <width>328</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.Comment]</label>
+ <scrollout>false</scrollout>
+ <pauseatend>2000</pauseatend>
+ <visible>!IsEmpty(RDS.Comment)</visible>
+ </control>
+ <control type="label">
+ <description>Channel Name</description>
+ <left>10</left>
+ <top>245</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[19148]:</label>
+ </control>
+ <control type="fadelabel">
+ <description>Channel Value</description>
+ <left>160</left>
+ <top>245</top>
+ <width>235</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.ProgStation]</label>
+ </control>
+ <control type="label">
+ <description>Editorial Staff Name</description>
+ <left>385</left>
+ <top>245</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29907]:</label>
+ <visible>!IsEmpty(RDS.ProgEditStaff)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Editorial Staff Value</description>
+ <left>535</left>
+ <top>245</top>
+ <width>328</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.ProgEditStaff]</label>
+ <visible>!IsEmpty(RDS.ProgEditStaff)</visible>
+ </control>
+
+ <control type="grouplist">
+ <left>10</left>
+ <top>280</top>
+ <width>160</width>
+ <height>300</height>
+ <itemgap>8</itemgap>
+ <control type="label">
+ <description>Program basename</description>
+ <left>10</left>
+ <top>280</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13caps</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29908]:</label>
+ <visible>!IsEmpty(RDS.ProgNow) | !IsEmpty(RDS.ProgNext)</visible>
+ </control>
+ <control type="label">
+ <description>blind label</description>
+ <left>10</left>
+ <top>280</top>
+ <width>140</width>
+ <height>25</height>
+ <label></label>
+ <visible>!IsEmpty(RDS.ProgNow) + !IsEmpty(RDS.ProgNext)</visible>
+ </control>
+ <control type="label">
+ <description>Studio basename</description>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13caps</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29909]:</label>
+ <visible>!IsEmpty(RDS.PhoneStudio) | !IsEmpty(RDS.EmailStudio) | !IsEmpty(RDS.SMSStudio)</visible>
+ </control>
+ </control>
+ <control type="grouplist">
+ <left>160</left>
+ <top>280</top>
+ <width>160</width>
+ <height>300</height>
+ <itemgap>8</itemgap>
+ <control type="label">
+ <description>Program now Name</description>
+ <width>160</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$LOCALIZE[19030]:</label>
+ <visible>!IsEmpty(RDS.ProgNow)</visible>
+ </control>
+ <control type="label">
+ <description>Program next Name</description>
+ <width>160</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$LOCALIZE[19031]:</label>
+ <visible>!IsEmpty(RDS.ProgNext)</visible>
+ </control>
+ <control type="label">
+ <description>Studio phone Name</description>
+ <width>95</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$LOCALIZE[29910]:</label>
+ <visible>!IsEmpty(RDS.PhoneStudio)</visible>
+ </control>
+ <control type="label">
+ <description>Studio email Name</description>
+ <width>95</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$LOCALIZE[29911]:</label>
+ <visible>!IsEmpty(RDS.EmailStudio)</visible>
+ </control>
+ <control type="label">
+ <description>Studio SMS Name</description>
+ <width>95</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$LOCALIZE[29912]:</label>
+ <visible>!IsEmpty(RDS.SMSStudio)</visible>
+ </control>
+ </control>
+ <control type="grouplist">
+ <left>230</left>
+ <top>280</top>
+ <width>620</width>
+ <height>300</height>
+ <itemgap>8</itemgap>
+ <control type="fadelabel">
+ <description>Program now Value</description>
+ <width>620</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
+ <label>$INFO[RDS.ProgNow]</label>
+ <visible>!IsEmpty(RDS.ProgNow)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Program next Value</description>
+ <width>620</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
+ <label>$INFO[RDS.ProgNext]</label>
+ <visible>!IsEmpty(RDS.ProgNext)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Studio phone Value</description>
+ <width>215</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
+ <label>$INFO[RDS.PhoneStudio]</label>
+ <visible>!IsEmpty(RDS.PhoneStudio)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Studio email Value</description>
+ <width>215</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
+ <label>$INFO[RDS.EmailStudio]</label>
+ <visible>!IsEmpty(RDS.EmailStudio)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Studio SMS Value</description>
+ <width>215</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
+ <label>$INFO[RDS.SMSStudio]</label>
+ <visible>!IsEmpty(RDS.SMSStudio)</visible>
+ </control>
+ </control>
+ <control type="grouplist">
+ <left>385</left>
+ <top>280</top>
+ <width>520</width>
+ <height>300</height>
+ <itemgap>8</itemgap>
+ <control type="label">
+ <description>blind label</description>
+ <width>5</width>
+ <height>25</height>
+ <label></label>
+ <visible>!IsEmpty(RDS.ProgNow)</visible>
+ </control>
+ <control type="label">
+ <description>blind label</description>
+ <width>5</width>
+ <height>25</height>
+ <label></label>
+ <visible>!IsEmpty(RDS.ProgNext)</visible>
+ </control>
+ <control type="label">
+ <description>Hotline basename</description>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13caps</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29913]:</label>
+ <visible>!IsEmpty(RDS.PhoneHotline) | !IsEmpty(RDS.EmailHotline)</visible>
+ </control>
+ <control type="label">
+ <description>blind label</description>
+ <width>140</width>
+ <height>25</height>
+ <label></label>
+ <visible>!IsEmpty(RDS.PhoneHotline) + !IsEmpty(RDS.EmailHotline)</visible>
+ </control>
+ <control type="label">
+ <description>Homepage Name</description>
+ <left>385</left>
+ <top>420</top>
+ <width>140</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29914]:</label>
+ <visible>!IsEmpty(RDS.ProgHomepage)</visible>
+ </control>
+ </control>
+ <control type="grouplist">
+ <left>535</left>
+ <top>280</top>
+ <width>520</width>
+ <height>300</height>
+ <itemgap>8</itemgap>
+ <control type="label">
+ <description>blind label</description>
+ <width>5</width>
+ <height>25</height>
+ <label></label>
+ <visible>!IsEmpty(RDS.ProgNow)</visible>
+ </control>
+ <control type="label">
+ <description>blind label</description>
+ <width>5</width>
+ <height>25</height>
+ <label></label>
+ <visible>!IsEmpty(RDS.ProgNext)</visible>
+ </control>
+ <control type="label">
+ <description>Hotline phone Name</description>
+ <width>160</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$LOCALIZE[29910]:</label>
+ <visible>!IsEmpty(RDS.PhoneHotline)</visible>
+ </control>
+ <control type="label">
+ <description>Hotline email Name</description>
+ <width>160</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$LOCALIZE[29911]:</label>
+ <visible>!IsEmpty(RDS.EmailHotline)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Homepage Value</description>
+ <width>320</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <label>$INFO[RDS.ProgHomepage]</label>
+ <visible>!IsEmpty(RDS.ProgHomepage)</visible>
+ </control>
+ </control>
+ <control type="grouplist">
+ <left>605</left>
+ <top>280</top>
+ <width>520</width>
+ <height>300</height>
+ <itemgap>8</itemgap>
+ <control type="label">
+ <description>blind label</description>
+ <width>5</width>
+ <height>25</height>
+ <label></label>
+ <visible>!IsEmpty(RDS.ProgNow)</visible>
+ </control>
+ <control type="label">
+ <description>blind label</description>
+ <width>140</width>
+ <height>25</height>
+ <label></label>
+ <visible>!IsEmpty(RDS.ProgNext)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Hotline phone Value</description>
+ <width>248</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
+ <label>$INFO[RDS.PhoneHotline]</label>
+ <visible>!IsEmpty(RDS.PhoneHotline)</visible>
+ </control>
+ <control type="fadelabel">
+ <description>Hotline email Value</description>
+ <width>248</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
+ <label>$INFO[RDS.EmailHotline]</label>
+ <visible>!IsEmpty(RDS.EmailHotline)</visible>
+ </control>
+ </control>
+
+ <control type="group">
+ <description>Radio text info list</description>
+ <left>40</left>
+ <top>455</top>
+ <visible>false</visible>
+ <include>VisibleFadeEffect</include>
+ <control type="label">
+ <description>Info label</description>
+ <left>375</left>
+ <top>0</top>
+ <width>110</width>
+ <height>25</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13caps</font>
+ <textcolor>blue</textcolor>
+ <label>$LOCALIZE[29915]:</label>
+ </control>
+ <control type="spincontrol" id="21">
+ <description>Source Type</description>
+ <left>740</left>
+ <top>5</top>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <aligny>center</aligny>
+ <label>-</label>
+ <textoffsetx>10</textoffsetx>
+ <onright>21</onright>
+ <onleft>21</onleft>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ </control>
+ <control type="spincontrol" id="60">
+ <description>Next page button</description>
+ <left>0</left>
+ <top>155</top>
+ <subtype>page</subtype>
+ <font>-</font>
+ <onright>9000</onright>
+ <onleft>9000</onleft>
+ <ondown>21</ondown>
+ <onup>21</onup>
+ <textcolor>-</textcolor>
+ <showonepage>true</showonepage>
+ </control>
+ <control type="textbox" id="22">
+ <description>PLOT</description>
+ <left>0</left>
+ <top>30</top>
+ <width>800</width>
+ <height>120</height>
+ <font>font11</font>
+ <align>justify</align>
+ <pagecontrol>60</pagecontrol>
+ <label>-</label>
+ </control>
+ </control>
+ <control type="grouplist" id="9000">
+ <left>40</left>
+ <top>620</top>
+ <width>790</width>
+ <height>40</height>
+ <itemgap>5</itemgap>
+ <align>center</align>
+ <orientation>horizontal</orientation>
+ <onleft>60</onleft>
+ <onright>60</onright>
+ <onup>21</onup>
+ <ondown>21</ondown>
+ <control type="button" id="10">
+ <description>OK</description>
+ <include>ButtonInfoDialogsCommonValues</include>
+ <label>186</label>
+ </control>
+ </control>
+ </controls>
+</window>
diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 56c9de9632..8fd7d2d7b9 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -669,13 +669,28 @@
<alttexturefocus>OSDPlayFO.png</alttexturefocus>
<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
<onleft>603</onleft>
- <onright>606</onright>
+ <onright>605</onright>
<onup>9003</onup>
<ondown>9000</ondown>
<onclick>PlayerControl(Play)</onclick>
<enable>Player.PauseEnabled</enable>
<animation effect="fade" start="100" end="30" time="75" condition="!Player.PauseEnabled">Conditional</animation>
</control>
+ <control type="button" id="605">
+ <left>130</left>
+ <top>2</top>
+ <width>30</width>
+ <height>30</height>
+ <label>-</label>
+ <texturefocus>OSDRadioRDSFO.png</texturefocus>
+ <texturenofocus>OSDRadioRDSNF.png</texturenofocus>
+ <onleft>604</onleft>
+ <onright>606</onright>
+ <onup>9003</onup>
+ <ondown>9000</ondown>
+ <onclick>ActivateWindow(PVRRadioRDSInfo)</onclick>
+ <visible>RDS.HasRadiotextPlus</visible>
+ </control>
<control type="button" id="606">
<left>160</left>
<top>2</top>
@@ -684,7 +699,7 @@
<label>-</label>
<texturefocus>OSDRecordOffFO.png</texturefocus>
<texturenofocus>OSDRecordOffNF.png</texturenofocus>
- <onleft>604</onleft>
+ <onleft>605</onleft>
<onright>607</onright>
<onup>9003</onup>
<ondown>9000</ondown>
diff --git a/addons/skin.confluence/720p/MusicOSD.xml b/addons/skin.confluence/720p/MusicOSD.xml
index 506efcdc65..c6647de9e5 100644
--- a/addons/skin.confluence/720p/MusicOSD.xml
+++ b/addons/skin.confluence/720p/MusicOSD.xml
@@ -26,7 +26,7 @@
<ondown>100</ondown>
<animation effect="fade" time="150">VisibleChange</animation>
<animation effect="slide" start="0,0" end="-30,0" time="0" condition="Window.IsVisible(Mutebug)">conditional</animation>
- <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
+ <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
</control>
<control type="slider" id="87">
<description>Seek Slider</description>
@@ -41,7 +41,7 @@
<textureslidernib>osd_slider_nibNF.png</textureslidernib>
<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
<animation effect="fade" time="150">VisibleChange</animation>
- <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
+ <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
</control>
<control type="grouplist" id="100">
<left>325</left>
@@ -51,7 +51,7 @@
<orientation>horizontal</orientation>
<itemgap>0</itemgap>
<animation effect="fade" time="150">VisibleChange</animation>
- <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
+ <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
<control type="button" id="300">
<width>55</width>
<height>55</height>
@@ -156,7 +156,18 @@
<texturefocus>OSDepgFO.png</texturefocus>
<texturenofocus>OSDepgNF.png</texturenofocus>
<onclick>ActivateWindow(PVROSDGuide)</onclick>
- <visible>MusicPlayer.Content(LiveTV)</visible>
+ <visible>MusicPlayer.Content(LiveTV) + !RDS.HasRadiotextPlus</visible>
+ </control>
+ <control type="button" id="308">
+ <visible>RDS.HasRadiotextPlus</visible>
+ <width>55</width>
+ <height>55</height>
+ <label>209</label>
+ <font>-</font>
+ <texturefocus>OSDRadioRDSFO.png</texturefocus>
+ <texturenofocus>OSDRadioRDSNF.png</texturenofocus>
+ <onclick>ActivateWindow(PVRRadioRDSInfo)</onclick>
+ <visible>MusicPlayer.Content(LiveTV) + RDS.HasRadiotextPlus</visible>
</control>
<control type="group" id="699">
<width>55</width>
diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml
index 23d4d8dbcd..00c183fee3 100644
--- a/addons/skin.confluence/720p/MusicVisualisation.xml
+++ b/addons/skin.confluence/720p/MusicVisualisation.xml
@@ -25,7 +25,7 @@
<!-- media infos -->
<control type="group">
<animation effect="fade" time="150">VisibleChange</animation>
- <visible>[Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
+ <visible>[Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
<control type="image">
<left>0</left>
<top>-150</top>
@@ -290,7 +290,7 @@
<control type="group" id="0">
<left>0</left>
<top>50</top>
- <visible>Player.ShowCodec + ![Window.IsVisible(script-cu-lrclyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
+ <visible>Player.ShowCodec + ![Window.IsVisible(script-cu-lrclyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
<animation effect="fade" time="150">VisibleChange</animation>
<control type="image">
<description>media info background image</description>
diff --git a/addons/skin.confluence/720p/MyPVRChannels.xml b/addons/skin.confluence/720p/MyPVRChannels.xml
index 766b1751f3..fcc5e0c83b 100644
--- a/addons/skin.confluence/720p/MyPVRChannels.xml
+++ b/addons/skin.confluence/720p/MyPVRChannels.xml
@@ -3,7 +3,7 @@
<defaultcontrol always="true">50</defaultcontrol>
<menucontrol>9000</menucontrol>
<allowoverlay>no</allowoverlay>
- <views>50</views>
+ <views>50,51</views>
<controls>
<include>CommonBackground</include>
<control type="image">
@@ -17,8 +17,9 @@
</control>
<control type="group">
<include>Window_OpenClose_Animation</include>
+ <include>VisibleFadeEffect</include>
<control type="group">
- <include>VisibleFadeEffect</include>
+ <visible>Control.IsVisible(50)</visible>
<control type="image">
<left>50</left>
<top>60</top>
@@ -26,28 +27,45 @@
<height>600</height>
<texture border="15">ContentPanel.png</texture>
</control>
+ </control>
+ <control type="group">
+ <visible>Control.IsVisible(51)</visible>
<control type="image">
<left>50</left>
- <top>652</top>
- <width>450</width>
- <height>64</height>
- <texture border="15">ContentPanelMirror.png</texture>
- </control>
- <control type="image">
- <left>510</left>
<top>60</top>
- <width>730</width>
- <height>600</height>
+ <width>450</width>
+ <height>420</height>
<texture border="15">ContentPanel.png</texture>
</control>
<control type="image">
- <left>510</left>
- <top>652</top>
- <width>730</width>
- <height>64</height>
- <texture border="15">ContentPanelMirror.png</texture>
+ <left>50</left>
+ <top>480</top>
+ <width>450</width>
+ <height>180</height>
+ <texture border="15">ContentPanel.png</texture>
</control>
</control>
+ <control type="image">
+ <left>50</left>
+ <top>652</top>
+ <width>450</width>
+ <height>64</height>
+ <texture border="15">ContentPanelMirror.png</texture>
+ </control>
+ <control type="image">
+ <left>510</left>
+ <top>60</top>
+ <width>730</width>
+ <height>600</height>
+ <texture border="15">ContentPanel.png</texture>
+ </control>
+ <control type="image">
+ <left>510</left>
+ <top>652</top>
+ <width>730</width>
+ <height>64</height>
+ <texture border="15">ContentPanelMirror.png</texture>
+ </control>
</control>
<include>MainWindowMouseButtons</include>
<include>PVRHeader</include>
@@ -55,7 +73,7 @@
<description>Small Media Window</description>
<left>530</left>
<top>80</top>
- <visible>Control.IsVisible(50)</visible>
+ <visible>Control.IsVisible(50) | Control.IsVisible(51)</visible>
<include>VisibleFadeEffect</include>
<include>Window_OpenClose_Animation</include>
<control type="image">
@@ -108,11 +126,12 @@
<control type="group">
<include>Window_OpenClose_Animation</include>
<description>TV Channels group</description>
- <visible>Control.IsVisible(50)</visible>
+ <visible>Control.IsVisible(50) | Control.IsVisible(51)</visible>
<include>VisibleFadeEffect</include>
<control type="group">
<left>530</left>
<top>490</top>
+ <visible>Control.IsVisible(50) + !RDS.HasRDS</visible>
<control type="label">
<left>0</left>
<top>0</top>
@@ -187,230 +206,626 @@
<label>$LOCALIZE[19031]: $INFO[Container(50).ListItem.NextTitle]</label>
</control>
</control>
- <control type="list" id="50">
+ <control type="group">
<left>70</left>
- <top>85</top>
- <width>390</width>
- <height>541</height>
- <onleft>100</onleft>
- <onright>70</onright>
- <onup>50</onup>
- <ondown>50</ondown>
- <viewtype label="535">list</viewtype>
- <pagecontrol>70</pagecontrol>
- <scrolltime>200</scrolltime>
- <itemlayout height="60" width="390">
- <control type="image">
- <left>0</left>
- <top>0</top>
- <width>390</width>
- <height>61</height>
- <texture border="2">MenuItemNF.png</texture>
- <include>VisibleFadeEffect</include>
- </control>
- <control type="label">
- <left>5</left>
- <top>-4</top>
- <width>40</width>
- <height>35</height>
- <font>font12</font>
- <align>left</align>
- <aligny>center</aligny>
- <textcolor>grey</textcolor>
- <selectedcolor>grey</selectedcolor>
- <info>ListItem.ChannelNumberLabel</info>
- </control>
- <control type="label">
- <left>50</left>
- <top>0</top>
- <width>270</width>
- <height>25</height>
- <font>font13</font>
- <textcolor>white</textcolor>
- <selectedcolor>selected</selectedcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Label]</label>
- </control>
- <control type="label">
- <left>50</left>
- <top>25</top>
- <width>330</width>
- <height>20</height>
- <font>font12</font>
- <textcolor>grey</textcolor>
- <selectedcolor>grey</selectedcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Title]</label>
- <visible>IsEmpty(Listitem.Icon)</visible>
- </control>
- <control type="label">
- <left>50</left>
- <top>25</top>
- <width>280</width>
- <height>20</height>
- <font>font12</font>
- <textcolor>grey</textcolor>
- <selectedcolor>grey</selectedcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Title]</label>
- <visible>!IsEmpty(Listitem.Icon)</visible>
- </control>
- <control type="progress">
- <description>Progressbar</description>
- <left>50</left>
- <top>48</top>
- <width>280</width>
- <height>6</height>
- <colordiffuse>88FFFFFF</colordiffuse>
- <visible>ListItem.HasEpg</visible>
- <info>ListItem.Progress</info>
- </control>
- <control type="image">
- <left>340</left>
- <top>4</top>
- <width>50</width>
- <height>50</height>
- <texture>$INFO[ListItem.Icon]</texture>
- <aspectratio>keep</aspectratio>
- </control>
- <control type="image">
- <left>5</left>
- <top>37</top>
- <width>30</width>
- <height>20</height>
- <texture>PVR-IsRecording.png</texture>
- <visible>ListItem.IsRecording</visible>
- </control>
- </itemlayout>
- <focusedlayout height="60" width="390">
- <control type="image">
- <left>0</left>
- <top>0</top>
- <width>390</width>
- <height>61</height>
- <texture border="2">MenuItemNF.png</texture>
- <visible>!Control.HasFocus(50)</visible>
- <include>VisibleFadeEffect</include>
- </control>
- <control type="image">
- <left>0</left>
- <top>0</top>
- <width>390</width>
- <height>61</height>
- <texture border="2">MenuItemFO.png</texture>
- <visible>Control.HasFocus(50)</visible>
- <include>VisibleFadeEffect</include>
- </control>
- <control type="label">
- <left>5</left>
- <top>-4</top>
- <width>40</width>
- <height>35</height>
- <font>font12</font>
- <align>left</align>
- <aligny>center</aligny>
- <textcolor>grey</textcolor>
- <selectedcolor>grey</selectedcolor>
- <info>ListItem.ChannelNumberLabel</info>
- </control>
- <control type="label">
- <left>50</left>
- <top>0</top>
- <width>270</width>
- <height>25</height>
- <font>font13</font>
- <textcolor>white</textcolor>
- <selectedcolor>selected</selectedcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Label]</label>
- </control>
- <control type="label">
- <left>50</left>
- <top>25</top>
- <width>330</width>
- <height>20</height>
- <font>font12</font>
- <textcolor>grey</textcolor>
- <selectedcolor>grey</selectedcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Title]</label>
- <visible>IsEmpty(Listitem.Icon)</visible>
- </control>
- <control type="label">
- <left>50</left>
- <top>25</top>
- <width>280</width>
- <height>20</height>
- <font>font12</font>
- <textcolor>grey</textcolor>
- <selectedcolor>grey</selectedcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Title]</label>
- <visible>!IsEmpty(Listitem.Icon)</visible>
- </control>
- <control type="progress">
- <description>Progressbar</description>
- <left>50</left>
- <top>48</top>
- <width>280</width>
- <height>6</height>
- <colordiffuse>88FFFFFF</colordiffuse>
- <visible>ListItem.HasEpg</visible>
- <info>ListItem.Progress</info>
- </control>
- <control type="image">
- <left>340</left>
- <top>4</top>
- <width>50</width>
- <height>50</height>
- <texture>$INFO[ListItem.Icon]</texture>
- <aspectratio>keep</aspectratio>
- </control>
- <control type="image">
- <left>5</left>
- <top>37</top>
- <width>30</width>
- <height>20</height>
- <texture>PVR-IsRecording.png</texture>
- <visible>ListItem.IsRecording</visible>
- </control>
- </focusedlayout>
+ <top>490</top>
+ <visible>Control.IsVisible(51)</visible>
+ <control type="label">
+ <left>0</left>
+ <top>0</top>
+ <width>415</width>
+ <height>20</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ <scroll>true</scroll>
+ <align>center</align>
+ <aligny>center</aligny>
+ <label>[B]$INFO[Container(51).ListItem.Title][/B]</label>
+ </control>
+ <control type="label">
+ <left>0</left>
+ <top>22</top>
+ <width>60</width>
+ <height>20</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font10_title</font>
+ <textcolor>blue</textcolor>
+ <visible>Container(51).ListItem.HasEpg</visible>
+ <label>$INFO[Container(51).ListItem.StartTime]</label>
+ </control>
+ <control type="progress">
+ <description>Progressbar</description>
+ <left>65</left>
+ <top>30</top>
+ <width>275</width>
+ <height>8</height>
+ <visible>Container(51).ListItem.HasEpg</visible>
+ <info>Container(51).ListItem.Progress</info>
+ </control>
+ <control type="label">
+ <left>345</left>
+ <top>22</top>
+ <width>80</width>
+ <height>20</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font10_title</font>
+ <textcolor>blue</textcolor>
+ <visible>Container(51).ListItem.HasEpg</visible>
+ <label>$INFO[Container(51).ListItem.EndTime]</label>
+ </control>
+ <control type="textbox">
+ <description>Plot Value for TVShow</description>
+ <left>0</left>
+ <top>50</top>
+ <width>415</width>
+ <height>74</height>
+ <font>font13</font>
+ <align>justify</align>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ <pagecontrol>-</pagecontrol>
+ <label>$INFO[Container(51).ListItem.Plot]</label>
+ <autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
+ </control>
+ <control type="label">
+ <left>0</left>
+ <top>140</top>
+ <width>400</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey2</textcolor>
+ <align>right</align>
+ <aligny>center</aligny>
+ <scroll>false</scroll>
+ <visible>!IsEmpty(Container(51).ListItem.NextTitle)</visible>
+ <label>$LOCALIZE[19031]: $INFO[Container(51).ListItem.NextTitle]</label>
+ </control>
</control>
- <control type="scrollbar" id="70">
- <left>465</left>
- <top>85</top>
- <width>25</width>
- <height>540</height>
- <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
- <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
- <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
- <textureslidernib>ScrollBarNib.png</textureslidernib>
- <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
- <onleft>50</onleft>
- <onright>100</onright>
- <showonepage>false</showonepage>
- <orientation>vertical</orientation>
+ <control type="group">
+ <visible>Control.IsVisible(50)</visible>
+ <control type="list" id="50">
+ <left>70</left>
+ <top>85</top>
+ <width>390</width>
+ <height>541</height>
+ <onleft>100</onleft>
+ <onright>70</onright>
+ <onup>50</onup>
+ <ondown>50</ondown>
+ <viewtype label="535">list</viewtype>
+ <pagecontrol>70</pagecontrol>
+ <scrolltime>200</scrolltime>
+ <visible>!Control.IsVisible(51)</visible>
+ <itemlayout height="60" width="390">
+ <control type="image">
+ <left>0</left>
+ <top>0</top>
+ <width>390</width>
+ <height>61</height>
+ <texture border="2">MenuItemNF.png</texture>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="label">
+ <left>5</left>
+ <top>-4</top>
+ <width>40</width>
+ <height>35</height>
+ <font>font12</font>
+ <align>left</align>
+ <aligny>center</aligny>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <info>ListItem.ChannelNumberLabel</info>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>0</top>
+ <width>270</width>
+ <height>25</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>25</top>
+ <width>330</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Title]</label>
+ <visible>IsEmpty(Listitem.Icon)</visible>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>25</top>
+ <width>280</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Title]</label>
+ <visible>!IsEmpty(Listitem.Icon)</visible>
+ </control>
+ <control type="progress">
+ <description>Progressbar</description>
+ <left>50</left>
+ <top>48</top>
+ <width>280</width>
+ <height>6</height>
+ <colordiffuse>88FFFFFF</colordiffuse>
+ <visible>ListItem.HasEpg</visible>
+ <info>ListItem.Progress</info>
+ </control>
+ <control type="image">
+ <left>340</left>
+ <top>4</top>
+ <width>50</width>
+ <height>50</height>
+ <texture>$INFO[ListItem.Icon]</texture>
+ <aspectratio>keep</aspectratio>
+ </control>
+ <control type="image">
+ <left>5</left>
+ <top>37</top>
+ <width>30</width>
+ <height>20</height>
+ <texture>PVR-IsRecording.png</texture>
+ <visible>ListItem.IsRecording</visible>
+ </control>
+ </itemlayout>
+ <focusedlayout height="60" width="390">
+ <control type="image">
+ <left>0</left>
+ <top>0</top>
+ <width>390</width>
+ <height>61</height>
+ <texture border="2">MenuItemNF.png</texture>
+ <visible>!Control.HasFocus(50)</visible>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="image">
+ <left>0</left>
+ <top>0</top>
+ <width>390</width>
+ <height>61</height>
+ <texture border="2">MenuItemFO.png</texture>
+ <visible>Control.HasFocus(50)</visible>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="label">
+ <left>5</left>
+ <top>-4</top>
+ <width>40</width>
+ <height>35</height>
+ <font>font12</font>
+ <align>left</align>
+ <aligny>center</aligny>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <info>ListItem.ChannelNumberLabel</info>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>0</top>
+ <width>270</width>
+ <height>25</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>25</top>
+ <width>330</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Title]</label>
+ <visible>IsEmpty(Listitem.Icon)</visible>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>25</top>
+ <width>280</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Title]</label>
+ <visible>!IsEmpty(Listitem.Icon)</visible>
+ </control>
+ <control type="progress">
+ <description>Progressbar</description>
+ <left>50</left>
+ <top>48</top>
+ <width>280</width>
+ <height>6</height>
+ <colordiffuse>88FFFFFF</colordiffuse>
+ <visible>ListItem.HasEpg</visible>
+ <info>ListItem.Progress</info>
+ </control>
+ <control type="image">
+ <left>340</left>
+ <top>4</top>
+ <width>50</width>
+ <height>50</height>
+ <texture>$INFO[ListItem.Icon]</texture>
+ <aspectratio>keep</aspectratio>
+ </control>
+ <control type="image">
+ <left>5</left>
+ <top>37</top>
+ <width>30</width>
+ <height>20</height>
+ <texture>PVR-IsRecording.png</texture>
+ <visible>ListItem.IsRecording</visible>
+ </control>
+ </focusedlayout>
+ </control>
+ <control type="scrollbar" id="70">
+ <left>465</left>
+ <top>85</top>
+ <width>25</width>
+ <height>540</height>
+ <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+ <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+ <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+ <textureslidernib>ScrollBarNib.png</textureslidernib>
+ <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+ <onleft>50</onleft>
+ <onright>61</onright>
+ <showonepage>false</showonepage>
+ <orientation>vertical</orientation>
+ </control>
+ <control type="label">
+ <animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
+ <description>Page Count Label</description>
+ <right>40</right>
+ <top>53r</top>
+ <width>500</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <scroll>false</scroll>
+ <align>right</align>
+ <aligny>center</aligny>
+ <label>([COLOR=blue]$INFO[Container(50).NumItems][/COLOR]) $LOCALIZE[19019] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages][/COLOR])</label>
+ <include>Window_OpenClose_Animation</include>
+ </control>
</control>
- <control type="label">
- <animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
- <description>Page Count Label</description>
- <right>40</right>
- <top>53r</top>
- <width>500</width>
- <height>20</height>
- <font>font12</font>
- <textcolor>grey</textcolor>
- <scroll>false</scroll>
- <align>right</align>
- <aligny>center</aligny>
- <label>([COLOR=blue]$INFO[Container(50).NumItems][/COLOR]) $LOCALIZE[19019] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages][/COLOR])</label>
- <include>Window_OpenClose_Animation</include>
+ <control type="group">
+ <visible>Control.IsVisible(51)</visible>
+ <control type="list" id="51">
+ <left>70</left>
+ <top>85</top>
+ <width>390</width>
+ <height>361</height>
+ <onleft>100</onleft>
+ <onright>70</onright>
+ <onup>51</onup>
+ <ondown>51</ondown>
+ <viewtype label="535">list</viewtype>
+ <pagecontrol>70</pagecontrol>
+ <scrolltime>200</scrolltime>
+ <visible>!IsEmpty(Window.Property(IsRadio)) + system.getbool(pvrplayback.enableradiords) + !Skin.HasSetting(HideEPGwithRDS)</visible>
+ <itemlayout height="60" width="390">
+ <control type="image">
+ <left>0</left>
+ <top>0</top>
+ <width>390</width>
+ <height>61</height>
+ <texture border="2">MenuItemNF.png</texture>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="label">
+ <left>5</left>
+ <top>-4</top>
+ <width>40</width>
+ <height>35</height>
+ <font>font12</font>
+ <align>left</align>
+ <aligny>center</aligny>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <info>ListItem.ChannelNumberLabel</info>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>0</top>
+ <width>270</width>
+ <height>25</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>25</top>
+ <width>330</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Title]</label>
+ <visible>IsEmpty(Listitem.Icon)</visible>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>25</top>
+ <width>280</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Title]</label>
+ <visible>!IsEmpty(Listitem.Icon)</visible>
+ </control>
+ <control type="progress">
+ <description>Progressbar</description>
+ <left>50</left>
+ <top>48</top>
+ <width>280</width>
+ <height>6</height>
+ <colordiffuse>88FFFFFF</colordiffuse>
+ <visible>ListItem.HasEpg</visible>
+ <info>ListItem.Progress</info>
+ </control>
+ <control type="image">
+ <left>340</left>
+ <top>4</top>
+ <width>50</width>
+ <height>50</height>
+ <texture>$INFO[ListItem.Icon]</texture>
+ <aspectratio>keep</aspectratio>
+ </control>
+ <control type="image">
+ <left>5</left>
+ <top>37</top>
+ <width>30</width>
+ <height>20</height>
+ <texture>PVR-IsRecording.png</texture>
+ <visible>ListItem.IsRecording</visible>
+ </control>
+ </itemlayout>
+ <focusedlayout height="60" width="390">
+ <control type="image">
+ <left>0</left>
+ <top>0</top>
+ <width>390</width>
+ <height>61</height>
+ <texture border="2">MenuItemNF.png</texture>
+ <visible>!Control.HasFocus(51)</visible>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="image">
+ <left>0</left>
+ <top>0</top>
+ <width>390</width>
+ <height>61</height>
+ <texture border="2">MenuItemFO.png</texture>
+ <visible>Control.HasFocus(51)</visible>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="label">
+ <left>5</left>
+ <top>-4</top>
+ <width>40</width>
+ <height>35</height>
+ <font>font12</font>
+ <align>left</align>
+ <aligny>center</aligny>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <info>ListItem.ChannelNumberLabel</info>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>0</top>
+ <width>270</width>
+ <height>25</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>25</top>
+ <width>330</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Title]</label>
+ <visible>IsEmpty(Listitem.Icon)</visible>
+ </control>
+ <control type="label">
+ <left>50</left>
+ <top>25</top>
+ <width>280</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <selectedcolor>grey</selectedcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Title]</label>
+ <visible>!IsEmpty(Listitem.Icon)</visible>
+ </control>
+ <control type="progress">
+ <description>Progressbar</description>
+ <left>50</left>
+ <top>48</top>
+ <width>280</width>
+ <height>6</height>
+ <colordiffuse>88FFFFFF</colordiffuse>
+ <visible>ListItem.HasEpg</visible>
+ <info>ListItem.Progress</info>
+ </control>
+ <control type="image">
+ <left>340</left>
+ <top>4</top>
+ <width>50</width>
+ <height>50</height>
+ <texture>$INFO[ListItem.Icon]</texture>
+ <aspectratio>keep</aspectratio>
+ </control>
+ <control type="image">
+ <left>5</left>
+ <top>37</top>
+ <width>30</width>
+ <height>20</height>
+ <texture>PVR-IsRecording.png</texture>
+ <visible>ListItem.IsRecording</visible>
+ </control>
+ </focusedlayout>
+ </control>
+ <control type="scrollbar" id="70">
+ <left>465</left>
+ <top>85</top>
+ <width>25</width>
+ <height>360</height>
+ <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+ <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+ <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+ <textureslidernib>ScrollBarNib.png</textureslidernib>
+ <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+ <onleft>51</onleft>
+ <onright>61</onright>
+ <showonepage>false</showonepage>
+ <orientation>vertical</orientation>
+ </control>
+ <control type="label">
+ <animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
+ <description>Page Count Label</description>
+ <right>40</right>
+ <top>53r</top>
+ <width>500</width>
+ <height>20</height>
+ <font>font12</font>
+ <textcolor>grey</textcolor>
+ <scroll>false</scroll>
+ <align>right</align>
+ <aligny>center</aligny>
+ <label>([COLOR=blue]$INFO[Container(51).NumItems][/COLOR]) $LOCALIZE[19019] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(51).CurrentPage]/$INFO[Container(51).NumPages][/COLOR])</label>
+ <include>Window_OpenClose_Animation</include>
+ </control>
+ </control>
+ <control type="group">
+ <left>530</left>
+ <top>490</top>
+ <visible>RDS.HasRDS</visible>
+ <control type="image">
+ <left>580</left>
+ <top>-3</top>
+ <width>104</width>
+ <height>40</height>
+ <visible>!RDS.HasRadioText</visible>
+ <texture>flagging/rds/rds-logo.png</texture>
+ </control>
+ <control type="image">
+ <left>580</left>
+ <top>-3</top>
+ <width>104</width>
+ <height>34</height>
+ <visible>RDS.HasRadioText + !RDS.HasRadioTextPlus</visible>
+ <texture>flagging/rds/rds-radiotext-logo.png</texture>
+ </control>
+ <control type="image">
+ <left>580</left>
+ <top>-3</top>
+ <width>104</width>
+ <height>40</height>
+ <visible>RDS.HasRadioTextPlus</visible>
+ <texture>flagging/rds/rds-radiotext-plus-logo.png</texture>
+ </control>
+ <control type="label">
+ <left>0</left>
+ <top>40</top>
+ <width>690</width>
+ <height>20</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <scroll>true</scroll>
+ <visible>RDS.HasRDS</visible>
+ <label>$INFO[RDS.Getline(3)]</label>
+ </control>
+ <control type="label">
+ <left>0</left>
+ <top>65</top>
+ <width>690</width>
+ <height>20</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <scroll>true</scroll>
+ <visible>RDS.HasRDS</visible>
+ <label>$INFO[RDS.Getline(2)]</label>
+ </control>
+ <control type="label">
+ <left>0</left>
+ <top>90</top>
+ <width>690</width>
+ <height>20</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <scroll>true</scroll>
+ <visible>RDS.HasRDS</visible>
+ <label>$INFO[RDS.Getline(1)]</label>
+ </control>
+ <control type="label">
+ <left>0</left>
+ <top>115</top>
+ <width>690</width>
+ <height>20</height>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ <align>left</align>
+ <aligny>center</aligny>
+ <scroll>true</scroll>
+ <visible>RDS.HasRDS</visible>
+ <label>$INFO[RDS.Getline(0)]</label>
+ </control>
</control>
</control>
<include>CommonNowPlaying</include>
diff --git a/addons/skin.confluence/720p/PlayerControls.xml b/addons/skin.confluence/720p/PlayerControls.xml
index 0669746e2f..48aaf3e3ad 100644
--- a/addons/skin.confluence/720p/PlayerControls.xml
+++ b/addons/skin.confluence/720p/PlayerControls.xml
@@ -368,7 +368,7 @@
<texturefocus>OSDRecordOffFO.png</texturefocus>
<texturenofocus>OSDRecordOffNF.png</texturenofocus>
<onleft>705</onleft>
- <onright>701</onright>
+ <onright>707</onright>
<onup>300</onup>
<ondown>200</ondown>
<onclick>PlayerControl(record)</onclick>
@@ -376,6 +376,21 @@
<animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation>
<visible>VideoPlayer.Content(LiveTV)</visible>
</control>
+ <control type="button" id="707">
+ <left>400</left>
+ <top>0</top>
+ <width>40</width>
+ <height>40</height>
+ <label>-</label>
+ <texturefocus>OSDRadioRDSFO.png</texturefocus>
+ <texturenofocus>OSDRadioRDSNF.png</texturenofocus>
+ <onleft>706</onleft>
+ <onright>701</onright>
+ <onup>300</onup>
+ <ondown>200</ondown>
+ <onclick>ActivateWindow(PVRRadioRDSInfo)</onclick>
+ <visible>VideoPlayer.Content(LiveTV) + RDS.HasRadiotextPlus</visible>
+ </control>
</control>
<control type="image">
<description>gradient</description>
diff --git a/addons/skin.confluence/720p/SkinSettings.xml b/addons/skin.confluence/720p/SkinSettings.xml
index f4a15cbc10..e2e193d560 100644
--- a/addons/skin.confluence/720p/SkinSettings.xml
+++ b/addons/skin.confluence/720p/SkinSettings.xml
@@ -308,6 +308,18 @@
<selected>Skin.HasSetting(ActivateTvTunes)</selected>
<visible>System.HasAddon(script.tvtunes)</visible>
</control>
+ <control type="radiobutton" id="116">
+ <width>750</width>
+ <height>40</height>
+ <font>font13</font>
+ <label>31122</label>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturefocus>MenuItemFO.png</texturefocus>
+ <texturenofocus>MenuItemNF.png</texturenofocus>
+ <onclick>Skin.ToggleSetting(HideEPGwithRDS)</onclick>
+ <selected>Skin.HasSetting(HideEPGwithRDS)</selected>
+ </control>
<control type="label" id="106">
<width>750</width>
<height>45</height>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index 46ed05aeb9..6506ff7eb5 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -305,7 +305,7 @@
<pulseonselect>false</pulseonselect>
</include>
<include name="SideBladeLeft">
- <animation effect="slide" start="0,0" end="250,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001) | Control.HasFocus(8999)">Conditional</animation>
+ <animation effect="slide" start="0,0" end="250,0" time="300" tween="quadratic" easing="out" condition="[ControlGroup(9000).HasFocus | Control.HasFocus(9001) | Control.HasFocus(8999)] + ![Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRadioRDSInfo)]">Conditional</animation>
<animation effect="slide" start="0,0" end="-300,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001)">WindowClose</animation>
<animation effect="slide" start="0,0" end="-50,0" time="225" tween="quadratic" easing="out" condition="![ControlGroup(9000).HasFocus | Control.HasFocus(9001)]">WindowClose</animation>
<animation effect="slide" start="-50,0" end="0,0" time="225" tween="quadratic" easing="out">WindowOpen</animation>
@@ -790,7 +790,7 @@
<visible>VideoPlayer.Content(LiveTV)</visible>
<include>VisibleFadeEffect</include>
<control type="button" id="600">
- <left>20</left>
+ <left>5</left>
<top>2</top>
<width>39</width>
<height>39</height>
@@ -804,7 +804,7 @@
<onclick>ChannelDown</onclick>
</control>
<control type="button" id="601">
- <left>60</left>
+ <left>45</left>
<top>2</top>
<width>39</width>
<height>39</height>
@@ -818,7 +818,7 @@
<onclick>ChannelUp</onclick>
</control>
<control type="button" id="603">
- <left>100</left>
+ <left>85</left>
<top>2</top>
<width>39</width>
<height>39</height>
@@ -833,7 +833,7 @@
<onclick>PlayerControl(Stop)</onclick>
</control>
<control type="togglebutton" id="604">
- <left>140</left>
+ <left>125</left>
<top>2</top>
<width>39</width>
<height>39</height>
@@ -853,7 +853,7 @@
<animation effect="fade" start="100" end="30" time="75" condition="!Player.PauseEnabled">Conditional</animation>
</control>
<control type="button" id="605">
- <left>180</left>
+ <left>165</left>
<top>2</top>
<width>39</width>
<height>39</height>
@@ -861,13 +861,43 @@
<texturefocus>OSDRecordOffFO.png</texturefocus>
<texturenofocus>OSDRecordOffNF.png</texturenofocus>
<onleft>604</onleft>
- <onright>50</onright>
+ <onright>606</onright>
<onup>610</onup>
<ondown>611</ondown>
<onclick>PlayerControl(record)</onclick>
<enable>Player.CanRecord</enable>
<animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation>
</control>
+ <control type="button" id="606">
+ <left>205</left>
+ <top>2</top>
+ <width>39</width>
+ <height>39</height>
+ <label>-</label>
+ <visible>RDS.HasRadiotextPlus</visible>
+ <texturefocus>OSDRadioRDSFO.png</texturefocus>
+ <texturenofocus>OSDRadioRDSNF.png</texturenofocus>
+ <onleft>605</onleft>
+ <onright>50</onright>
+ <onup>610</onup>
+ <ondown>611</ondown>
+ <onclick>ActivateWindow(PVRRadioRDSInfo)</onclick>
+ </control>
+ <control type="button" id="606">
+ <left>205</left>
+ <top>2</top>
+ <width>39</width>
+ <height>39</height>
+ <label>-</label>
+ <visible>!RDS.HasRadiotextPlus</visible>
+ <texturefocus>OSDChannelListFO.png</texturefocus>
+ <texturenofocus>OSDChannelListNF.png</texturenofocus>
+ <onleft>605</onleft>
+ <onright>50</onright>
+ <onup>610</onup>
+ <ondown>611</ondown>
+ <onclick>ActivateWindow(PVRGuideInfo)</onclick>
+ </control>
</control>
<control type="group" id="9005">
<visible>Player.HasMedia</visible>
diff --git a/addons/skin.confluence/language/resource.language.en_gb/strings.po b/addons/skin.confluence/language/resource.language.en_gb/strings.po
index 66020c58a5..7aaa300d1b 100644
--- a/addons/skin.confluence/language/resource.language.en_gb/strings.po
+++ b/addons/skin.confluence/language/resource.language.en_gb/strings.po
@@ -257,7 +257,15 @@ msgctxt "#31119"
msgid "Hide background fanart"
msgstr ""
-#empty strings from id 31120 to 31123
+#empty strings from id 31120 to 31121
+
+#. Boolean settings value
+#: system/settings/settings.xml
+msgctxt "#31122"
+msgid "Hide EPG if RDS is present on channel window"
+msgstr ""
+
+#empty string id 31123
msgctxt "#31124"
msgid "Show background \"Now playing\" video"
diff --git a/addons/skin.confluence/media/OSDRadioRDSFO.png b/addons/skin.confluence/media/OSDRadioRDSFO.png
new file mode 100644
index 0000000000..3a7cdb9fdc
--- /dev/null
+++ b/addons/skin.confluence/media/OSDRadioRDSFO.png
Binary files differ
diff --git a/addons/skin.confluence/media/OSDRadioRDSNF.png b/addons/skin.confluence/media/OSDRadioRDSNF.png
new file mode 100644
index 0000000000..9081ec017d
--- /dev/null
+++ b/addons/skin.confluence/media/OSDRadioRDSNF.png
Binary files differ
diff --git a/addons/skin.confluence/media/flagging/rds/rds-logo.png b/addons/skin.confluence/media/flagging/rds/rds-logo.png
new file mode 100644
index 0000000000..440b4901f9
--- /dev/null
+++ b/addons/skin.confluence/media/flagging/rds/rds-logo.png
Binary files differ
diff --git a/addons/skin.confluence/media/flagging/rds/rds-radiotext-logo.png b/addons/skin.confluence/media/flagging/rds/rds-radiotext-logo.png
new file mode 100644
index 0000000000..26951c1e9a
--- /dev/null
+++ b/addons/skin.confluence/media/flagging/rds/rds-radiotext-logo.png
Binary files differ
diff --git a/addons/skin.confluence/media/flagging/rds/rds-radiotext-plus-logo.png b/addons/skin.confluence/media/flagging/rds/rds-radiotext-plus-logo.png
new file mode 100644
index 0000000000..4def9c4790
--- /dev/null
+++ b/addons/skin.confluence/media/flagging/rds/rds-radiotext-plus-logo.png
Binary files differ