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

Replaces info icon with higher quality version. Fixes #1469.

Browse Source 
Uses add_color effect, so it's easier to change the theme.
Fixes some inconsistent whitespace.

This was SVN commit r11930.
This commit is contained in:
historic_bruno 2012-06-02 00:09:57 +00:00
parent 98ee2bdf0a
commit 8c848c2f45
6 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/data/mods/public/art/textures/ui/global/icon/info.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/global/icon/info_black.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/global/icon/info_white.dds (Stored with Git LFS)
View File

Binary file not shown.

2
binaries/data/mods/public/gui/common/setup.xml
View File

@ -53,7 +53,7 @@
/> />
<icon name="iconInfo" <icon name="iconInfo"
sprite="iconInfo" sprite="iconInfoWhite"
size="16 16" size="16 16"
/> />

107
binaries/data/mods/public/gui/common/sprite1.xml
View File

@ -14,37 +14,37 @@
/> />
</sprite> </sprite>
<sprite name="bkWhiteBorderBlack"> <sprite name="bkWhiteBorderBlack">
<image backcolor="white" <image backcolor="white"
size="0 0 100% 100%" size="0 0 100% 100%"
border="true" border="true"
bordercolor="black" bordercolor="black"
/> />
</sprite> </sprite>
<sprite name="bkGrayBorderBlack"> <sprite name="bkGrayBorderBlack">
<image backcolor="gray" <image backcolor="gray"
size="0 0 100% 100%" size="0 0 100% 100%"
border="true" border="true"
bordercolor="black" bordercolor="black"
/> />
</sprite> </sprite>
<sprite name="bkDarkGrayBorderBlack"> <sprite name="bkDarkGrayBorderBlack">
<image backcolor="darkgray" <image backcolor="darkgray"
size="0 0 100% 100%"
border="true"
bordercolor="black"
/>
</sprite>
<sprite name="bkBlueBorderBlack">
<image backcolor="blue"
size="0 0 100% 100%" size="0 0 100% 100%"
border="true" border="true"
bordercolor="black" bordercolor="black"
/> />
</sprite> </sprite>
<sprite name="bkBlueBorderBlack">
<image backcolor="blue"
size="0 0 100% 100%"
border="true"
bordercolor="black"
/>
</sprite>
<sprite name="bkBorderBlack"> <sprite name="bkBorderBlack">
<image backcolor="black" <image backcolor="black"
@ -59,7 +59,7 @@
<image backcolor="black" <image backcolor="black"
size="100% 0 100%+1 100%" size="100% 0 100%+1 100%"
/> />
</sprite> </sprite>
<sprite name="bkFillBlack"> <sprite name="bkFillBlack">
<image backcolor="black"/> <image backcolor="black"/>
@ -171,25 +171,27 @@
</sprite> </sprite>
<sprite name="iconBullet"> <sprite name="iconBullet">
<image texture="global/icon/bullet.dds" <image texture="global/icon/bullet.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="iconInfinity"> <sprite name="iconInfinity">
<image texture="global/icon/infinity.dds" <image texture="global/icon/infinity.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="iconInfo"> <sprite name="iconInfoGold">
<image texture="global/icon/info_white.dds" <effect add_color="237 227 167" />
<image texture="global/icon/info.png"
size="0 3 100% 100%+3" size="0 3 100% 100%+3"
/> />
</sprite> </sprite>
<sprite name="iconInfoOver"> <sprite name="iconInfoWhite">
<image texture="global/icon/info_black.dds" <effect add_color="255 255 255" />
<image texture="global/icon/info.png"
size="0 3 100% 100%+3" size="0 3 100% 100%+3"
/> />
</sprite> </sprite>
@ -219,11 +221,11 @@
texture_size="0 0 32 128" texture_size="0 0 32 128"
size="100%-22 0 100%+10 100%" size="100%-22 0 100%+10 100%"
/> />
<image texture="global/border/corner_bronze.dds" <image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15" real_texture_placement="0 0 15 15"
size="100% 100% 100%+10 100%+10" size="100% 100% 100%+10 100%+10"
/> />
<image texture="global/border/bottom_marble.dds" <image texture="global/border/bottom_marble.dds"
texture_size="0 0 128 32" texture_size="0 0 128 32"
size="0 100%-22 100% 100%+10" size="0 100%-22 100% 100%+10"
/> />
@ -265,11 +267,11 @@
texture_size="0 0 32 128" texture_size="0 0 32 128"
size="100%-7 0%-10 100%+25 100%+10" size="100%-7 0%-10 100%+25 100%+10"
/> />
<image texture="global/border/corner_bronze.dds" <image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15" real_texture_placement="0 0 15 15"
size="100%+10 100%+10 100%+25 100%+25" size="100%+10 100%+10 100%+25 100%+25"
/> />
<image texture="global/border/bottom_marble.dds" <image texture="global/border/bottom_marble.dds"
texture_size="0 0 128 32" texture_size="0 0 128 32"
size="0%-10 100%-7 100%+10 100%+25" size="0%-10 100%-7 100%+10 100%+25"
/> />
@ -306,11 +308,11 @@
texture_size="0 0 32 128" texture_size="0 0 32 128"
size="100%-6 0%-10 100%+26 100%+10" size="100%-6 0%-10 100%+26 100%+10"
/> />
<image texture="global/border/corner_bronze.dds" <image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15" real_texture_placement="0 0 15 15"
size="100%+10 100%+10 100%+25 100%+25" size="100%+10 100%+10 100%+25 100%+25"
/> />
<image texture="global/border/bottom_marble.dds" <image texture="global/border/bottom_marble.dds"
texture_size="0 0 128 32" texture_size="0 0 128 32"
size="0%-10 100%-7 100%+10 100%+25" size="0%-10 100%-7 100%+10 100%+25"
/> />
@ -329,11 +331,11 @@
real_texture_placement="0 0 64 32" real_texture_placement="0 0 64 32"
size="0%+0 0% 64 0%+32" size="0%+0 0% 64 0%+32"
/> />
<image texture="global/titlebar/middle_gold_fern.dds" <image texture="global/titlebar/middle_gold_fern.dds"
real_texture_placement="0 0 64 32" real_texture_placement="0 0 64 32"
size="64 0% 100%-64 0%+32" size="64 0% 100%-64 0%+32"
/> />
<image texture="global/titlebar/right_gold_fern.dds" <image texture="global/titlebar/right_gold_fern.dds"
real_texture_placement="0 0 64 32" real_texture_placement="0 0 64 32"
size="100%-64 0% 100%+0 0%+32" size="100%-64 0% 100%+0 0%+32"
/> />
@ -343,72 +345,73 @@
<image texture="global/button/checkbox_open_gray.dds" <image texture="global/button/checkbox_open_gray.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatCheckBoxTick"> <sprite name="wheatCheckBoxTick">
<image texture="global/button/checkbox_tick_gray.dds" <image texture="global/button/checkbox_tick_gray.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatCheckBoxCross"> <sprite name="wheatCheckBoxCross">
<image texture="global/button/checkbox_cross_gray.dds" <image texture="global/button/checkbox_cross_gray.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatCheckBoxCrossOver"> <sprite name="wheatCheckBoxCrossOver">
<image texture="global/button/checkbox_cross_over_gray.dds" <image texture="global/button/checkbox_cross_over_gray.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatArrowLeft"> <sprite name="wheatArrowLeft">
<image texture="global/button/arrowbox_lt.dds" <image texture="global/button/arrowbox_lt.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatArrowLeftOver"> <sprite name="wheatArrowLeftOver">
<image texture="global/button/arrowbox_lt_over.dds" <image texture="global/button/arrowbox_lt_over.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatArrowRight"> <sprite name="wheatArrowRight">
<image texture="global/button/arrowbox_rt.dds" <image texture="global/button/arrowbox_rt.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatArrowRightOver"> <sprite name="wheatArrowRightOver">
<image texture="global/button/arrowbox_rt_over.dds" <image texture="global/button/arrowbox_rt_over.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatArrowUp"> <sprite name="wheatArrowUp">
<image texture="global/button/arrowbox_up.dds" <image texture="global/button/arrowbox_up.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatArrowUpOver"> <sprite name="wheatArrowUpOver">
<image texture="global/button/arrowbox_up_over.dds" <image texture="global/button/arrowbox_up_over.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatArrowDn"> <sprite name="wheatArrowDn">
<image texture="global/button/arrowbox_dn.dds" <image texture="global/button/arrowbox_dn.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatArrowDnOver"> <sprite name="wheatArrowDnOver">
<image texture="global/button/arrowbox_dn_over.dds" <image texture="global/button/arrowbox_dn_over.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatScrollSpriteBar"> <sprite name="wheatScrollSpriteBar">
<image texture="global/border/scrollbar.dds" <image texture="global/border/scrollbar.dds"
@ -429,7 +432,7 @@
real_texture_placement="0 32 160 64" real_texture_placement="0 32 160 64"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatButtonDisabled"> <sprite name="wheatButtonDisabled">
<effect grayscale="" /> <effect grayscale="" />
@ -437,7 +440,7 @@
real_texture_placement="0 0 160 31" real_texture_placement="0 0 160 31"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatButtonGlow"> <sprite name="wheatButtonGlow">
<effect add_color="60 42 42 0" /> <effect add_color="60 42 42 0" />
@ -445,7 +448,7 @@
real_texture_placement="0 0 160 31" real_texture_placement="0 0 160 31"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="wheatIndentBorder"> <sprite name="wheatIndentBorder">
<!-- Starting with top left corner continuing in a clockwise manner --> <!-- Starting with top left corner continuing in a clockwise manner -->
@ -534,11 +537,11 @@
/> />
</sprite> </sprite>
<!-- <!--
========================================== ==========================================
SCREENSHOT WATERMARK SCREENSHOT WATERMARK
========================================== ==========================================
--> -->
<sprite name="watermarkProduct"> <sprite name="watermarkProduct">
<image texture="global/watermark/product.dds" <image texture="global/watermark/product.dds"

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

@ -90,9 +90,9 @@
<object name="playerCivHeading" type="text" style="CenteredLabelText" size="350 0 530 100%">Civilization</object> <object name="playerCivHeading" type="text" style="CenteredLabelText" size="350 0 530 100%">Civilization</object>
<object name="civInfoButton" <object name="civInfoButton"
type="button" type="button"
sprite="iconInfo" sprite="iconInfoGold"
sprite_over="iconInfoOver" sprite_over="iconInfoWhite"
size="484 0 500 16" size="484 1 500 17"
tooltip_style="onscreenToolTip" tooltip_style="onscreenToolTip"
tooltip="View civilization info" tooltip="View civilization info"
> >