Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Commiting Stuart's GUI updates.

Browse Source 
This was SVN commit r1292.
This commit is contained in:
Fire Giant 2004-11-08 00:41:54 +00:00
parent ee21933c49
commit 31ac2a5e03
4 changed files with 99 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
binaries/data/mods/official/gui/test/3_session.xml
View File

@ -39,7 +39,7 @@
"50%-16 100%-64 50%+16 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_1_bar" sprite="sprite1" z="60" hidden="false" >
<object type="progressbar" name="session_group_pane_portrait_1_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-16 66 50%+16 70",
@ -53,7 +53,7 @@
"50%-52 100%-64 50%-20 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_2_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_2_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-52 66 50%-20 70",
@ -67,7 +67,7 @@
"50%+20 100%-64 50%+52 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_3_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_3_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+20 66 50%+52 70",
@ -81,7 +81,7 @@
"50%-88 100%-64 50%-56 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_4_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_4_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-88 66 50%-56 70",
@ -95,7 +95,7 @@
"50%+56 100%-64 50%+88 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_5_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_5_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+56 66 50%+88 70",
@ -109,7 +109,7 @@
"50%-124 100%-64 50%-92 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_6_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_6_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-124 66 50%-92 70",
@ -123,7 +123,7 @@
"50%+92 100%-64 50%+124 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_7_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_7_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+92 66 50%+124 70",
@ -137,7 +137,7 @@
"50%-160 100%-64 50%-128 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_8_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_8_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-160 66 50%-128 70",
@ -151,7 +151,7 @@
"50%+128 100%-64 50%+160 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_9_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_9_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+128 66 50%+160 70",
@ -165,7 +165,7 @@
"50%-196 100%-64 50%-164 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_10_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_10_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-196 66 50%-164 70",
@ -179,7 +179,7 @@
"50%+164 100%-64 50%+192 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_11_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_11_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+164 66 50%+192 70",
@ -193,7 +193,7 @@
"50%-232 100%-64 50%-200 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_12_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_12_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-232 66 50%-200 70",
@ -207,7 +207,7 @@
"50%+200 100%-64 50%+232 100%-32");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_13_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_13_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+200 66 50%+232 70",
@ -223,7 +223,7 @@
"50%-16 100%-110 50%+16 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_14_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_14_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-16 112 50%+16 116",
@ -237,7 +237,7 @@
"50%-52 100%-110 50%-20 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_15_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_15_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-52 112 50%-20 116",
@ -251,7 +251,7 @@
"50%+20 100%-110 50%+52 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_16_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_16_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+20 112 50%+52 116",
@ -265,7 +265,7 @@
"50%-88 100%-110 50%-56 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_17_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_17_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-88 112 50%-56 116",
@ -279,7 +279,7 @@
"50%+56 100%-110 50%+88 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_18_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_18_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+56 112 50%+88 116",
@ -293,7 +293,7 @@
"50%-124 100%-110 50%-92 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_19_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_19_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-124 112 50%-92 116",
@ -307,7 +307,7 @@
"50%+92 100%-110 50%+124 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_20_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_20_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+92 112 50%+124 116",
@ -321,7 +321,7 @@
"50%-160 100%-110 50%-128 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_21_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_21_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-160 112 50%-128 116",
@ -335,7 +335,7 @@
"50%+128 100%-110 50%+160 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_22_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_22_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+128 112 50%+160 116",
@ -349,7 +349,7 @@
"50%-196 100%-110 50%-164 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_23_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_23_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-196 112 50%-164 116",
@ -363,7 +363,7 @@
"50%+164 100%-110 50%+192 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_24_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_24_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+164 112 50%+192 116",
@ -377,7 +377,7 @@
"50%-232 100%-110 50%-200 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_25_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_25_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-232 112 50%-200 116",
@ -391,7 +391,7 @@
"50%+200 100%-110 50%+232 100%-78");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_26_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_26_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+200 112 50%+232 116",
@ -407,7 +407,7 @@
"50%-16 100%-156 50%+16 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_27_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_27_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-16 158 50%+16 162",
@ -421,7 +421,7 @@
"50%-52 100%-156 50%-20 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_28_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_28_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-52 158 50%-20 162",
@ -435,7 +435,7 @@
"50%+20 100%-156 50%+52 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_29_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_29_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+20 158 50%+52 162",
@ -449,7 +449,7 @@
"50%-88 100%-156 50%-56 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_30_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_30_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-88 158 50%-56 162",
@ -463,7 +463,7 @@
"50%+56 100%-156 50%+88 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_31_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_31_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+56 158 50%+88 162",
@ -477,7 +477,7 @@
"50%-124 100%-156 50%-92 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_32_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_32_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-124 158 50%-92 162",
@ -491,7 +491,7 @@
"50%+92 100%-156 50%+124 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_33_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_33_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+92 158 50%+124 162",
@ -505,7 +505,7 @@
"50%-160 100%-156 50%-128 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_34_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_34_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-160 158 50%-128 162",
@ -519,7 +519,7 @@
"50%+128 100%-156 50%+160 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_35_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_35_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+128 158 50%+160 162",
@ -533,7 +533,7 @@
"50%-196 100%-156 50%-164 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_36_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_36_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-196 158 50%-164 162",
@ -547,7 +547,7 @@
"50%+164 100%-156 50%+192 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_37_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_37_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+164 158 50%+192 162",
@ -561,7 +561,7 @@
"50%-232 100%-156 50%-200 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_38_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_38_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%-232 158 50%-200 162",
@ -575,7 +575,7 @@
"50%+200 100%-156 50%+232 100%-124");
]]></action>
</object>
<object type="button" name="session_group_pane_portrait_39_bar" sprite="sprite1" z="60" hidden="false">
<object type="progressbar" name="session_group_pane_portrait_39_bar" style="group_portrait_bar" z="60" hidden="false" >
<action on="Load"><![CDATA[
AddSize(this.name,
"50%+200 158 50%+232 162",
@ -605,7 +605,7 @@
"50%-171 100%-24 50%-118 100%-5");
]]></action>
</object>
<object type="text" name="resource_food_text" font="prospero16" text-align="left" textcolor="255 255 255" z="70" ghost="true" hidden="false">
<object type="text" name="resource_food_text" font="prospero16" textcolor="255 255 255" z="70" ghost="true" hidden="false">
<action on="Load"><![CDATA[
this.caption = "123,456";
AddSize(this.name,
@ -833,20 +833,35 @@
getGUIObjectByName("session_panel_status_icon_exp").caption = "200/200";
]]></action>
</object>
<object type="button" name="session_panel_status_icon_hp" sprite="statistic_hp" textcolor="0 255 0" text-align="center" text-valign="bottom" z="60" hidden="false">
<object type="progressbar" name="session_panel_status_icon_hp_bar" style="group_portrait_bar" sprite-background="back-bar" z="60" hidden="false">
<action on="Load"><![CDATA[
AddSize("session_panel_status_icon_hp",
"0%+75 0%+125 0%+90 0%+162",
"0%+75 100%-57 0%+90 100%-20");
getGUIObjectByName("session_panel_status_icon_hp").caption = "325/1000";
AddSize("session_panel_status_icon_hp_bar",
"0%+55 0%+147 0%+119 0%+160",
"0%+55 100%-33 0%+119 100%-20");
]]></action>
</object>
<object type="button" name="session_panel_status_icon_hp_text" textcolor="100 100 100" text-align="center" text-valign="bottom" z="60" hidden="false">
<action on="Load"><![CDATA[
AddSize("session_panel_status_icon_hp_text",
"0%+55 0%+148 0%+119 0%+161",
"0%+75 100%-56 0%+90 100%-19");
]]></action>
</object>
<object type="button" name="session_panel_status_icon_hp" sprite="statistic_hp" z="60" hidden="false">
<action on="Load"><![CDATA[
AddSize("session_panel_status_icon_hp",
"0%+75 0%+125 0%+95 0%+145",
"0%+75 100%-57 0%+95 100%-37");
]]></action>
</object>
<object type="button" name="session_panel_status_icon_supply" sprite="resource_food" textcolor="252 148 78" text-align="center" text-valign="center" z="60" hidden="false">
<action on="Load"><![CDATA[
AddSize("session_panel_status_icon_supply",
"0%+135 0%+65 0%+150 0%+130",
"0%+135 100%-110 0%+150 100%-45");
getGUIObjectByName("session_panel_status_icon_supply").caption = "1576";
getGUIObjectByName("session_panel_status_icon_supply").caption = "1575";
]]></action>
</object>
<object type="button" name="session_panel_status_icon_garrison" sprite="statistic_garrison" textcolor="100 100 255" text-align="center" text-valign="center" z="60" hidden="false">
@ -952,7 +967,7 @@
</object>
<!-- GROUP: TEAM TRAY -->
<object type="empty" name="session_team_tray" hotkey="teamtray.toggle" size="0 0 100% 100%" z="60" hidden="false">
<object type="empty" name="session_team_tray" hotkey="teamtray.toggle" size="0 0 100% 100%" z="60" hidden="true">
<action on="Press"><![CDATA[
GUIObjectToggle("session_team_tray");
]]></action>
@ -1115,11 +1130,13 @@
AddSize("FPS_Counter",
"18 100%-35 200 100%",
"18 0% 200 0%+35");
setInterval(UpdateFPSCounter, 50);
]]></action>
<action on="Press"><![CDATA[
GUIObjectToggle("FPS_Counter");
]]></action>
<action on="Tick"><![CDATA[
UpdateFPSCounter(mouse);
]]></action>
</object>
<!--

12
binaries/data/mods/official/gui/test/functions_session.js
View File

@ -1,6 +1,6 @@
function initSession()
{
GUIType="top";
GUIType="bottom";
GUIStyleName = new Array();
GUIStyleSize1 = new Array();
GUIStyleSize2 = new Array();
@ -66,6 +66,10 @@ function getObjectInfo()
// Update portrait
setPortrait("session_panel_status_portrait", selection[0].traits.id.icon);
// Update hitpoints
getGUIObjectByName("session_panel_status_icon_hp_text").caption = selection[0].traits.health.initial + "/" + selection[0].traits.health.hitpoints;
getGUIObjectByName("session_panel_status_icon_hp_bar").caption = ((selection[0].traits.health.initial * 100 ) / selection[0].traits.health.hitpoints);
// Reveal Status Orb
getGUIObjectByName("session_status_orb").hidden = false;
@ -76,7 +80,9 @@ function getObjectInfo()
// NOTE: This "if" is an optimisation because the game crawls if this set of processing occurs every frame.
// It's quite possible for the player to select another group of the same size and for it to not be recognised.
// Best solution would be to base this off a "new entities selected" instead of an on-tick.
if (getGUIObjectByName("session_group_pane").hidden == true || selection.length != MultipleEntitiesSelected)
if (
// getGUIObjectByName("session_group_pane").hidden == true ||
selection.length != MultipleEntitiesSelected)
{
// Reveal Group Pane.
@ -132,6 +138,8 @@ function getObjectInfo()
// Reveal and set to display this entity's portrait in the group pane.
groupPanePortrait.hidden = false;
groupPaneBar.hidden = false;
// Set progress bar for hitpoints.
groupPaneBar.caption = ((selection[groupPaneLoop-1].traits.health.initial * 100 ) / selection[groupPaneLoop-1].traits.health.hitpoints);
setPortrait("session_group_pane_portrait_" + groupPaneLoop, selection[groupPaneLoop-1].traits.id.icon);
}
// If it's empty, hide its group portrait.

17
binaries/data/mods/official/gui/test/sprite1.xml
View File

@ -98,6 +98,23 @@
<image backcolor="150 105 180" size="2 0 100%-2 100%" z-level="1" />
</sprite>
<sprite name="green-bar">
<image backcolor="255 255 255" size="0 1 1 100%-1" />
<image backcolor="255 255 255" size="0 0 100%-1 1" />
<image backcolor="64 64 64" size="100%-1 0 100% 100%" />
<image backcolor="64 64 64" size="0 100%-1 100%-1 100%" />
<image backcolor="128 128 128" size="100%-2 1 100%-1 100%-1" />
<image backcolor="128 128 128" size="1 100%-2 100%-1 100%-1" />
<image backcolor="0 200 0" size="0 0 100% 100%" />
</sprite>
<sprite name="back-bar">
<image backcolor="200 200 200" size="0 1 1 100%-1" />
<image backcolor="200 200 200" size="0 0 100%-1 1" />
<image backcolor="200 200 200" size="100%-1 0 100% 100%" />
<image backcolor="200 200 200" size="0 100%-1 100%-1 100%" />
</sprite>
<!--
==========================================
PREGAME GUI

7
binaries/data/mods/official/gui/test/styles.xml
View File

@ -31,4 +31,11 @@
tooltip-style="session-tooltip"
/>
<!-- Entity progress bar. -->
<style name="group_portrait_bar"
sprite-background=""
sprite-bar="green-bar"
tooltip-style="session-tooltip"
/>
</styles>