supersonic/skin.tributary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor media info / now playing views (#44)

Browse Source 
Thanks.
This commit is contained in:
jjd-uk 2018-12-04 15:20:41 +00:00 committed by Kevin Goffe
parent b44c28827d
commit 8a07feb3c8
2 changed files with 55 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
720p/Includes.xml
View File

@ -445,6 +445,23 @@
<value condition="Container.Content(Albums)">$INFO[ListItem.Property(Album_Description)]</value> <value condition="Container.Content(Albums)">$INFO[ListItem.Property(Album_Description)]</value>
<value condition="Container.Content(Songs)">$INFO[ListItem.Comment]</value> <value condition="Container.Content(Songs)">$INFO[ListItem.Comment]</value>
</variable> </variable>
<variable name="MusicInfoListViewLabel">
<value condition="Control.IsVisible(506)">$LOCALIZE[544]</value>
<value condition="Control.IsVisible(507) + !Player.HasAudio">$LOCALIZE[31040]</value>
<value condition="Control.IsVisible(507) + Player.HasAudio">$LOCALIZE[31040]$INFO[musicplayer.Playlistposition,: ]$INFO[musicplayer.Playlistlength,/]</value>
</variable>
<variable name="MusicInfoListViewPanel">
<value condition="Control.IsVisible(506)">$INFO[ListItem.TrackNumber,,. ]$INFO[ListItem.Title,,[CR]]$INFO[ListItem.Artist,,[CR]]$INFO[ListItem.Album,[COLOR grey2],[/COLOR][CR]]$INFO[ListItem.DiscNumber,[COLOR grey2]$LOCALIZE[427] ,[/COLOR][CR]]$INFO[ListItem.Year,[COLOR grey2], | [/COLOR]]$INFO[ListItem.Genre,[COLOR grey2],[/COLOR][CR]]$INFO[ListItem.PlayCount,$LOCALIZE[567]: ,[CR]]$INFO[ListItem.Time,$LOCALIZE[180]: ,/]$INFO[ListItem.Duration,,[CR]]</value>
<value condition="Control.IsVisible(507) + Player.HasAudio">$INFO[MusicPlayer.TrackNumber,,. ]$INFO[MusicPlayer.Title,,[CR]]$INFO[MusicPlayer.Artist,,[CR]]$INFO[MusicPlayer.Album,[COLOR grey2],[/COLOR][CR]]$INFO[MusicPlayer.DiscNumber,[COLOR grey2]$LOCALIZE[427] ,[/COLOR][CR]]$INFO[MusicPlayer.Year,[COLOR grey2], | [/COLOR]]$INFO[MusicPlayer.Genre,[COLOR grey2],[/COLOR][CR]]$INFO[MusicPlayer.PlayCount,$LOCALIZE[567]: ,[CR]]$INFO[MusicPlayer.Time,$LOCALIZE[31016]: ,/]$INFO[MusicPlayer.Duration,,[CR]]</value>
</variable>
<variable name="MusicInfoListViewtRating">
<value condition="Control.IsVisible(506)">$INFO[ListItem.UserRating,ratings/,.png]</value>
<value condition="Control.IsVisible(507) + Player.HasAudio">$INFO[MusicPlayer.UserRating,ratings/,.png]</value>
</variable>
<variable name="MusicInfoListViewThumb">
<value condition="Control.IsVisible(506)">$INFO[ListItem.Icon]</value>
<value condition="Control.IsVisible(507)">$INFO[Player.Art(thumb)]</value>
</variable>
<variable name="MusicInfoListThumb"> <variable name="MusicInfoListThumb">
<value condition="Container.Content(Artists) + !String.IsEmpty(Container(50).Listitem.Icon)">$INFO[Container(50).Listitem.Icon]</value> <value condition="Container.Content(Artists) + !String.IsEmpty(Container(50).Listitem.Icon)">$INFO[Container(50).Listitem.Icon]</value>
<value condition="[Container.Content(Albums) | Container.Content(Songs)] + !String.IsEmpty(Container.Art(artist.thumb))">$INFO[Container.Art(artist.thumb)]</value> <value condition="[Container.Content(Albums) | Container.Content(Songs)] + !String.IsEmpty(Container.Art(artist.thumb))">$INFO[Container.Art(artist.thumb)]</value>

345
720p/ViewsMusicLibrary.xml
View File

@ -4,239 +4,37 @@
<control type="group"> <control type="group">
<visible>Control.IsVisible(506)</visible> <visible>Control.IsVisible(506)</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
<control type="list" id="506"> <include content="CommonInfoListView">
<left>70</left> <param name="control_id" value="506" />
<top>75</top> <param name="view_label" value="$LOCALIZE[544]" />
<width>780</width> <param name="visible" value="Container.Content(Files) | Window.IsVisible(MusicPlaylist) | Container.Content(Songs) | Container.Content(Albums)" />
<height>561</height> </include>
<onleft>2</onleft>
<onright>60</onright>
<onup>506</onup>
<ondown>506</ondown>
<viewtype label="$LOCALIZE[544]">list</viewtype>
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
<visible>Container.Content(Files) | Window.IsVisible(MusicPlaylist) | Container.Content(Songs) | Container.Content(Albums)</visible>
<itemlayout height="40" width="780">
<control type="image">
<left>0</left>
<top>0</top>
<width>780</width>
<height>41</height>
<texture border="0,2,0,2">MenuItemNF.png</texture>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>730</width>
<height>40</height>
<font>font13</font>
<textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
<left>60</left>
<top>0</top>
<width>700</width>
<height>40</height>
<font>font12</font>
<textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
</control>
</itemlayout>
<focusedlayout height="40" width="760">
<control type="image">
<left>0</left>
<top>0</top>
<width>760</width>
<height>41</height>
<texture border="0,2,0,2">MenuItemNF.png</texture>
<visible>!Control.HasFocus(506)</visible>
<include>VisibleFadeEffect</include>
</control>
<control type="image">
<left>0</left>
<top>0</top>
<width>780</width>
<height>41</height>
<texture border="0,2,0,2">MenuItemFO.png</texture>
<visible>Control.HasFocus(506)</visible>
<include>VisibleFadeEffect</include>
</control>
<control type="image">
<left>580</left>
<top>5</top>
<width>200</width>
<height>31</height>
<texture border="0,0,14,0">MediaItemDetailBG.png</texture>
<visible>Control.HasFocus(506) + !String.IsEmpty(ListItem.Label2)</visible>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>730</width>
<height>40</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>60</left>
<top>0</top>
<width>700</width>
<height>40</height>
<font>font12</font>
<textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
</control>
</focusedlayout>
</control>
<control type="scrollbar" id="60">
<left>850</left>
<top>78</top>
<width>25</width>
<height>560</height>
<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
<textureslidernib>ScrollBarNib.png</textureslidernib>
<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
<onleft>506</onleft>
<onright>2</onright>
<showonepage>false</showonepage>
<orientation>vertical</orientation>
<visible>Control.IsVisible(506)</visible>
</control>
<control type="group">
<visible>Control.IsVisible(506)</visible>
<left>910</left>
<top>80</top>
<control type="label">
<left>10</left>
<top>0</top>
<width>290</width>
<height>20</height>
<label>$LOCALIZE[544]</label>
<align>center</align>
<aligny>center</aligny>
<font>font13</font>
<textcolor>white</textcolor>
</control>
<control type="image">
<left>10</left>
<top>20</top>
<width>290</width>
<height>290</height>
<aspectratio aligny="bottom">keep</aspectratio>
<fadetime>IconCrossfadeTime</fadetime>
<texture background="true">$INFO[ListItem.Icon]</texture>
<bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize>
</control>
<control type="label">
<left>10</left>
<top>315</top>
<width>290</width>
<height>45</height>
<label>$INFO[listitem.TrackNumber,,. ]$INFO[ListItem.Title]</label>
<wrapmultiline>true</wrapmultiline>
<scroll>true</scroll>
<align>left</align>
<font>font13_title</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="label">
<left>10</left>
<top>360</top>
<width>290</width>
<height>45</height>
<label>$INFO[listitem.Artist]</label>
<wrapmultiline>true</wrapmultiline>
<scroll>true</scroll>
<align>left</align>
<font>font13_title</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="image">
<left>10</left>
<top>415</top>
<width>168</width>
<height>20</height>
<texture fallback="ratings/0.png">$VAR[MusicRating,ratings/,.png]</texture>
</control>
<control type="label">
<left>10</left>
<top>440</top>
<width>290</width>
<height>45</height>
<label>$INFO[ListItem.Album]$INFO[ListItem.DiscNumber, - $LOCALIZE[427] ]</label>
<wrapmultiline>true</wrapmultiline>
<scroll>false</scroll>
<scrolltime>200</scrolltime>
<align>left</align>
<font>font13</font>
<textcolor>grey2</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="label">
<left>10</left>
<top>485</top>
<width>290</width>
<height>20</height>
<label>$INFO[listitem.Year,, | ]$INFO[ListItem.Genre]</label>
<wrapmultiline>true</wrapmultiline>
<scroll>false</scroll>
<scrolltime>200</scrolltime>
<align>left</align>
<font>font13</font>
<textcolor>grey2</textcolor>
<shadowcolor>black</shadowcolor>
<wrapmultiline>true</wrapmultiline>
</control>
<control type="label">
<left>10</left>
<top>530</top>
<width>290</width>
<height>20</height>
<label>$LOCALIZE[180]: $INFO[ListItem.Duration(mm:ss)]</label>
<align>left</align>
<font>font13</font>
<textcolor>white</textcolor>
</control>
</control>
</control> </control>
</include>
<include name="NowPlaying">
<control type="group"> <control type="group">
<visible>Control.IsVisible(507)</visible> <visible>Control.IsVisible(507)</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
<control type="list" id="507"> <include content="CommonInfoListView">
<param name="control_id" value="507" />
<param name="view_label" value="$LOCALIZE[31040]" />
<param name="visible" value="Window.IsVisible(MusicPlaylist) | Window.IsVisible(10502)" />
</include>
</control>
</include>
<include name="CommonInfoListView">
<definition>
<control type="list" id="$PARAM[control_id]">
<left>70</left> <left>70</left>
<top>75</top> <top>75</top>
<width>780</width> <width>780</width>
<height>561</height> <height>561</height>
<onleft>2</onleft> <onleft>2</onleft>
<onright>60</onright> <onright>60</onright>
<onup>507</onup> <onup>$PARAM[control_id]</onup>
<ondown>507</ondown> <ondown>$PARAM[control_id]</ondown>
<viewtype label="$LOCALIZE[31040]">list</viewtype> <viewtype label="$PARAM[view_label]">list</viewtype>
<pagecontrol>60</pagecontrol> <pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime> <scrolltime>200</scrolltime>
<visible>Window.IsVisible(MusicPlaylist) | Window.IsVisible(10502)</visible> <visible>$PARAM[visible]</visible>
<itemlayout height="40" width="780"> <itemlayout height="40" width="780">
<control type="image"> <control type="image">
<left>0</left> <left>0</left>
@ -277,7 +75,7 @@
<width>760</width> <width>760</width>
<height>41</height> <height>41</height>
<texture border="0,2,0,2">MenuItemNF.png</texture> <texture border="0,2,0,2">MenuItemNF.png</texture>
<visible>!Control.HasFocus(507)</visible> <visible>!Control.HasFocus($PARAM[control_id])</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
</control> </control>
<control type="image"> <control type="image">
@ -286,7 +84,7 @@
<width>780</width> <width>780</width>
<height>41</height> <height>41</height>
<texture border="0,2,0,2">MenuItemFO.png</texture> <texture border="0,2,0,2">MenuItemFO.png</texture>
<visible>Control.HasFocus(507)</visible> <visible>Control.HasFocus($PARAM[control_id])</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
</control> </control>
<control type="image"> <control type="image">
@ -295,7 +93,7 @@
<width>200</width> <width>200</width>
<height>31</height> <height>31</height>
<texture border="0,0,14,0">MediaItemDetailBG.png</texture> <texture border="0,0,14,0">MediaItemDetailBG.png</texture>
<visible>Control.HasFocus(507) + !String.IsEmpty(ListItem.Label2)</visible> <visible>Control.HasFocus($PARAM[control_id]) + !String.IsEmpty(ListItem.Label2)</visible>
</control> </control>
<control type="label"> <control type="label">
<left>10</left> <left>10</left>
@ -333,14 +131,14 @@
<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus> <texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
<textureslidernib>ScrollBarNib.png</textureslidernib> <textureslidernib>ScrollBarNib.png</textureslidernib>
<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus> <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
<onleft>506</onleft> <onleft>$PARAM[control_id]</onleft>
<onright>2</onright> <onright>2</onright>
<showonepage>false</showonepage> <showonepage>false</showonepage>
<orientation>vertical</orientation> <orientation>vertical</orientation>
<visible>Control.IsVisible(507)</visible> <visible>Control.IsVisible($PARAM[control_id])</visible>
</control> </control>
<control type="group"> <control type="group">
<visible>Control.IsVisible(507)</visible> <visible>Control.IsVisible($PARAM[control_id])</visible>
<left>910</left> <left>910</left>
<top>80</top> <top>80</top>
<control type="label"> <control type="label">
@ -348,20 +146,7 @@
<top>0</top> <top>0</top>
<width>290</width> <width>290</width>
<height>20</height> <height>20</height>
<label>$LOCALIZE[31040]</label> <label>$VAR[MusicInfoListViewLabel]</label>
<visible>!Player.HasAudio</visible>
<align>center</align>
<aligny>center</aligny>
<font>font13</font>
<textcolor>white</textcolor>
</control>
<control type="label">
<left>10</left>
<top>0</top>
<width>290</width>
<height>20</height>
<label>$LOCALIZE[31040]$INFO[musicplayer.Playlistposition,: ]$INFO[musicplayer.Playlistlength,/]</label>
<visible>Player.HasAudio</visible>
<align>center</align> <align>center</align>
<aligny>center</aligny> <aligny>center</aligny>
<font>font13</font> <font>font13</font>
@ -374,86 +159,32 @@
<height>290</height> <height>290</height>
<aspectratio aligny="bottom">keep</aspectratio> <aspectratio aligny="bottom">keep</aspectratio>
<fadetime>IconCrossfadeTime</fadetime> <fadetime>IconCrossfadeTime</fadetime>
<texture background="true">$INFO[Player.Art(thumb)]</texture> <texture fallback="DefaultAlbumCover.png" background="true">$VAR[MusicInfoListViewThumb]</texture>
<bordertexture border="8">ThumbShadow.png</bordertexture> <bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize> <bordersize>8</bordersize>
</control> </control>
<control type="label">
<left>10</left>
<top>315</top>
<width>290</width>
<height>45</height>
<label>$INFO[MusicPlayer.Title]</label>
<wrapmultiline>true</wrapmultiline>
<scroll>true</scroll>
<align>left</align>
<font>font13_title</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="label">
<left>10</left>
<top>360</top>
<width>290</width>
<height>45</height>
<label>$INFO[MusicPlayer.Artist]</label>
<wrapmultiline>true</wrapmultiline>
<scroll>true</scroll>
<align>left</align>
<font>font13_title</font>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="image"> <control type="image">
<left>10</left> <left>10</left>
<top>415</top> <top>315</top>
<width>168</width> <width>168</width>
<height>20</height> <height>20</height>
<texture fallback="ratings/0.png">$INFO[MusicPlayer.UserRating,ratings/,.png]</texture> <texture fallback="ratings/0.png">$VAR[MusicInfoListViewtRating]</texture>
<visible>Player.HasAudio</visible> </control>
</control>
<control type="label"> <control type="label">
<left>10</left> <left>10</left>
<top>440</top> <top>340</top>
<width>290</width> <width>290</width>
<height>45</height> <height>200</height>
<label>$INFO[MusicPlayer.Album]$INFO[MusicPlayer.DiscNumber, - $LOCALIZE[427] ]</label> <label>$VAR[MusicInfoListViewPanel]</label>
<wrapmultiline>true</wrapmultiline> <wrapmultiline>true</wrapmultiline>
<scroll>false</scroll> <scroll>true</scroll>
<scrolltime>200</scrolltime>
<align>left</align> <align>left</align>
<font>font13</font> <font>font12_title</font>
<textcolor>grey2</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="label">
<left>10</left>
<top>485</top>
<width>290</width>
<height>20</height>
<label>$INFO[MusicPlayer.Year,, | ]$INFO[MusicPlayer.Genre]</label>
<wrapmultiline>true</wrapmultiline>
<scroll>false</scroll>
<scrolltime>200</scrolltime>
<align>left</align>
<font>font13</font>
<textcolor>grey2</textcolor>
<shadowcolor>black</shadowcolor>
<wrapmultiline>true</wrapmultiline>
</control>
<control type="label">
<left>10</left>
<top>530</top>
<width>290</width>
<height>20</height>
<label>$LOCALIZE[31016]: $INFO[Player.Time(mm:ss]$INFO[Player.Duration(mm:ss),/]</label>
<align>left</align>
<font>font13</font>
<textcolor>white</textcolor> <textcolor>white</textcolor>
<visible>Player.HasAudio</visible> <shadowcolor>black</shadowcolor>
</control> </control>
</control> </control>
</control> </definition>
</include> </include>
<include name="AlbumWrapView2_Fanart"> <include name="AlbumWrapView2_Fanart">
<control type="group"> <control type="group">