Skip to content

Commit

Permalink
Added description box to settings category
Browse files Browse the repository at this point in the history
  • Loading branch information
@troych
troych committed Sep 24, 2013
1 parent 60f2015 commit 29f30e6
Show file tree
Hide file tree
Showing 3 changed files with 158 additions and 22 deletions.
180 changes: 158 additions & 22 deletions 1080i/SettingsCategory.xml
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<control type="group">
<include>OptionsShutdownAnimation</include>
<include>listEndAnimation</include>
<animation type="WindowClose">
<effect type="fade" start="100" end="0" time="300" tween="sine" easing="out" />
<effect type="zoom" start="100" end="85" time="300" center="960,600" tween="sine" easing="out" />
Expand All @@ -19,7 +20,7 @@
<effect type="fade" start="0" end="100" tween="sine" easing="inout" time="300" />
<effect type="zoom" start="88" end="100" center="576,560" tween="cubic" easing="out" time="400" />
</animation>
<animation effect="slide" start="0" end="-430" time="500" tween="cubic" easing="inout" condition="Control.HasFocus(71)">Conditional</animation>
<control type="label">
<description>Category</description>
<posx>483</posx>
Expand All @@ -28,7 +29,7 @@
<width>338</width>
<align>right</align>
<font>Font-Condensed-S25</font>
<label>[UPPERCASE]$LOCALIZE[42130][/UPPERCASE]</label>
<label>$LOCALIZE[42130]</label>
<textcolor>aawhite2</textcolor>
</control>

Expand All @@ -49,7 +50,7 @@
<width>338</width>
<height>609</height>
<itemgap>-1</itemgap>
<onleft>5</onleft>
<onleft>9010</onleft>
<onright>5</onright>
<onup>3</onup>
<ondown>3</ondown>
Expand All @@ -64,16 +65,25 @@
<effect type="fade" start="0" end="100" tween="sine" easing="inout" time="300" delay="75" />
<effect type="zoom" start="76" end="100" center="1344,560" tween="cubic" easing="out" time="400" delay="75" />
</animation>
<animation effect="slide" start="0" end="-430" time="500" tween="cubic" easing="inout" condition="Control.HasFocus(71)">Conditional</animation>
<control type="image">
<posx>392</posx>
<posy>251</posy>
<height>18</height>
<width>16</width>
<colordiffuse>aawhite</colordiffuse>
<texture>windows/settings/images/level-icon.png</texture>
</control>

<control type="label">
<description>Settings info</description>
<posx>390</posx>
<posx>415</posx>
<posy>240</posy>
<height>40</height>
<width>338</width>
<align>left</align>
<font>Font-Condensed-S25</font>
<label>[UPPERCASE]$LOCALIZE[5][/UPPERCASE]</label>
<label>$INFO[Control.GetLabel(20)]</label>
<textcolor>aawhite2</textcolor>
</control>

Expand Down Expand Up @@ -102,24 +112,71 @@
<height>609</height>
<itemgap>-1</itemgap>
<onleft>3</onleft>
<onright>40</onright>
<onright>71</onright>
<onup>5</onup>
<ondown>5</ondown>
<pagecontrol>40</pagecontrol>
<scrolltime tween="cubic" easing="out">500</scrolltime>
<orientation>vertical</orientation>
</control>

<control type="image" id="42">
<animation effect="fade" start="100" end="0" time="0" delay="1500">WindowOpen</animation>

<control type="group">
<animation effect="slide" start="0" end="526" time="500" tween="cubic" easing="inout" condition="Control.HasFocus(71)">Conditional</animation>
<control type="image">
<posx>1520</posx>
<posy>252</posy>
<width>10</width>
<height>18</height>
<texture>windows/settings/images/rarrow.png</texture>
<colordiffuse>aawhite</colordiffuse>
<include>visiblehidefadeinfo</include>
<visible>!Control.HasFocus(71)</visible>
</control>
<control type="label">
<description>Description</description>
<posx>1510</posx>
<posy>240</posy>
<height>40</height>
<width>338</width>
<align>right</align>
<font>Font-Condensed-S25-B</font>
<label>$LOCALIZE[21821]</label>
<textcolor>aawhite</textcolor>
</control>
</control>
<control type="image" id="41">
<animation effect="fade" start="0" end="100" time="0">Visible</animation>
<animation effect="fade" start="100" end="0" time="0">Hidden</animation>
<visible>Control.HasFocus(40) | !Control.IsVisible(42)</visible>
</control>
<control type="group">
<description>Setting description</description>
<posx>1970</posx>
<animation type="Visible">
<effect type="fade" start="50" end="100" time="500" delay="20" tween="cubic" easing="inout" />
<effect type="slide" start="0" end="-650" time="500" delay="20" tween="cubic" easing="inout" />
</animation>
<animation type="Hidden">
<effect type="slide" start="-650" end="0" time="500" tween="cubic" easing="inout" />
</animation>
<visible allowhiddenfocus="true">Control.HasFocus(71)</visible>
<control type="image">
<posx>0</posx>
<posy>278</posy>
<height>613</height>
<width>498</width>
<texture border="4">views/list/panel/panel.png</texture>
</control>
<control type="scrollbar" id="40">
<posx>1559</posx>
<control type="textbox" id="6">
<description>Plot</description>
<posx>37</posx>
<posy>295</posy>
<width>428</width>
<height>573</height>
<align>left</align>
<textcolor>aawhite</textcolor>
<shadowcolor>33000000</shadowcolor>
<pagecontrol>71</pagecontrol>
<autoscroll delay="13000" time="3000" repeat="13000">!Control.HasFocus(71) + !Skin.HasSetting(AutoScroll.Disable)</autoscroll>
<font>Font-Condensed-S32</font>
</control>
<control type="scrollbar" id="71">
<posx>490</posx>
<posy>281</posy>
<width>6</width>
<height>608</height>
Expand All @@ -129,10 +186,11 @@
<textureslidernib>-</textureslidernib>
<textureslidernibfocus>-</textureslidernibfocus>
<onleft>5</onleft>
<onright>3</onright>
<onright condition="!Window.IsVisible(3009)">SetProperty(BounceRight,1,Home)</onright>
<showonepage>false</showonepage>
<orientation>vertical</orientation>
<animation effect="fade" start="45" end="0" time="300" tween="sine" easing="inout" condition="!Control.IsVisible(41)">Conditional</animation>
<animation effect="fade" start="45" end="0" time="300" tween="sine" easing="inout" condition="!Control.IsVisible(71)">Conditional</animation>
<visible allowhiddenfocus="true">Control.HasFocus(71)</visible>
</control>
</control>
</control>
Expand All @@ -154,7 +212,7 @@
<texturefocus border="150,3,150,3">windows/settings/images/right-focus.png</texturefocus>
<texturenofocus border="90,3,90,3">views/list/other/separator.png</texturenofocus>
<textcolor>96FFFFFF</textcolor>
<focusedcolor>white</focusedcolor>
<focusedcolor>eewhite</focusedcolor>
<disabledcolor>40FFFFFF</disabledcolor>
<font>Font-Condensed-S30</font>
<textoffsetx>35</textoffsetx>
Expand All @@ -168,7 +226,7 @@
<texturefocus border="150,3,150,3">windows/settings/images/right-focus.png</texturefocus>
<texturenofocus border="90,3,90,3">views/list/other/separator.png</texturenofocus>
<textcolor>96FFFFFF</textcolor>
<focusedcolor>white</focusedcolor>
<focusedcolor>eewhite</focusedcolor>
<disabledcolor>40FFFFFF</disabledcolor>
<font>Font-Condensed-S30</font>
<textoffsetx>35</textoffsetx>
Expand All @@ -182,7 +240,7 @@
<texturefocus border="150,3,150,3">windows/settings/images/right-focus.png</texturefocus>
<texturenofocus border="90,3,90,3">views/list/other/separator.png</texturenofocus>
<textcolor>96FFFFFF</textcolor>
<focusedcolor>white</focusedcolor>
<focusedcolor>eewhite</focusedcolor>
<disabledcolor>40FFFFFF</disabledcolor>
<font>Font-Condensed-S30</font>
<textoffsetx>35</textoffsetx>
Expand All @@ -193,6 +251,84 @@
</control>

<include>FadeBackground</include>
<include>Common-Info-NoOptions</include>
<include>Common-Info</include>

<control type="group" id="9000">
<posx>267</posx>
<posy>517</posy>
<include>OptionsAnimations</include>
<animation effect="slide" start="0" end="-204" time="0" condition="Skin.HasSetting(HideShutdownButton)">Conditional</animation>
<control type="group">
<include>OptionsPanelAnimations</include>
<control type="image">
<description>shadow image</description>
<posx>5</posx>
<posy>505</posy>
<height>60</height>
<width>442</width>
<texture>dialogs/shutdown/shadow.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<description>background image</description>
<posx>0</posx>
<posy>0</posy>
<height>540</height>
<width>442</width>
<texture>dialogs/shutdown/shutdown.png</texture>
<aspectratio>stretch</aspectratio>
</control>
</control>

<control type="grouplist" id="9111">
<posx>19</posx>
<posy>47</posy>
<width>404</width>
<height>399</height>
<itemgap>0</itemgap>
<onleft>3</onleft>
<onright>3</onright>
<onup>9111</onup>
<ondown>9111</ondown>
<include>GeneralOptionsAnimations</include>
<control type="button" id="20">
<description>Setting level button</description>
<include>optionsbuttonsdimensions</include>
<label>$LOCALIZE[10037]</label>
<onclick>SettingsLevelChange</onclick>
<texturefocus border="70,2,2,2">dialogs/options/buttons/level-fo.png</texturefocus>
<texturenofocus border="70,2,2,2">dialogs/options/buttons/level-nf.png</texturenofocus>
</control>
<control type="button" id="21">
<description>Reset button</description>
<include>optionsbuttonsdimensions</include>
<label>$LOCALIZE[10035]</label>
<onclick>SettingsReset</onclick>
<texturefocus border="70,2,2,2">dialogs/options/buttons/reset-fo.png</texturefocus>
<texturenofocus border="70,2,2,2">dialogs/options/buttons/reset-nf.png</texturenofocus>
</control>
</control>

<control type="group">
<include>GeneralOptionsAnimations</include>
<control type="image">
<posx>9</posx>
<posy>433</posy>
<width>100</width>
<height>100</height>
<texture>buttons/options_nofo.png</texture>
</control>
<control type="label">
<posx>94</posx>
<posy>433</posy>
<width>300</width>
<height>100</height>
<label>$LOCALIZE[41600]</label>
<font>Font-Condensed-S34</font>
<textcolor>eewhite</textcolor>
<shadowcolor>22000000</shadowcolor>
</control>
</control>
</control>
</controls>
</window>
Binary file added media/windows/settings/images/level-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/windows/settings/images/rarrow.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 29f30e6

Please sign in to comment.