Skip to content

Commit

Permalink
DialogProgress changed to use textbox ID 9.
Browse files Browse the repository at this point in the history 
Addresses Issue #314.
  • Loading branch information
@jingai
jingai committed Feb 11, 2015
1 parent 2ee5ac3 commit 65a93e0
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 63 deletions.
145 changes: 83 additions & 62 deletions 720p/DialogProgress.xml
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<window id="101">
<defaultcontrol always="true">10</defaultcontrol>
<animation type="WindowOpen" reversible="false">
<effect type="slide" start="0,-100" end="0,0" time="300" />
<effect type="fade" start="0" end="100" time="300" />
</animation>
<animation type="WindowClose" reversible="false">
<effect type="slide" start="0,0" end="0,-100" time="300" />
<effect type="fade" start="100" end="0" time="300" />
</animation>
<coordinates>
<posx>-30</posx>
<posy>-15</posy>
</coordinates>
<controls>
<animation effect="slide" end="0,-300" time="300" reversible="false" condition="Window.IsActive(extendedprogressdialog)">Conditional</animation>
<!-- Background Panel -->
<control type="image">
<description>background image</description>
<posx>0</posx>
<posy>-10</posy>
<width>1100</width>
<height>67</height>
<texture>dialogs/DialogBG_DropdownWide2.png</texture>
<colordiffuse>DialogDropdownColor</colordiffuse>
</control>
<control type="progress" id="20">
<description>Progress Bar</description>
<posx>50</posx>
<posy>24</posy>
<width>175</width>
<height>17</height>
<texturebg>osd/osd_progress_back3.png</texturebg>
<lefttexture>osd/osd_progress_left3.png</lefttexture>
<midtexture>osd/osd_progress_mid3.png</midtexture>
<righttexture>osd/osd_progress_right3.png</righttexture>
<colordiffuse>DialogProgressBar</colordiffuse>
<info>System.Progressbar</info>
</control>
<control type="grouplist">
<posx>235</posx>
<posy>16</posy>
<width>835</width>
<height>30</height>
<align>left</align>
<itemgap>10</itemgap>
<orientation>horizontal</orientation>
<control type="label" id="1">
<width min="25" max="835">auto</width>
<height>30</height>
<aligny>center</aligny>
<font>METF_DialogSmallBold</font>
<textcolor>DialogTextFO</textcolor>
</control>
<control type="label" id="2">
<width min="25" max="835">auto</width>
<height>30</height>
<aligny>center</aligny>
<font>METF_DialogSmallBold</font>
<textcolor>TextNF</textcolor>
<control type="group">
<posy>50</posy>
<animation type="WindowOpen" reversible="false">
<effect type="slide" start="0,-200" end="0,0" time="300" />
<effect type="fade" start="0" end="100" time="300" />
</animation>
<animation type="WindowClose" reversible="false">
<effect type="slide" start="0,0" end="0,-100" time="300" />
<effect type="fade" start="100" end="0" time="300" />
</animation>
<!-- Background Panel -->
<control type="image">
<description>background image</description>
<width>600</width>
<height>106</height>
<texture>dialogs/DialogBG_Dropdown2.png</texture>
<colordiffuse>DialogDropdownColor</colordiffuse>
</control>
<control type="label" id="3">
<width min="25" max="835">auto</width>
<height>30</height>
<aligny>center</aligny>
<control type="textbox" id="9">
<posx>38</posx>
<posy>6</posy>
<width>538</width>
<height>78</height>
<font>METF_DialogSmall</font>
<textcolor>TextNF</textcolor>
<autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll>
</control>
</control>
<control type="group">
<animation type="WindowOpen" reversible="false">
<effect type="slide" start="0,-100" end="0,0" time="300" />
<effect type="fade" start="0" end="100" time="300" />
</animation>
<animation type="WindowClose" reversible="false">
<effect type="slide" start="0,0" end="0,-100" time="300" delay="400" />
<effect type="fade" start="100" end="0" time="300" delay="400" />
</animation>
<!-- Background Panel -->
<control type="image">
<description>background image</description>
<posx>0</posx>
<posy>-10</posy>
<width>1100</width>
<height>67</height>
<texture>dialogs/DialogBG_DropdownWide2.png</texture>
<colordiffuse>DialogDropdownColor</colordiffuse>
</control>
<control type="progress" id="20">
<description>Progress Bar</description>
<posx>50</posx>
<posy>24</posy>
<width>175</width>
<height>17</height>
<texturebg>osd/osd_progress_back3.png</texturebg>
<lefttexture>osd/osd_progress_left3.png</lefttexture>
<midtexture>osd/osd_progress_mid3.png</midtexture>
<righttexture>osd/osd_progress_right3.png</righttexture>
<colordiffuse>DialogProgressBar</colordiffuse>
<info>System.Progressbar</info>
</control>
<control type="label" id="4">
<width min="25" max="835">auto</width>
<control type="label" id="1">
<description>Fake Heading Label</description>
<posx>0</posx>
<posy>0</posy>
<width>0</width>
<height>0</height>
<font>-</font>
<visible>false</visible>
</control>
<control type="grouplist">
<posx>235</posx>
<posy>16</posy>
<width>835</width>
<height>30</height>
<aligny>center</aligny>
<font>METF_DialogSmall</font>
<textcolor>TextNF</textcolor>
<align>left</align>
<itemgap>10</itemgap>
<orientation>horizontal</orientation>
<control type="label">
<width min="25" max="835">auto</width>
<height>30</height>
<aligny>center</aligny>
<font>METF_DialogSmallBold</font>
<textcolor>DialogTextFO</textcolor>
<label>$INFO[Control.GetLabel(1)] $INFO[System.Progressbar,- ,%]</label>
</control>
</control>
</control>
<control type="button" id="10">
<animation effect="fade" start="100" end="0" time="0">WindowOpen</animation>
<description>Cancel</description>
<posx>0</posx>
<posy>0</posy>
<width>0</width>
<height>0</height>
<font>-</font>
<label>$LOCALIZE[222]</label>
<texturefocus border="1">-</texturefocus>
<texturenofocus border="1">-</texturenofocus>
Expand Down
2 changes: 1 addition & 1 deletion 720p/Includes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@
<height>135</height>
<font>METF_PlotTextMedium</font>
-->
<height>128</height>
<height>130</height>
<font>METF_PlotTextSmall</font>
<include condition="!Skin.HasSetting(AutoScrollFast)">AutoScrollLong</include>
<include condition="Skin.HasSetting(AutoScrollFast)">AutoScrollLongFast</include>
Expand Down

0 comments on commit 65a93e0

Please sign in to comment.