various
This commit is contained in:
Chris Bevan
parent
d0ed2d12b5
commit
34550fda82
|
|
@ -1,7 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<window>
|
||||
<defaultcontrol always="true">901</defaultcontrol>
|
||||
|
||||
<visible>!window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(1104) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
|
||||
<controls>
|
||||
<control type="image">
|
||||
|
|
@ -14,7 +12,7 @@
|
|||
<posx>col-4-begin</posx>
|
||||
<posy>row-24-begin</posy>
|
||||
<control type="label">
|
||||
<visible>Player.Playing | player.seeking</visible>
|
||||
<visible>Player.Playing</visible>
|
||||
<posx>0</posx>
|
||||
<posy>-32</posy>
|
||||
<width>18-col</width>
|
||||
|
|
@ -99,105 +97,29 @@
|
|||
<shadowcolor>-</shadowcolor>
|
||||
</control>
|
||||
</control>
|
||||
<!--player controls-->
|
||||
<control type="group">
|
||||
<posx>10-col</posx>
|
||||
<posy>row-12-begin</posy>
|
||||
<control type="label">
|
||||
<posx>3-col</posx>
|
||||
<posy>0</posy>
|
||||
<width>3-col</width>
|
||||
<height>1-col</height>
|
||||
<font>smallStrong</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[Player.SeekStepSize]</label>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
</control>
|
||||
<control type="button" id="500">
|
||||
<posx>3-col</posx>
|
||||
<posy>1-col</posy>
|
||||
<height>1-col</height>
|
||||
<width>1-col</width>
|
||||
<font>symbol</font>
|
||||
<label></label>
|
||||
<textoffsetx>25</textoffsetx>
|
||||
<texturenofocus colordiffuse="overlay" diffuse="masks/circle.png">colors/black.png</texturenofocus>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>2-col-gutter</posx>
|
||||
<posy>2-col</posy>
|
||||
<width>3-col</width>
|
||||
<height>1-col</height>
|
||||
<align>right</align>
|
||||
<font>smallStrong</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[Player.SeekStepSize]</label>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
</control>
|
||||
<control type="button" id="501">
|
||||
<posx>2-col</posx>
|
||||
<posy>2-col</posy>
|
||||
<height>1-col</height>
|
||||
<width>1-col</width>
|
||||
<font>symbol</font>
|
||||
<label></label>
|
||||
<textoffsetx>25</textoffsetx>
|
||||
<texturenofocus colordiffuse="overlay" diffuse="masks/circle.png">colors/black.png</texturenofocus>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>372</posx>
|
||||
<posy>2-col</posy>
|
||||
<width>3-col</width>
|
||||
<height>1-col</height>
|
||||
<font>smallStrong</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[Player.SeekStepSize]</label>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
</control>
|
||||
<control type="button" id="502">
|
||||
<posx>4-col</posx>
|
||||
<posy>2-col</posy>
|
||||
<height>1-col</height>
|
||||
<width>1-col</width>
|
||||
<font>symbol</font>
|
||||
<label></label>
|
||||
<textoffsetx>25</textoffsetx>
|
||||
<texturenofocus colordiffuse="overlay" diffuse="masks/circle.png">colors/black.png</texturenofocus>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>3-col</posx>
|
||||
<posy>4-col</posy>
|
||||
<width>3-col</width>
|
||||
<height>1-col</height>
|
||||
<font>smallStrong</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[Player.SeekStepSize]</label>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
</control>
|
||||
<control type="button" id="503">
|
||||
<posx>3-col</posx>
|
||||
<posy>3-col</posy>
|
||||
<height>1-col</height>
|
||||
<width>1-col</width>
|
||||
<font>symbol</font>
|
||||
<label></label>
|
||||
<textoffsetx>25</textoffsetx>
|
||||
<texturenofocus colordiffuse="overlay" diffuse="masks/circle.png">colors/black.png</texturenofocus>
|
||||
</control>
|
||||
</control>
|
||||
<!--ff / rw speed indicators-->
|
||||
<control type="group">
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>row-24-begin</posy>
|
||||
<visible>Player.seeking</visible>
|
||||
<posx>12-col</posx>
|
||||
<posy>row-21-begin</posy>
|
||||
<control type="label">
|
||||
<visible>Player.Rewinding | Player.Forwarding</visible>
|
||||
<posx>0</posx>
|
||||
<posy>-12</posy>
|
||||
<width>24-col</width>
|
||||
<posy>0</posy>
|
||||
<width>1-col</width>
|
||||
<align>center</align>
|
||||
<font>symbolVeryLarge</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label></label>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>24-col</width>
|
||||
<align>left</align>
|
||||
<font>pageTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$VAR[seekSpeed]</label>
|
||||
<label>$INFO[player.SeekStepSize]</label>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
</control>
|
||||
</control>
|
||||
|
|
|
|||
|
|
@ -36,8 +36,7 @@
|
|||
|
||||
<!--initial animation-->
|
||||
<animation type="Windowopen">
|
||||
<effect type="zoom" start="150" time="200" center="auto" tween="linear" easing="out"/>
|
||||
<effect type="fade" start="30" end="100" time="100"/>
|
||||
<effect type="fade" start="0" end="100" time="300"/>
|
||||
</animation>
|
||||
|
||||
<!--Main content listing-->
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
|
||||
<!--initial animation-->
|
||||
<animation type="Windowopen">
|
||||
<effect type="zoom" start="130" time="200" center="auto" tween="linear" easing="out"/>
|
||||
<effect type="fade" start="30" end="100" time="100"/>
|
||||
<effect type="fade" start="0" end="100" time="300"/>
|
||||
</animation>
|
||||
|
||||
<!--Main content listing-->
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
|
||||
<!--initial animation-->
|
||||
<animation type="Windowopen">
|
||||
<effect type="zoom" start="120" time="200" center="auto" tween="linear" easing="out"/>
|
||||
<effect type="fade" start="30" end="100" time="100"/>
|
||||
<effect type="fade" start="0" end="100" time="300"/>
|
||||
</animation>
|
||||
|
||||
<!--Main content listing-->
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
|
||||
<!--initial animation-->
|
||||
<animation type="Windowopen">
|
||||
<effect type="zoom" start="120" time="100" center="auto" tween="linear" easing="out"/>
|
||||
<effect type="fade" start="30" end="100" time="100"/>
|
||||
<effect type="fade" start="0" end="100" time="300"/>
|
||||
</animation>
|
||||
|
||||
<!--Main content listing-->
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
<aspectratio>stretch</aspectratio>
|
||||
</control>
|
||||
</control>
|
||||
|
||||
<control type="group">
|
||||
<visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
|
||||
<posx>col-1-begin</posx>
|
||||
|
|
@ -42,7 +41,6 @@
|
|||
<animation effect="rotateY" end="-7" center="auto,auto" time="0">windowopen</animation>
|
||||
</control>
|
||||
</control>
|
||||
|
||||
<control type="group">
|
||||
<visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
|
||||
<control type="label">
|
||||
|
|
@ -66,7 +64,6 @@
|
|||
<label>$INFO[ListItem.Artist] $INFO[ListItem.Year,(,)]</label>
|
||||
</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>
|
||||
<posx>col-10-begin</posx>
|
||||
|
|
|
|||
|
|
@ -41,89 +41,97 @@
|
|||
</control>
|
||||
<!--Track info-->
|
||||
<control type="group">
|
||||
<posx>36</posx>
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>row-23-begin</posy>
|
||||
<animation type="Conditional" condition="control.hasfocus(6789)">
|
||||
<effect type="fade" start="100" end="0" time="300"/>
|
||||
<effect type="slide" start="0,0" end="0,300" tween="quadratic" easing="out" time="400"/>
|
||||
<effect type="slide" start="0,0" end="0,700" tween="sine" time="400"/>
|
||||
</animation>
|
||||
<animation type="conditional" condition="!StringCompare(MusicPlayer.Time,00:00)">
|
||||
<effect type="slide" start="0,700" end="0,0" tween="sine" time="400"/>
|
||||
</animation>
|
||||
<!--coverart (or channel art if radio)-->
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>1-row</posy>
|
||||
<width>10-col</width>
|
||||
<height>3-row</height>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>aaFFFFFF</colordiffuse>
|
||||
<posy>-412</posy>
|
||||
<width>6-col</width>
|
||||
<height>6-col</height>
|
||||
<aspectratio>keep</aspectratio>
|
||||
<texture fallback="defaultAlbumCover.png" border="0">$INFO[ListItem.art(thumb)]</texture>
|
||||
<fadetime>500</fadetime>
|
||||
</control>
|
||||
<!--track info-->
|
||||
<control type="group">
|
||||
<posx>12</posx>
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<control type="label">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>48</posy>
|
||||
<width>684</width>
|
||||
<font>pageTitle</font>
|
||||
<textcolor>cc000000</textcolor>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>71</height>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>24</posx>
|
||||
<posy>0</posy>
|
||||
<width>396</width>
|
||||
<height>2-row</height>
|
||||
<font>regularStrong</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<scroll>false</scroll>
|
||||
<label>$INFO[MusicPlayer.Title]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<visible>!Pvr.IsPlayingRadio</visible>
|
||||
<posx>0</posx>
|
||||
<posy>96</posy>
|
||||
<width>684</width>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>cc000000</textcolor>
|
||||
<scroll>false</scroll>
|
||||
<label>$INFO[MusicPlayer.artist,, | ]$INFO[MusicPlayer.Album,, ]$INFO[MusicPlayer.year,(,)]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<visible>Pvr.IsPlayingRadio</visible>
|
||||
<posx>0</posx>
|
||||
<posy>96</posy>
|
||||
<width>684</width>
|
||||
<font>itemTitle</font>
|
||||
<textcolor>cc000000</textcolor>
|
||||
<scroll>false</scroll>
|
||||
<label>$INFO[VideoPlayer.Plot]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>0</posx>
|
||||
<posy>4-row</posy>
|
||||
<width>12-col</width>
|
||||
<height>2-row</height>
|
||||
<font>pageTitle</font>
|
||||
<align>left</align>
|
||||
<textcolor>aaFFFFFF</textcolor>
|
||||
<scroll>false</scroll>
|
||||
<label>$INFO[MusicPlayer.time,, / ]$INFO[MusicPlayer.duration]</label>
|
||||
</control>
|
||||
<control type="button">
|
||||
<description>Fake button - decorative only</description>
|
||||
<visible>MusicPlayer.HasNext</visible>
|
||||
<posx>4-col</posx>
|
||||
<posy>164</posy>
|
||||
<width>2-col-gutter</width>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>2-row</posy>
|
||||
<width>6-col</width>
|
||||
<height>1-row</height>
|
||||
<font>smallStrong</font>
|
||||
<align>center</align>
|
||||
<focusedcolor>black</focusedcolor>
|
||||
<textcolor>black</textcolor>
|
||||
<texturenofocus colordiffuse="aaFFFFFF">colors/white.png</texturenofocus>
|
||||
<texturefocus colordiffuse="aaFFFFFF">colors/white.png</texturefocus>
|
||||
<label>[UPPERCASE]$LOCALIZE[19031][/UPPERCASE]</label>
|
||||
<onclick>noop</onclick>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>FFFFFFFF</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>424</posx>
|
||||
<posy>165</posy>
|
||||
<width>4-col-gutter</width>
|
||||
<font>itemSubTitle</font>
|
||||
<align>left</align>
|
||||
<textcolor>aaFFFFFF</textcolor>
|
||||
<posx>24</posx>
|
||||
<posy>2-row</posy>
|
||||
<width>396</width>
|
||||
<height>1-row</height>
|
||||
<font>smallStrong</font>
|
||||
<textcolor>black</textcolor>
|
||||
<scroll>false</scroll>
|
||||
<label>[UPPERCASE]$INFO[MusicPlayer.offset(1).Artist,, - ]$INFO[MusicPlayer.offset(1).Title][/UPPERCASE]</label>
|
||||
<label>[UPPERCASE][B]$INFO[MusicPlayer.artist,, ][/B]$INFO[MusicPlayer.Album, | , ]$INFO[MusicPlayer.year,(,)][/UPPERCASE]</label>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>3-row</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<texture>colors/black.png</texture>
|
||||
<colordiffuse>overlay</colordiffuse>
|
||||
</control>
|
||||
<control type="progress">
|
||||
<description>Duration</description>
|
||||
<posx>0</posx>
|
||||
<posy>3-row</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<reveal>false</reveal>
|
||||
<texturebg>-</texturebg>
|
||||
<lefttexture>-</lefttexture>
|
||||
<midtexture border="36" colordiffuse="22FFFFFF">colors/white.png</midtexture>
|
||||
<righttexture>-</righttexture>
|
||||
<overlaytexture>-</overlaytexture>
|
||||
<info>Player.Progress</info>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>24</posx>
|
||||
<posy>3-row</posy>
|
||||
<width>10-col</width>
|
||||
<height>2-row</height>
|
||||
<font>regularStrong</font>
|
||||
<align>left</align>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>99000000</shadowcolor>
|
||||
<scroll>false</scroll>
|
||||
<label>$INFO[MusicPlayer.time,, / ]$INFO[MusicPlayer.duration]</label>
|
||||
</control>
|
||||
</control>
|
||||
</control>
|
||||
|
|
|
|||
|
|
@ -34,9 +34,13 @@
|
|||
|
||||
***To do***
|
||||
|
||||
Revise initial zoom
|
||||
|
||||
Global search results needs a reboot
|
||||
|
||||
Revise fullscreenmusic. Use album art as default background.
|
||||
|
||||
DialogProgress Player controls (include details of UDLR skip levels - check skip heading from paused)
|
||||
DialogProgress Player controls (fix pause indicator to show seek level etc)
|
||||
|
||||
Fullscreen music view - add star rating selector
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue