various
This commit is contained in:
Chris Bevan
parent
926437f9d5
commit
186c86ada6
|
|
@ -72,17 +72,12 @@
|
|||
</variable>
|
||||
<!--Star rating for music tracks-->
|
||||
<variable name="starRating">
|
||||
<value condition="SubString(MusicPlayer.Rating,1)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,2)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,3)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,4)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,5)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,6)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,7)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,8)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,9)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,10)"></value>
|
||||
<value></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,1)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,2)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,3)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,4)"></value>
|
||||
<value condition="SubString(MusicPlayer.Rating,5)"></value>
|
||||
<value></value>
|
||||
</variable>
|
||||
<!--custom addon handling-->
|
||||
<!--video-->
|
||||
|
|
|
|||
|
|
@ -77,6 +77,8 @@
|
|||
|
||||
<!--dateTime-->
|
||||
<include>dateTime</include>
|
||||
|
||||
xc
|
||||
</control>
|
||||
|
||||
<!--hub menu-->
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<window>
|
||||
<defaultcontrol always="true">8001</defaultcontrol>
|
||||
<onload>Control.SetFocus(8001,3)</onload>
|
||||
<include>fadeInOut</include>
|
||||
<controls>
|
||||
<control type="group">
|
||||
|
|
@ -18,7 +19,7 @@
|
|||
<height>14-row</height>
|
||||
<texture>colors/black.png</texture>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<colordiffuse>ccFFFFFF</colordiffuse>
|
||||
<colordiffuse>textboxInactive</colordiffuse>
|
||||
</control>
|
||||
<!--player controls-->
|
||||
<control type="panel" id="8001">
|
||||
|
|
@ -208,7 +209,7 @@
|
|||
</focusedlayout>
|
||||
<content>
|
||||
<item>
|
||||
<visible>System.GetBool(pvrmanager.enabled) + Player.CanRecord</visible>
|
||||
<enabled>System.GetBool(pvrmanager.enabled) + Player.CanRecord</enabled>
|
||||
<label>31201</label>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<window type="dialog" id="1100">
|
||||
<defaultcontrol always="true">6000</defaultcontrol>
|
||||
|
||||
<onload>Skin.Reset(menuItemType)</onload>
|
||||
<onload>Skin.SetString(currentAddonSourceSlot,$VAR[customAddonSourceSlot])</onload>
|
||||
<onload condition="stringcompare(skin.string(menuItemTypeFilter),video)">Skin.SetString(menuItemType,videoAddon)</onload>
|
||||
|
|
@ -40,7 +39,6 @@
|
|||
<effect type="rotatey" start="0" end="15" center="132" tween="back" easing="out" delay="900" time="300"/>
|
||||
</animation>
|
||||
</control>
|
||||
|
||||
<!--set shortcut-->
|
||||
<control type="grouplist" id="6000">
|
||||
<posx>0</posx>
|
||||
|
|
|
|||
|
|
@ -65,13 +65,23 @@
|
|||
<control type="label">
|
||||
<posx>24</posx>
|
||||
<posy>0</posy>
|
||||
<width>612</width>
|
||||
<width>542</width>
|
||||
<height>2-row</height>
|
||||
<font>regularStrong</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<scroll>true</scroll>
|
||||
<label>$INFO[MusicPlayer.Title]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>8-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>612</width>
|
||||
<height>2-row</height>
|
||||
<font>regularStrong</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<scroll>true</scroll>
|
||||
<label>[B]$INFO[MusicPlayer.rating]*[/B]</label>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>2-row</posy>
|
||||
|
|
@ -160,128 +170,6 @@
|
|||
<colordiffuse>ffffffff</colordiffuse>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
</control>
|
||||
<!-- side menu-->
|
||||
<control type="group" id="8765">
|
||||
<animation type="Conditional" condition="controlgroup(8765).hasfocus">
|
||||
<effect type="fade" start="0" end="100" time="300"/>
|
||||
<effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
|
||||
</animation>
|
||||
<animation type="Conditional" condition="!controlgroup(8765).hasfocus">
|
||||
<effect type="fade" start="100" end="0" time="300"/>
|
||||
<effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
|
||||
</animation>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>col-7-begin</width>
|
||||
<height>fullscreenHeight</height>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>highlight</colordiffuse>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>col-7-begin</posx>
|
||||
<posy>0</posy>
|
||||
<width>3</width>
|
||||
<height>fullscreenHeight</height>
|
||||
<texture>colors/black.png</texture>
|
||||
<colordiffuse>33ffffff</colordiffuse>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
</control>
|
||||
<!--section logo-->
|
||||
<control type="group">
|
||||
<control type="label">
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>row-1-begin</posy>
|
||||
<width>1-col</width>
|
||||
<height>1-col</height>
|
||||
<font>symbolVeryLarge</font>
|
||||
<aligny>center</aligny>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label></label>
|
||||
</control>
|
||||
</control>
|
||||
<control type="list" id="8002">
|
||||
<posx>0</posx>
|
||||
<posy>row-4-begin</posy>
|
||||
<width>8-col</width>
|
||||
<height>24-row</height>
|
||||
<orientation>vertical</orientation>
|
||||
<onleft>9002</onleft>
|
||||
<onright>9876</onright>
|
||||
<onback>activateWindow(home)</onback>
|
||||
<itemlayout width="col-7-begin" height="2-row">
|
||||
<control type="label">
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>0</posy>
|
||||
<width>7-col</width>
|
||||
<height>2-row</height>
|
||||
<font>menuTitle</font>
|
||||
<aligny>center</aligny>
|
||||
<textcolor>textActive</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.label]</label>
|
||||
</control>
|
||||
</itemlayout>
|
||||
<focusedlayout width="col-7-begin" height="2-row">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>col-7-begin</width>
|
||||
<height>2-row</height>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>textActive</colordiffuse>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>col-1-begin</posx>
|
||||
<posy>0</posy>
|
||||
<width>8-col</width>
|
||||
<height>2-row</height>
|
||||
<font>menuTitle</font>
|
||||
<aligny>center</aligny>
|
||||
<textcolor>highlight</textcolor>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
<label>$INFO[ListItem.label]</label>
|
||||
</control>
|
||||
</focusedlayout>
|
||||
<content>
|
||||
<item>
|
||||
<description>Playlist</description>
|
||||
<label>31123</label>
|
||||
<thumb>-</thumb>
|
||||
<onclick>Dialog.Close(all,true)</onclick>
|
||||
<onclick>activateWindow(musicplaylist)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Repeat</description>
|
||||
<label>$VAR[repeatState]</label>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(Repeat)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Shuffle</description>
|
||||
<label>$VAR[shuffleState]</label>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(Random)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Visualisation</description>
|
||||
<label>31032</label>
|
||||
<thumb>-</thumb>
|
||||
<onclick>activateWindow(musicOSD)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<visible>visualisation.enabled</visible>
|
||||
<description>Visualisation Settings</description>
|
||||
<label>$LOCALIZE[21417]</label>
|
||||
<thumb>-</thumb>
|
||||
<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
|
||||
</item>
|
||||
</content>
|
||||
</control>
|
||||
</control>
|
||||
<!--hidden buttons to handle dialog autohide-->
|
||||
<control type="button" id="9876">
|
||||
<posx>-100</posx>
|
||||
|
|
@ -290,7 +178,7 @@
|
|||
<width>1-col</width>
|
||||
<onup>noop</onup>
|
||||
<ondown>6789</ondown>
|
||||
<onleft>8765</onleft>
|
||||
<onclick>activatewindow(1105)</onclick>
|
||||
</control>
|
||||
<control type="button" id="6789">
|
||||
<posx>-100</posx>
|
||||
|
|
@ -299,7 +187,7 @@
|
|||
<width>1-col</width>
|
||||
<onup>9876</onup>
|
||||
<ondown>noop</ondown>
|
||||
<onleft>8765</onleft>
|
||||
<onclick>activatewindow(1105)</onclick>
|
||||
</control>
|
||||
<!--debugging-->
|
||||
<include>DebugGrid</include>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,301 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<window type="dialog" id="1105">
|
||||
<defaultcontrol always="true">8001</defaultcontrol>
|
||||
<controls>
|
||||
<!-- options menu-->
|
||||
<control type="group">
|
||||
<posx>col-10-begin</posx>
|
||||
<posy>row-6-begin</posy>
|
||||
<!--animations-->
|
||||
<include>modalDialogInOutVertical</include>
|
||||
<control type="image">
|
||||
<posx>-36</posx>
|
||||
<posy>-36</posy>
|
||||
<width>7-col</width>
|
||||
<height>16-row</height>
|
||||
<texture>colors/black.png</texture>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<colordiffuse>overlay</colordiffuse>
|
||||
</control>
|
||||
<!--player controls-->
|
||||
<control type="panel" id="8001">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<itemgap>0</itemgap>
|
||||
<ondown>8002</ondown>
|
||||
<onup>Control.SetFocus(8003,4)</onup>
|
||||
<orientation>horizontal</orientation>
|
||||
<itemlayout width="1-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>1-col-textbox</width>
|
||||
<height>69</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture>colors/black.png</texture>
|
||||
<colordiffuse>overlay</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>1-col</width>
|
||||
<height>2-row</height>
|
||||
<align>center</align>
|
||||
<aligny>center</aligny>
|
||||
<font>symbolLarge</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[ListItem.label2]</label>
|
||||
</control>
|
||||
</itemlayout>
|
||||
<focusedlayout width="1-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>1-col-textbox</width>
|
||||
<height>69</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>highlight</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>1-col</width>
|
||||
<height>2-row</height>
|
||||
<align>center</align>
|
||||
<aligny>center</aligny>
|
||||
<font>symbolLarge</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[ListItem.label2]</label>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
</control>
|
||||
</focusedlayout>
|
||||
<content>
|
||||
<item>
|
||||
<description>Previous</description>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(previous)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Rewind</description>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(rewind)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Stop</description>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(stop)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<visible>Player.Playing | player.forwarding | player.rewinding</visible>
|
||||
<description>Play/Pause</description>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(play)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<visible>Player.Paused</visible>
|
||||
<description>Pause</description>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(play)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Fast forward</description>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(forward)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Next Chapter</description>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(next)</onclick>
|
||||
</item>
|
||||
</content>
|
||||
</control>
|
||||
<!--Star rating-->
|
||||
<control type="group">
|
||||
<posx>0</posx>
|
||||
<posy>2-row</posy>
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>69</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture>colors/black.png</texture>
|
||||
<colordiffuse>overlay</colordiffuse>
|
||||
</control>
|
||||
<control type="image">
|
||||
<visible>control.hasfocus(8002)</visible>
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>1-col</width>
|
||||
<height>69</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>highlight</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>1-col</width>
|
||||
<height>69</height>
|
||||
<align>center</align>
|
||||
<aligny>center</aligny>
|
||||
<font>symbolLarge</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label></label>
|
||||
</control>
|
||||
<control type="button" id="8002">
|
||||
<posx>1-col</posx>
|
||||
<posy>0</posy>
|
||||
<height>69</height>
|
||||
<width>5-col</width>
|
||||
<font>symbolLarge</font>
|
||||
<textoffsetx>12</textoffsetx>
|
||||
<label>$VAR[starRating]</label>
|
||||
<onup>8001</onup>
|
||||
<ondown>control.setfocus(8003,0)</ondown>
|
||||
<onleft>decreaserating</onleft>
|
||||
<onright>increaserating</onright>
|
||||
<onclick>noop</onclick>
|
||||
</control>
|
||||
</control>
|
||||
<!--final options-->
|
||||
<control type="panel" id="8003">
|
||||
<posx>0</posx>
|
||||
<posy>4-row</posy>
|
||||
<width>6-col</width>
|
||||
<height>10-row</height>
|
||||
<orientation>vertical</orientation>
|
||||
<onup>8002</onup>
|
||||
<ondown>Control.SetFocus(8001,3)</ondown>
|
||||
<itemlayout width="6-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>69</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture>colors/black.png</texture>
|
||||
<colordiffuse>overlay</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>1-col</width>
|
||||
<height>2-row</height>
|
||||
<align>center</align>
|
||||
<aligny>center</aligny>
|
||||
<font>symbolLarge</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[ListItem.label2]</label>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>5-col-gutter</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemSubTitle</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[ListItem.label]</label>
|
||||
</control>
|
||||
</itemlayout>
|
||||
<focusedlayout width="6-col" height="2-row">
|
||||
<control type="image">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>1-col</width>
|
||||
<height>2-row</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>highlight</colordiffuse>
|
||||
</control>
|
||||
<control type="image">
|
||||
<posx>1-col</posx>
|
||||
<posy>0</posy>
|
||||
<width>6-col</width>
|
||||
<height>2-row</height>
|
||||
<aspectratio>stretch</aspectratio>
|
||||
<texture>colors/white.png</texture>
|
||||
<colordiffuse>eeffffff</colordiffuse>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>0</posx>
|
||||
<posy>0</posy>
|
||||
<width>1-col</width>
|
||||
<height>2-row</height>
|
||||
<align>center</align>
|
||||
<aligny>center</aligny>
|
||||
<font>symbolLarge</font>
|
||||
<textcolor>textActive</textcolor>
|
||||
<label>$INFO[ListItem.label2]</label>
|
||||
<shadowcolor>-</shadowcolor>
|
||||
</control>
|
||||
<control type="label">
|
||||
<posx>1-col-indent</posx>
|
||||
<posy>0</posy>
|
||||
<width>5-col-gutter</width>
|
||||
<height>2-row</height>
|
||||
<aligny>center</aligny>
|
||||
<font>itemSubTitle</font>
|
||||
<textcolor>black</textcolor>
|
||||
<label>$INFO[ListItem.label]</label>
|
||||
</control>
|
||||
</focusedlayout>
|
||||
<content>
|
||||
<item>
|
||||
<description>Playlist</description>
|
||||
<label>31123</label>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>Dialog.Close(all,true)</onclick>
|
||||
<onclick>activateWindow(musicplaylist)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Repeat</description>
|
||||
<label>$VAR[repeatState]</label>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(Repeat)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Shuffle</description>
|
||||
<label>$VAR[shuffleState]</label>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>PlayerControl(Random)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Visualisation</description>
|
||||
<label>31032</label>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>activateWindow(musicOSD)</onclick>
|
||||
</item>
|
||||
<item>
|
||||
<description>Visualisation Settings</description>
|
||||
<label>$LOCALIZE[21417]</label>
|
||||
<label2></label2>
|
||||
<thumb>-</thumb>
|
||||
<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
|
||||
</item>
|
||||
</content>
|
||||
</control>
|
||||
</control>
|
||||
<!--debugging-->
|
||||
<include>DebugGrid</include>
|
||||
<control type="label">
|
||||
<include>DialogID</include>
|
||||
<label>custom_musicPlayerOptions.xml</label>
|
||||
</control>
|
||||
</controls>
|
||||
</window>
|
||||
|
|
@ -34,8 +34,6 @@
|
|||
|
||||
***To do (Skinners Notes)***
|
||||
|
||||
Music "love" toggle
|
||||
|
||||
PVR Recording indicators
|
||||
PVR Recording scheduler (integrate with recordings)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue