real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Made ingame resource counters use percent-based positioning. Lined up ingame bottom panel textures better. Remove old session dialog sprites.

Browse Source 
This was SVN commit r10115.
This commit is contained in:
WhiteTreePaladin 2011-08-27 23:17:14 +00:00
parent e933986351
commit 0e81ee4f60
2 changed files with 72 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
binaries/data/mods/public/gui/session/session.xml
View File

@ -356,36 +356,36 @@
<!-- Player resource bar --> <!-- Player resource bar -->
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object <object
size="0 0 500 100%" size="1% 0 45% 100%"
> >
<!-- Food --> <!-- Food -->
<object size="0 0 80 100%" type="image" style="resourceCounter" tooltip="Food" tooltip_style="sessionToolTipBold"> <object size="0 0 20% 100%" type="image" style="resourceCounter" tooltip="Food" tooltip_style="sessionToolTipBold">
<object size="0 -6 48 42" type="image" style="resourceIcon" cell_id="0"/> <object size="0 -6 48 42" type="image" style="resourceIcon" cell_id="0"/>
<object size="36 0 100% 100%-2" type="text" style="resourceText" name="resourceFood"/> <object size="30% 0 100% 100%-2" type="text" style="resourceText" name="resourceFood"/>
</object> </object>
<!-- Wood --> <!-- Wood -->
<object size="90 0 180 100%" type="image" style="resourceCounter" tooltip="Wood" tooltip_style="sessionToolTipBold"> <object size="20% 0 40% 100%" type="image" style="resourceCounter" tooltip="Wood" tooltip_style="sessionToolTipBold">
<object size="0 -6 48 42" type="image" style="resourceIcon" cell_id="1"/> <object size="0 -6 48 42" type="image" style="resourceIcon" cell_id="1"/>
<object size="36 0 100% 100%-2" type="text" style="resourceText" name="resourceWood"/> <object size="30% 0 100% 100%-2" type="text" style="resourceText" name="resourceWood"/>
</object> </object>
<!-- Stone --> <!-- Stone -->
<object size="180 0 270 100%" type="image" style="resourceCounter" tooltip="Stone" tooltip_style="sessionToolTipBold"> <object size="40% 0 60% 100%" type="image" style="resourceCounter" tooltip="Stone" tooltip_style="sessionToolTipBold">
<object size="0 -2 48 42" type="image" style="resourceIcon" cell_id="2"/> <object size="0 -2 48 42" type="image" style="resourceIcon" cell_id="2"/>
<object size="36 0 100% 100%-2" type="text" style="resourceText" name="resourceStone"/> <object size="30% 0 100% 100%-2" type="text" style="resourceText" name="resourceStone"/>
</object> </object>
<!-- Metal --> <!-- Metal -->
<object size="270 0 360 100%" type="image" style="resourceCounter" tooltip="Metal" tooltip_style="sessionToolTipBold"> <object size="60% 0 80% 100%" type="image" style="resourceCounter" tooltip="Metal" tooltip_style="sessionToolTipBold">
<object size="0 -6 48 42" type="image" style="resourceIcon" cell_id="3"/> <object size="0 -6 48 42" type="image" style="resourceIcon" cell_id="3"/>
<object size="36 0 100% 100%-2" type="text" style="resourceText" name="resourceMetal"/> <object size="30% 0 100% 100%-2" type="text" style="resourceText" name="resourceMetal"/>
</object> </object>
<!-- Population --> <!-- Population -->
<object size="360 0 450 100%" type="image" style="resourceCounter" tooltip="Population (current / limit)" tooltip_style="sessionToolTipBold"> <object size="80% 0 100% 100%" type="image" style="resourceCounter" tooltip="Population (current / limit)" tooltip_style="sessionToolTipBold">
<object size="0 -6 44 38" type="image" style="resourceIcon" cell_id="4"/> <object size="0 -6 44 38" type="image" style="resourceIcon" cell_id="4"/>
<object size="42 0 100% 100%-2" type="text" style="resourceText" name="resourcePop"/> <object size="30% 0 100% 100%-2" type="text" style="resourceText" name="resourcePop"/>
</object> </object>
</object> </object>

249
binaries/data/mods/public/gui/session/sprites.xml
View File

@ -57,93 +57,6 @@
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<!-- Panel Backgrounds --> <!-- Panel Backgrounds -->
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<sprite name="sessionDialog">
<!-- background -->
<image
texture="global/tile/tile_dark.png"
texture_size="0 0 100% 100%"
size="0 0 100% 100%"
/>
<!-- sides -->
<image
texture="session/border/border-top.png"
texture_size="0 0 128 16"
size="16 0 100%-16 16"
/>
<image
texture="session/border/border-right.png"
texture_size="0 0 16 128"
size="100%-16 16 100% 100%-16"
/>
<image
texture="session/border/border-bottom.png"
texture_size="0 0 128 16"
size="16 100%-16 100%-16 100%"
/>
<image
texture="session/border/border-left.png"
texture_size="0 0 16 128"
size="0 16 16 100%-16"
/>
<!-- corners -->
<image
texture="session/border/border-corner.png"
texture_size="0 0 16 16"
size="100%-16 0 100% 16"
/>
<image
texture="session/border/border-corner.png"
texture_size="0 0 16 16"
size="100%-16 100%-16 100% 100%"
/>
<image
texture="session/border/border-corner.png"
texture_size="0 0 16 16"
size="0 100%-16 16 100%"
/>
<image
texture="session/border/border-corner.png"
texture_size="0 0 16 16"
size="0 0 16 16"
/>
</sprite>
<sprite name="sessionDialogTitleBar">
<image texture="session/titlebar/titlebar_left.png"
real_texture_placement="0 0 64 32"
size="0%+0 0% 64 0%+32"
/>
<image texture="session/titlebar/titlebar_middle.png"
real_texture_placement="0 0 64 32"
size="64 0% 100%-64 0%+32"
/>
<image texture="session/titlebar/titlebar_right.png"
real_texture_placement="0 0 64 32"
size="100%-64 0% 100%+0 0%+32"
/>
</sprite>
<!-- Generic Panel --> <!-- Generic Panel -->
<sprite name="genericPanel"> <sprite name="genericPanel">
@ -272,107 +185,93 @@
<!-- Bottom Left Panel --> <!-- Bottom Left Panel -->
<sprite name="bottomLeft"> <sprite name="bottomLeft">
<image
texture="session/panel_left.png"
real_texture_placement="0 0 189 170"
texture_size="0 0 100% 100%"
size="0 0 100% 100%"
/>
<!-- sides --> <!-- sides -->
<image <image texture="global/border/line_horiz.png"
texture="global/border/line_horiz.png"
texture_size="0 0 64 4" texture_size="0 0 64 4"
size="4 0 100%-4 4" size="4 0 100%-4 4"
/> />
<image <image texture="global/border/line_vert.png"
texture="global/border/line_vert.png"
texture_size="0 0 4 64" texture_size="0 0 4 64"
size="100%-4 4 100% 100%-4" size="100%-4 4 100% 100%-4"
/> />
<image <image texture="global/border/line_horiz.png"
texture="global/border/line_horiz.png"
texture_size="0 0 64 4" texture_size="0 0 64 4"
size="4 100%-4 100%-4 100%" size="4 100%-4 100%-4 100%"
/> />
<image <image texture="global/border/line_vert.png"
texture="global/border/line_vert.png"
texture_size="0 0 4 64" texture_size="0 0 4 64"
size="0 4 4 100%-4" size="0 4 4 100%-4"
/> />
<!-- corners --> <!-- corners -->
<image <image texture="global/border/line_corner_middle_left.png"
texture="global/border/line_corner_middle_left.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="100%-4 0 100% 4" size="100%-4 0 100% 4"
/> />
<image <image texture="global/border/line_corner_bottom_middle.png"
texture="global/border/line_corner_bottom_middle.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="100%-4 100%-4 100% 100%" size="100%-4 100%-4 100% 100%"
/> />
<image <image texture="global/border/line_corner_bottom_middle.png"
texture="global/border/line_corner_bottom_middle.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="0 100%-4 4 100%" size="0 100%-4 4 100%"
/> />
<image <image texture="global/border/line_corner_middle_right.png"
texture="global/border/line_corner_middle_right.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="0 0 4 4" size="0 0 4 4"
/> />
<!-- background -->
<image texture="session/panel_left.png"
real_texture_placement="0 0 189 170"
texture_size="0 0 100% 100%"
size="4 4 100%-4 100%-4"
/>
</sprite> </sprite>
<!-- Bottom Middle Panel --> <!-- Bottom Middle Panel -->
<sprite name="bottomMiddle"> <sprite name="bottomMiddle">
<image
texture="session/panel_middle.png" <!-- background -->
<image texture="session/panel_middle.png"
real_texture_placement="0 0 228 205" real_texture_placement="0 0 228 205"
texture_size="0 0 100% 100%" texture_size="0 0 100% 100%"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
<!-- sides --> <!-- sides -->
<image <image texture="global/border/line_horiz.png"
texture="global/border/line_horiz.png" texture_size="0 0 64 4"
texture_size="0 0 64 4"
size="4 0 100%-4 4" size="4 0 100%-4 4"
/> />
<image <image texture="global/border/line_vert.png"
texture="global/border/line_vert.png"
texture_size="0 0 4 64" texture_size="0 0 4 64"
size="100%-4 4 100% 100%-4" size="100%-4 4 100% 100%-4"
/> />
<image <image texture="global/border/line_horiz.png"
texture="global/border/line_horiz.png"
texture_size="0 0 64 4" texture_size="0 0 64 4"
size="4 100%-4 100%-4 100%" size="4 100%-4 100%-4 100%"
/> />
<image <image texture="global/border/line_vert.png"
texture="global/border/line_vert.png"
texture_size="0 0 4 64" texture_size="0 0 4 64"
size="0 4 4 100%-4" size="0 4 4 100%-4"
/> />
<!-- corners --> <!-- corners -->
<image <image texture="global/border/line_corner_top_right.png"
texture="global/border/line_corner_top_right.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="100%-4 0 100% 4" size="100%-4 0 100% 4"
/> />
<image <image texture="global/border/line_corner_bottom_right.png"
texture="global/border/line_corner_bottom_right.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="100%-4 100%-4 100% 100%" size="100%-4 100%-4 100% 100%"
/> />
<image <image texture="global/border/line_corner_bottom_left.png"
texture="global/border/line_corner_bottom_left.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="0 100%-4 4 100%" size="0 100%-4 4 100%"
/> />
<image <image texture="global/border/line_corner_top_left.png"
texture="global/border/line_corner_top_left.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="0 0 4 4" size="0 0 4 4"
/> />
@ -380,134 +279,113 @@
<!-- Bottom Right Panel --> <!-- Bottom Right Panel -->
<sprite name="bottomRight"> <sprite name="bottomRight">
<image
texture="session/panel_right.png"
real_texture_placement="0 0 398 170"
texture_size="0 0 100% 100%"
size="0 0 100% 100%"
/>
<!-- sides --> <!-- sides -->
<image <image texture="global/border/line_horiz.png"
texture="global/border/line_horiz.png"
texture_size="0 0 64 4" texture_size="0 0 64 4"
size="4 0 100%-4 4" size="4 0 100%-4 4"
/> />
<image <image texture="global/border/line_vert.png"
texture="global/border/line_vert.png"
texture_size="0 0 4 64" texture_size="0 0 4 64"
size="100%-4 4 100% 100%-4" size="100%-4 4 100% 100%-4"
/> />
<image <image texture="global/border/line_horiz.png"
texture="global/border/line_horiz.png"
texture_size="0 0 64 4" texture_size="0 0 64 4"
size="4 100%-4 100%-4 100%" size="4 100%-4 100%-4 100%"
/> />
<image <image texture="global/border/line_vert.png"
texture="global/border/line_vert.png"
texture_size="0 0 4 64" texture_size="0 0 4 64"
size="0 4 4 100%-4" size="0 4 4 100%-4"
/> />
<!-- corners --> <!-- corners -->
<image <image texture="global/border/line_corner_top_right.png"
texture="global/border/line_corner_top_right.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="100%-4 0 100% 4" size="100%-4 0 100% 4"
/> />
<image <image texture="global/border/line_corner_bottom_right.png"
texture="global/border/line_corner_bottom_right.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="100%-4 100%-4 100% 100%" size="100%-4 100%-4 100% 100%"
/> />
<image <image texture="global/border/line_corner_bottom_middle.png"
texture="global/border/line_corner_bottom_middle.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="0 100%-4 4 100%" size="0 100%-4 4 100%"
/> />
<image <image texture="global/border/line_corner_middle_right.png"
texture="global/border/line_corner_middle_right.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="0 0 4 4" size="0 0 4 4"
/> />
<!-- background -->
<image texture="session/panel_right.png"
real_texture_placement="0 0 398 170"
texture_size="0 0 100% 100%"
size="4 4 100%-4 100%-4"
/>
</sprite> </sprite>
<!-- Older Panel Sprites --> <!-- Older Panel Sprites -->
<sprite name="goldPanel"> <sprite name="goldPanel">
<!-- (currently this is all a hack - need proper textures) --> <!-- (currently this is all a hack - need proper textures) -->
<image <image texture="global/titlebar/middle_gold_fern.dds"
texture="global/titlebar/middle_gold_fern.dds"
texture_size="0 0 64 32" texture_size="0 0 64 32"
size="0 -6 100% 0" size="0 -6 100% 0"
/> />
<image <image texture="global/titlebar/middle_gold_fern.dds"
texture="global/titlebar/middle_gold_fern.dds"
texture_size="0 0 64 32" texture_size="0 0 64 32"
size="0 100%+5 100% 100%" size="0 100%+5 100% 100%"
/> />
<image <image texture="global/border/corner_bronze.dds"
texture="global/border/corner_bronze.dds"
texture_size="0 0 16 100%" texture_size="0 0 16 100%"
size="-4 -4 0 100%+4" size="-4 -4 0 100%+4"
/> />
<image <image texture="global/border/corner_bronze.dds"
texture="global/border/corner_bronze.dds"
texture_size="0 0 16 100%" texture_size="0 0 16 100%"
size="100% 0%-4 100%+4 100%+4" size="100% 0%-4 100%+4 100%+4"
/> />
<image <image texture="global/tile/sandstone.dds"
texture="global/tile/sandstone.dds"
texture_size="0 0 128 128" texture_size="0 0 128 128"
/> />
</sprite> </sprite>
<sprite name="goldPanelFrilly"> <sprite name="goldPanelFrilly">
<!-- (currently this is all a hack - need proper textures) --> <!-- (currently this is all a hack - need proper textures) -->
<image <image texture="global/titlebar/middle_gold_fern.dds"
texture="global/titlebar/middle_gold_fern.dds"
texture_size="0 0 64 32" texture_size="0 0 64 32"
size="0 -6 100% 0" size="0 -6 100% 0"
/> />
<image <image texture="global/titlebar/middle_gold_fern.dds"
texture="global/titlebar/middle_gold_fern.dds"
texture_size="0 0 64 32" texture_size="0 0 64 32"
size="0 100%+5 100% 100%" size="0 100%+5 100% 100%"
/> />
<image <image texture="global/border/corner_bronze.dds"
texture="global/border/corner_bronze.dds"
texture_size="0 0 16 100%" texture_size="0 0 16 100%"
size="-4 -4 0 100%+4" size="-4 -4 0 100%+4"
/> />
<image <image texture="global/border/corner_bronze.dds"
texture="global/border/corner_bronze.dds"
texture_size="0 0 16 100%" texture_size="0 0 16 100%"
size="100% 0%-4 100%+4 100%+4" size="100% 0%-4 100%+4 100%+4"
/> />
<image <image texture="global/titlebar/left_gold_fern.dds"
texture="global/titlebar/left_gold_fern.dds"
texture_size="0 0 64 32" texture_size="0 0 64 32"
size="-48 50%-16 0 50%+16" size="-48 50%-16 0 50%+16"
/> />
<image <image texture="global/titlebar/right_gold_fern.dds"
texture="global/titlebar/right_gold_fern.dds"
texture_size="-16 0 48 32" texture_size="-16 0 48 32"
size="100% 50%-16 100%+48 50%+16" size="100% 50%-16 100%+48 50%+16"
/> />
<image <image texture="global/tile/sandstone.dds"
texture="global/tile/sandstone.dds"
texture_size="0 0 128 128" texture_size="0 0 128 128"
/> />
</sprite> </sprite>
<sprite name="frilly"> <sprite name="frilly">
<!-- (currently this is all a hack - need proper textures) --> <!-- (currently this is all a hack - need proper textures) -->
<image <image texture="global/titlebar/left_gold_fern.dds"
texture="global/titlebar/left_gold_fern.dds"
texture_size="0 0 64 32" texture_size="0 0 64 32"
size="-48 50%-16 0 50%+16" size="-48 50%-16 0 50%+16"
/> />
<image <image texture="global/titlebar/right_gold_fern.dds"
texture="global/titlebar/right_gold_fern.dds"
texture_size="-16 0 48 32" texture_size="-16 0 48 32"
size="100% 50%-16 100%+48 50%+16" size="100% 50%-16 100%+48 50%+16"
/> />
@ -540,31 +418,26 @@
<sprite name="mainPanel"> <sprite name="mainPanel">
<!-- (currently this is all a hack - need proper textures) --> <!-- (currently this is all a hack - need proper textures) -->
<image <image texture="global/tile/sandstone.dds"
texture="global/tile/sandstone.dds"
texture_size="0 0 128 128" texture_size="0 0 128 128"
/> />
<image <image texture="global/titlebar/middle_gold_fern.dds"
texture="global/titlebar/middle_gold_fern.dds"
real_texture_placement="0 4 64 6" real_texture_placement="0 4 64 6"
texture_size="0 0 64 32" texture_size="0 0 64 32"
size="0 0 100% 3" size="0 0 100% 3"
/> />
<image <image texture="global/titlebar/middle_gold_fern.dds"
texture="global/titlebar/middle_gold_fern.dds"
real_texture_placement="0 4 64 6" real_texture_placement="0 4 64 6"
texture_size="0 0 64 32" texture_size="0 0 64 32"
size="0 100%-3 100% 100%" size="0 100%-3 100% 100%"
/> />
<image <image texture="global/border/corner_bronze.dds"
texture="global/border/corner_bronze.dds"
real_texture_placement="1 1 15 15" real_texture_placement="1 1 15 15"
texture_size="0 0 16 100%" texture_size="0 0 16 100%"
size="0 0 3 100%" size="0 0 3 100%"
/> />
<image <image texture="global/border/corner_bronze.dds"
texture="global/border/corner_bronze.dds"
real_texture_placement="1 1 15 15" real_texture_placement="1 1 15 15"
texture_size="0 0 16 100%" texture_size="0 0 16 100%"
size="100%-3 0 100% 100%" size="100%-3 0 100% 100%"