diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2017-12-09 23:56:18 +0100 |
|---|---|---|
| committer | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2017-12-11 17:40:58 +0100 |
| commit | f82187b98e65410d228504f0a680fe968f15809e (patch) | |
| tree | 0c76a1afe45178e70160dff18fd9e7857acaacb2 /addons/skin.estuary | |
| parent | 8a9d76193c4462d8a5af47a5681f198d5f4ede81 (diff) | |
[Estuary] Seekbar for PVR radio now is aligned with PVR Live TV, not 'normal' music anymore.
Diffstat (limited to 'addons/skin.estuary')
| -rw-r--r-- | addons/skin.estuary/xml/DialogSeekBar.xml | 28 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/MusicOSD.xml | 5 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/MusicVisualisation.xml | 4 |
3 files changed, 10 insertions, 27 deletions
diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml index 9286cbbc6c..bbc7fa4cb0 100644 --- a/addons/skin.estuary/xml/DialogSeekBar.xml +++ b/addons/skin.estuary/xml/DialogSeekBar.xml @@ -28,7 +28,8 @@ <height>100</height> <texture>$INFO[MusicPlayer.Codec,flags/audiocodec/,.png]</texture> <aspectratio>keep</aspectratio> - <visible>!Player.ChannelPreviewActive</visible> + <visible>Player.ShowInfo + !Player.ChannelPreviewActive + Window.IsActive(visualisation)</visible> + <animation effect="fade" start="0" end="100" time="200" delay="1000">Visible</animation> </control> <control type="image"> <left>200</left> @@ -58,7 +59,7 @@ <include>Animation_BottomSlide</include> <orientation>horizontal</orientation> <itemgap>10</itemgap> - <visible>Player.ShowInfo + Window.IsActive(fullscreenvideo) + !Player.ChannelPreviewActive</visible> + <visible>Player.ShowInfo + !Player.ChannelPreviewActive + Window.IsActive(fullscreenvideo)</visible> <animation effect="fade" start="0" end="100" time="200" delay="1000">Visible</animation> <include content="MediaFlag"> <param name="texture" value="$INFO[VideoPlayer.AudioChannels,flags/audiochannel/,.png]" /> @@ -74,7 +75,7 @@ </include> </control> <control type="group"> - <visible>Window.IsActive(fullscreenvideo) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive</visible> + <visible>PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive</visible> <control type="image"> <top>100</top> <left>20</left> @@ -92,25 +93,6 @@ <label>$LOCALIZE[19158]</label> </control> </control> - <control type="group"> - <visible>Window.IsActive(visualisation) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive</visible> - <control type="image"> - <top>100</top> - <left>170</left> - <width>74</width> - <height>74</height> - <texture>osd/fullscreen/buttons/record.png</texture> - </control> - <control type="label"> - <top>110</top> - <left>240</left> - <width>400</width> - <height>50</height> - <aligny>center</aligny> - <font>font25_title</font> - <label>$LOCALIZE[19158]</label> - </control> - </control> <control type="label"> <top>110</top> <right>20</right> @@ -225,7 +207,7 @@ </control> <control type="group"> <visible>!Window.IsVisible(playerprocessinfo)</visible> - <visible>Player.ShowInfo + VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo)</visible> + <visible>Player.ShowInfo + VideoPlayer.Content(LiveTV)</visible> <animation effect="fade" time="400">VisibleChange</animation> <animation effect="slide" end="0,-80" time="150" condition="Control.IsVisible(6000)">conditional</animation> <bottom>0</bottom> diff --git a/addons/skin.estuary/xml/MusicOSD.xml b/addons/skin.estuary/xml/MusicOSD.xml index 63a1070c2e..08a5252db3 100644 --- a/addons/skin.estuary/xml/MusicOSD.xml +++ b/addons/skin.estuary/xml/MusicOSD.xml @@ -43,6 +43,7 @@ <param name="texture" value="osd/fullscreen/buttons/previous.png"/> </include> <onclick>PlayerControl(Previous)</onclick> + <visible>!MusicPlayer.Content(livetv)</visible> </control> <control type="radiobutton" id="602"> <textureradioonfocus colordiffuse="white">osd/fullscreen/buttons/play.png</textureradioonfocus> @@ -73,7 +74,7 @@ <param name="texture" value="osd/fullscreen/buttons/next.png"/> </include> <onclick>PlayerControl(Next)</onclick> - <visible>MusicPlayer.HasNext</visible> + <visible>MusicPlayer.HasNext + !MusicPlayer.Content(livetv)</visible> </control> <control type="radiobutton" id="606"> <textureradioonfocus colordiffuse="white">osd/fullscreen/buttons/record-white.png</textureradioonfocus> @@ -93,7 +94,7 @@ <selected>!PVR.IsRecordingPlayingChannel</selected> <onclick>PVR.ToggleRecordPlayingChannel</onclick> <visible>PVR.CanRecordPlayingChannel</visible> - <visible>VideoPlayer.Content(livetv)</visible> + <visible>MusicPlayer.Content(livetv)</visible> </control> </control> <control type="grouplist" id="202"> diff --git a/addons/skin.estuary/xml/MusicVisualisation.xml b/addons/skin.estuary/xml/MusicVisualisation.xml index 5bf2e21b7a..1f697e3c68 100644 --- a/addons/skin.estuary/xml/MusicVisualisation.xml +++ b/addons/skin.estuary/xml/MusicVisualisation.xml @@ -31,7 +31,7 @@ <left>33</left> <top>200</top> <include>Visible_Left</include> - <visible>Player.ShowInfo | Window.IsActive(musicosd)</visible> + <visible>[Player.ShowInfo | Window.IsActive(musicosd)] + !MusicPlayer.Content(livetv)</visible> <width>500</width> <height>500</height> <fadetime>400</fadetime> @@ -42,7 +42,7 @@ </control> <control type="group"> <top>-30</top> - <visible>[Player.ShowInfo | Window.IsActive(musicosd)] + !Window.IsActive(playerprocessinfo)</visible> + <visible>[Player.ShowInfo | Window.IsActive(musicosd)] + ![Window.IsActive(playerprocessinfo) | MusicPlayer.Content(livetv)]</visible> <include>Visible_Left</include> <control type="group"> <left>30</left> |