New GUI design - marble edges instead of bronze edges
Overall layout changes (lower panel is shorter) Moved presetting of shadows and fancy water into session.xml from session.js using action on="Load" This was SVN commit r7640.
This commit is contained in:
parent
a947ab5582
commit
08710e4dd6
@ -13,10 +13,6 @@ function init(initData, hotloadData)
|
||||
{
|
||||
// Starting for the first time:
|
||||
startMusic();
|
||||
|
||||
// Preset the Settings Dialog's options based on user's current settings
|
||||
getGUIObjectByName("shadowsCheckbox").checked = renderer.shadows;
|
||||
getGUIObjectByName("fancyWaterCheckbox").checked = renderer.fancyWater;
|
||||
}
|
||||
|
||||
onSimulationUpdate();
|
||||
@ -256,13 +252,13 @@ function hideCommands(booleanValue)
|
||||
// Multiple Selection Layout
|
||||
function selectionLayoutMultiple()
|
||||
{
|
||||
getGUIObjectByName("selectionDetailsMainText").size = "110 100%-74 100%-20 100%-20";
|
||||
getGUIObjectByName("selectionDetailsMainText").size = "74 100%-70 100%-6 100%-10";
|
||||
getGUIObjectByName("selectionDetailsSpecific").size = "0 0 100% 24";
|
||||
getGUIObjectByName("selectionDetailsPlayer").size = "0 30 100% 50";
|
||||
|
||||
getGUIObjectByName("selectionDetailsIcon").size = "16 100%-94 88 100%-22";
|
||||
getGUIObjectByName("selectionDetailsHealth").size = "16 100%-20 88 100%-14";
|
||||
getGUIObjectByName("selectionDetailsStamina").size = "16 100%-12 88 100%-6";
|
||||
getGUIObjectByName("selectionDetailsIcon").size = "2 100%-74 58 100%-18";
|
||||
getGUIObjectByName("selectionDetailsHealth").size = "2 100%-16 58 100%-12";
|
||||
getGUIObjectByName("selectionDetailsStamina").size = "2 100%-10 58 100%-6";
|
||||
|
||||
getGUIObjectByName("selectionDetailsAttack").hidden = true;
|
||||
getGUIObjectByName("selectionDetailsArmour").hidden = true;
|
||||
@ -274,14 +270,16 @@ function selectionLayoutMultiple()
|
||||
// Single Selection Layout
|
||||
function selectionLayoutSingle()
|
||||
{
|
||||
getGUIObjectByName("selectionDetailsMainText").size = "10 0 100%-10 56";
|
||||
getGUIObjectByName("selectionDetailsMainText").size = "-8 -10 100%+8 56";
|
||||
getGUIObjectByName("selectionDetailsSpecific").size = "0 0 100% 30";
|
||||
getGUIObjectByName("selectionDetailsPlayer").size = "0 30 100% 56";
|
||||
|
||||
getGUIObjectByName("selectionDetailsIcon").size = "16 100%-118 112 100%-22";
|
||||
getGUIObjectByName("selectionDetailsHealth").size = "16 100%-20 112 100%-14";
|
||||
getGUIObjectByName("selectionDetailsStamina").size = "16 100%-12 112 100%-6";
|
||||
getGUIObjectByName("selectionDetailsIcon").size = "2 100%-104 82 100%-22";
|
||||
getGUIObjectByName("selectionDetailsHealth").size = "2 100%-20 82 100%-14";
|
||||
getGUIObjectByName("selectionDetailsStamina").size = "2 100%-12 82 100%-6";
|
||||
|
||||
getGUIObjectByName("selectionDetailsAttack").size = "88 72 100% 100%";
|
||||
getGUIObjectByName("selectionDetailsArmour").size = "186 72 100% 100%";
|
||||
getGUIObjectByName("selectionDetailsAttack").hidden = false;
|
||||
getGUIObjectByName("selectionDetailsArmour").hidden = false;
|
||||
|
||||
@ -414,8 +412,8 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
|
||||
}
|
||||
else // Larger Icons
|
||||
{
|
||||
size.left = 40*i;
|
||||
size.right = 40*i + size.bottom;
|
||||
size.left = 45*i;
|
||||
size.right = 45*i + size.bottom;
|
||||
}
|
||||
|
||||
button.size = size;
|
||||
@ -434,30 +432,26 @@ function updateUnitDisplay()
|
||||
{
|
||||
var detailsPanel = getGUIObjectByName("selectionDetails");
|
||||
var commandsPanel = getGUIObjectByName("unitCommands");
|
||||
var selection = g_Selection.toList();
|
||||
|
||||
var selection = g_Selection.toList();
|
||||
if (selection.length == 0)
|
||||
{
|
||||
hideSelectionDetails(true);
|
||||
hideCommands(true);
|
||||
detailsPanel.hidden = true;
|
||||
commandsPanel.hidden = true;
|
||||
return;
|
||||
}
|
||||
|
||||
var entState = Engine.GuiInterfaceCall("GetEntityState", selection[g_Selection.getPrimary()]);
|
||||
|
||||
/* If the unit has no data (e.g. it was killed), don't try displaying any
|
||||
data for it. (TODO: it should probably be removed from the selection too;
|
||||
also need to handle multi-unit selections) */
|
||||
var entState = Engine.GuiInterfaceCall("GetEntityState", selection[g_Selection.getPrimary()]);
|
||||
if (!entState)
|
||||
{
|
||||
hideSelectionDetails(true);
|
||||
hideCommands(true);
|
||||
detailsPanel.hidden = true;
|
||||
commandsPanel.hidden = true;
|
||||
return;
|
||||
}
|
||||
|
||||
hideSelectionDetails(false);
|
||||
hideCommands(false);
|
||||
|
||||
var template = Engine.GuiInterfaceCall("GetTemplateData", entState.template);
|
||||
var iconTooltip = "";
|
||||
|
||||
@ -521,6 +515,9 @@ function updateUnitDisplay()
|
||||
else
|
||||
selectionLayoutSingle();
|
||||
|
||||
// Show Panels
|
||||
detailsPanel.hidden = false;
|
||||
|
||||
// Panels that are active
|
||||
var usedPanels = {};
|
||||
|
||||
@ -553,6 +550,12 @@ function updateUnitDisplay()
|
||||
if (selection.length > 1)
|
||||
setupUnitPanel("Selection", usedPanels, entState, g_Selection.groups.groupTemplates,
|
||||
function (entType) { changePrimarySelectionGroup(entType); } );
|
||||
|
||||
commandsPanel.hidden = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
commandsPanel.hidden = true;
|
||||
}
|
||||
|
||||
// Hides / unhides Unit Panels (panels should be grouped by type, not by order, but we will leave that for another time)
|
||||
|
@ -130,15 +130,17 @@
|
||||
>
|
||||
<object size="0 10 100%-80 35" type="text" style="settingsText" ghost="true">Enable Shadows</object>
|
||||
<object name="shadowsCheckbox" size="100%-56 15 100%-30 40" type="checkbox" style="wheatCrossBox" checked="true">
|
||||
<action on="Load">if (renderer.shadows) this.checked = true; else this.checked = false;</action>
|
||||
<action on="Press">renderer.shadows = this.checked;</action>
|
||||
</object>
|
||||
|
||||
<object size="0 35 100%-80 60" type="text" style="settingsText" ghost="true">Enable Water Reflections</object>
|
||||
<object name="fancyWaterCheckbox" size="100%-56 40 100%-30 65" type="checkbox" style="wheatCrossBox" checked="true">
|
||||
<action on="Load">if (renderer.fancyWater) this.checked = true; else this.checked = false;</action>
|
||||
<action on="Press">renderer.fancyWater = this.checked;</action>
|
||||
</object>
|
||||
|
||||
<object size="0 60 100%-80 85" type="text" style="settingsText" ghost="true">Toggle Music</object>
|
||||
<object size="0 60 100%-80 85" type="text" style="settingsText" ghost="true">Enable Music</object>
|
||||
<object size="100%-56 65 100%-30 90" type="checkbox" style="wheatCrossBox" checked="true">
|
||||
<action on="Press">if (this.checked) startMusic(); else stopMusic();</action>
|
||||
</object>
|
||||
@ -221,8 +223,8 @@
|
||||
<!-- ================================ ================================ -->
|
||||
<object
|
||||
name="mapAndResourcePanel"
|
||||
style="goldPanel"
|
||||
size="0 100%-188 280 100%"
|
||||
style="wheatWindow"
|
||||
size="0 100%-144 264 100%"
|
||||
type="image"
|
||||
z="30"
|
||||
>
|
||||
@ -232,46 +234,47 @@
|
||||
size="24 100%-164 164 100%-24"
|
||||
type="image"
|
||||
style="wheatWindow"
|
||||
z="20"
|
||||
/>
|
||||
|
||||
<object name="minimapDisplay"
|
||||
type="minimap"
|
||||
size="6 6 182 182"
|
||||
size="6 100%-182 182 100%-6"
|
||||
/>
|
||||
</object>
|
||||
|
||||
<!-- Player resource bar -->
|
||||
<object
|
||||
size="192 100%-120 280 100%"
|
||||
size="192 28 270 100%"
|
||||
>
|
||||
<!-- Food -->
|
||||
<object size="0 0 100% 100%" type="image" style="resourceCounter" tooltip="Food">
|
||||
<object size="0 0 28 28" type="image" style="resourceIcon" cell_id="0"/>
|
||||
<object size="24 4 100% 32" type="text" style="resourceText" name="resourceFood"/>
|
||||
<object size="0 0 100% 22" type="image" style="resourceCounter" tooltip="Food">
|
||||
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="0"/>
|
||||
<object size="24 0 100% 24" type="text" style="resourceText" name="resourceFood"/>
|
||||
</object>
|
||||
|
||||
<!-- Wood -->
|
||||
<object size="0 18% 100% 100%" type="image" style="resourceCounter" tooltip="Wood">
|
||||
<object size="0 0 28 28" type="image" style="resourceIcon" cell_id="1"/>
|
||||
<object size="24 4 100% 32" type="text" style="resourceText" name="resourceWood"/>
|
||||
<object size="0 22 100% 44" type="image" style="resourceCounter" tooltip="Wood">
|
||||
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="1"/>
|
||||
<object size="24 0 100% 24" type="text" style="resourceText" name="resourceWood"/>
|
||||
</object>
|
||||
|
||||
<!-- Stone -->
|
||||
<object size="0 36% 100% 100%" type="image" style="resourceCounter" tooltip="Stone">
|
||||
<object size="0 0 28 28" type="image" style="resourceIcon" cell_id="2"/>
|
||||
<object size="24 4 100% 32" type="text" style="resourceText" name="resourceStone"/>
|
||||
<object size="0 44 100% 66" type="image" style="resourceCounter" tooltip="Stone">
|
||||
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="2"/>
|
||||
<object size="24 0 100% 24" type="text" style="resourceText" name="resourceStone"/>
|
||||
</object>
|
||||
|
||||
<!-- Metal -->
|
||||
<object size="0 54% 100% 100%" type="image" style="resourceCounter" tooltip="Metal">
|
||||
<object size="0 0 28 28" type="image" style="resourceIcon" cell_id="3"/>
|
||||
<object size="24 4 100% 32" type="text" style="resourceText" name="resourceMetal"/>
|
||||
<object size="0 66 100% 88" type="image" style="resourceCounter" tooltip="Metal">
|
||||
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="3"/>
|
||||
<object size="24 0 100% 24" type="text" style="resourceText" name="resourceMetal"/>
|
||||
</object>
|
||||
|
||||
<!-- Population -->
|
||||
<object size="0 72% 100% 100%" type="image" style="resourceCounter" tooltip="Population (current / maximum)">
|
||||
<object size="0 0 28 28" type="image" style="resourceIcon" cell_id="4"/>
|
||||
<object size="24 4 100% 32" type="text" style="resourceText" name="resourcePop"/>
|
||||
<object size="0 88 100% 110" type="image" style="resourceCounter" tooltip="Population (current / maximum)">
|
||||
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="4"/>
|
||||
<object size="24 0 100% 24" type="text" style="resourceText" name="resourcePop"/>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
@ -281,27 +284,30 @@
|
||||
<!-- ================================ ================================ -->
|
||||
<object name="selectionDetails"
|
||||
type="image"
|
||||
style="goldPanel"
|
||||
size="280 100%-178 600 100%"
|
||||
style="wheatWindow"
|
||||
size="300 100%-144 574 100%"
|
||||
hidden="true"
|
||||
z="20"
|
||||
>
|
||||
<!-- OAD logo background-->
|
||||
|
||||
<!-- OAD logo background
|
||||
<object name="selectionProductLogo"
|
||||
size="75 50 100%-75 100%-50"
|
||||
size="65 45 100%-65 100%-55"
|
||||
type="image"
|
||||
style="frilly"
|
||||
hidden="false"
|
||||
hidden="true"
|
||||
>
|
||||
<object name="selectionProductLogoImage"
|
||||
type="image"
|
||||
size="-4 -7 100%+24 100%+13"
|
||||
size="-4 -16 100%+24 100%+22"
|
||||
sprite="watermarkProduct"
|
||||
/>
|
||||
</object>
|
||||
-->
|
||||
|
||||
<!-- Unit Selection Area -->
|
||||
<object name="unitSelectionPanel"
|
||||
size="20 6 100%-20 74"
|
||||
size="-2 -4 278 64"
|
||||
type="image"
|
||||
style="goldPanel"
|
||||
>
|
||||
@ -342,15 +348,15 @@
|
||||
</object>
|
||||
|
||||
<!-- Attack stats -->
|
||||
<object hidden="true" size="120 58 100% 108" type="image" name="selectionDetailsAttack" tooltip="Attack strengths" tooltip_style="snToolTip">
|
||||
<object hidden="true" size="116 72 100% 100%" type="image" name="selectionDetailsAttack" tooltip="Attack strengths" tooltip_style="snToolTip">
|
||||
<object size="-4 -8 36 36" type="image" name="selectionDetailsAttackImage" ghost="true" sprite="snIconSheetStance" cell_id="1"/>
|
||||
<object size="40 0 100% 100%" type="text" name="selectionDetailsAttackStats" ghost="true" font="serif-bold-12"/>
|
||||
<object size="30 0 100% 100%" type="text" name="selectionDetailsAttackStats" ghost="true" font="serif-bold-12"/>
|
||||
</object>
|
||||
|
||||
<!-- Armour stats -->
|
||||
<object hidden="true" size="120 122 100% 172" type="image" name="selectionDetailsArmour" tooltip="Armour strengths" tooltip_style="snToolTip">
|
||||
<object hidden="true" size="216 72 100% 100%" type="image" name="selectionDetailsArmour" tooltip="Armour strengths" tooltip_style="snToolTip">
|
||||
<object size="-4 -4 36 36" type="image" name="selectionDetailsArmourImage" ghost="true" sprite="snIconSheetStance" cell_id="3"/>
|
||||
<object size="40 0 100% 100%" type="text" name="selectionDetailsArmourStats" ghost="true" font="serif-bold-12"/>
|
||||
<object size="30 0 100% 100%" type="text" name="selectionDetailsArmourStats" ghost="true" font="serif-bold-12"/>
|
||||
</object>
|
||||
</object>
|
||||
|
||||
@ -359,19 +365,27 @@
|
||||
<!-- ================================ ================================ -->
|
||||
<object name="unitCommands"
|
||||
type="image"
|
||||
style="goldPanel"
|
||||
size="600 100%-168 100% 100%"
|
||||
style="wheatWindow"
|
||||
size="610 100%-144 100% 100%"
|
||||
hidden="true"
|
||||
z="0"
|
||||
>
|
||||
<object name="bronzeSquares"
|
||||
type="image"
|
||||
sprite="bronzeSquare"
|
||||
size="50 0 100% 100%"
|
||||
/>
|
||||
|
||||
<object name="unitConstructionPanel"
|
||||
size="4 0 100% 33%"
|
||||
size="-6 0 100% 33%"
|
||||
>
|
||||
<object size="0 -2 64 62" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
|
||||
<object size="-2 -6 54 50" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
|
||||
cell_id="0" tooltip="Construction"/>
|
||||
|
||||
<object size="64 10 100% 47">
|
||||
<object size="56 0 100% 37">
|
||||
<repeat count="16">
|
||||
<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 37 37">
|
||||
<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
|
||||
<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 43 43">
|
||||
<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 40 40"/>
|
||||
</object>
|
||||
</repeat>
|
||||
</object>
|
||||
@ -411,15 +425,15 @@
|
||||
</object>
|
||||
|
||||
<object name="unitTrainingPanel"
|
||||
size="4 0 100% 33%"
|
||||
size="-6 0 100% 33%"
|
||||
>
|
||||
<object size="0 -2 64 62" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
|
||||
<object size="-2 -6 54 50" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
|
||||
cell_id="2" tooltip="Training"/>
|
||||
|
||||
<object size="64 10 100% 47">
|
||||
<object size="56 0 100% 37">
|
||||
<repeat count="16">
|
||||
<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 37 37">
|
||||
<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
|
||||
<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 43 43">
|
||||
<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 40 40"/>
|
||||
</object>
|
||||
</repeat>
|
||||
</object>
|
||||
@ -427,16 +441,16 @@
|
||||
|
||||
<object name="unitQueuePanel"
|
||||
style="goldPanelFrilly"
|
||||
size="4 -62 100% 100%-174"
|
||||
size="-10 -76 100% 100%-172"
|
||||
type="image"
|
||||
>
|
||||
<object size="0 -2 64 62" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
|
||||
<object size="2 -3 58 53" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
|
||||
cell_id="3" tooltip="Production queue"/>
|
||||
|
||||
<object size="64 10 100% 47">
|
||||
<object size="60 3 100% 37">
|
||||
<repeat count="16">
|
||||
<object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 37 37">
|
||||
<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 35 35"/>
|
||||
<object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 43 43">
|
||||
<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 40 40"/>
|
||||
<object name="unitQueueCount[n]" ghost="true" style="iconButtonCount" type="text"/>
|
||||
<object name="unitQueueProgress[n]" ghost="true" style="iconButtonProgress" type="text"/>
|
||||
</object>
|
||||
|
@ -81,6 +81,15 @@
|
||||
/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="bronzeSquare">
|
||||
<!-- (currently this is all a hack - need proper textures) -->
|
||||
<image
|
||||
texture="global/border/corner_bronze.dds"
|
||||
texture_size="0 0 45 45"
|
||||
size="0 0 100% 135"
|
||||
/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="selectionDetailsIconOutline">
|
||||
<image backcolor="blue"/>
|
||||
</sprite>
|
||||
|
@ -31,6 +31,7 @@
|
||||
textcolor="black"
|
||||
font="serif-bold-14"
|
||||
ghost="true"
|
||||
text_valign="center"
|
||||
/>
|
||||
|
||||
<style name="resourceCounter"
|
||||
|
Loading…
Reference in New Issue
Block a user