gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

GUI style / sprite cleanup.

Browse Source 
Move remains of common/sprite1.xml to common/common_sprites.xml.

Remove duplicates bkFillBlack and bkTranslucent.
Rename bkWhiteBorderBlack to BackgroundWhiteBorderBlack.

Move BackgroundSessionTooltip and BackgroundInformationTooltip to
session/.
Remove unused BackgroundErrorTooltip.

This was SVN commit r18636.
This commit is contained in:
elexis
2016-08-25 18:36:05 +00:00
parent eab5436d55
commit 84bde41394
17 changed files with 92 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/civinfo/civinfo.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<script file="gui/civinfo/civinfo.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" sprite="bkTranslucent"/>
<object type="image" z="0" sprite="BackgroundTranslucent"/>
<object type="image" style="ModernDialog" size="50%-500 50%-368 50%+500 50%+370">
binaries/data/mods/public/gui/common/common_sprites.xml
+65 -20
View File
@@ -33,34 +33,19 @@
/>
</sprite>
<sprite name="BackgroundSessionTooltip">
<image
backcolor="darkbrown"
size="0 0 100% 100%"
border="true"
bordercolor="gold"
/>
<sprite name="BackgroundBlack">
<image backcolor="black"/>
</sprite>
<sprite name="BackgroundInformationTooltip">
<sprite name="BackgroundWhiteBorderBlack">
<image
backcolor="0 0 0 191"
backcolor="white"
size="0 0 100% 100%"
border="true"
bordercolor="white"
bordercolor="black"
/>
</sprite>
<sprite name="BackgroundErrorTooltip">
<image
backcolor="0 0 0 191"
size="0 0 100% 100%"
border="true"
bordercolor="red"
/>
</sprite>
<!--
==========================================
PANEL SPRITES
@@ -154,6 +139,66 @@
/>
</sprite>
<!--
==========================================
GENERIC ICONS
==========================================
-->
<sprite name="iconInfoGold">
<effect add_color="237 227 167"/>
<image
texture="global/icon/info.png"
size="0 3 100% 100%+3"
/>
</sprite>
<sprite name="iconInfoWhite">
<effect add_color="255 255 255"/>
<image
texture="global/icon/info.png"
size="0 3 100% 100%+3"
/>
</sprite>
<sprite name="iconResetGold">
<effect add_color="237 227 167"/>
<image
texture="global/icon/reset.png"
size="0 3 100% 100%+3"
/>
</sprite>
<sprite name="iconResetWhite">
<effect add_color="255 255 255"/>
<image
texture="global/icon/reset.png"
size="0 3 100% 100%+3"
/>
</sprite>
<!--
==========================================
SCREENSHOT WATERMARK
==========================================
-->
<sprite name="watermarkProduct">
<image
texture="global/watermark/product.dds"
real_texture_placement="0 0 200 98"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="watermarkCompany">
<image
texture="global/watermark/company.dds"
real_texture_placement="0 0 207 28"
size="0 0 100% 100%"
/>
</sprite>
<!--
==========================================
MENU CONTROL ELEMENT SPRITES
binaries/data/mods/public/gui/common/setup.xml
+2 -2
View File
@@ -34,7 +34,7 @@
font="sans-14"
maxwidth="300"
offset="16 32"
sprite="bkWhiteBorderBlack"
sprite="BackgroundWhiteBorderBlack"
textcolor="0 0 0"
/>
@@ -45,7 +45,7 @@
font="sans-14"
maxwidth="300"
offset="-4 -4"
sprite="bkWhiteBorderBlack"
sprite="BackgroundWhiteBorderBlack"
textcolor="0 0 0"
/>
binaries/data/mods/public/gui/common/sprite1.xml
-83
View File
@@ -1,83 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<sprites>
<!--
==========================================
GENERIC - BACKCOLOR SPRITES
==========================================
-->
<sprite name="bkTranslucent">
<image backcolor="0 0 0 85"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="bkWhiteBorderBlack">
<image backcolor="white"
size="0 0 100% 100%"
border="true"
bordercolor="black"
/>
</sprite>
<sprite name="bkFillBlack">
<image backcolor="black"/>
</sprite>
<!--
==========================================
GENERIC ICONS
==========================================
-->
<sprite name="iconInfoGold">
<effect add_color="237 227 167" />
<image texture="global/icon/info.png"
size="0 3 100% 100%+3"
/>
</sprite>
<sprite name="iconInfoWhite">
<effect add_color="255 255 255" />
<image texture="global/icon/info.png"
size="0 3 100% 100%+3"
/>
</sprite>
<sprite name="iconResetGold">
<effect add_color="237 227 167" />
<image texture="global/icon/reset.png"
size="0 3 100% 100%+3"
/>
</sprite>
<sprite name="iconResetWhite">
<effect add_color="255 255 255" />
<image texture="global/icon/reset.png"
size="0 3 100% 100%+3"
/>
</sprite>
<!--
==========================================
SCREENSHOT WATERMARK
==========================================
-->
<sprite name="watermarkProduct">
<image texture="global/watermark/product.dds"
real_texture_placement="0 0 200 98"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="watermarkCompany">
<image texture="global/watermark/company.dds"
real_texture_placement="0 0 207 28"
size="0 0 100% 100%"
/>
</sprite>
</sprites>
binaries/data/mods/public/gui/page_civinfo.xml
-1
View File
@@ -5,7 +5,6 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_gamesetup.xml
-1
View File
@@ -5,7 +5,6 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_loadgame.xml
-1
View File
@@ -5,7 +5,6 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_loading.xml
-1
View File
@@ -5,7 +5,6 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_pregame.xml
-1
View File
@@ -5,7 +5,6 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_replaymenu.xml
-1
View File
@@ -5,7 +5,6 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_savegame.xml
-1
View File
@@ -5,7 +5,6 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_session.xml
-1
View File
@@ -6,7 +6,6 @@
<include>common/setup.xml</include>
<include>common/setup_resources.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/page_structree.xml
-1
View File
@@ -5,7 +5,6 @@
<include>common/modern/sprites.xml</include>
<include>common/setup_resources.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
binaries/data/mods/public/gui/session/selection_details.js
+1 -1
View File
@@ -280,7 +280,7 @@ function displaySingle(entState)
Engine.GetGUIObjectByName("player").tooltip = isGaia ? "" : civName;
// TODO: we should require all entities to have icons
Engine.GetGUIObjectByName("icon").sprite = template.icon ? ("stretched:session/portraits/" + template.icon) : "bkFillBlack";
Engine.GetGUIObjectByName("icon").sprite = template.icon ? ("stretched:session/portraits/" + template.icon) : "BackgroundBlack";
Engine.GetGUIObjectByName("attackAndArmorStats").tooltip = [
getAttackTooltip,
binaries/data/mods/public/gui/session/sprites.xml
+21
View File
@@ -490,6 +490,27 @@
<image backcolor="255 165 0 192" size="-2 1 100% 100%+1"/>
</sprite>
<!-- ================================ ================================ -->
<!-- Tooltips -->
<!-- ================================ ================================ -->
<sprite name="BackgroundSessionTooltip">
<image
backcolor="darkbrown"
size="0 0 100% 100%"
border="true"
bordercolor="gold"
/>
</sprite>
<sprite name="BackgroundInformationTooltip">
<image
backcolor="0 0 0 192"
size="0 0 100% 100%"
border="true"
bordercolor="white"
/>
</sprite>
<!-- ================================ ================================ -->
<!-- Misc -->
<!-- ================================ ================================ -->
binaries/data/mods/public/gui/session/unit_commands.js
+1 -1
View File
@@ -98,7 +98,7 @@ function setupUnitPanel(guiName, unitEntState, playerState)
// TODO: we should require all entities to have icons, so this case never occurs
if (data.icon && !data.icon.sprite)
data.icon.sprite = "bkFillBlack";
data.icon.sprite = "BackgroundBlack";
}
// Hide any buttons we're no longer using
binaries/data/mods/public/gui/structree/structree.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<script file="gui/structree/load.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" sprite="bkTranslucent"/>
<object type="image" z="0" sprite="BackgroundTranslucent"/>
<object type="image" style="ModernDialog" size="16 24 100%-16 100%-24">
<object style="TitleText" type="text" size="50%-128 -18 50%+128 14">