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

Some more progress towards Michael's GUI design.

Browse Source 
This was SVN commit r8213.
This commit is contained in:
WhiteTreePaladin 2010-09-29 21:55:51 +00:00
parent 0be4b5858f
commit 54142e5ee8
6 changed files with 364 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ function layoutSelectionSingle(entState)
function displayGeneralInfo(entState, template)
{
// Get general unit and player data
var specificName = "[font=\"serif-bold-18\"]" + template.name.specific + "[/font]";
var specificName = template.name.specific;
var genericName = template.name.generic != template.name.specific? template.name.generic : "";
var civName = getFormalCivName(toTitleCase(g_Players[entState.player].civ));
@ -100,7 +100,7 @@ function displayGeneralInfo(entState, template)
// Set Captions
getGUIObjectByName("specific").caption = specificName;
getGUIObjectByName("player").caption = civName == GAIA? playerName : playerName + " (" + civName + ")"; // Don't need civ tooltip for Gaia Player - redundant
getGUIObjectByName("player").textcolor = playerColor;
// getGUIObjectByName("player").textcolor = playerColor;
// Icon image

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

@ -150,6 +150,14 @@
<action on="Press">togglePause();</action>
</object>
<!-- ================================ ================================ -->
<!-- Notification Area -->
<!-- ================================ ================================ -->
<object name="notificationPanel" type="image" size="50%-300 30 50%+300 90" ghost="true">
<object name="notificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
</object>
<!-- ================================ ================================ -->
<!-- Chat -->
<!-- ================================ ================================ -->
@ -160,7 +168,7 @@
</object>
<!-- Chat window -->
<object name="chatWindow" size="50%-200 50%-46 50%+200 50%+46" type="image" hidden="true" z="40" style="sessionPanel">
<object name="chatWindow" size="50%-200 50%-46 50%+200 50%+46" type="image" hidden="true" z="40" style="sessionPanelDark">
<object name="chatInput" size="16 12 100%-16 36" type="input" style="chatInput" max_length="80">
<action on="Press">submitChatInput();</action>
</object>
@ -182,7 +190,7 @@
<object name="menuPanel"
size="50%-74 50%-180 50%+74 50%+20"
type="image"
style="sessionPanel"
style="sessionPanelDark"
hidden="true"
z="60"
>
@ -254,7 +262,7 @@
<!-- Settings Window -->
<!-- ================================ ================================ -->
<object name="settingsWindow"
style="sessionPanel"
style="sessionPanelDark"
type="image"
size="50%-180 50%-200 50%+180 50%+50"
hidden="true"
@ -264,7 +272,7 @@
<object name="settingsOptions"
size="30 36 100%-30 180"
type="image"
style="sessionPanel"
style="sessionPanelDark"
>
<!-- Settings / shadows -->
<object size="0 10 100%-80 35" type="text" style="settingsText" ghost="true">Enable Shadows</object>
@ -309,7 +317,7 @@
<!-- ================================ ================================ -->
<object name="topPanel"
type="image"
style="sessionPanel"
sprite="topPanel"
size="-3 0 100%+3 26"
>
<!-- ================================ ================================ -->
@ -357,17 +365,17 @@
<!-- ================================ ================================ -->
<!-- Phase -->
<!-- ================================ ================================ -->
<object size="67%-100 1 67%+100 26" name="PhaseTitleBar" type="text" font="serif-bold-stroke-14" textcolor="white">Phase: Village</object>
<object size="50%+50 1 50%+300 26" name="PhaseTitleBar" type="text" font="serif-bold-stroke-14" textcolor="white"> Death Match :: Village Phase</object>
<!-- ================================ ================================ -->
<!-- Menu Button -->
<!-- ================================ ================================ -->
<object type="button"
name="menuButton"
size="100%-100 0 100% 24"
size="100%-80 4 100%-4 100%-4"
tooltip_style="snToolTip"
>
<object size="0 0 100% 100%" type="text" style="largeBoldCenteredText" name="menuButtonText" ghost="true">MENU</object>
<object size="0 0 100% 100%" type="image" sprite="menuButton" name="menuButtonText" ghost="true">MENU</object>
<action on="Press">toggleMenu();</action>
</object> <!-- END OF MENU -->
@ -383,40 +391,35 @@
<!-- ================================ ================================ -->
<object
name="minimapPanel"
size="0 100%-180 180 100%"
size="0 100%-212 212 100%"
type="image"
style="sessionPanel"
sprite="mapPanel"
z="20"
>
<object
type="image"
style="sessionPanel"
size="6 6 100%-6 100%-6"
<object name="minimap"
type="minimap"
size="10 10 100%-10 100%-10"
>
<object name="minimap"
type="minimap"
size="2 2 100%-2 100%-2"
>
<action on="WorldClick">handleMinimapEvent(arguments[0]);</action>
</object>
<action on="WorldClick">handleMinimapEvent(arguments[0]);</action>
</object>
<object size="10 10 100%-10 100%-10" type="image" sprite="glassSquareMap" ghost="true"/>
</object>
<!-- ================================ ================================ -->
<!-- Supplemental Details Panel on Left -->
<!-- ================================ ================================ -->
<object size="177 100%-150 50%-109 100%+3" name="supplementalSelectionDetails" type="image" style="sessionPanel">
<object size="208 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" sprite="bottomLeft" z="20">
<object name="unitFormationPanel"
size="12 12 100% 100%"
size="20 10 100% 100%"
>
<!--<object size="-5 -2 59 62" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip" cell_id="5" tooltip="Formations"/>-->
<object size="0 0 100% 100%">
<repeat count="15">
<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" z="100">
<object name="unitFormationIcon[n]" type="image" style="formationIcon" ghost="true" size="1 1 39 39"/>
<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>
</repeat>
</object>
@ -429,8 +432,8 @@
<object size="0 0 100% 100%">
<repeat count="15">
<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" z="100">
<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="1 1 39 39"/>
<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="1 1 37 37"/>
<object name="unitGarrisonCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
</object>
</repeat>
@ -444,10 +447,9 @@
<!-- ================================ ================================ -->
<object name="selectionDetails"
type="image"
style="sessionPanel"
size="50%-112 100%-170 50%+112 100%+3"
sprite="bottomMiddle"
size="50%-114 100%-205 50%+114 100%"
hidden="true"
z="20"
>
<object name="unitSelectionPanel"
size="10 10 100%-20 100%"
@ -465,10 +467,13 @@
</object>
<!-- Specific unit details -->
<object size="50%-112 16 50%+112 100%" name="detailsArea">
<object size="50%-112 0 50%+112 100%" name="detailsArea">
<!-- Player Name -->
<object size="0 8 100% 30" name="player" type="text" style="largeCenteredOutlinedText" tooltip_style="snToolTip"/>
<!-- Stats -->
<object size="6 0 50 100%" name="statsArea" type="image">
<object size="6 44 50 100%" name="statsArea" type="image">
<!-- Attack icon -->
<object size="0 0 48 48" type="image" name="attackIcon" sprite="snIconSheetStance" cell_id="1" tooltip_style="snToolTip"/>
@ -477,9 +482,10 @@
</object>
<!-- Big unit icon -->
<object size= "50%-48 0 50%+48 96" type="image" name="iconBorder" style="sessionPanel" tooltip_style="snToolTip">
<object size= "3 3 100%-3 100%-3" type="image" name="icon" ghost="true"/>
<object size= "50%-48 44 50%+48 140" type="image" name="iconBorder" tooltip_style="snToolTip">
<object size= "0 0 100% 100%" type="image" name="icon" ghost="true"/>
<object size="100%-32 0 100% 32" name="rankIcon" type="image" cell_id="-1" sprite="snIconSheetRank" ghost="true"/>
<object type="image" sprite="glassSquareIcon" ghost="true"/>
<!-- Health bar -->
<object size="100%+18 0 100%+30 100%" type="image" name="health" tooltip="Hitpoints" tooltip_style="snToolTip">
@ -504,10 +510,7 @@
</object>
<!-- Specific Name -->
<object size="0 96 100% 122" name="specific" type="text" style="centeredText" font="serif-bold-18" textcolor="white" tooltip_style="snToolTip"/>
<!-- Player Name -->
<object size="0 100%-34 100% 100%-8" name="player" type="text" style="centeredText" font="serif-bold-stroke-14" tooltip_style="snToolTip"/>
<object size="0 144 100% 164" name="specific" type="text" style="largeCenteredOutlinedText" tooltip_style="snToolTip"/>
</object>
<!-- Unit Commands -->
@ -518,8 +521,8 @@
>
<object size="0 4 100% 100%-2">
<repeat count="9">
<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 24 24">
<object name="unitCommandIcon[n]" ghost="true" type="image" size="1 1 23 23" style="commandIcon"/>
<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 28 28">
<object name="unitCommandIcon[n]" ghost="true" type="image" size="1 1 25 25" style="commandIcon"/>
</object>
</repeat>
</object>
@ -532,28 +535,20 @@
<!-- ================================ ================================ -->
<object name="unitCommands"
type="image"
style="sessionPanel"
size="621 100%-150 100%+3 100%+3"
sprite="bottomRight"
size="622 100%-170 100% 100%"
hidden="true"
>
<!-- ================================ ================================ -->
<!-- Notification Area -->
<!-- ================================ ================================ -->
<object name="notificationPanel" type="image" size="0 -60 100% 0" ghost="true">
<object name="notificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
</object>
<object name="unitConstructionPanel"
size="12 12 100% 100%"
size="6 10 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 40 40">
<object name="unitConstructionIcon[n]" type="image" ghost="true" size="1 1 39 39"/>
<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 48 48">
<object name="unitConstructionIcon[n]" type="image" ghost="true" size="1 1 47 47"/>
</object>
</repeat>
</object>
@ -582,15 +577,15 @@
</object>
<object name="unitTrainingPanel"
size="12 12 100% 100%"
size="6 10 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 40 40">
<object name="unitTrainingIcon[n]" type="image" ghost="true" size="1 1 39 39"/>
<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 48 48">
<object name="unitTrainingIcon[n]" type="image" ghost="true" size="1 1 47 47"/>
</object>
</repeat>
</object>
@ -599,7 +594,7 @@
<object name="unitQueuePanel"
size="3 100%-51 100% 100%-3"
type="image"
style="sessionPanel"
style="sessionPanelDark"
>
<object size="-4 -3 52 53" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip" cell_id="3" tooltip="Production queue">
<object name="queueProgress" ghost="true" style="iconButtonProgress" type="text"/>

288
binaries/data/mods/public/gui/session_new/sprites.xml
View File

@ -36,6 +36,294 @@
/>
</sprite>
<sprite name="menuButton">
<image
texture="session/icons/single/menu.png"
real_texture_placement="0 0 120 30"
size="0 2 100%-8 100%-2"
/>
</sprite>
<sprite name="glassSquareMap">
<image backcolor="255 255 255 56" size="0 0 100% 1"/>
<image backcolor="255 255 255 56" size="100%-1 1 100% 100%"/>
<image backcolor="255 255 255 56" size="0 100%-1 100% 100%"/>
<image backcolor="255 255 255 56" size="0 1 1 100%-1"/>
<image backcolor="255 255 255 44" size="1 1 100%-1 2"/>
<image backcolor="255 255 255 44" size="100%-2 2 100%-1 100%-1"/>
<image backcolor="255 255 255 44" size="1 100%-2 100%-1 100%-1"/>
<image backcolor="255 255 255 44" size="1 2 2 100%-2"/>
<image backcolor="255 255 255 32" size="2 2 100%-2 3"/>
<image backcolor="255 255 255 32" size="100%-3 3 100%-2 100%-2"/>
<image backcolor="255 255 255 32" size="2 100%-3 100%-2 100%-2"/>
<image backcolor="255 255 255 32" size="2 3 3 100%-3"/>
</sprite>
<sprite name="glassSquareIcon">
<image backcolor="255 255 255 128" size="0 0 100% 1"/>
<image backcolor="255 255 255 44" size="100%-1 1 100% 100%"/>
<image backcolor="255 255 255 44" size="0 100%-1 100% 100%"/>
<image backcolor="255 255 255 128" size="0 1 1 100%-1"/>
<image backcolor="255 255 255 96" size="1 1 100%-1 2"/>
<image backcolor="255 255 255 32" size="100%-2 2 100%-1 100%-1"/>
<image backcolor="255 255 255 32" size="1 100%-2 100%-1 100%-1"/>
<image backcolor="255 255 255 96" size="1 2 2 100%-2"/>
<image backcolor="255 255 255 64" size="2 2 100%-2 3"/>
<image backcolor="255 255 255 16" size="100%-3 3 100%-2 100%-2"/>
<image backcolor="255 255 255 16" size="2 100%-3 100%-2 100%-2"/>
<image backcolor="255 255 255 64" size="2 3 3 100%-3"/>
</sprite>
<!-- PANELS -->
<!-- top -->
<sprite name="topPanel">
<image
texture="session/ribbon_bg.png"
texture_size="0 0 1024 32"
size="0 0 100% 100%"
/>
<!-- Sides -->
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 0 100%-4 4"
/>
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 100%-4 100%-4 100%"
/>
</sprite>
<!-- Map -->
<sprite name="mapPanel">
<image
texture="session/map_bg.png"
texture_size="0 0 212 212"
/>
<!-- Sides -->
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 0 100%-4 4"
/>
<image
texture="global/border/line_vert.png"
texture_size="0 0 4 64"
size="100%-4 4 100% 100%-4"
/>
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 100%-4 100%-4 100%"
/>
<image
texture="global/border/line_vert.png"
texture_size="0 0 4 64"
size="0 4 4 100%-4"
/>
<!-- Corners -->
<image
texture="global/border/line_corner_top_right.png"
texture_size="0 0 4 4"
size="100%-4 0 100% 4"
/>
<image
texture="global/border/line_corner_bottom_right.png"
texture_size="0 0 4 4"
size="100%-4 100%-4 100% 100%"
/>
<image
texture="global/border/line_corner_bottom_left.png"
texture_size="0 0 4 4"
size="0 100%-4 4 100%"
/>
<image
texture="global/border/line_corner_top_left.png"
texture_size="0 0 4 4"
size="0 0 4 4"
/>
</sprite>
<!-- bottomLeft -->
<sprite name="bottomLeft">
<image
texture="global/tile/tile_dark.png"
texture_size="0 0 256 256"
/>
<!-- Sides -->
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 0 100%-4 4"
/>
<image
texture="global/border/line_vert.png"
texture_size="0 0 4 64"
size="100%-4 4 100% 100%-4"
/>
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 100%-4 100%-4 100%"
/>
<image
texture="global/border/line_vert.png"
texture_size="0 0 4 64"
size="0 4 4 100%-4"
/>
<!-- Corners -->
<image
texture="global/border/line_corner_middle_left.png"
texture_size="0 0 4 4"
size="100%-4 0 100% 4"
/>
<image
texture="global/border/line_corner_bottom_middle.png"
texture_size="0 0 4 4"
size="100%-4 100%-4 100% 100%"
/>
<image
texture="global/border/line_corner_bottom_middle.png"
texture_size="0 0 4 4"
size="0 100%-4 4 100%"
/>
<image
texture="global/border/line_corner_middle_right.png"
texture_size="0 0 4 4"
size="0 0 4 4"
/>
</sprite>
<!-- bottomMiddle-->
<sprite name="bottomMiddle">
<image
texture="session/ui_bg.png"
real_texture_placement="256 0 768 205"
texture_size="0 0 224 256"
/>
<!-- Sides -->
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 0 100%-4 4"
/>
<image
texture="global/border/line_vert.png"
texture_size="0 0 4 64"
size="100%-4 4 100% 100%-4"
/>
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 100%-4 100%-4 100%"
/>
<image
texture="global/border/line_vert.png"
texture_size="0 0 4 64"
size="0 4 4 100%-4"
/>
<!-- Corners -->
<image
texture="global/border/line_corner_top_right.png"
texture_size="0 0 4 4"
size="100%-4 0 100% 4"
/>
<image
texture="global/border/line_corner_bottom_right.png"
texture_size="0 0 4 4"
size="100%-4 100%-4 100% 100%"
/>
<image
texture="global/border/line_corner_bottom_left.png"
texture_size="0 0 4 4"
size="0 100%-4 4 100%"
/>
<image
texture="global/border/line_corner_top_left.png"
texture_size="0 0 4 4"
size="0 0 4 4"
/>
</sprite>
<!-- bottomRight -->
<sprite name="bottomRight">
<image
texture="global/tile/tile_dark.png"
texture_size="0 0 256 256"
/>
<!-- Sides -->
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 0 100%-4 4"
/>
<image
texture="global/border/line_vert.png"
texture_size="0 0 4 64"
size="100%-4 4 100% 100%-4"
/>
<image
texture="global/border/line_horiz.png"
texture_size="0 0 64 4"
size="4 100%-4 100%-4 100%"
/>
<image
texture="global/border/line_vert.png"
texture_size="0 0 4 64"
size="0 4 4 100%-4"
/>
<!-- Corners -->
<image
texture="global/border/line_corner_top_right.png"
texture_size="0 0 4 4"
size="100%-4 0 100% 4"
/>
<image
texture="global/border/line_corner_bottom_right.png"
texture_size="0 0 4 4"
size="100%-4 100%-4 100% 100%"
/>
<image
texture="global/border/line_corner_bottom_middle.png"
texture_size="0 0 4 4"
size="0 100%-4 4 100%"
/>
<image
texture="global/border/line_corner_middle_right.png"
texture_size="0 0 4 4"
size="0 0 4 4"
/>
</sprite>
<sprite name="lightPanel">
<!-- (currently this is all a hack - need proper textures) -->
<image

20
binaries/data/mods/public/gui/session_new/styles.xml
View File

@ -29,7 +29,14 @@
text_valign="top"
/>
<style name="sessionPanel"
<style name="sessionPanelLight"
sprite="lightPanel"
buffer_zone="2"
text_align="left"
text_valign="top"
/>
<style name="sessionPanelDark"
sprite="darkPanel"
buffer_zone="2"
text_align="left"
@ -59,9 +66,10 @@
ghost="true"
/>
<!--font="serif-bold-14"-->
<style name="resourceText"
textcolor="white"
font="serif-bold-14"
font="serif-bold-stroke-14"
ghost="true"
text_align="left"
text_valign="center"
@ -160,6 +168,13 @@
text_align="center"
text_valign="center"
/>
<style name="largeCenteredOutlinedText"
font="serif-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
/>
<style name="netStatus"
font="serif-bold-18"
@ -189,7 +204,6 @@
buffer_zone="5"
font="serif-bold-stroke-14"
textcolor="white"
textcolor_selected="black"
text_align="center"
text_valign="bottom"
/>

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

@ -8,8 +8,8 @@ const CONSTRUCTION = "Construction";
const COMMAND = "Command";
// Constants used by the Queue or Garrison panel
//const UNIT_PANEL_BASE = -48; // The offset above the main panel (will often be negative)
//const UNIT_PANEL_HEIGHT = 41; // The height needed for a row of buttons
const UNIT_PANEL_BASE = -48; // The offset above the main panel (will often be negative)
const UNIT_PANEL_HEIGHT = 41; // The height needed for a row of buttons
// The number of currently visible buttons (used to optimise showing/hiding)
var g_unitPanelButtons = {"Selection": 0, "Queue": 0, "Formation": 0, "Garrison": 0, "Training": 0, "Construction": 0, "Command": 0};
@ -243,7 +243,7 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
var rowLength = 8;
if (guiName == "Selection" || guiName == "Formation" || guiName == "Garrison")
rowLength = 5;
rowLength = 4;
else if (guiName == "Command")
rowLength = 4;
@ -251,7 +251,6 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
var buttonSideLength = getGUIObjectByName("unit"+guiName+"Button[0]").size.bottom;
var buttonSpacer = buttonSideLength+1;
/*
// Resize Queue panel if needed
if (guiName == "Queue") // or garrison
{
@ -260,12 +259,11 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
size.top = (UNIT_PANEL_BASE - ((numRows-1)*UNIT_PANEL_HEIGHT));
panel.size = size;
}
*/
// Layout buttons
if (guiName == "Command")
{
layoutButtonRowCentered(0, guiName, 0, numButtons, 222);
layoutButtonRowCentered(0, guiName, 0, numButtons, 230);
}
else
{
@ -340,13 +338,11 @@ function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, s
setupUnitPanel("Queue", usedPanels, entState, entState.training.queue,
function (item) { removeFromTrainingQueue(entState.id, item.id); } );
getGUIObjectByName("player").hidden = true;
supplementalDetailsPanel.hidden = false;
commandsPanel.hidden = isInvisble;
}
else
{
getGUIObjectByName("player").hidden = false;
getGUIObjectByName("stamina").hidden = true;
supplementalDetailsPanel.hidden = true;
commandsPanel.hidden = true;

2
binaries/data/mods/public/gui/session_new/utility_functions.js
View File

@ -216,7 +216,7 @@ function getEntityCost(template)
function getEntityName(template)
{
return "[font=\"serif-bold-16\"]" + (template.name.specific || template.name.generic || "???") + "[/font]";
return (template.name.specific || template.name.generic || "???");
}
function getEntityNameWithGenericType(template)