aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorSascha Montellese <sascha.montellese@gmail.com>2013-07-10 00:13:36 -0700
committerSascha Montellese <sascha.montellese@gmail.com>2013-07-10 00:13:36 -0700
commit4f8cf4d591fffea434a45d71de65cfe46334a063 (patch)
tree6386dd610449c89240eae1514a67f67ff052981b /addons
parent2636c2d2bffea010d253e96d0986cfd5d74f0bb6 (diff)
parent57db178863f5e22e74e9b88028c16245233f8223 (diff)
Merge pull request #2958 from Montellese/settings_description_confluence
[confluence] add settings descriptions to GUI
Diffstat (limited to 'addons')
-rw-r--r--addons/skin.confluence/720p/SettingsCategory.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml
index ace6202b61..704b4d721f 100644
--- a/addons/skin.confluence/720p/SettingsCategory.xml
+++ b/addons/skin.confluence/720p/SettingsCategory.xml
@@ -108,7 +108,7 @@
<posx>290</posx>
<posy>70</posy>
<width>750</width>
- <height>530</height>
+ <height>435</height>
<itemgap>-1</itemgap>
<pagecontrol>60</pagecontrol>
<onleft>3</onleft>
@@ -120,7 +120,7 @@
<posx>1060</posx>
<posy>60</posy>
<width>25</width>
- <height>530</height>
+ <height>435</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>
@@ -131,6 +131,17 @@
<showonepage>false</showonepage>
<orientation>vertical</orientation>
</control>
+ <control type="textbox" id="6">
+ <description>description area</description>
+ <posx>290</posx>
+ <posy>515</posy>
+ <width>750</width>
+ <height>85</height>
+ <font>font12</font>
+ <align>justify</align>
+ <textcolor>white</textcolor>
+ <autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll>
+ </control>
</control>
<include>BehindDialogFadeOut</include>