Skip to content

Commit

Permalink
[Estuary] Improvements to Fullscreen Info/Seekbar for Video & Music
Browse files Browse the repository at this point in the history
  • Loading branch information
jjd-uk committed Jun 12, 2020
1 parent f76ad6a commit c133fac
Show file tree
Hide file tree
Showing 4 changed files with 183 additions and 145 deletions.
6 changes: 3 additions & 3 deletions addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml
View file
Expand Up @@ -40,22 +40,22 @@
<visible>String.IsEmpty(Player.Art(clearlogo))</visible>
<visible>String.IsEmpty(Player.Art(tvshow.clearlogo))</visible>
<animation effect="fade" time="150">VisibleChange</animation>
<left>30</left>
<left>20</left>
<right>400</right>
<control type="label">
<label>$VAR[NowPlayingBreadcrumbsVar]</label>
<font>font45</font>
<shadowcolor>text_shadow</shadowcolor>
<top>7</top>
<height>100</height>
<height>50</height>
<left>0</left>
<right>0</right>
</control>
<control type="label">
<top>60</top>
<label>$VAR[OSDSubLabelVar]</label>
<shadowcolor>text_shadow</shadowcolor>
<height>100</height>
<height>60</height>
<left>0</left>
<right>0</right>
</control>
Expand Down
187 changes: 89 additions & 98 deletions addons/skin.estuary/xml/DialogSeekBar.xml
View file
Expand Up @@ -21,30 +21,37 @@
<control type="group">
<visible>!Window.IsVisible(videoosd) + !Window.IsVisible(musicosd)</visible>
<animation effect="fade" time="200">VisibleChange</animation>
<control type="image">
<left>20</left>
<top>120</top>
<width>264</width>
<height>40</height>
<texture>$INFO[MusicPlayer.UserRating,flags/starrating/,.png]</texture>
<aspectratio>keep</aspectratio>
</control>
<control type="label">
<top>110</top>
<control type="grouplist">
<visible>[PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive] | PVR.IsPlayingActiveRecording</visible>
<left>20</left>
<width>400</width>
<height>50</height>
<aligny>center</aligny>
<font>font13</font>
<wrapmultiline>true</wrapmultiline>
<label>[COLOR button_focus]$LOCALIZE[21396]:[CR][/COLOR]$INFO[player.chapter]$INFO[player.chaptercount, / ]</label>
<visible>player.chaptercount</visible>
<centertop>125</centertop>
<height>60</height>
<align>left</align>
<orientation>horizontal</orientation>
<itemgap>-5</itemgap>
<control type="image">
<top>100</top>
<left>20</left>
<width>60</width>
<height>60</height>
<aligny>center</aligny>
<texture>osd/fullscreen/buttons/record.png</texture>
</control>
<control type="label">
<top>110</top>
<left>90</left>
<width>400</width>
<height>60</height>
<aligny>center</aligny>
<font>font25_title</font>
<label>[COLOR red][B]$LOCALIZE[19158][/B][/COLOR]</label>
</control>
</control>
<control type="grouplist">
<right>20</right>
<top>110</top>
<width>1000</width>
<height>100</height>
<centertop>125</centertop>
<width>800</width>
<height>50</height>
<align>right</align>
<include>Animation_BottomSlide</include>
<orientation>horizontal</orientation>
Expand All @@ -61,17 +68,17 @@
<param name="texture" value="$INFO[VideoPlayer.VideoAspect,flags/aspectratio/,.png]" />
</include>
<include content="MediaFlag">
<param name="texture" value="$INFO[VideoPlayer.AudioCodec,flags/audiocodec/,.png]" />
<param name="texture" value="$INFO[VideoPlayer.AudioCodec,flags/audiocodec/,.png]" />
</include>
<include content="MediaFlag">
<param name="texture" value="$INFO[VideoPlayer.AudioChannels,flags/audiochannel/,.png]" />
<param name="texture" value="$INFO[VideoPlayer.AudioChannels,flags/audiochannel/,.png]" />
</include>
</control>
<control type="grouplist">
<right>20</right>
<top>110</top>
<width>1000</width>
<height>100</height>
<centertop>125</centertop>
<width>800</width>
<height>50</height>
<align>right</align>
<include>Animation_BottomSlide</include>
<orientation>horizontal</orientation>
Expand Down Expand Up @@ -134,30 +141,11 @@
</include>
</control>
</control>
<control type="group">
<visible>[PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive] | PVR.IsPlayingActiveRecording</visible>
<control type="image">
<top>100</top>
<left>20</left>
<width>74</width>
<height>74</height>
<texture>osd/fullscreen/buttons/record.png</texture>
</control>
<control type="label">
<top>110</top>
<left>90</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>
<centertop>145</centertop>
<right>20</right>
<width>400</width>
<height>50</height>
<height>100</height>
<align>right</align>
<aligny>center</aligny>
<font>font13</font>
Expand All @@ -167,10 +155,10 @@
<visible>![Player.ShowInfo | Window.IsVisible(playerprocessinfo) | VideoPlayer.HasEpg] + !Window.IsActive(fullscreeninfo)</visible>
</control>
<control type="label">
<top>110</top>
<centertop>125</centertop>
<right>20</right>
<width>400</width>
<height>50</height>
<height>100</height>
<align>right</align>
<aligny>center</aligny>
<font>font13</font>
Expand All @@ -182,25 +170,25 @@
</control>
<control type="label">
<centerleft>50%</centerleft>
<top>110</top>
<centertop>125</centertop>
<width>50%</width>
<height>75</height>
<height>60</height>
<align>center</align>
<aligny>bottom</aligny>
<animation delay="0" effect="slide" time="120" start="0,0" end="0,-20" tween="sine" easing="inout" condition="!String.IsEmpty(Control.GetLabel(40000))">Conditional</animation>
<aligny>top</aligny>
<label>$VAR[SeekTimeLabelVar]</label>
<font>font45</font>
<shadowcolor>black</shadowcolor>
<visible>!Player.ChannelPreviewActive | VideoPlayer.HasEpg</visible>
</control>
<control type="label" id="40000">
<centerleft>50%</centerleft>
<top>134</top>
<centertop>175</centertop>
<width>50%</width>
<height>60</height>
<height>50</height>
<align>center</align>
<aligny>center</aligny>
<aligny>top</aligny>
<label>$VAR[SeekLabel]</label>
<font>font13</font>
<shadowcolor>black</shadowcolor>
</control>
<control type="group">
Expand Down Expand Up @@ -320,35 +308,35 @@
<texture>dialogs/dialog-bg-nobo.png</texture>
</control>
<control type="image">
<left>30</left>
<left>20</left>
<top>20</top>
<width>200</width>
<height>200</height>
<aspectratio aligny="center">keep</aspectratio>
<texture>$INFO[Player.Icon]</texture>
</control>
<control type="textbox">
<left>260</left>
<left>240</left>
<top>10</top>
<right>30</right>
<right>20</right>
<height>160</height>
<label fallback="19055">$INFO[VideoPlayer.Plot]</label>
<align>justify</align>
<autoscroll delay="5000" repeat="7500" time="5000"></autoscroll>
<visible>String.IsEmpty(PVR.EpgEventIcon)</visible>
</control>
<control type="textbox">
<left>260</left>
<left>240</left>
<top>10</top>
<right>260</right>
<right>240</right>
<height>160</height>
<label fallback="19055">$INFO[VideoPlayer.Plot]</label>
<align>justify</align>
<autoscroll delay="5000" repeat="7500" time="5000"></autoscroll>
<visible>!String.IsEmpty(PVR.EpgEventIcon)</visible>
</control>
<control type="image">
<right>30</right>
<right>20</right>
<top>20</top>
<width>200</width>
<height>200</height>
Expand All @@ -357,59 +345,62 @@
<visible>!String.IsEmpty(PVR.EpgEventIcon)</visible>
</control>
<control type="label">
<left>260</left>
<left>240</left>
<top>180</top>
<height>25</height>
<label>[COLOR grey]$LOCALIZE[19031]:[/COLOR] $INFO[VideoPlayer.NextStartTime] - $INFO[VideoPlayer.NextEndTime]: $INFO[VideoPlayer.NextTitle]</label>
<label>[COLOR button_focus]$LOCALIZE[19031]:[/COLOR] $INFO[VideoPlayer.NextStartTime] - $INFO[VideoPlayer.NextEndTime]: $INFO[VideoPlayer.NextTitle]</label>
<visible>VideoPlayer.HasEpg + !RDS.HasRadioText</visible>
</control>
<control type="label">
<left>260</left>
<left>240</left>
<top>180</top>
<height>25</height>
<label>[COLOR grey]$LOCALIZE[14304]: [/COLOR]$INFO[RDS.GetLine(0)]</label>
<visible>RDS.HasRadioText</visible>
</control>
</control>
<control type="group">
<bottom>0</bottom>
<height>230</height>
<visible>!Window.IsVisible(playerprocessinfo)</visible>
<visible>[Player.ShowInfo | Window.IsActive(fullscreeninfo)] + !VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo)</visible>
<animation effect="fade" time="200">VisibleChange</animation>
<control type="group">
<control type="image">
<depth>DepthOSD+</depth>
<left>10</left>
<top>-490</top>
<width>400</width>
<height>600</height>
<aspectratio aligny="bottom">keep</aspectratio>
<texture fallback="DefaultVideo.png" background="true">$VAR[NowPlayingPosterVar]</texture>
<bordertexture border="21">overlays/shadow.png</bordertexture>
<bordersize>20</bordersize>
<include>OpenClose_Left</include>
<bottom>0</bottom>
<height>470</height>
<control type="image">
<left>0</left>
<width>100%</width>
<height>330</height>
<texture>dialogs/dialog-bg-nobo.png</texture>
</control>
<control type="image">
<depth>DepthOSD+</depth>
<left>10</left>
<bottom>145</bottom>
<width>400</width>
<height>600</height>
<aspectratio aligny="bottom">keep</aspectratio>
<texture fallback="DefaultVideo.png" background="true">$VAR[NowPlayingPosterVar]</texture>
<bordertexture border="21">overlays/shadow.png</bordertexture>
<bordersize>20</bordersize>
<include>OpenClose_Left</include>
</control>
<control type="grouplist">
<left>420</left>
<top>10</top>
<right>20</right>
<height>300</height>
<align>left</align>
<orientation>vertical</orientation>
<itemgap>10</itemgap>
<control type="textbox">
<height>250</height>
<label fallback="10005">$INFO[VideoPlayer.Tagline,[B],[/B][CR]]$INFO[VideoPlayer.Plot]</label>
<align>left</align>
<autoscroll delay="5000" repeat="7500" time="5000"></autoscroll>
</control>
<control type="group">
<include>OpenClose_Right</include>
<control type="image">
<left>400</left>
<top>-240</top>
<right>20</right>
<height>350</height>
<texture>dialogs/dialog-bg-nobo.png</texture>
<bordertexture border="21">overlays/shadow.png</bordertexture>
<bordersize>20</bordersize>
</control>
<control type="textbox">
<left>443</left>
<top>-207</top>
<right>80</right>
<height>290</height>
<label fallback="10005">$INFO[VideoPlayer.Tagline,[B],[/B][CR]]$INFO[VideoPlayer.Plot]</label>
<align>left</align>
<autoscroll delay="5000" repeat="7500" time="5000"></autoscroll>
</control>
<control type="label">
<height>50</height>
<label>[COLOR button_focus]$LOCALIZE[19031]: [/COLOR]$INFO[VideoPlayer.offset(1).TVShowtitle, , - ]$INFO[VideoPlayer.offset(1).Season,S,]$INFO[VideoPlayer.offset(1).Episode,E, - ]$INFO[VideoPlayer.offset(1).Title]</label>
<visible>Integer.IsGreater(Playlist.Length(video),1)</visible>
</control>
</control>
</control>
Expand Down

0 comments on commit c133fac

Please sign in to comment.