diff options
author | Jezz_X <jezzx2@gmail.com> | 2011-10-07 09:36:43 +1100 |
---|---|---|
committer | Jezz_X <jezzx2@gmail.com> | 2011-10-07 09:36:43 +1100 |
commit | 2a144d5fc057b5e735d47e1458898eb9d3672902 (patch) | |
tree | dffd3af577995e4ef301b8e4edd0e24aba801be7 /addons/skin.confluence | |
parent | fbcf56faa2ffee67a5ea852a15c4029ca5c0c418 (diff) |
Changed: [Confluence] Redesign of the DialogPeripheral*.xml windows
Diffstat (limited to 'addons/skin.confluence')
-rw-r--r-- | addons/skin.confluence/720p/DialogPeripheralManager.xml | 416 | ||||
-rw-r--r-- | addons/skin.confluence/720p/DialogPeripheralSettings.xml | 187 |
2 files changed, 231 insertions, 372 deletions
diff --git a/addons/skin.confluence/720p/DialogPeripheralManager.xml b/addons/skin.confluence/720p/DialogPeripheralManager.xml index 16195d97ca..e86919b0ad 100644 --- a/addons/skin.confluence/720p/DialogPeripheralManager.xml +++ b/addons/skin.confluence/720p/DialogPeripheralManager.xml @@ -1,47 +1,43 @@ <window id="10140"> <defaultcontrol always="true">20</defaultcontrol> - <allowoverlay>no</allowoverlay> <coordinates> <system>1</system> - <posx>190</posx> + <posx>335</posx> <posy>30</posy> </coordinates> <include>dialogeffect</include> - <controls> <control type="image"> + <description>background image</description> <posx>0</posx> <posy>0</posy> - <width>900</width> - <height>660</height> + <width>610</width> + <height>650</height> <texture border="40">DialogBack.png</texture> + <visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible> + </control> + <control type="image"> + <description>background image</description> + <posx>0</posx> + <posy>0</posy> + <width>610</width> + <height>650</height> + <texture border="40">DialogBack2.png</texture> + <visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible> </control> <control type="image"> <description>Dialog Header image</description> <posx>40</posx> <posy>16</posy> - <width>820</width> + <width>530</width> <height>40</height> <texture>dialogheader.png</texture> </control> - <control type="label"> + <control type="label" id="1"> <description>header label</description> <posx>40</posx> <posy>20</posy> - <width>820</width> - <height>30</height> - <font>font13_title</font> - <label>$LOCALIZE[35000]</label> - <align>center</align> - <aligny>center</aligny> - <textcolor>selected</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="label"> - <description>header label</description> - <posx>40</posx> - <posy>20</posy> - <width>820</width> + <width>530</width> <height>30</height> <font>font13_title</font> <label>$LOCALIZE[35000]</label> @@ -52,7 +48,7 @@ </control> <control type="button"> <description>Close Window button</description> - <posx>810</posx> + <posx>520</posx> <posy>15</posy> <width>64</width> <height>32</height> @@ -68,314 +64,166 @@ <visible>system.getbool(input.enablemouse)</visible> </control> - <control type="group"> - <description>Peripheral list</description> + <control type="list" id="20"> <posx>20</posx> - <posy>70</posy> - <control type="label"> - <description>peripheral option header</description> - <posx>130</posx> - <posy>0</posy> - <width>380</width> - <height>20</height> - <font>font12_title</font> - <label>$LOCALIZE[35000]</label> - <align>left</align> - <aligny>center</aligny> - <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="scrollbar" id="60"> - <posx>0</posx> - <posy>40</posy> - <width>25</width> - <height>445</height> - <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground> - <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar> - <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus> - <textureslidernib>ScrollBarNib.png</textureslidernib> - <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus> - <onleft>9000</onleft> - <onright>20</onright> - <showonepage>false</showonepage> - <orientation>vertical</orientation> - </control> - <control type="image"> - <posx>25</posx> - <posy>35</posy> - <width>330</width> - <height>440</height> - <texture border="5">button-nofocus.png</texture> - </control> - - <control type="list" id="20"> - <posx>30</posx> - <posy>40</posy> - <width>320</width> - <height>445</height> - <onup>20</onup> - <ondown>20</ondown> - <onleft>60</onleft> - <onright>9000</onright> - <pagecontrol>60</pagecontrol> - <scrolltime>200</scrolltime> - <itemlayout height="45" width="320"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>320</width> - <height>40</height> - <texture border="5">button-nofocus.png</texture> - </control> - <control type="label"> - <posx>10</posx> - <posy>0</posy> - <width>320</width> - <height>40</height> - <font>font12</font> - <align>left</align> - <aligny>center</aligny> - <textcolor>grey2</textcolor> - <selectedcolor>selected</selectedcolor> - <info>ListItem.Label</info> - </control> - </itemlayout> - <focusedlayout height="45" width="320"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>320</width> - <height>40</height> - <texture border="5">button-nofocus.png</texture> - <visible>!Control.HasFocus(20)</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>320</width> - <height>40</height> - <texture border="5">button-focus2.png</texture> - <visible>Control.HasFocus(20)</visible> - </control> - <control type="label"> - <posx>10</posx> - <posy>0</posy> - <width>320</width> - <height>40</height> - <font>font12</font> - <align>left</align> - <aligny>center</aligny> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <info>ListItem.Label</info> - </control> - </focusedlayout> - </control> - - <control type="label"> - <description>Page Count Label</description> - <posx>80</posx> - <posy>480</posy> - <width>420</width> - <height>20</height> - <font>font12</font> - <textcolor>grey</textcolor> - <scroll>false</scroll> - <align>center</align> - <aligny>center</aligny> - <label>([COLOR=blue]$INFO[Container(20).NumItems][/COLOR]) $LOCALIZE[19019] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR])</label> - </control> - </control> - - <control type="group" id="9002"> - <control type="group"> - <posx>400</posx> - <posy>70</posy> - <control type="label"> - <description>peripheral option header</description> - <posx>150</posx> + <posy>65</posy> + <width>550</width> + <height>510</height> + <onup>6</onup> + <ondown>6</ondown> + <onleft>5</onleft> + <onright>61</onright> + <pagecontrol>61</pagecontrol> + <scrolltime>200</scrolltime> + <animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation> + <itemlayout height="85" width="550"> + <control type="image"> + <posx>0</posx> <posy>0</posy> - <width>380</width> - <height>20</height> - <font>font12_title</font> - <label>$LOCALIZE[33029]</label> - <align>left</align> - <aligny>center</aligny> - <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> + <width>550</width> + <height>80</height> + <texture border="5">button-nofocus.png</texture> </control> - <control type="label"> - <description>name</description> - <posx>0</posx> - <posy>35</posy> - <width>380</width> + <description>Name</description> + <posx>10</posx> + <posy>5</posy> + <width>520</width> <height>20</height> - <label>$LOCALIZE[35502]</label> + <label>$INFO[ListItem.Label]</label> <align>left</align> <aligny>center</aligny> - <font>font12</font> - <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> + <font>font13</font> + <textcolor>white</textcolor> </control> <control type="label"> - <description>name value</description> - <posx>150</posx> - <posy>35</posy> - <width>330</width> + <description>Product ID Vendor ID</description> + <posx>10</posx> + <posy>30</posy> + <width>520</width> <height>20</height> - <label fallback="13205">$INFO[Container(20).ListItem.Label]</label> - <align>left</align> - <aligny>center</aligny> - <font>font12</font> - <scroll>true</scroll> - <shadowcolor>black</shadowcolor> - </control> - - <control type="label"> - <description>location</description> - <posx>0</posx> - <posy>60</posy> - <width>380</width> - <height>20</height> - <label>$LOCALIZE[35500]</label> + <label>$LOCALIZE[35504]: [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR] $LOCALIZE[35503]: [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label> <align>left</align> <aligny>center</aligny> <font>font12</font> <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> - </control> - <control type="label"> - <description>location value</description> - <posx>150</posx> - <posy>60</posy> - <width>330</width> - <height>20</height> - <label fallback="13205">$INFO[Container(20).ListItem.Property(Bus)] - $INFO[Container(20).ListItem.Property(Location)]</label> - <align>left</align> - <aligny>center</aligny> - <font>font12</font> - <scroll>true</scroll> - <shadowcolor>black</shadowcolor> </control> - <control type="label"> <description>class</description> - <posx>0</posx> - <posy>85</posy> - <width>380</width> + <posx>10</posx> + <posy>50</posy> + <width>520</width> <height>20</height> - <label>$LOCALIZE[35501]</label> + <label>$LOCALIZE[35501]: [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label> <align>left</align> <aligny>center</aligny> <font>font12</font> <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> </control> - <control type="label"> - <description>class value</description> - <posx>150</posx> - <posy>85</posy> - <width>330</width> - <height>20</height> - <label fallback="13205">$INFO[Container(20).ListItem.Property(Class)]</label> - <align>left</align> - <aligny>center</aligny> - <font>font12</font> - <scroll>true</scroll> - <shadowcolor>black</shadowcolor> + </itemlayout> + <focusedlayout height="85" width="550"> + <control type="image"> + <posx>0</posx> + <posy>0</posy> + <width>550</width> + <height>80</height> + <texture border="5">button-nofocus.png</texture> + <visible>!Control.HasFocus(20)</visible> + <include>VisibleFadeEffect</include> </control> - - <control type="label"> - <description>vendor</description> + <control type="image"> <posx>0</posx> - <posy>110</posy> - <width>380</width> - <height>20</height> - <label>$LOCALIZE[35503]</label> - <align>left</align> - <aligny>center</aligny> - <font>font12</font> - <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> + <posy>0</posy> + <width>550</width> + <height>80</height> + <texture border="5">button-focus2.png</texture> + <visible>Control.HasFocus(20)</visible> + <include>VisibleFadeEffect</include> </control> <control type="label"> - <description>vendor value</description> - <posx>150</posx> - <posy>110</posy> - <width>330</width> + <description>Name</description> + <posx>10</posx> + <posy>5</posy> + <width>520</width> <height>20</height> - <label fallback="13205">$INFO[Container(20).ListItem.Property(Vendor)]</label> + <label>$INFO[ListItem.Label]</label> <align>left</align> <aligny>center</aligny> - <font>font12</font> - <scroll>true</scroll> - <shadowcolor>black</shadowcolor> + <font>font13</font> + <textcolor>white</textcolor> </control> - <control type="label"> - <description>product</description> - <posx>0</posx> - <posy>135</posy> - <width>380</width> + <description>Product ID Vendor ID</description> + <posx>10</posx> + <posy>30</posy> + <width>520</width> <height>20</height> - <label>$LOCALIZE[35504]</label> + <label>$LOCALIZE[35504]: [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR] $LOCALIZE[35503]: [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label> <align>left</align> <aligny>center</aligny> <font>font12</font> <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> </control> <control type="label"> - <description>product value</description> - <posx>150</posx> - <posy>135</posy> - <width>330</width> + <description>class</description> + <posx>10</posx> + <posy>50</posy> + <width>520</width> <height>20</height> - <label fallback="13205">$INFO[Container(20).ListItem.Property(Product)]</label> + <label>$LOCALIZE[35501]: [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label> <align>left</align> <aligny>center</aligny> <font>font12</font> - <scroll>true</scroll> - <shadowcolor>black</shadowcolor> + <textcolor>blue</textcolor> </control> - - </control> + </focusedlayout> </control> - <control type="group" id="9000"> - <posx>70</posx> - <posy>590</posy> - <control type="button" id="10"> - <description>Close Button</description> - <posy>0</posy> - <posx>100</posx> - <width>200</width> - <height>40</height> - <align>center</align> - <aligny>center</aligny> - <font>font12_title</font> - <label>186</label> - <onleft>11</onleft> - <onright>11</onright> - <onup>20</onup> - <ondown>20</ondown> - </control> - <control type="button" id="11"> - <description>Settings Button</description> - <posy>0</posy> - <posx>400</posx> - <width>200</width> - <height>40</height> - <align>center</align> - <aligny>center</aligny> - <font>font12_title</font> - <label>5</label> - <onleft>10</onleft> - <onright>10</onright> - <onup>20</onup> - <ondown>20</ondown> - </control> + <control type="scrollbar" id="61"> + <posx>570</posx> + <posy>65</posy> + <width>25</width> + <height>510</height> + <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground> + <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar> + <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus> + <textureslidernib>ScrollBarNib.png</textureslidernib> + <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus> + <onleft>3</onleft> + <onright>3</onright> + <ondown>61</ondown> + <onup>61</onup> + <showonepage>false</showonepage> + <orientation>vertical</orientation> + </control> + <control type="label"> + <description>number of files/pages in list text label</description> + <posx>580</posx> + <posy>585</posy> + <width>300</width> + <height>35</height> + <font>font12</font> + <align>right</align> + <aligny>center</aligny> + <scroll>true</scroll> + <textcolor>grey</textcolor> + <label>([COLOR=blue]$INFO[Container(20).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR])</label> + </control> + <control type="button" id="10"> + <description>Close button</description> + <posx>20</posx> + <posy>585</posy> + <width>200</width> + <height>40</height> + <label>186</label> + <font>font12_title</font> + <textcolor>white</textcolor> + <focusedcolor>white</focusedcolor> + <align>center</align> + <onleft>61</onleft> + <onright>20</onright> + <onup>20</onup> + <ondown>20</ondown> </control> </controls> </window> diff --git a/addons/skin.confluence/720p/DialogPeripheralSettings.xml b/addons/skin.confluence/720p/DialogPeripheralSettings.xml index df089c1764..b5e025b3bb 100644 --- a/addons/skin.confluence/720p/DialogPeripheralSettings.xml +++ b/addons/skin.confluence/720p/DialogPeripheralSettings.xml @@ -2,94 +2,96 @@ <defaultcontrol>5</defaultcontrol> <coordinates> <system>1</system> - <posx>240</posx> - <posy>60</posy> + <posx>290</posx> + <posy>75</posy> </coordinates> <include>dialogeffect</include> <controls> - <control type="group"> - <animation effect="fade" start="100" end="0" time="400" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(FileBrowser)">Conditional</animation> - <control type="image"> - <description>background image</description> - <posx>0</posx> - <posy>0</posy> - <width>800</width> - <height>600</height> - <texture border="40">DialogBack2.png</texture> - </control> - <control type="image"> - <description>Dialog Header image</description> - <posx>40</posx> - <posy>16</posy> - <width>720</width> - <height>40</height> - <texture>dialogheader.png</texture> - </control> - <control type="button"> - <description>Close Window button</description> - <posx>710</posx> - <posy>15</posy> - <width>64</width> - <height>32</height> - <label>-</label> - <font>-</font> - <onclick>PreviousMenu</onclick> - <texturefocus>DialogCloseButton-focus.png</texturefocus> - <texturenofocus>DialogCloseButton.png</texturenofocus> - <onleft>2</onleft> - <onright>2</onright> - <onup>2</onup> - <ondown>2</ondown> - <visible>system.getbool(input.enablemouse)</visible> - </control> - <control type="label" id="3"> - <description>No Settings Label</description> - <posx>20</posx> - <posy>180</posy> - <width>760</width> - <align>center</align> - <label>35004</label> - <font>font13caps</font> - </control> - <control type="grouplist" id="5"> - <description>control area</description> - <posx>40</posx> - <posy>65</posy> - <width>720</width> - <height>490</height> - <itemgap>5</itemgap> - <pagecontrol>60</pagecontrol> - <onleft>9000</onleft> - <onright>60</onright> - <onup>5</onup> - <ondown>5</ondown> - </control> - <control type="scrollbar" id="60"> - <posx>760</posx> - <posy>65</posy> - <width>25</width> - <height>450</height> - <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground> - <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar> - <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus> - <textureslidernib>ScrollBarNib.png</textureslidernib> - <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus> - <onleft>5</onleft> - <onright>9000</onright> - <ondown>61</ondown> - <onup>61</onup> - <showonepage>true</showonepage> - <orientation>vertical</orientation> - </control> + <control type="image"> + <description>background image</description> + <posx>0</posx> + <posy>0</posy> + <width>700</width> + <height>570</height> + <texture border="40">DialogBack.png</texture> </control> - <control type="sliderex" id="10"> - <description>Default Slider</description> + <control type="image"> + <description>Dialog Header image</description> + <posx>40</posx> + <posy>16</posy> + <width>620</width> <height>40</height> - <texturenofocus border="5">button-nofocus.png</texturenofocus> - <texturefocus border="5">button-focus2.png</texturefocus> - <font>font13</font> - <textcolor>grey2</textcolor> - <focusedcolor>white</focusedcolor> + <texture>dialogheader.png</texture> + </control> + <control type="label"> + <description>header label</description> + <posx>40</posx> + <posy>20</posy> + <width>620</width> + <height>30</height> + <font>font13_title</font> + <label>$LOCALIZE[5]</label> + <align>center</align> + <aligny>center</aligny> + <textcolor>selected</textcolor> + <shadowcolor>black</shadowcolor> + </control> + <control type="button"> + <description>Close Window button</description> + <posx>610</posx> + <posy>15</posy> + <width>64</width> + <height>32</height> + <label>-</label> + <font>-</font> + <onclick>PreviousMenu</onclick> + <texturefocus>DialogCloseButton-focus.png</texturefocus> + <texturenofocus>DialogCloseButton.png</texturenofocus> + <onleft>5</onleft> + <onright>5</onright> + <onup>5</onup> + <ondown>5</ondown> + <visible>system.getbool(input.enablemouse)</visible> + </control> + <control type="label" id="3"> + <description>No Settings Label</description> + <posx>20</posx> + <posy>180</posy> + <width>640</width> + <align>center</align> + <label>35004</label> + <font>font13caps</font> + </control> + <control type="grouplist" id="5"> + <animation effect="slide" start="0,0" end="5,0" time="0" condition="!Control.IsVisible(60)">Conditional</animation> + <description>control area</description> + <posx>30</posx> + <posy>70</posy> + <width>630</width> + <height>410</height> + <itemgap>5</itemgap> + <pagecontrol>60</pagecontrol> + <onleft>28</onleft> + <onright>60</onright> + <onup>28</onup> + <ondown>28</ondown> + </control> + <control type="scrollbar" id="60"> + <posx>658</posx> + <posy>70</posy> + <width>25</width> + <height>410</height> + <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground> + <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar> + <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus> + <textureslidernib>ScrollBarNib.png</textureslidernib> + <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus> + <onleft>3</onleft> + <onright>3</onright> + <ondown>60</ondown> + <onup>60</onup> + <showonepage>false</showonepage> + <orientation>vertical</orientation> </control> <control type="button" id="7"> <description>Default Button</description> @@ -119,11 +121,20 @@ <font>font13</font> <textcolor>grey2</textcolor> <focusedcolor>white</focusedcolor> - <texturenofocus border="5">button-nofocus.png</texturenofocus> <texturefocus border="5">button-focus2.png</texturefocus> + <texturenofocus border="5">button-nofocus.png</texturenofocus> <aligny>center</aligny> <reverse>yes</reverse> </control> + <control type="sliderex" id="10"> + <description>Default Slider</description> + <height>40</height> + <texturenofocus border="5">button-nofocus.png</texturenofocus> + <texturefocus border="5">button-focus2.png</texturefocus> + <font>font13</font> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> + </control> <control type="image" id="11"> <description>separator image</description> <height>2</height> @@ -131,8 +142,8 @@ </control> <control type="group" id="9000"> - <posx>50</posx> - <posy>530</posy> + <posx>40</posx> + <posy>505</posy> <control type="button" id="29"> <description>Cancel Button</description> <posy>0</posy> @@ -151,7 +162,7 @@ <control type="button" id="28"> <description>OK Button</description> <posy>0</posy> - <posx>250</posx> + <posx>210</posx> <width>200</width> <height>40</height> <align>center</align> @@ -166,7 +177,7 @@ <control type="button" id="50"> <description>Defaults Button</description> <posy>0</posy> - <posx>500</posx> + <posx>420</posx> <width>200</width> <height>40</height> <align>center</align> |