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

Applied new theme (thinWheatWindow)

Browse Source 
Added bronze rectangles behind resources
Made queue panel resize if needed

This was SVN commit r7646.
This commit is contained in:
WhiteTreePaladin 2010-06-29 15:54:53 +00:00
parent 26bdae945b
commit 1f7bb6c1fc
4 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
binaries/data/mods/public/gui/session_new/session.js
View File

@ -252,13 +252,13 @@ function hideCommands(booleanValue)
// Multiple Selection Layout // Multiple Selection Layout
function selectionLayoutMultiple() function selectionLayoutMultiple()
{ {
getGUIObjectByName("selectionDetailsMainText").size = "70 100%-70 100%-2 100%-10"; getGUIObjectByName("selectionDetailsMainText").size = "80 100%-70 100%-14 100%-10";
getGUIObjectByName("selectionDetailsSpecific").size = "0 0 100% 24"; getGUIObjectByName("selectionDetailsSpecific").size = "0 6 100% 30";
getGUIObjectByName("selectionDetailsPlayer").size = "0 30 100% 50"; getGUIObjectByName("selectionDetailsPlayer").size = "0 34 100% 100%-8";
getGUIObjectByName("selectionDetailsIcon").size = "0 100%-74 56 100%-18"; getGUIObjectByName("selectionDetailsIcon").size = "10 100%-74 66 100%-18";
getGUIObjectByName("selectionDetailsHealth").size = "0 100%-16 56 100%-12"; getGUIObjectByName("selectionDetailsHealth").size = "10 100%-16 66 100%-12";
getGUIObjectByName("selectionDetailsStamina").size = "0 100%-10 56 100%-6"; getGUIObjectByName("selectionDetailsStamina").size = "10 100%-10 66 100%-6";
getGUIObjectByName("selectionDetailsAttack").hidden = true; getGUIObjectByName("selectionDetailsAttack").hidden = true;
getGUIObjectByName("selectionDetailsArmour").hidden = true; getGUIObjectByName("selectionDetailsArmour").hidden = true;
@ -270,16 +270,16 @@ function selectionLayoutMultiple()
// Single Selection Layout // Single Selection Layout
function selectionLayoutSingle() function selectionLayoutSingle()
{ {
getGUIObjectByName("selectionDetailsMainText").size = "-8 -10 100%+8 56"; getGUIObjectByName("selectionDetailsMainText").size = "6 0 100%-6 60";
getGUIObjectByName("selectionDetailsSpecific").size = "0 0 100% 30"; getGUIObjectByName("selectionDetailsSpecific").size = "0 0 100% 30";
getGUIObjectByName("selectionDetailsPlayer").size = "0 30 100% 56"; getGUIObjectByName("selectionDetailsPlayer").size = "0 30 100% 56";
getGUIObjectByName("selectionDetailsIcon").size = "2 100%-104 82 100%-22"; getGUIObjectByName("selectionDetailsIcon").size = "10 100%-104 90 100%-22";
getGUIObjectByName("selectionDetailsHealth").size = "2 100%-20 82 100%-14"; getGUIObjectByName("selectionDetailsHealth").size = "10 100%-20 90 100%-14";
getGUIObjectByName("selectionDetailsStamina").size = "2 100%-12 82 100%-6"; getGUIObjectByName("selectionDetailsStamina").size = "10 100%-12 90 100%-6";
getGUIObjectByName("selectionDetailsAttack").size = "88 72 100% 100%"; getGUIObjectByName("selectionDetailsAttack").size = "104 72 100% 100%";
getGUIObjectByName("selectionDetailsArmour").size = "186 72 100% 100%"; getGUIObjectByName("selectionDetailsArmour").size = "204 72 100% 100%";
getGUIObjectByName("selectionDetailsAttack").hidden = false; getGUIObjectByName("selectionDetailsAttack").hidden = false;
getGUIObjectByName("selectionDetailsArmour").hidden = false; getGUIObjectByName("selectionDetailsArmour").hidden = false;
@ -380,10 +380,10 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
++i; ++i;
} }
// Position the visible buttons (TODO: if there's lots, maybe they should be squeezed together to fit) // Position the visible buttons (TODO: if there's lots, maybe they should be squeezed together to fit)
var buttonSideLength = getGUIObjectByName("unit"+guiName+"Button[0]").size.bottom; var buttonSideLength = getGUIObjectByName("unit"+guiName+"Button[0]").size.bottom;
var buttonSpacer = ((guiName == "Selection")? 35 : 45); var buttonSpacer = ((guiName == "Selection")? 37 : 45);
var numButtons = i; var numButtons = i;
var j = 0; // index for second row of buttons var j = 0; // index for second row of buttons
@ -394,6 +394,9 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
if (i > 7) // Make second row if (i > 7) // Make second row
{ {
if (guiName == "Queue")
getGUIObjectByName("unit"+guiName+"Panel").size = "0 -104 100% 100%-166"
size.left = buttonSpacer*j; size.left = buttonSpacer*j;
size.right = buttonSpacer*j + buttonSideLength; size.right = buttonSpacer*j + buttonSideLength;
size.top = buttonSpacer; size.top = buttonSpacer;
@ -402,6 +405,9 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
} }
else // Make first row else // Make first row
{ {
if ((guiName == "Queue"))
getGUIObjectByName("unit"+guiName+"Panel").size = "0 -60 100% 100%-166"
size.left = buttonSpacer*i; size.left = buttonSpacer*i;
size.right = buttonSpacer*i + size.bottom; size.right = buttonSpacer*i + size.bottom;
} }

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

@ -223,8 +223,8 @@
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object <object
name="mapAndResourcePanel" name="mapAndResourcePanel"
style="wheatWindow" style="thinWheatWindow"
size="0 100%-144 264 100%" size="0 100%-154 272 100%"
type="image" type="image"
z="30" z="30"
> >
@ -244,36 +244,38 @@
<!-- Player resource bar --> <!-- Player resource bar -->
<object <object
size="192 28 270 100%" size="188 100%-130 100% 100%-2"
type="image"
sprite="bronzeResourceRectangles"
> >
<!-- Food --> <!-- Food -->
<object size="0 0 100% 22" type="image" style="resourceCounter" tooltip="Food"> <object size="0 0 100% 26" type="image" style="resourceCounter" tooltip="Food" >
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="0"/> <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 size="28 0 100% 24" type="text" style="resourceText" name="resourceFood"/>
</object> </object>
<!-- Wood --> <!-- Wood -->
<object size="0 22 100% 44" type="image" style="resourceCounter" tooltip="Wood"> <object size="0 26 100% 52" type="image" style="resourceCounter" tooltip="Wood">
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="1"/> <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 size="28 0 100% 24" type="text" style="resourceText" name="resourceWood"/>
</object> </object>
<!-- Stone --> <!-- Stone -->
<object size="0 44 100% 66" type="image" style="resourceCounter" tooltip="Stone"> <object size="0 52 100%78" type="image" style="resourceCounter" tooltip="Stone">
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="2"/> <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 size="28 0 100% 24" type="text" style="resourceText" name="resourceStone"/>
</object> </object>
<!-- Metal --> <!-- Metal -->
<object size="0 66 100% 88" type="image" style="resourceCounter" tooltip="Metal"> <object size="0 78 100% 104" type="image" style="resourceCounter" tooltip="Metal">
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="3"/> <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 size="28 0 100% 24" type="text" style="resourceText" name="resourceMetal"/>
</object> </object>
<!-- Population --> <!-- Population -->
<object size="0 88 100% 110" type="image" style="resourceCounter" tooltip="Population (current / maximum)"> <object size="0 104 100% 130" type="image" style="resourceCounter" tooltip="Population (current / maximum)">
<object size="0 0 28 24" type="image" style="resourceIcon" cell_id="4"/> <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 size="28 0 100% 24" type="text" style="resourceText" name="resourcePop"/>
</object> </object>
</object> </object>
</object> </object>
@ -283,8 +285,8 @@
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object name="selectionDetails" <object name="selectionDetails"
type="image" type="image"
style="wheatWindow" style="thinWheatWindow"
size="300 100%-144 574 100%" size="282 100%-154 594 100%"
hidden="true" hidden="true"
z="20" z="20"
> >
@ -306,13 +308,13 @@
<!-- Unit Selection Area --> <!-- Unit Selection Area -->
<object name="unitSelectionPanel" <object name="unitSelectionPanel"
size="-2 -4 278 64" size="10 4 278 64"
> >
<object size="1 1 100% 47"> <object size="0 0 100% 47">
<repeat count="18"> <repeat count="18">
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" z="20"> <object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 34 34" z="20">
<object name="unitSelectionHighlight[n]" hidden="true" ghost="true" type="image" sprite="primaryGroupHighlight" size="-1 -1 33 33"/> <object name="unitSelectionHighlight[n]" hidden="true" ghost="true" type="image" sprite="primaryGroupHighlight" size="-1 -1 35 35"/>
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 30 30"/> <object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 32 32"/>
<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text"/> <object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text"/>
</object> </object>
</repeat> </repeat>
@ -362,19 +364,19 @@
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object name="unitCommands" <object name="unitCommands"
type="image" type="image"
style="wheatWindow" style="thinWheatWindow"
size="610 100%-144 1024 100%" size="604 100%-154 1024 100%"
hidden="true" hidden="true"
z="0" z="0"
> >
<object name="bronzeSquares" <object name="bronzeSquares"
type="image" type="image"
sprite="bronzeSquare" sprite="bronzeCommandsSquares"
size="50 0 100%-5 100%" size="56 10 414 100%"
/> />
<object name="unitConstructionPanel" <object name="unitConstructionPanel"
size="-6 0 100% 33%" size="0 10 100% 33%"
> >
<object size="-2 -6 54 50" 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"/> cell_id="0" tooltip="Construction"/>
@ -422,7 +424,7 @@
</object> </object>
<object name="unitTrainingPanel" <object name="unitTrainingPanel"
size="-6 0 100% 33%" size="0 10 100% 33%"
> >
<object size="-2 -6 54 50" 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"/> cell_id="2" tooltip="Training"/>
@ -438,13 +440,13 @@
<object name="unitQueuePanel" <object name="unitQueuePanel"
style="goldPanelFrilly" style="goldPanelFrilly"
size="-10 -76 100% 100%-172" size="0 -60 100% 100%-166"
type="image" type="image"
> >
<object size="2 -3 58 53" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip" <object size="-2 -3 54 53" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
cell_id="3" tooltip="Production queue"/> cell_id="3" tooltip="Production queue"/>
<object size="60 3 100% 37"> <object size="56 3 100% 37">
<repeat count="16"> <repeat count="16">
<object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 43 43"> <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="unitQueueIcon[n]" ghost="true" type="image" size="3 3 40 40"/>

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

@ -81,7 +81,16 @@
/> />
</sprite> </sprite>
<sprite name="bronzeSquare"> <sprite name="bronzeResourceRectangles">
<!-- (currently this is all a hack - need proper textures) -->
<image
texture="global/border/corner_bronze.dds"
texture_size="0 0 60 26"
size="28 0 100% 100%"
/>
</sprite>
<sprite name="bronzeCommandsSquares">
<!-- (currently this is all a hack - need proper textures) --> <!-- (currently this is all a hack - need proper textures) -->
<image <image
texture="global/border/corner_bronze.dds" texture="global/border/corner_bronze.dds"

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

@ -28,7 +28,7 @@
/> />
<style name="resourceText" <style name="resourceText"
textcolor="black" textcolor="white"
font="serif-bold-14" font="serif-bold-14"
ghost="true" ghost="true"
text_valign="center" text_valign="center"