better playlist handling
This commit is contained in:
Chris Bevan
parent
05ecab0478
commit
a716ca6720
|
|
@ -11,7 +11,6 @@
|
|||
<include file="View_Episodes.xml"/>
|
||||
<include file="View_Movies.xml"/>
|
||||
<include file="View_TVShows.xml"/>
|
||||
<include file="View_MusicAddons.xml"/>
|
||||
<include file="View_MusicGenres.xml"/>
|
||||
<include file="View_VideoFiles.xml"/>
|
||||
<include file="View_Photos.xml"/>
|
||||
|
|
@ -33,7 +32,13 @@
|
|||
<expression name="isEpisode">container.content(episodes) + !Substring(Container.folderpath,plugin)</expression>
|
||||
<expression name="isMusicVideo">container.content(musicvideos) + !Substring(Container.folderpath,plugin)</expression>
|
||||
|
||||
<expression name="isMusicPlaylist">container.content(playlists) + !Substring(Container.folderpath,plugin)</expression>
|
||||
<expression name="isMusicList">Substring(container.foldername,Files) | container.content(files) | container.content(addons) | [container.content(playlists) + !Substring(Container.folderpath,special://profile/playlists)]</expression>
|
||||
<expression name="isMusicArtist">container.content(artists) + [Substring(container.folderpath,musicdb://) | Substring(Container.folderpath,special://profile/playlists)]</expression>
|
||||
<expression name="isMusicArtistCatalogue">container.content(albums) + Substring(container.folderpath,albumartistsonly)</expression>
|
||||
<expression name="isMusicAlbum">container.content(albums) + [Substring(container.folderpath,musicdb://) | Substring(Container.folderpath,special://profile/playlists)]</expression>
|
||||
<expression name="isMusicGenre">container.content(genres) + Substring(container.folderpath,musicdb://)</expression>
|
||||
<expression name="isMusicSong">container.content(songs) + Substring(Container.folderpath,musicdb://)</expression>
|
||||
<expression name="isMusicPlaylist">container.content(songs) + [Substring(Container.folderpath,special://profile/playlists) | Substring(Container.foldername,PartyMode) | Substring(Container.folderpath,playlistmusic://)]</expression>
|
||||
|
||||
<!--item fanart-->
|
||||
<include name="itemFanart">
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
<value condition="Window.isactive(Videos) + [Container.Content(seasons) | Container.Content(episodes)]">$LOCALIZE[20343]</value>
|
||||
<value condition="Window.isactive(Videos) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>
|
||||
<value condition="Window.isactive(Videos) + isEmpty(container.foldername)">$LOCALIZE[31012]</value>
|
||||
<value condition="Window.isactive(Music) + Substring(Container.folderpath,special://profile/playlists)">[CAPITALIZE]$INFO[container.foldername][/CAPITALIZE]</value>
|
||||
<value condition="Window.isactive(Music) + Container.Content(albums) + Substring(Container.folderpath,special://profile/playlists/music)">[CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
|
||||
<value condition="Window.isactive(Music) + SubString(container.folderpath,addons://)">$LOCALIZE[31058]</value>
|
||||
<value condition="Window.isactive(Music) + SubString(container.folderpath,plugin://)">$INFO[container.foldername]</value>
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
<include>contentOpen</include>
|
||||
<!--source content-->
|
||||
<control type="group" id="9500">
|
||||
<include>artist</include>
|
||||
<include>album</include>
|
||||
<include>artistalbums</include>
|
||||
<include>song</include>
|
||||
<include>musicgenre</include>
|
||||
<include>musicfiles</include>
|
||||
<include>musicaddons</include>
|
||||
<include>musicgenre</include>
|
||||
<include>musicartistcatalogue</include>
|
||||
<include>musicartist</include>
|
||||
<include>musicalbum</include>
|
||||
<include>musicsongs</include>
|
||||
<include>musicPlayList</include>
|
||||
</control>
|
||||
</control>
|
||||
<!--page scrollbar-->
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<include>DebugGrid</include>
|
||||
<control type="label">
|
||||
<include>WindowID</include>
|
||||
<label>MyMusicNav.xml $INFO[container.folderpath]</label>
|
||||
<label>MyMusicNav.xml path: $INFO[container.folderpath] name: $INFO[container.foldername] content: $INFO[container.content] Control: $INFO[System.CurrentControl]</label>
|
||||
</control>
|
||||
</controls>
|
||||
</window>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<!--Main content listing-->
|
||||
<control type="group" id="9999">
|
||||
<include>contentOpen</include>
|
||||
<include>viewMusicPlayList</include>
|
||||
<include>musicPlayList</include>
|
||||
</control>
|
||||
<!--page scrollbar-->
|
||||
<control type="group" id="8000">
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
<include>DebugGrid</include>
|
||||
<control type="label">
|
||||
<include>WindowID</include>
|
||||
<label>MyMusicPlaylist.xml</label>
|
||||
<label>MyMusicPlaylist.xml path: $INFO[container.folderpath] name: $INFO[container.foldername] content: $INFO[container.content] Control: $INFO[System.CurrentControl]</label>
|
||||
</control>
|
||||
</controls>
|
||||
</window>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<includes>
|
||||
<!--Album browser-->
|
||||
<include name="album">
|
||||
<include name="musicalbum">
|
||||
<!--fanart-->
|
||||
<control type="group">
|
||||
<visible>container.content(albums) + !container.content(songs) + !SubString(container.folderpath,musicdb://artists) + !SubString(container.folderpath,musicdb://genres)</visible>
|
||||
<visible>$EXP[isMusicAlbum]</visible>
|
||||
<control type="image">
|
||||
<include>dimensionsFullscreen</include>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
|
|
@ -12,81 +12,20 @@
|
|||
<fadetime>1500</fadetime>
|
||||
<colordiffuse>22ffffff</colordiffuse>
|
||||
</control>
|
||||
</control>
|
||||
<control type="panel" id="50">
|
||||
<visible>container.content(albums) + !container.content(songs) + !SubString(container.folderpath,musicdb://artists) + !SubString(container.folderpath,musicdb://genres)</visible>
|
||||
<posx>78</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
<width>1800</width>
|
||||
<height>24-row</height>
|
||||
<onleft>9000</onleft>
|
||||
<onright>60</onright>
|
||||
<ondown>50</ondown>
|
||||
<onup>50</onup>
|
||||
<onback>9000</onback>
|
||||
<pagecontrol>60</pagecontrol>
|
||||
<scrolltime tween="cubic" easing="out">600</scrolltime>
|
||||
<itemlayout width="300" height="348">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>4-col-gutter</width>
|
||||
<height>4-col-gutter</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture border="6">DefaultAlbumCover.png</texture>
|
||||
<bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
|
||||
<bordersize>6</bordersize>
|
||||
<colordiffuse>overlay</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<visible>isempty(listitem.title)</visible>
|
||||
<posx>12</posx>
|
||||
<posy>2-row</posy>
|
||||
<width>240</width>
|
||||
<height>2-row</height>
|
||||
<align>center</align>
|
||||
<aligny>center</aligny>
|
||||
<font>regularStrong</font>
|
||||
<textcolor>textDisabled</textcolor>
|
||||
<label>$INFO[ListItem.label]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<visible>!controlgroup(9000).hasfocus</visible>
|
||||
<posx>12</posx>
|
||||
<posy>262</posy>
|
||||
<width>240</width>
|
||||
<height>1-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>thumbtitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>[B]$INFO[ListItem.Title][/B]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<visible>!controlgroup(9000).hasfocus</visible>
|
||||
<posx>12</posx>
|
||||
<posy>286</posy>
|
||||
<width>240</width>
|
||||
<height>1-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>thumbTitle</font>
|
||||
<textcolor>textDisabled</textcolor>
|
||||
<label>$INFO[ListItem.artist]</label>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>4-col-gutter</width>
|
||||
<height>4-col-gutter</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture border="6">$INFO[ListItem.Art(thumb)]</texture>
|
||||
<bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
|
||||
<bordersize>6</bordersize>
|
||||
<colordiffuse>ffFFFFFF</colordiffuse>
|
||||
</control>
|
||||
</itemlayout>
|
||||
<focusedlayout width="4-col" height="348">
|
||||
<control type="group">
|
||||
<include>focusThumb</include>
|
||||
<control type="panel" id="50">
|
||||
<visible>$EXP[isMusicAlbum]</visible>
|
||||
<posx>78</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
<width>1800</width>
|
||||
<height>24-row</height>
|
||||
<onleft>9000</onleft>
|
||||
<onright>60</onright>
|
||||
<ondown>50</ondown>
|
||||
<onup>50</onup>
|
||||
<onback>9000</onback>
|
||||
<pagecontrol>60</pagecontrol>
|
||||
<scrolltime tween="cubic" easing="out">600</scrolltime>
|
||||
<itemlayout width="300" height="348">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
|
|
@ -94,19 +33,9 @@
|
|||
<height>4-col-gutter</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture border="6">DefaultAlbumCover.png</texture>
|
||||
<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
|
||||
<bordersize>6</bordersize>
|
||||
<colordiffuse>ff666666</colordiffuse>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>4-col-gutter</width>
|
||||
<height>4-col-gutter</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture border="6">$INFO[ListItem.Art(thumb)]</texture>
|
||||
<bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
|
||||
<bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
|
||||
<bordersize>6</bordersize>
|
||||
<colordiffuse>overlay</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<visible>isempty(listitem.title)</visible>
|
||||
|
|
@ -117,10 +46,11 @@
|
|||
<align>center</align>
|
||||
<aligny>center</aligny>
|
||||
<font>regularStrong</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<textcolor>textDisabled</textcolor>
|
||||
<label>$INFO[ListItem.label]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<visible>!controlgroup(9000).hasfocus</visible>
|
||||
<posx>12</posx>
|
||||
<posy>262</posy>
|
||||
<width>240</width>
|
||||
|
|
@ -131,17 +61,87 @@
|
|||
<label>[B]$INFO[ListItem.Title][/B]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<visible>!controlgroup(9000).hasfocus</visible>
|
||||
<posx>12</posx>
|
||||
<posy>286</posy>
|
||||
<width>240</width>
|
||||
<height>1-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>thumbTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<textcolor>textDisabled</textcolor>
|
||||
<label>$INFO[ListItem.artist]</label>
|
||||
</control>
|
||||
</control>
|
||||
</focusedlayout>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>4-col-gutter</width>
|
||||
<height>4-col-gutter</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture border="6">$INFO[ListItem.Art(thumb)]</texture>
|
||||
<bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
|
||||
<bordersize>6</bordersize>
|
||||
<colordiffuse>ffFFFFFF</colordiffuse>
|
||||
</control>
|
||||
</itemlayout>
|
||||
<focusedlayout width="4-col" height="348">
|
||||
<control type="group">
|
||||
<include>focusThumb</include>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>4-col-gutter</width>
|
||||
<height>4-col-gutter</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture border="6">DefaultAlbumCover.png</texture>
|
||||
<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
|
||||
<bordersize>6</bordersize>
|
||||
<colordiffuse>ff666666</colordiffuse>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>4-col-gutter</width>
|
||||
<height>4-col-gutter</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture border="6">$INFO[ListItem.Art(thumb)]</texture>
|
||||
<bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
|
||||
<bordersize>6</bordersize>
|
||||
</control>
|
||||
<control type="label">
|
||||
<visible>isempty(listitem.title)</visible>
|
||||
<posx>12</posx>
|
||||
<posy>2-row</posy>
|
||||
<width>240</width>
|
||||
<height>2-row</height>
|
||||
<align>center</align>
|
||||
<aligny>center</aligny>
|
||||
<font>regularStrong</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[ListItem.label]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>12</posx>
|
||||
<posy>262</posy>
|
||||
<width>240</width>
|
||||
<height>1-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>thumbtitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>[B]$INFO[ListItem.Title][/B]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>12</posx>
|
||||
<posy>286</posy>
|
||||
<width>240</width>
|
||||
<height>1-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>thumbTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[ListItem.artist]</label>
|
||||
</control>
|
||||
</control>
|
||||
</focusedlayout>
|
||||
</control>
|
||||
</control>
|
||||
</include>
|
||||
</includes>
|
||||
|
|
@ -1,16 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<includes>
|
||||
<!--Artist Album browser-->
|
||||
<include name="artistalbums">
|
||||
|
||||
<include name="musicartistcatalogue">
|
||||
<!--fanart-->
|
||||
<control type="group">
|
||||
<visible>container.content(albums) + !container.content(songs) + [SubString(container.folderpath,musicdb://artists) | SubString(container.folderpath,musicdb://genres)]</visible>
|
||||
<visible>$EXP[isMusicArtistCatalogue]</visible>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>fullscreenWidth</width>
|
||||
<height>fullscreenHeight</height>
|
||||
<include>dimensionsFullscreen</include>
|
||||
<aspectratio scalediffuse="false" align="center">stretch</aspectratio>
|
||||
<texture background="true" fallback="special://skin/extras/backgrounds/music.jpg" border="0">$INFO[Container.Art(artist.fanart)]</texture>
|
||||
<fadetime>500</fadetime>
|
||||
|
|
@ -23,7 +19,6 @@
|
|||
<colordiffuse>ffffffff</colordiffuse>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
</control>
|
||||
|
||||
<control type="group">
|
||||
<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
|
||||
<effect type="fade" start="100" end="0" time="200"/>
|
||||
|
|
@ -46,7 +41,6 @@
|
|||
<texture border="0">colors/white.png</texture>
|
||||
<colordiffuse>highlight</colordiffuse>
|
||||
</control>
|
||||
|
||||
<!--titles-->
|
||||
<control type="group">
|
||||
<posx>col-1-begin</posx>
|
||||
|
|
@ -75,9 +69,8 @@
|
|||
<label>$INFO[container.foldername]</label>
|
||||
</control>
|
||||
</control>
|
||||
|
||||
<control type="panel" id="50">
|
||||
<visible>container.content(albums) + !container.content(songs) + [SubString(container.folderpath,musicdb://artists) | SubString(container.folderpath,musicdb://genres)]</visible>
|
||||
<visible>$EXP[isMusicArtistCatalogue]</visible>
|
||||
<posx>72</posx>
|
||||
<posy>row-21-begin</posy>
|
||||
<width>1848</width>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<includes>
|
||||
<!--Artist browser-->
|
||||
<include name="artist">
|
||||
<!--fanart-->
|
||||
<include name="musicartist">
|
||||
<control type="group">
|
||||
<visible>container.content(artists) + !container.content(songs) + !container.content(albums)</visible>
|
||||
<visible>$EXP[isMusicArtist]</visible>
|
||||
<!--fanart-->
|
||||
<control type="image">
|
||||
<include>dimensionsFullscreen</include>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
|
|
@ -12,73 +12,74 @@
|
|||
<fadetime>500</fadetime>
|
||||
<colordiffuse>22ffffff</colordiffuse>
|
||||
</control>
|
||||
</control>
|
||||
<control type="panel" id="50">
|
||||
<visible>container.content(artists) + !container.content(songs) + !container.content(albums)</visible>
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
<width>24-col</width>
|
||||
<height>23-row</height>
|
||||
<onleft>9000</onleft>
|
||||
<onright>60</onright>
|
||||
<ondown>50</ondown>
|
||||
<onup>50</onup>
|
||||
<pagecontrol>60</pagecontrol>
|
||||
<itemlayout width="8-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>3</posy>
|
||||
<width>66</width>
|
||||
<height>66</height>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.Label]</label>
|
||||
</control>
|
||||
</itemlayout>
|
||||
<focusedlayout width="8-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>1-col</posx>
|
||||
<posy>0</posy>
|
||||
<width>7-col-gutter</width>
|
||||
<height>2-row</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>highlight</colordiffuse>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>3</posy>
|
||||
<width>66</width>
|
||||
<height>66</height>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
|
||||
<animation type="focus" loop="false" reversible="false">
|
||||
<effect type="fade" time="500"/>
|
||||
<effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
|
||||
</animation>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.Label]</label>
|
||||
</control>
|
||||
</focusedlayout>
|
||||
<!--content-->
|
||||
<control type="panel" id="50">
|
||||
<visible>$EXP[isMusicArtist]</visible>
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
<width>24-col</width>
|
||||
<height>23-row</height>
|
||||
<onleft>9000</onleft>
|
||||
<onright>60</onright>
|
||||
<ondown>50</ondown>
|
||||
<onup>50</onup>
|
||||
<pagecontrol>60</pagecontrol>
|
||||
<itemlayout width="8-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>3</posy>
|
||||
<width>66</width>
|
||||
<height>66</height>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.Label]</label>
|
||||
</control>
|
||||
</itemlayout>
|
||||
<focusedlayout width="8-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>1-col</posx>
|
||||
<posy>0</posy>
|
||||
<width>7-col-gutter</width>
|
||||
<height>2-row</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>highlight</colordiffuse>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>3</posy>
|
||||
<width>66</width>
|
||||
<height>66</height>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
|
||||
<animation type="focus" loop="false" reversible="false">
|
||||
<effect type="fade" time="500"/>
|
||||
<effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
|
||||
</animation>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.Label]</label>
|
||||
</control>
|
||||
</focusedlayout>
|
||||
</control>
|
||||
</control>
|
||||
</include>
|
||||
</includes>
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<includes>
|
||||
<include name="musicaddons">
|
||||
<control type="panel" id="50">
|
||||
<visible>Substring(Container.folderpath,addons://sources/audio)</visible>
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
<width>24-col</width>
|
||||
<height>23-row</height>
|
||||
<onleft>9000</onleft>
|
||||
<onright>60</onright>
|
||||
<ondown>50</ondown>
|
||||
<onup>50</onup>
|
||||
<pagecontrol>60</pagecontrol>
|
||||
<itemlayout width="24-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>3</posy>
|
||||
<width>66</width>
|
||||
<height>66</height>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>1-col</posx>
|
||||
<posy>0</posy>
|
||||
<width>23-col</width>
|
||||
<height>69</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture border="0">colors/black.png</texture>
|
||||
<colordiffuse>textboxInactive</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>23-col-gutter</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.Label]</label>
|
||||
</control>
|
||||
</itemlayout>
|
||||
<focusedlayout width="24-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>3</posy>
|
||||
<width>66</width>
|
||||
<height>66</height>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
<texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
|
||||
<animation type="focus" loop="false" reversible="false">
|
||||
<effect type="fade" time="500"/>
|
||||
<effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
|
||||
</animation>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>1-col</posx>
|
||||
<posy>0</posy>
|
||||
<width>23-col</width>
|
||||
<height>2-row</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture border="0">colors/white.png</texture>
|
||||
<colordiffuse>highlight</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>23-col-gutter</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.Label]</label>
|
||||
</control>
|
||||
</focusedlayout>
|
||||
</control>
|
||||
</include>
|
||||
</includes>
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
<posx>col-1-begin</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
<control type="panel" id="50">
|
||||
<visible>!Substring(Container.folderpath,addons://sources/audio) + !isempty(container.folderpath)</visible>
|
||||
<visible>$EXP[isMusicList]</visible>
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>24-col</width>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<!--Music genre browser-->
|
||||
<include name="musicgenre">
|
||||
<control type="panel" id="50">
|
||||
<visible>Substring(Container.folderpath,musicdb://genres) + !container.content(artists) + !container.content(songs) + !container.content(albums)</visible>
|
||||
<visible>$EXP[isMusicGenre]</visible>
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
<width>24-col</width>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<includes>
|
||||
<!--playlist-->
|
||||
<include name="viewMusicPlayList">
|
||||
<include name="musicPlayList">
|
||||
<control type="group">
|
||||
<visible>$EXP[isMusicPlaylist]</visible>
|
||||
<!--fanart-->
|
||||
<control type="image">
|
||||
<visible>$EXP[isMusicPlaylist]</visible>
|
||||
<include>dimensionsFullscreen</include>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
<texture background="true" border="0">$INFO[Listitem.art(fanart)]</texture>
|
||||
<fadetime>500</fadetime>
|
||||
<colordiffuse>22ffffff</colordiffuse>
|
||||
</control>
|
||||
<control type="panel" id="59">
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
|
|
@ -71,7 +81,7 @@
|
|||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>-8</posy>
|
||||
<width>6-col</width>
|
||||
<width>13-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
|
|
@ -82,7 +92,7 @@
|
|||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>26</posy>
|
||||
<width>6-col</width>
|
||||
<width>13-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>smallStrong</font>
|
||||
|
|
@ -90,17 +100,6 @@
|
|||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>15-col</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label></label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<right>24</right>
|
||||
<posy>0</posy>
|
||||
|
|
@ -186,7 +185,7 @@
|
|||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>-8</posy>
|
||||
<width>6-col</width>
|
||||
<width>13-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
|
|
@ -197,7 +196,7 @@
|
|||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>26</posy>
|
||||
<width>6-col</width>
|
||||
<width>13-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>smallStrong</font>
|
||||
|
|
@ -205,17 +204,6 @@
|
|||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>15-col</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label></label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<right>24</right>
|
||||
<posy>0</posy>
|
||||
|
|
@ -233,6 +221,7 @@
|
|||
</control>
|
||||
<!--coverart selection-->
|
||||
<control type="group">
|
||||
<visible>$EXP[isMusicPlaylist]</visible>
|
||||
<posx>col-17-begin</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
<control type="image">
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<includes>
|
||||
<!--Song browser-->
|
||||
<include name="song">
|
||||
<include name="musicsongs">
|
||||
<control type="group">
|
||||
<visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
|
||||
<visible>$EXP[isMusicSong]</visible>
|
||||
<control type="image">
|
||||
<include>dimensionsFullscreen</include>
|
||||
<aspectratio scalediffuse="false">stretch</aspectratio>
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
</control>
|
||||
</control>
|
||||
<control type="group">
|
||||
<visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
|
||||
<visible>$EXP[isMusicSong]</visible>
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
<animation type="visible">
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
</control>
|
||||
</control>
|
||||
<control type="group">
|
||||
<visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
|
||||
<visible>$EXP[isMusicSong]</visible>
|
||||
<control type="label">
|
||||
<posx>col-10-begin</posx>
|
||||
<posy>row-5-begin</posy>
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
</control>
|
||||
</control>
|
||||
<control type="panel" id="50">
|
||||
<visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
|
||||
<visible>$EXP[isMusicSong]</visible>
|
||||
<posx>col-10-begin</posx>
|
||||
<posy>row-9-begin</posy>
|
||||
<width>15-col</width>
|
||||
|
|
|
|||
|
|
@ -734,9 +734,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>[Library.HasContent(Video)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(videos)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(videos)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Master user)</visible>
|
||||
<property name="group">videosubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -931,9 +932,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(music)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(music)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Master user)</visible>
|
||||
<property name="group">musicsubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -1396,9 +1398,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>[Library.HasContent(Video)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(videos)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(videos)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Test profile)</visible>
|
||||
<property name="group">videosubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -1593,9 +1596,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(music)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(music)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Test profile)</visible>
|
||||
<property name="group">musicsubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -2734,9 +2738,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>Library.HasContent(Video)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(videos)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(videos)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Master user)</visible>
|
||||
<property name="group">videosubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -2931,9 +2936,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>Library.HasContent(Video)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(videos)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(videos)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Test profile)</visible>
|
||||
<property name="group">videosubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -3130,9 +3136,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>[Library.HasContent(Video)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(videos)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(videos)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Master user)</visible>
|
||||
<property name="group">videosubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -3327,9 +3334,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>[Library.HasContent(Video)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(videos)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(videos)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Test profile)</visible>
|
||||
<property name="group">videosubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -3526,9 +3534,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>Library.HasContent(Music)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(music)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(music)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Master user)</visible>
|
||||
<property name="group">musicsubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -3744,9 +3753,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>Library.HasContent(Music)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(music)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(music)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Test profile)</visible>
|
||||
<property name="group">musicsubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -3964,9 +3974,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(music)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(music)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Master user)</visible>
|
||||
<property name="group">musicsubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
@ -4182,9 +4193,10 @@
|
|||
<property name="defaultID">31005</property>
|
||||
<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
|
||||
<onclick condition="true">control.setfocus(9999)</onclick>
|
||||
<onclick>ActivateWindow(1106)</onclick>
|
||||
<onclick condition="window.isactive(music)">ActivateWindow(1106)</onclick>
|
||||
<property name="path">ActivateWindow(1106)</property>
|
||||
<property name="list">1106</property>
|
||||
<onclick condition="window.isactive(music)">control.setfocus(9998,0)</onclick>
|
||||
<visible>StringCompare(System.ProfileName,Test profile)</visible>
|
||||
<property name="group">musicsubmenu</property>
|
||||
<property name="isSubmenu">True</property>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
**Changelog**
|
||||
|
||||
[PLANNED WORKS]
|
||||
- Improve playlist display in music view (rework as per video)
|
||||
|
||||
[V1.2.0]
|
||||
- [NEW] Extended fanart support for video info and seasons (active by default)
|
||||
- [NEW] 'Media Showcase'. This extension to the video info screen presents media art in a much more engaging way, taking advantage of available media art.
|
||||
- [NEW] User option: disable extended fanart
|
||||
- [NEW] Keyboard autocomplete support
|
||||
- [NEW] Improved playlist display in music view
|
||||
- Various tweaks and bugfixes
|
||||
|
||||
[V1.1.1]
|
||||
|
|
|
|||
|
|
@ -15,6 +15,18 @@
|
|||
<action>::ACTION::</action>
|
||||
</override>
|
||||
|
||||
<override action="ActivateWindow(1106)" group="musicsubmenu">
|
||||
<condition>window.isactive(music)</condition>
|
||||
<action>::ACTION::</action>
|
||||
<action>control.setfocus(9998,0)</action>
|
||||
</override>
|
||||
|
||||
<override action="ActivateWindow(1106)" group="videosubmenu">
|
||||
<condition>window.isactive(videos)</condition>
|
||||
<action>::ACTION::</action>
|
||||
<action>control.setfocus(9998,0)</action>
|
||||
</override>
|
||||
|
||||
<override action="RunScript(script.globalsearch)">
|
||||
<condition>!system.hasaddon(script.globalsearch)</condition>
|
||||
<action>InstallAddon(script.globalsearch)</action>
|
||||
|
|
|
|||
Loading…
Reference in New Issue