diff options
| -rw-r--r-- | addons/resource.language.en_gb/resources/strings.po | 3 | ||||
| -rw-r--r-- | addons/skin.estuary/media/osd/fullscreen/buttons/rds.png | bin | 0 -> 3785 bytes | |||
| -rw-r--r-- | addons/skin.estuary/xml/MusicOSD.xml | 15 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/Variables.xml | 12 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/VideoOSD.xml | 10 |
5 files changed, 29 insertions, 11 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index 7318f41d89..97211d3b71 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -9301,6 +9301,7 @@ msgstr "" #: xbmc/pvr/PVRGUIActions.cpp #: xbmc/pvr/PVRManager.cpp #: xbmc/video/windows/GUIWindowVideoBase.cpp +#: addons/skin.estuary/xml/MusicOSD.xml #: addons/skin.estuary/xml/VideoOSD.xml msgctxt "#19033" msgid "Information" @@ -15582,6 +15583,8 @@ msgstr "" #empty strings from id 29806 to 29899 #. Header string on RDS Radiotext+ Info dialog +#: addons/skin.estuary/xml/DialogPVRRadioRDSInfo.xml +#: addons/skin.estuary/xml/Variables.xml msgctxt "#29900" msgid "Radiotext Plus info" msgstr "" diff --git a/addons/skin.estuary/media/osd/fullscreen/buttons/rds.png b/addons/skin.estuary/media/osd/fullscreen/buttons/rds.png Binary files differnew file mode 100644 index 0000000000..4a960b0407 --- /dev/null +++ b/addons/skin.estuary/media/osd/fullscreen/buttons/rds.png diff --git a/addons/skin.estuary/xml/MusicOSD.xml b/addons/skin.estuary/xml/MusicOSD.xml index 81d938e8f8..8f32b08625 100644 --- a/addons/skin.estuary/xml/MusicOSD.xml +++ b/addons/skin.estuary/xml/MusicOSD.xml @@ -2,6 +2,7 @@ <window> <onload condition="!Player.PauseEnabled">SetFocus(603)</onload> <defaultcontrol always="true">602</defaultcontrol> + <include>Animation_BottomSlide</include> <depth>DepthOSD</depth> <controls> <control type="button"> @@ -18,7 +19,6 @@ <bottom>0</bottom> <height>120</height> <visible>!Window.IsActive(osdaudiosettings) + !Window.IsActive(osdvideosettings) + !Window.IsActive(playerprocessinfo)</visible> - <include>Animation_BottomSlide</include> <animation type="Visible" reversible="false"> <effect type="fade" start="0" end="100" time="300"/> <effect type="slide" start="0,200" end="0,0" time="300" tween="cubic" easing="out" /> @@ -114,13 +114,20 @@ <onright>600</onright> <control type="radiobutton" id="62040"> <include content="OSDButton"> + <param name="texture" value="osd/fullscreen/buttons/information.png"/> + </include> + <onclick>Info</onclick> + <visible>MusicPlayer.Content(LiveTV)</visible> + </control> + <control type="radiobutton" id="62041"> + <include content="OSDButton"> <param name="texture" value="osd/fullscreen/buttons/channels.png"/> </include> <onclick>Dialog.Close(MusicOSD)</onclick> <onclick>ActivateWindow(PVROSDChannels)</onclick> <visible>MusicPlayer.Content(LiveTV)</visible> </control> - <control type="radiobutton" id="62041"> + <control type="radiobutton" id="62042"> <include content="OSDButton"> <param name="texture" value="osd/fullscreen/buttons/guide.png"/> </include> @@ -128,9 +135,9 @@ <onclick>ActivateWindow(PVRChannelGuide)</onclick> <visible>MusicPlayer.Content(LiveTV) + VideoPlayer.HasEPG</visible> </control> - <control type="radiobutton" id="62042"> + <control type="radiobutton" id="62043"> <include content="OSDButton"> - <param name="texture" value="osd/fullscreen/buttons/information.png"/> + <param name="texture" value="osd/fullscreen/buttons/rds.png"/> </include> <onclick>Dialog.Close(MusicOSD)</onclick> <onclick>ActivateWindow(PVRRadioRDSInfo)</onclick> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index bf5b3681ae..b2ed5287e2 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -216,8 +216,9 @@ <value condition="Control.HasFocus(703)">$LOCALIZE[31106]</value> <value condition="Control.HasFocus(704)">$LOCALIZE[24012]</value> <value condition="Control.HasFocus(804)">$LOCALIZE[31092]</value> - <value condition="Control.HasFocus(70040)">$LOCALIZE[19019]</value> - <value condition="Control.HasFocus(70041)">$LOCALIZE[19069]</value> + <value condition="Control.HasFocus(70040)">$LOCALIZE[19033]</value> + <value condition="Control.HasFocus(70041)">$LOCALIZE[19019]</value> + <value condition="Control.HasFocus(70042)">$LOCALIZE[19069]</value> <value condition="Control.HasFocus(70043)">$LOCALIZE[5]</value> <value condition="Control.HasFocus(255)">$LOCALIZE[36501]</value> <value condition="Control.HasFocus(606)+ PVR.IsRecordingPlayingChannel">$LOCALIZE[19059]</value> @@ -226,9 +227,10 @@ </variable> <variable name="MusicOSDHelpTextVar"> <value condition="Control.HasFocus(620)">$LOCALIZE[31033]$INFO[MusicPlayer.UserRating, : ]</value> - <value condition="Control.HasFocus(62040)">$LOCALIZE[19019]</value> - <value condition="Control.HasFocus(62041)">$LOCALIZE[19069]</value> - <value condition="Control.HasFocus(62042)">$LOCALIZE[29900]</value> + <value condition="Control.HasFocus(62040)">$LOCALIZE[19033]</value> + <value condition="Control.HasFocus(62041)">$LOCALIZE[19019]</value> + <value condition="Control.HasFocus(62042)">$LOCALIZE[19069]</value> + <value condition="Control.HasFocus(62043)">$LOCALIZE[29900]</value> <value condition="Control.HasFocus(704)">$LOCALIZE[486]$INFO[Playlist.Repeat, : ]</value> <value condition="Control.HasFocus(607) + Playlist.IsRandom">$LOCALIZE[590]: $LOCALIZE[16041]</value> <value condition="Control.HasFocus(607)">$LOCALIZE[590]: $LOCALIZE[16039]</value> diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml index edd731ade5..c024a5c1aa 100644 --- a/addons/skin.estuary/xml/VideoOSD.xml +++ b/addons/skin.estuary/xml/VideoOSD.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <window> <onload condition="!Player.PauseEnabled">SetFocus(603)</onload> - <depth>DepthOSD</depth> <defaultcontrol always="true">602</defaultcontrol> <include>Animation_BottomSlide</include> + <depth>DepthOSD</depth> <controls> <control type="button"> <description>background close area</description> @@ -128,13 +128,19 @@ <onright>600</onright> <control type="radiobutton" id="70040"> <include content="OSDButton"> + <param name="texture" value="osd/fullscreen/buttons/information.png"/> + </include> + <onclick>Info</onclick> + </control> + <control type="radiobutton" id="70041"> + <include content="OSDButton"> <param name="texture" value="osd/fullscreen/buttons/channels.png"/> </include> <onclick>Dialog.Close(VideoOSD)</onclick> <onclick>ActivateWindow(PVROSDChannels)</onclick> <visible>VideoPlayer.Content(livetv)</visible> </control> - <control type="radiobutton" id="70041"> + <control type="radiobutton" id="70042"> <include content="OSDButton"> <param name="texture" value="osd/fullscreen/buttons/guide.png"/> </include> |
