This commit is contained in:
Chris Bevan 2015-05-05 20:53:00 +01:00
parent 45f6ae5262
commit 7e23a310e9
8 changed files with 224 additions and 137 deletions

View File

@ -23,25 +23,7 @@
<colordiffuse>highlight</colordiffuse> <colordiffuse>highlight</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<control type="image"> <control type="label">
<posx>0</posx>
<posy>2-row</posy>
<width>16-col</width>
<height>16-row</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<posx>12-col</posx>
<posy>2-row</posy>
<width>4-col</width>
<height>16-row</height>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="label" id="2">
<posx>24</posx> <posx>24</posx>
<posy>0</posy> <posy>0</posy>
<width>16-col</width> <width>16-col</width>
@ -52,50 +34,140 @@
<label>$LOCALIZE[1026]</label> <label>$LOCALIZE[1026]</label>
</control> </control>
<!--dialog controls 1-->
<control type="group"> <control type="group">
<posx>0</posx> <posx>0</posx>
<posy>3-row</posy> <posy>3-row</posy>
<!--set path--> <control type="panel" id="8000">
<control type="label"> <posx>0</posx>
<description>path label</description>
<posx>24</posx>
<posy>0</posy> <posy>0</posy>
<width>16-col</width> <width>4-col</width>
<font>itemSubTitle</font> <height>6-row</height>
<label>1021</label> <orientation>vertical</orientation>
<textcolor>textActive</textcolor> <onleft>10</onleft>
<shadowcolor>-</shadowcolor> <itemlayout width="4-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>textboxInactive</colordiffuse>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>3-col-textbox</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>textboxInactive</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>symbol</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</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>
<focusedlayout width="4-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>
<include>spinFocusIcon</include>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>3-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
</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>symbol</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</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>black</textcolor>
<label>$INFO[ListItem.label]</label>
<shadowcolor>-</shadowcolor>
</control>
</focusedlayout>
<content>
<item>
<description>Browse</description>
<label>1024</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(129,11)</onclick>
</item>
</content>
</control> </control>
<control type="image"> </control>
<posx>24</posx>
<posy>2-row</posy> <control type="group">
<width>11-col</width> <posx>0</posx>
<height>5-row</height> <posy>3-row</posy>
<texture>colors/black.png</texture> <!--name field-->
<colordiffuse>77ffffff</colordiffuse> <control type="edit" id="12">
<aspectratio>stretch</aspectratio> <description>Name Button</description>
<posx>4-col</posx>
<posy>0</posy>
<width>12-col</width>
<align>left</align>
<label>-</label>
<onup>10</onup>
<onright>8000</onright>
<ondown>10</ondown>
</control> </control>
<!--path list--> <!--path list-->
<control type="panel" id="10"> <control type="panel" id="10">
<posx>24</posx> <posx>4-col</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>11-col</width> <width>12-col-textbox</width>
<height>4-row</height> <height>6-row</height>
<onright>8000</onright> <onright>8000</onright>
<ondown>12</ondown> <ondown>12</ondown>
<pagecontrol>-</pagecontrol> <pagecontrol>-</pagecontrol>
<scrolltime>200</scrolltime> <scrolltime>200</scrolltime>
<itemlayout width="12-col" height="2-row"> <itemlayout width="12-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>12-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<bordersize>0</bordersize>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="label"> <control type="label">
<posx>12</posx> <posx>12</posx>
<posy>0</posy> <posy>0</posy>
@ -134,42 +206,48 @@
</control> </control>
</focusedlayout> </focusedlayout>
</control> </control>
<!--name source-->
<control type="label">
<description>Name label</description>
<posx>24</posx>
<posy>8-row</posy>
<width>11-col</width>
<font>itemSubtitle</font>
<label>31045</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<control type="edit" id="12">
<description>Name Button</description>
<posx>24</posx>
<posy>10-row</posy>
<width>11-col</width>
<align>left</align>
<label>-</label>
<onup>10</onup>
<onright>8000</onright>
<ondown>10</ondown>
</control>
</control> </control>
<!--dialog controls-->
<!--dialog controls 2-->
<control type="group"> <control type="group">
<posx>12-col</posx> <posx>0</posx>
<posy>3-row</posy> <posy>7-row</posy>
<control type="panel" id="8000"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<width>4-col</width> <width>8-col-textbox</width>
<height>10-row</height> <height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="panel" id="8001">
<posx>8-col</posx>
<posy>0</posy>
<width>8-col</width>
<height>2-row</height>
<itemgap>3</itemgap> <itemgap>3</itemgap>
<orientation>vertical</orientation> <orientation>horizontal</orientation>
<onleft>10</onleft> <onleft>10</onleft>
<itemlayout width="6-col" height="2-row"> <itemlayout width="4-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="image">
<posx>1-col</posx>
<posy>0</posy>
<width>3-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>
@ -184,7 +262,7 @@
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
<posy>-1</posy> <posy>-1</posy>
<width>5-col-gutter</width> <width>3-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>buttonTitle</font> <font>buttonTitle</font>
@ -192,7 +270,7 @@
<label>$INFO[ListItem.label]</label> <label>$INFO[ListItem.label]</label>
</control> </control>
</itemlayout> </itemlayout>
<focusedlayout width="6-col" height="2-row"> <focusedlayout width="4-col" height="2-row">
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
@ -206,7 +284,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>3-col</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>
@ -226,7 +304,7 @@
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
<posy>-1</posy> <posy>-1</posy>
<width>5-col-gutter</width> <width>3-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>buttonTitle</font> <font>buttonTitle</font>
@ -236,35 +314,14 @@
</control> </control>
</focusedlayout> </focusedlayout>
<content> <content>
<item id="1"> <item>
<description>Browse</description>
<label>1024</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(129,11)</onclick>
</item>
<item id="2">
<description>Add Path Button</description>
<label>15019</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(129,13)</onclick>
</item>
<item id="6">
<description>Remove Path Button</description>
<label>1210</label>
<label2></label2>
<thumb>-</thumb>
<onclick>SendClick(129,14)</onclick>
</item>
<item id="3">
<description>Ok Button</description> <description>Ok Button</description>
<label>186</label> <label>186</label>
<label2></label2> <label2></label2>
<thumb>-</thumb> <thumb>-</thumb>
<onclick>SendClick(129,18)</onclick> <onclick>SendClick(129,18)</onclick>
</item> </item>
<item id="4"> <item>
<description>Cancel Button</description> <description>Cancel Button</description>
<label>222</label> <label>222</label>
<label2></label2> <label2></label2>
@ -274,6 +331,7 @@
</content> </content>
</control> </control>
</control> </control>
</control> </control>
<!--buttons--> <!--buttons-->
<control type="group"> <control type="group">

View File

@ -2,7 +2,7 @@
<window> <window>
<defaultcontrol always="true">901</defaultcontrol> <defaultcontrol always="true">901</defaultcontrol>
<allowoverlay>yes</allowoverlay> <allowoverlay>yes</allowoverlay>
<visible>!Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible> <visible>!window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
<controls> <controls>
<control type="image"> <control type="image">
<include>dimensionsFullscreen</include> <include>dimensionsFullscreen</include>

View File

@ -94,11 +94,11 @@
<itemlayout height="2-row" width="12-col"> <itemlayout height="2-row" width="12-col">
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>3</posy>
<width>1-col</width> <width>66</width>
<height>2-row</height> <height>66</height>
<aspectratio scalediffuse="false">scale</aspectratio> <aspectratio scalediffuse="false">stretch</aspectratio>
<texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture> <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
</control> </control>
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
@ -125,12 +125,15 @@
</control> </control>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>3</posy>
<width>1-col</width> <width>66</width>
<height>2-row</height> <height>66</height>
<aspectratio scalediffuse="false">scale</aspectratio> <aspectratio scalediffuse="false">stretch</aspectratio>
<texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture> <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
<include>spinFocusIcon</include> <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>
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>

View File

@ -12,7 +12,7 @@
<!--browse controls--> <!--browse controls-->
<control type="group"> <control type="group">
<posx>24</posx> <posx>0</posx>
<posy>row-1-begin</posy> <posy>row-1-begin</posy>
<control type="list" id="9000"> <control type="list" id="9000">
<posx>0</posx> <posx>0</posx>
@ -31,7 +31,7 @@
<width>1-col-textbox</width> <width>1-col-textbox</width>
<height>1-col-textbox</height> <height>1-col-textbox</height>
<aspectratio scalediffuse="false">scale</aspectratio> <aspectratio scalediffuse="false">scale</aspectratio>
<texture diffuse="masks/circle.png" border="0">colors/black.png</texture> <texture border="0">colors/black.png</texture>
<bordersize>0</bordersize> <bordersize>0</bordersize>
<colordiffuse>textboxInactive</colordiffuse> <colordiffuse>textboxInactive</colordiffuse>
</control> </control>
@ -50,19 +50,19 @@
</itemlayout> </itemlayout>
<focusedlayout width="2-col" height="2-col"> <focusedlayout width="2-col" height="2-col">
<control type="group"> <control type="group">
<animation type="focus" loop="false" reversible="false">
<effect type="rotatey" start="0" end="-15" center="70" tween="back" easing="out" time="300"/>
<effect type="rotatey" start="0" end="15" center="70" tween="back" easing="out" delay="300" time="300"/>
</animation>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<width>2-col-textbox</width> <width>2-col-textbox</width>
<height>2-col-textbox</height> <height>2-col-textbox</height>
<aspectratio scalediffuse="false">scale</aspectratio> <aspectratio scalediffuse="false">scale</aspectratio>
<texture diffuse="masks/circle.png" border="0">colors/white.png</texture> <texture border="0">colors/white.png</texture>
<bordersize>0</bordersize> <bordersize>0</bordersize>
<colordiffuse>highlight</colordiffuse> <colordiffuse>highlight</colordiffuse>
<animation type="focus" loop="false" reversible="false">
<effect type="rotatey" start="0" end="-15" center="70" tween="back" easing="out" time="300"/>
<effect type="rotatey" start="0" end="15" center="70" tween="back" easing="out" delay="300" time="300"/>
</animation>
</control> </control>
<control type="label"> <control type="label">
<posx>0</posx> <posx>0</posx>

View File

@ -62,7 +62,7 @@
</include> </include>
<include name="modalDialogContentShift"> <include name="modalDialogContentShift">
<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus"> <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus">
<effect type="zoom" end="205" time="200" center="auto" tween="linear" easing="out"/> <effect type="zoom" end="300" time="200" center="auto" tween="linear" easing="out"/>
<effect type="fade" start="100" end="30" time="200"/> <effect type="fade" start="100" end="30" time="200"/>
</animation> </animation>
</include> </include>

View File

@ -4,15 +4,10 @@
<allowoverlay>yes</allowoverlay> <allowoverlay>yes</allowoverlay>
<controls> <controls>
<control type="image"> <control type="image">
<visible>!Window.IsVisible(SliderDialog)</visible> <include>dimensionsFullscreen</include>
<posx>0</posx> <texture>vignette.png</texture>
<posy>0</posy> <colordiffuse>ffffffff</colordiffuse>
<width>fullscreenWidth</width>
<height>fullscreenHeight</height>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>ddFFFFFF</colordiffuse>
<include>fadeInOut</include>
</control> </control>
<control type="group"> <control type="group">
<visible>!Window.IsVisible(SliderDialog)</visible> <visible>!Window.IsVisible(SliderDialog)</visible>
@ -27,7 +22,7 @@
<height>25-row</height> <height>25-row</height>
<texture>colors/black.png</texture> <texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
<colordiffuse>ffffffff</colordiffuse> <colordiffuse>aaFFFFFF</colordiffuse>
</control> </control>
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
@ -67,18 +62,23 @@
<width>12-col</width> <width>12-col</width>
<height>21-row</height> <height>21-row</height>
<orientation>vertical</orientation> <orientation>vertical</orientation>
<itemgap>3</itemgap>
</control> </control>
<control type="button" id="7"> <control type="button" id="7">
<description>Default Button</description> <description>Default Button</description>
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
</control> </control>
<control type="radiobutton" id="8"> <control type="radiobutton" id="8">
<description>Default RadioButton</description> <description>Default RadioButton</description>
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
</control> </control>
<control type="spincontrolex" id="9"> <control type="spincontrolex" id="9">
<description>Default spincontrolex</description> <description>Default spincontrolex</description>
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
</control> </control>
<control type="sliderex" id="13"> <control type="sliderex" id="13">
<description>Default Slider</description> <description>Default Slider</description>
<texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
</control> </control>
</control> </control>
<!--debugging--> <!--debugging-->

View File

@ -233,6 +233,19 @@
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Label]</label> <label>$INFO[ListItem.Label]</label>
</control> </control>
<control type="label">
<visible>!isempty(ListItem.playcount)</visible>
<posx>23-col</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbol</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
</itemlayout> </itemlayout>
<focusedlayout width="24-col" height="2-row"> <focusedlayout width="24-col" height="2-row">
<control type="image"> <control type="image">
@ -267,6 +280,19 @@
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Label]</label> <label>$INFO[ListItem.Label]</label>
</control> </control>
<control type="label">
<visible>!isempty(ListItem.playcount)</visible>
<posx>23-col</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbol</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
</focusedlayout> </focusedlayout>
</control> </control>
</control> </control>

View File

@ -6,10 +6,10 @@
<posy>row-5-begin</posy> <posy>row-5-begin</posy>
<!--animations--> <!--animations-->
<animation type="Conditional" condition="controlgroup(9301).hasfocus | controlgroup(9302).hasfocus"> <animation type="Conditional" condition="controlgroup(9301).hasfocus | controlgroup(9302).hasfocus" reversible="false">
<effect type="slide" start="0" end="0,-398" tween="cubic" easing="out" time="400"/> <effect type="slide" start="0" end="0,-398" tween="cubic" easing="out" time="400"/>
</animation> </animation>
<animation type="Conditional" condition="controlgroup(9302).hasfocus"> <animation type="Conditional" condition="controlgroup(9302).hasfocus" reversible="false">
<effect type="slide" start="0" end="0,-686" tween="cubic" easing="out" time="400"/> <effect type="slide" start="0" end="0,-686" tween="cubic" easing="out" time="400"/>
</animation> </animation>