This commit is contained in:
Chris Bevan 2015-05-26 21:18:13 +01:00
parent d46a7cf733
commit 0c61254c6b
7 changed files with 78 additions and 95 deletions

View File

@ -387,7 +387,7 @@
<align>left</align> <align>left</align>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
<height>200</height> <height>160</height>
<label fallback="31205">$INFO[ListItem.plot]</label> <label fallback="31205">$INFO[ListItem.plot]</label>
<autoscroll delay="10000" time="1000" repeat="10000"/> <autoscroll delay="10000" time="1000" repeat="10000"/>
</control> </control>

View File

@ -32,12 +32,6 @@
<include>artist</include> <include>artist</include>
<include>album</include> <include>album</include>
<include>song</include> <include>song</include>
<!--
<include>viewMusicList</include>
<include>viewArtistList</include>
<include>viewSongList</include>
<include>viewMusicGrid</include>
-->
</control> </control>
</control> </control>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window> <window>
<defaultcontrol always="true">9999</defaultcontrol> <defaultcontrol always="true">9999</defaultcontrol>
<allowoverlay>no</allowoverlay> <allowoverlay>yes</allowoverlay>
<previouswindow>home</previouswindow> <previouswindow>home</previouswindow>
<controls> <controls>
<include>globalBackground</include> <include>globalBackground</include>
@ -17,6 +17,12 @@
<!--shift page for certain modal dialogs--> <!--shift page for certain modal dialogs-->
<include>modalDialogContentShift</include> <include>modalDialogContentShift</include>
<!--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"/>
</animation>
<!--Main content listing--> <!--Main content listing-->
<control type="group" id="9999"> <control type="group" id="9999">
<include>viewMusicPlayList</include> <include>viewMusicPlayList</include>

View File

@ -8,7 +8,7 @@
<!--animations--> <!--animations-->
<include>modalDialogInOutVertical</include> <include>modalDialogInOutVertical</include>
<control type="group"> <control type="group">
<posx>col-4-begin</posx> <posx>col-7-begin</posx>
<posy>row-3-begin</posy> <posy>row-3-begin</posy>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
@ -19,19 +19,9 @@
<colordiffuse>highlight</colordiffuse> <colordiffuse>highlight</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<!--
<control type="image">
<posx>0</posx>
<posy>2-row</posy>
<width>18-col</width>
<height>12-row</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
-->
<control type="label"> <control type="label">
<posx>12</posx> <posx>24</posx>
<posy>0</posy> <posy>0</posy>
<width>8-col</width> <width>8-col</width>
<height>2-row</height> <height>2-row</height>
@ -150,12 +140,12 @@
</control> </control>
<control type="panel" id="10"> <control type="panel" id="10">
<description>Rules List Control</description> <description>Rules List Control</description>
<posx>12</posx> <posx>1-col-indent</posx>
<posy>12</posy> <posy>12</posy>
<width>12-col-gutter</width> <width>11-col-gutter</width>
<height>4-row</height> <height>4-row</height>
<onup>18</onup> <onup>18</onup>
<onright>9001</onright> <onleft>9001</onleft>
<ondown>16</ondown> <ondown>16</ondown>
<itemlayout width="12-col" height="2-row"> <itemlayout width="12-col" height="2-row">
<control type="image"> <control type="image">
@ -208,29 +198,46 @@
</control> </control>
<!--items must match...--> <!--items must match...-->
<control type="spincontrolex" id="16"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>8-row</posy> <posy>300</posy>
<width>12-col</width> <width>12-col</width>
<height>96</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="spincontrolex" id="16">
<posx>12</posx>
<posy>312</posy>
<width>12-col-gutter</width>
<label>21424</label> <label>21424</label>
<onright>9002</onright> <onright>9002</onright>
<onup>10</onup> <onup>10</onup>
<ondown>17</ondown> <ondown>9002</ondown>
</control> </control>
</control> </control>
<!--add / edit / delete rules--> <!--add / edit / delete rules-->
<control type="panel" id="9001"> <control type="panel" id="9001">
<posx>14-col</posx> <posx>12</posx>
<posy>6-row</posy> <posy>382</posy>
<width>12-col-gutter</width> <width>12-col-gutter</width>
<height>8-row</height> <height>8-row</height>
<itemgap>3</itemgap>
<onright>10</onright> <onright>10</onright>
<onup>12</onup> <onup>18</onup>
<ondown>16</ondown>
<orientation>horizontal</orientation> <orientation>horizontal</orientation>
<itemlayout width="3-col" height="2-row"> <itemlayout width="3-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="label"> <control type="label">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
@ -238,20 +245,10 @@
<height>2-row</height> <height>2-row</height>
<align>center</align> <align>center</align>
<aligny>center</aligny> <aligny>center</aligny>
<font>symbol</font> <font>symbolLarge</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label> <label>$INFO[ListItem.label2]</label>
</control> </control>
<control type="label">
<posx>1-col-indent</posx>
<posy>-1</posy>
<width>3-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</itemlayout> </itemlayout>
<focusedlayout width="3-col" height="2-row"> <focusedlayout width="3-col" height="2-row">
<control type="image"> <control type="image">
@ -264,14 +261,6 @@
<colordiffuse>highlight</colordiffuse> <colordiffuse>highlight</colordiffuse>
<include>spinFocusIcon</include> <include>spinFocusIcon</include>
</control> </control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>2-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
</control>
<control type="label"> <control type="label">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
@ -279,22 +268,11 @@
<height>2-row</height> <height>2-row</height>
<align>center</align> <align>center</align>
<aligny>center</aligny> <aligny>center</aligny>
<font>symbol</font> <font>symbolLarge</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label> <label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
</control> </control>
<control type="label">
<posx>1-col-indent</posx>
<posy>-1</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>black</textcolor>
<label>$INFO[ListItem.label]</label>
<shadowcolor>-</shadowcolor>
</control>
</focusedlayout> </focusedlayout>
<content> <content>
<item id="1"> <item id="1">
@ -304,28 +282,27 @@
<thumb>-</thumb> <thumb>-</thumb>
<onclick>SendClick(129,13)</onclick> <onclick>SendClick(129,13)</onclick>
</item> </item>
<item id="2">
<description>Remove Rule</description>
<label>1210</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(129,14)</onclick>
</item>
</content> </content>
</control> </control>
<!--OK / Cancel--> <!--OK / Cancel-->
<control type="panel" id="9002"> <control type="panel" id="9002">
<visible>false</visible> <posx>0</posx>
<posx>14-col</posx> <posy>780</posy>
<posy>2-row</posy> <width>8-col</width>
<width>4-col</width> <height>2-row</height>
<height>5-row</height> <orientation>horizontal</orientation>
<itemgap>3</itemgap> <onup>16</onup>
<orientation>vertical</orientation>
<onleft>22</onleft>
<itemlayout width="4-col" height="2-row"> <itemlayout width="4-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>276</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="label"> <control type="label">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
@ -362,7 +339,7 @@
<control type="image"> <control type="image">
<posx>1-col</posx> <posx>1-col</posx>
<posy>0</posy> <posy>0</posy>
<width>5-col</width> <width>204</width>
<height>2-row</height> <height>2-row</height>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture> <texture>colors/white.png</texture>

View File

@ -203,6 +203,7 @@
<thumb>-</thumb> <thumb>-</thumb>
<onclick>dialog.close(137,true)</onclick> <onclick>dialog.close(137,true)</onclick>
<onclick>Control.Message(14,click,136)</onclick> <onclick>Control.Message(14,click,136)</onclick>
<onclick>Control.setfocus(10)</onclick>
</item> </item>
</content> </content>
</control> </control>

View File

@ -79,20 +79,6 @@
<onup>56</onup> <onup>56</onup>
<pagecontrol>60</pagecontrol> <pagecontrol>60</pagecontrol>
<itemlayout width="15-col" height="2-row"> <itemlayout width="15-col" height="2-row">
<control type="label">
<visible>ListItem.IsPlaying</visible>
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbol</font>
<textcolor>textActive</textcolor>
<selectedcolor>selected</selectedcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
@ -103,7 +89,16 @@
<bordersize>0</bordersize> <bordersize>0</bordersize>
<colordiffuse>textboxInactive</colordiffuse> <colordiffuse>textboxInactive</colordiffuse>
</control> </control>
<control type="image">
<visible>ListItem.IsPlaying</visible>
<posx>12</posx>
<posy>0</posy>
<width>1-col-gutter</width>
<height>1-col-gutter</height>
<texture>equaliser.gif</texture>
</control>
<control type="label"> <control type="label">
<visible>!ListItem.IsPlaying</visible>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<width>1-col-textbox</width> <width>1-col-textbox</width>
@ -171,7 +166,16 @@
<colordiffuse>highlight</colordiffuse> <colordiffuse>highlight</colordiffuse>
<include>spinFocusIcon</include> <include>spinFocusIcon</include>
</control> </control>
<control type="image">
<visible>ListItem.IsPlaying</visible>
<posx>12</posx>
<posy>0</posy>
<width>1-col-gutter</width>
<height>1-col-gutter</height>
<texture>equaliser.gif</texture>
</control>
<control type="label"> <control type="label">
<visible>!ListItem.IsPlaying</visible>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<width>1-col-textbox</width> <width>1-col-textbox</width>

View File

@ -260,8 +260,8 @@
<label>31097</label> <label>31097</label>
<label2></label2> <label2></label2>
<thumb>-</thumb> <thumb>-</thumb>
<onclick>activateWindow(500)</onclick>
<onclick>dialog.close(5001)</onclick> <onclick>dialog.close(5001)</onclick>
<onclick>activateWindow(musicplaylist)</onclick>
</item> </item>
<item> <item>
<description>Visualisation</description> <description>Visualisation</description>
@ -271,6 +271,7 @@
<onclick>activateWindow(musicOSD)</onclick> <onclick>activateWindow(musicOSD)</onclick>
</item> </item>
<item> <item>
<visible>visualisation.enabled</visible>
<description>Visualisation Settings</description> <description>Visualisation Settings</description>
<label>$LOCALIZE[21417]</label> <label>$LOCALIZE[21417]</label>
<label2></label2> <label2></label2>