mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI style / sprite cleanup.

Browse Source 
Move civ icon overlay entries from common/ to session/.
Move main menu entries from common/ to pregame/.
Remove unused pgButton.

This was SVN commit r18634.
This commit is contained in:
elexis
2016-08-25 13:59:25 +00:00
parent a8837fed41
commit 52504bbfa8
6 changed files with 90 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/common/common_sprites.xml
-71
View File
@@ -67,64 +67,6 @@
==========================================
-->
<sprite name="MainMenuPanel">
<image texture="global/tile/stone_background.png"
real_texture_placement="28 0 292 264"
texture_size="0 0 240 240"
/>
<image texture="pregame/shading/menu_panel_background_shading.png"
texture_size="0 0 100% 100%"
size="0 0 100% 100%"
/>
<!-- top -->
<image backcolor="230 190 80"
size="2 0 100%-2 2"
/>
<!-- bottom -->
<image backcolor="230 190 80"
size="2 100%-2 100%-2 100%"
/>
<!-- left -->
<image backcolor="230 190 80"
size="0 0 2 100%"
/>
</sprite>
<sprite name="MainMenuPanelRightBorder">
<!-- right -->
<image backcolor="230 190 80"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="SubmenuPanel">
<image texture="global/tile/stone_background.png"
real_texture_placement="32 0 292 264"
texture_size="0 0 240 240"
/>
<image texture="pregame/shading/menu_panel_background_shading.png"
texture_size="0 0 100% 100%"
size="0 0 100% 100%"
/>
<!-- sides -->
<image backcolor="230 190 80"
size="0 0 100%-2 2"
/>
<image backcolor="230 190 80"
size="100%-2 0 100% 100%"
/>
<image backcolor="230 190 80"
size="0 100%-2 100%-2 100%"
/>
<!-- no left border here -->
</sprite>
<sprite name="TranslucentPanelThinBorder">
<image backcolor="0 0 0 85"
size="0 0 100% 100%"
@@ -303,17 +245,4 @@
/>
</sprite>
<!--
==========================================
CIV ICON
==========================================
-->
<sprite name="CivIconOver">
<image
texture="session/portraits/emblems/states/hover.png"
size="0 0 100% 100%"
/>
</sprite>
</sprites>
binaries/data/mods/public/gui/common/common_styles.xml
-24
View File
@@ -123,20 +123,6 @@
text_valign="top"
/>
<style name="MainMenuPanel"
sprite="MainMenuPanel"
buffer_zone="10"
text_align="left"
text_valign="top"
/>
<style name="SubmenuPanel"
sprite="SubmenuPanel"
buffer_zone="10"
text_align="left"
text_valign="top"
/>
<style name="StonePanelThinBorder"
sprite="StonePanelThinBorder"
buffer_zone="10"
@@ -184,14 +170,4 @@
text_align="left"
text_valign="top"
/>
<!--
==========================================
CIV ICON
==========================================
-->
<style name="CivIconOverlay"
sprite=""
sprite_over="CivIconOver"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
/>
</styles>
binaries/data/mods/public/gui/pregame/sprites.xml
+65 -8
View File
@@ -2,13 +2,70 @@
<sprites>
<sprite name="pgUserReportBox">
<image
backcolor="0 0 0 220"
size="0 0 100% 100%"
border="true"
bordercolor="200 200 200"
/>
</sprite>
<sprite name="MainMenuPanel">
<image texture="global/tile/stone_background.png"
real_texture_placement="28 0 292 264"
texture_size="0 0 240 240"
/>
<image texture="pregame/shading/menu_panel_background_shading.png"
texture_size="0 0 100% 100%"
size="0 0 100% 100%"
/>
<!-- top -->
<image backcolor="230 190 80"
size="2 0 100%-2 2"
/>
<!-- bottom -->
<image backcolor="230 190 80"
size="2 100%-2 100%-2 100%"
/>
<!-- left -->
<image backcolor="230 190 80"
size="0 0 2 100%"
/>
</sprite>
<sprite name="MainMenuPanelRightBorder">
<!-- right -->
<image backcolor="230 190 80"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="SubmenuPanel">
<image texture="global/tile/stone_background.png"
real_texture_placement="32 0 292 264"
texture_size="0 0 240 240"
/>
<image texture="pregame/shading/menu_panel_background_shading.png"
texture_size="0 0 100% 100%"
size="0 0 100% 100%"
/>
<!-- sides -->
<image backcolor="230 190 80"
size="0 0 100%-2 2"
/>
<image backcolor="230 190 80"
size="100%-2 0 100% 100%"
/>
<image backcolor="230 190 80"
size="0 100%-2 100%-2 100%"
/>
<!-- no left border here -->
</sprite>
<sprite name="pgUserReportBox">
<image backcolor="0 0 0 220"
size="0 0 100% 100%"
border="true"
bordercolor="200 200 200"
/>
</sprite>
</sprites>
binaries/data/mods/public/gui/pregame/styles.xml
+12 -4
View File
@@ -2,9 +2,18 @@
<styles>
<style name="pgButton"
tooltip_style="pgToolTip"
tooltip=""
<style name="MainMenuPanel"
sprite="MainMenuPanel"
buffer_zone="10"
text_align="left"
text_valign="top"
/>
<style name="SubmenuPanel"
sprite="SubmenuPanel"
buffer_zone="10"
text_align="left"
text_valign="top"
/>
<style name="userReportPanel"
@@ -17,5 +26,4 @@
textcolor="white"
/>
</styles>
binaries/data/mods/public/gui/session/sprites.xml
+7
View File
@@ -97,6 +97,13 @@
/>
</sprite>
<sprite name="CivIconOver">
<image
texture="session/portraits/emblems/states/hover.png"
size="0 0 100% 100%"
/>
</sprite>
<!-- Map Panel -->
<sprite name="mapPanel">
<image backcolor="0 0 0"
binaries/data/mods/public/gui/session/styles.xml
+6
View File
@@ -188,6 +188,12 @@
<!-- ================================ ================================ -->
<!-- Icon Styles -->
<!-- ================================ ================================ -->
<style name="CivIconOverlay"
sprite=""
sprite_over="CivIconOver"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
/>
<style name="commandIcon"
sprite="command"
ghost="true"