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

Made GUI always visible

Browse Source 
Adjusted size of icon buttons in the session GUI
Allowed support units to garrison in watch towers

This was SVN commit r8458.
This commit is contained in:
WhiteTreePaladin 2010-10-24 23:40:09 +00:00
parent b100ba5a08
commit 6373c2cfcb
4 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
binaries/data/mods/public/gui/session_new/selection_details.js
View File

@ -184,10 +184,14 @@ function updateSelectionDetails()
if (selection.length == 0)
{
supplementalDetailsPanel.hidden = true;
detailsPanel.hidden = true;
commandsPanel.hidden = true;
getGUIObjectByName("unitSelectionPanel").hidden = true;
getGUIObjectByName("detailsAreaMultiple").hidden = true;
getGUIObjectByName("detailsAreaSingle").hidden = true;
hideUnitCommands();
// supplementalDetailsPanel.hidden = true;
// detailsPanel.hidden = true;
// commandsPanel.hidden = true;
// getGUIObjectByName("unitSelectionPanel").hidden = true;
return;
}

40
binaries/data/mods/public/gui/session_new/session.xml
View File

@ -415,24 +415,24 @@
<object size="208 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" sprite="bottomLeft" z="30">
<object name="unitFormationPanel"
size="20 10 100% 100%"
size="24 12 100% 100%"
>
<object size="0 0 100% 100%">
<repeat count="16">
<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" z="100">
<object name="unitFormationIcon[n]" type="image" style="formationIcon" ghost="true" size="1 1 37 37"/>
<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" z="100">
<object name="unitFormationIcon[n]" type="image" style="formationIcon" ghost="true" size="3 3 33 33"/>
</object>
</repeat>
</object>
</object>
<object name="unitGarrisonPanel"
size="20 10 100% 100%"
size="24 12 100% 100%"
>
<object size="0 0 100% 100%">
<repeat count="16">
<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" z="100">
<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" z="100">
<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
<object name="unitGarrisonCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
</object>
</repeat>
@ -448,7 +448,7 @@
type="image"
sprite="bottomMiddle"
size="50%-114 100%-205 50%+114 100%"
hidden="true"
hidden="false"
>
<!-- Unit details for Single Unit -->
<object size="50%-112 0 50%+112 100%" name="detailsAreaSingle">
@ -473,7 +473,7 @@
</object>
<!-- Stats Bars -->
<object size= "50%+48 36 100% 140" type="image" tooltip_style="snToolTip">
<object size= "50%+48 40 100% 136" type="image" tooltip_style="snToolTip">
<!-- Health bar -->
<object size="18 0 30 100%" type="image" name="health" tooltip="Hitpoints" tooltip_style="snToolTip">
<object type="image" sprite="healthBackground" ghost="true"/>
@ -504,12 +504,12 @@
<object size="50%-112 0 50%+112 100%" name="detailsAreaMultiple">
<object name="unitSelectionPanel"
size="20 10 100%-20 100%"
size="20 12 100%-20 100%"
>
<object size="0 0 100% 100%">
<repeat count="16">
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" z="100">
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" z="100">
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
<object size="0 100%-3 100% 100%" name="unitSelectionHealth[n]" ghost="true">
</object>
@ -544,7 +544,7 @@
<!-- Unit Commands -->
<object name="unitCommandPanel"
size="0 100%-35 100% 100%"
size="0 100%-36 100% 100%-4"
type="image"
z="30"
>
@ -566,19 +566,19 @@
<object name="unitCommands"
type="image"
sprite="bottomRight"
size="622 100%-170 100% 100%"
hidden="true"
size="622 100%-170 100%-4 100%"
hidden="false"
>
<object name="unitConstructionPanel"
size="6 10 100% 100%"
size="12 12 100% 100%"
>
<!--<object size="-2 -2 54 54" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
cell_id="0" tooltip="Construction"/>-->
<object size="0 0 100% 100%">
<repeat count="18">
<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 48 48">
<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 45 45"/>
<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46">
<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
</object>
</repeat>
</object>
@ -607,15 +607,15 @@
</object>
<object name="unitTrainingPanel"
size="6 10 100% 100%"
size="12 12 100% 100%"
>
<!--<object size="-2 -2 54 54" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
cell_id="2" tooltip="Training"/>-->
<object size="0 0 100% 100%">
<repeat count="18">
<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 48 48">
<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 45 45"/>
<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46">
<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
</object>
</repeat>
</object>

21
binaries/data/mods/public/gui/session_new/unit_commands.js
View File

@ -311,7 +311,7 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
// Updates right Unit Commands Panel - runs in the main session loop via updateSelectionDetails()
function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, selection)
{
var isInvisble = true;
//var isInvisible = true;
// Panels that are active
var usedPanels = {};
@ -361,28 +361,28 @@ function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, s
if (entState.buildEntities && entState.buildEntities.length)
{
setupUnitPanel("Construction", usedPanels, entState, entState.buildEntities, startBuildingPlacement);
isInvisble = false;
// isInvisible = false;
}
if (entState.training && entState.training.entities.length)
{
setupUnitPanel("Training", usedPanels, entState, entState.training.entities,
function (trainEntType) { addToTrainingQueue(entState.id, trainEntType); } );
isInvisble = false;
// isInvisible = false;
}
if (entState.training && entState.training.queue.length)
setupUnitPanel("Queue", usedPanels, entState, entState.training.queue,
function (item) { removeFromTrainingQueue(entState.id, item.id); } );
supplementalDetailsPanel.hidden = false;
commandsPanel.hidden = isInvisble;
// supplementalDetailsPanel.hidden = false;
// commandsPanel.hidden = isInvisible;
}
else
{
getGUIObjectByName("stamina").hidden = true;
supplementalDetailsPanel.hidden = true;
commandsPanel.hidden = true;
// supplementalDetailsPanel.hidden = true;
// commandsPanel.hidden = true;
}
// Hides / unhides Unit Panels (panels should be grouped by type, not by order, but we will leave that for another time)
@ -396,3 +396,10 @@ function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, s
panel.hidden = true;
}
}
// Force hide commands panels
function hideUnitCommands()
{
for each (var panelName in g_unitPanels)
getGUIObjectByName("unit" + panelName + "Panel").hidden = true;
}

2
binaries/data/mods/public/simulation/templates/template_structure_defense_scout_tower.xml
View File

@ -45,7 +45,7 @@
<GarrisonHolder>
<Max>5</Max>
<EjectHealth>0.1</EjectHealth>
<List datatype="tokens">Infantry</List>
<List datatype="tokens">Support Infantry</List>
<BuffHeal>1</BuffHeal>
</GarrisonHolder>
</Entity>