mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 03:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup post-game summary page again. Fixes #3072

Browse Source 
This was SVN commit r16391.
This commit is contained in:
JoshuaJB
2015-02-28 18:32:50 +00:00
parent ea2eb2bd57
commit 37da37dbd5
3 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/page_summary.xml
+1 -8
View File
@@ -4,15 +4,8 @@
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/icon_sprites.xml</include>
<include>common/init.xml</include>
<include>common/global.xml</include>
<include>summary/summary.xml</include>
<include>summary/sprites.xml</include>
<include>common/global.xml</include>
</page>
binaries/data/mods/public/gui/summary/sprites.xml
+36 -36
View File
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<sprites>
<sprite name="TabSpacer">
<image backcolor="gold" size="0 0 100% 100%"/>
</sprite>
<sprite name="ForegroundTab">
<image backcolor="255 255 255 40" size="0 0 100% 100%"/>
<image backcolor="gold" size="0 0 2 100%"/>
<image backcolor="gold" size="2 0 100%-2 2"/>
<image backcolor="gold" size="100%-2 0 100% 100%"/>
</sprite>
<sprite name="BackgroundTab">
<image backcolor="50 35 0 120" size="0 0 100% 100%"/>
<image backcolor="gold" size="0 0 1 100%"/>
<image backcolor="gold" size="1 0 100%-1 1"/>
<image backcolor="gold" size="100%-1 0 100% 100%"/>
</sprite>
<sprite name="ForegroundBody">
<image backcolor="255 255 255 40" size="0 0 100% 100%"/>
<image backcolor="gold" size="0 0 2 100%"/>
<image backcolor="gold" size="2 100%-2 100%-2 100%"/>
<image backcolor="gold" size="100%-2 0 100% 100%"/>
</sprite>
<sprite name="ForegroundBox">
<image backcolor="255 255 255 40" size="0 0 100% 100%"/>
<image backcolor="gold" size="0 0 2 100%"/>
<image backcolor="gold" size="2 100%-2 100%-2 100%"/>
<image backcolor="gold" size="100%-2 0 100% 100%"/>
<image backcolor="gold" size="0 0 100% 100%"/>
</sprite>
</sprites>
<?xml version="1.0" encoding="utf-8"?>
<sprites>
<sprite name="TabSpacer">
<image backcolor="gold" size="0 0 100% 100%"/>
</sprite>
<sprite name="ForegroundTab">
<image backcolor="255 255 255 40" size="0 0 100% 100%"/>
<image backcolor="gold" size="0 0 2 100%"/>
<image backcolor="gold" size="2 0 100%-2 2"/>
<image backcolor="gold" size="100%-2 0 100% 100%"/>
</sprite>
<sprite name="BackgroundTab">
<image backcolor="50 35 0 120" size="0 0 100% 100%"/>
<image backcolor="gold" size="0 0 1 100%"/>
<image backcolor="gold" size="1 0 100%-1 1"/>
<image backcolor="gold" size="100%-1 0 100% 100%"/>
</sprite>
<sprite name="ForegroundBody">
<image backcolor="255 255 255 40" size="0 0 100% 100%"/>
<image backcolor="gold" size="0 0 2 100%"/>
<image backcolor="gold" size="2 100%-2 100%-2 100%"/>
<image backcolor="gold" size="100%-2 0 100% 100%"/>
</sprite>
<sprite name="ForegroundBox">
<image backcolor="255 255 255 40" size="0 0 100% 100%"/>
<image backcolor="gold" size="0 0 2 100%"/>
<image backcolor="gold" size="2 100%-2 100%-2 100%"/>
<image backcolor="gold" size="100%-2 0 100% 100%"/>
<image backcolor="gold" size="0 0 100% 100%"/>
</sprite>
</sprites>
binaries/data/mods/public/gui/summary/summary.xml
+18 -17
View File
@@ -7,6 +7,7 @@
-->
<objects>
<script file="gui/common/functions_global_object.js"/>
<script file="gui/common/functions_civinfo.js"/>
<script file="gui/common/functions_utility.js"/>
<script file="gui/summary/counters.js"/>
@@ -17,15 +18,15 @@
style="ModernWindow"
size="0 0 100% 100%"
>
<object style="TitleText" type="text" size="50%-128 4 50%+128 36">
<object style="ModernLabelText" type="text" size="50%-128 4 50%+128 36">
<translatableAttribute id="caption">Summary</translatableAttribute>
</object>
<object type="image" sprite="ForegroundBody" size="20 24 100%-20 80">
<object size="20 26 100%-20 92">
<object name="summaryText"
type="text"
size="50 6 100%-50 100%-20"
size="50 16 100%-50 100%-16"
font="sans-bold-18"
textcolor="255 255 255"
text_align="left"
@@ -34,17 +35,17 @@
<object name="timeElapsed"
type="text"
size="100%-200 8 100%-10 100%-20"
font="sans-16"
size="50 16 100%-50 100%-16"
font="sans-bold-18"
textcolor="255 255 255"
text_align="center"
text_align="right"
text_valign="center"
/>
<object name="mapName"
type="text"
size="50 20 100%-50 100%-4"
font="sans-bold-16"
size="50 16 100%-50 100%-16"
font="sans-bold-18"
textcolor="255 255 255"
text_align="center"
text_valign="center"
@@ -57,47 +58,47 @@
<object name="scorePanelButton" type="button" sprite="ForegroundTab" size="20 92 136 120">
<action on="Press">selectPanel(0);</action>
<object type="text" style="TitleText" ghost="true">
<object type="text" style="ModernLabelText" ghost="true">
<translatableAttribute id="caption">Score</translatableAttribute>
</object>
</object>
<object name="buildingsPanelButton" type="button" sprite="BackgroundTab" size="142 92 260 120">
<action on="Press">selectPanel(1);</action>
<object type="text" style="TitleText" ghost="true">
<object type="text" style="ModernLabelText" ghost="true">
<translatableAttribute id="caption">Buildings</translatableAttribute>
</object>
</object>
<object name="unitsPanelButton" type="button" sprite="BackgroundTab" size="266 92 384 120">
<action on="Press">selectPanel(2);</action>
<object type="text" style="TitleText" ghost="true">
<object type="text" style="ModernLabelText" ghost="true">
<translatableAttribute id="caption">Units</translatableAttribute>
</object>
</object>
<object name="resourcesPanelButton" type="button" sprite="BackgroundTab" size="390 92 508 120">
<action on="Press">selectPanel(3);</action>
<object type="text" style="TitleText" ghost="true">
<object type="text" style="ModernLabelText" ghost="true">
<translatableAttribute id="caption">Resources</translatableAttribute>
</object>
</object>
<object name="marketPanelButton" type="button" sprite="BackgroundTab" size="514 92 632 120">
<action on="Press">selectPanel(4);</action>
<object type="text" style="TitleText" ghost="true">
<object type="text" style="ModernLabelText" ghost="true">
<translatableAttribute id="caption">Market</translatableAttribute>
</object>
</object>
<object name="miscPanelButton" type="button" sprite="BackgroundTab" size="638 92 756 120">
<action on="Press">selectPanel(5);</action>
<object type="text" style="TitleText" ghost="true">
<object type="text" style="ModernLabelText" ghost="true">
<translatableAttribute id="caption">Miscellaneous</translatableAttribute>
</object>
</object>
<object name="generalPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-58">
<object name="generalPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-54">
<object size="0 0 100% 100%-50">
<object name="playerNameHeading" type="text" style="ModernLeftTabLabelText">
<translatableAttribute id="caption">Player name</translatableAttribute>
@@ -153,10 +154,10 @@
</object>
</object>
<object type="button" style="StoneButton" size="100%-164 100%-52 100%-24 100%-24">
<object type="button" style="ModernButtonRed" size="100%-160 100%-48 100%-20 100%-20">
<translatableAttribute id="caption">Continue</translatableAttribute>
<action on="Press"><![CDATA[
if(!Engine.HasXmppClient())
if (!Engine.HasXmppClient())
{
Engine.SwitchGuiPage("page_pregame.xml");
}