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

Fixes text alignment and inconsistencies in game setup UI.

Browse Source 
This was SVN commit r10290.
This commit is contained in:
historic_bruno 2011-09-16 23:42:37 +00:00
parent b6882ca146
commit b885498477
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View File

@ -181,7 +181,9 @@ function initMain()
// If we're a network client, disable all the map controls
// TODO: make them look visually disabled so it's obvious why they don't work
getGUIObjectByName("mapTypeSelection").hidden = true;
getGUIObjectByName("mapTypeText").hidden = false;
getGUIObjectByName("mapFilterSelection").hidden = true;
getGUIObjectByName("mapFilterText").hidden = false;
getGUIObjectByName("mapSelection").enabled = false;
// Disable player and game options controls
@ -748,12 +750,10 @@ function onGameAttributesChange()
// Update some controls for clients
if (!g_IsController)
{
var mapFilterHeading = getGUIObjectByName("mapFilterHeading");
mapFilterHeading.caption = "Map Filter: "+g_GameAttributes.mapFilter;
getGUIObjectByName("mapFilterText").caption = g_GameAttributes.mapFilter;
var mapTypeSelection = getGUIObjectByName("mapTypeSelection");
var mapTypeHeading = getGUIObjectByName("mapTypeHeading");
var idx = mapTypeSelection.list_data.indexOf(g_GameAttributes.mapType);
mapTypeHeading.caption = "Match Type: "+mapTypeSelection.list[idx];
getGUIObjectByName("mapTypeText").caption = mapTypeSelection.list[idx];
var mapSelectionBox = getGUIObjectByName("mapSelection");
mapSelectionBox.selected = mapSelectionBox.list_data.indexOf(mapName);
@ -808,16 +808,17 @@ function onGameAttributesChange()
else
{
// Client
numPlayersText.hidden = true;
mapSizeText.hidden = true;
revealMapText.hidden = true;
victoryConditionText.hidden = true;
lockTeamsText.hidden = true;
numPlayersText.hidden = false;
mapSizeText.hidden = false;
revealMapText.hidden = false;
victoryConditionText.hidden = false;
lockTeamsText.hidden = false;
mapSizeText.caption = "Map size: " + g_MapSizes.names[sizeIdx];
revealMapText.caption = "Reveal map: " + (mapSettings.RevealMap ? "Yes" : "No");
victoryConditionText.caption = "Victory condition: " + VICTORY_TEXT[victoryIdx];
lockTeamsText.caption = "Teams locked: " + (mapSettings.LockTeams === undefined || mapSettings.LockTeams ? "Yes" : "No");
numPlayersText.caption = numPlayers;
mapSizeText.caption = g_MapSizes.names[sizeIdx];
revealMapText.caption = (mapSettings.RevealMap ? "Yes" : "No");
victoryConditionText.caption = VICTORY_TEXT[victoryIdx];
lockTeamsText.caption = (mapSettings.LockTeams === undefined || mapSettings.LockTeams ? "Yes" : "No");
}
break;

32
binaries/data/mods/public/gui/gamesetup/gamesetup.xml
View File

@ -37,8 +37,13 @@
<object size="24 64 300 100%-24">
<object size="0 0 100%-180 100%">
<object name="mapTypeHeading" type="text" style="RightLabelText" size="0 0 100% 28">Match Type:</object>
<object name="mapFilterHeading" type="text" style="RightLabelText" size="0 34 100% 60">Map Filter:</object>
<object type="text" style="RightLabelText" size="0 0 100% 28">Match Type:</object>
<object type="text" style="RightLabelText" size="0 34 100% 60">Map Filter:</object>
</object>
<object size="100%-180 0 100% 100%">
<object name="mapTypeText" type="text" style="LeftLabelText" size="0 0 100% 28" hidden="true"/>
<object name="mapFilterText" type="text" style="LeftLabelText" size="0 34 100% 60" hidden="true"/>
</object>
<object name="mapTypeSelection"
@ -107,7 +112,7 @@
<object name="playerCiv[n]" type="dropdown" style="StoneDropDown" size="285 2 415 30" tooltip_style="onscreenToolTip" tooltip="Select player's civilization."/>
<object name="playerCivText[n]" type="text" style="CenteredLabelText" size="285 0 415 30"/>
<object name="playerTeam[n]" type="dropdown" style="StoneDropDown" size="435 2 505 30" tooltip_style="onscreenToolTip" tooltip="Select player's team."/>
<object name="playerTeamText[n]" type="text" text_align="center" text_valign="center" size="435 0 505 100%"/>
<object name="playerTeamText[n]" type="text" style="CenteredLabelText" size="435 0 505 100%"/>
</object>
</repeat>
</object>
@ -122,7 +127,7 @@
<!-- Number of Players-->
<object size="0 0 100% 32">
<object size="0 0 100% 100%" type="text" style="RightLabelText">Number of Players:</object>
<object size="0 0 100% 100%" type="text" style="RightLabelText">Number of players:</object>
</object>
<object size="0 32 100% 64">
@ -140,13 +145,13 @@
<!-- Number of Players-->
<object size="0 0 100% 32">
<object name="numPlayersText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="numPlayersSelection"
type="dropdown"
style="StoneDropDown"
size="0 2 100% 30"
tooltip_style="onscreenToolTip"
tooltip="Select number of players.">
<object name="numPlayersText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="numPlayersSelection"
type="dropdown"
style="StoneDropDown"
size="0 2 100% 30"
tooltip_style="onscreenToolTip"
tooltip="Select number of players.">
<action on="SelectionChange">selectNumPlayers(this.list_data[this.selected]);</action>
</object>
</object>
@ -156,7 +161,7 @@
<object name="mapSize" size="0 2 100% 30" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select map size. (Larger sizes may reduce performance.)"/>
</object>
<object size="0 64 100% 96">
<object size="0 64 100% 96">
<object name="victoryConditionText" size="0 0 100% 100%" type="text" style="LeftLabelText"/>
<object name="victoryCondition" size="0 2 100% 30" type="dropdown" style="StoneDropDown" hidden="true" tooltip_style="onscreenToolTip" tooltip="Select victory condition."/>
</object>
@ -183,6 +188,7 @@
<object name="lockTeams" size="0 50%-8 16 50%+8" type="checkbox" style="StoneCrossBox" hidden="true" tooltip_style="onscreenToolTip" tooltip="Toggle locked teams."/>
</object>
</object>
<!-- End Options -->
</object>
@ -234,7 +240,7 @@
tooltip_style="onscreenToolTip"
tooltip="Return to the main menu."
>
Main Menu
Main menu
<action on="Press">
<![CDATA[
cancelSetup();