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 sprite / style cleanup.

Browse Source 
Merge common/styles.xml (which contains only the special default style)
with common/common_styles.xml.
Rename common/common_sprites.xml to common/sprites.xml.

This was SVN commit r18637.
This commit is contained in:
elexis
2016-08-25 20:23:17 +00:00
parent 84bde41394
commit 29c95f3a49
12 changed files with 179 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/common/common_styles.xml
-173
View File
@@ -1,173 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<styles>
<!--
==========================================
MENU TEXT STYLES
==========================================
-->
<style name="CenteredButtonText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
/>
<style name="LeftButtonText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="RightButtonText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="right"
text_valign="top"
/>
<style name="LeftLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="left"
text_valign="center"
/>
<style name="RightLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="right"
text_valign="center"
/>
<style name="CenteredLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="center"
text_valign="center"
/>
<style name="LeftTabLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="left"
text_valign="top"
/>
<style name="RightTabLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="right"
text_valign="top"
/>
<style name="CenteredTabLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="center"
text_valign="top"
/>
<style name="SmallLeftLabelText"
font="sans-12"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="TitleText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
/>
<style name="LargeTitleText"
font="sans-bold-24"
textcolor="white"
text_align="center"
text_valign="center"
/>
<style name="MediumTitleText"
font="sans-bold-12"
textcolor="white"
text_align="center"
text_valign="center"
/>
<!--
==========================================
MENU WINDOW STYLES
==========================================
-->
<style name="TranslucentPanel"
sprite="BackgroundTranslucent"
buffer_zone="10"
font="sans-bold-stroke-14"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="TranslucentPanelThinBorder"
sprite="TranslucentPanelThinBorder"
buffer_zone="10"
font="sans-bold-stroke-14"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="StonePanelThinBorder"
sprite="StonePanelThinBorder"
buffer_zone="10"
text_align="left"
text_valign="top"
/>
<!--
==========================================
MENU CONTROL ELEMENT STYLES
==========================================
-->
<style name="StoneButtonFancy"
sprite="StoneButton"
sprite_disabled="StoneButtonDisabled"
sprite_over="StoneButtonFancyOver"
sprite_pressed="StoneButtonFancyGlow"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
/>
<style name="StoneButton"
sprite="StoneButton"
sprite_disabled="StoneButtonDisabled"
sprite_over="StoneButtonOver"
sprite_pressed="StoneButtonGlow"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
/>
<style name="MapPlayerList"
buffer_zone="8"
font="sans-14"
scrollbar="true"
scrollbar_style="ModernScrollBar"
scroll_bottom="false"
textcolor="white"
text_align="left"
text_valign="top"
/>
</styles>
binaries/data/mods/public/gui/common/common_sprites.xml → binaries/data/mods/public/gui/common/sprites.xml
View File
binaries/data/mods/public/gui/common/styles.xml
+170
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<styles>
<!--
==========================================
- DEFAULT STYLE: The style with the name 'default' is special, it will
@@ -20,4 +21,173 @@
buffer_zone="5"
multiline="false"
/>
<!--
==========================================
MENU TEXT STYLES
==========================================
-->
<style name="CenteredButtonText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
/>
<style name="LeftButtonText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="RightButtonText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="right"
text_valign="top"
/>
<style name="LeftLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="left"
text_valign="center"
/>
<style name="RightLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="right"
text_valign="center"
/>
<style name="CenteredLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="center"
text_valign="center"
/>
<style name="LeftTabLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="left"
text_valign="top"
/>
<style name="RightTabLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="right"
text_valign="top"
/>
<style name="CenteredTabLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
text_align="center"
text_valign="top"
/>
<style name="SmallLeftLabelText"
font="sans-12"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="TitleText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
/>
<style name="LargeTitleText"
font="sans-bold-24"
textcolor="white"
text_align="center"
text_valign="center"
/>
<style name="MediumTitleText"
font="sans-bold-12"
textcolor="white"
text_align="center"
text_valign="center"
/>
<!--
==========================================
MENU WINDOW STYLES
==========================================
-->
<style name="TranslucentPanel"
sprite="BackgroundTranslucent"
buffer_zone="10"
font="sans-bold-stroke-14"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="TranslucentPanelThinBorder"
sprite="TranslucentPanelThinBorder"
buffer_zone="10"
font="sans-bold-stroke-14"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="StonePanelThinBorder"
sprite="StonePanelThinBorder"
buffer_zone="10"
text_align="left"
text_valign="top"
/>
<!--
==========================================
MENU CONTROL ELEMENT STYLES
==========================================
-->
<style name="StoneButtonFancy"
sprite="StoneButton"
sprite_disabled="StoneButtonDisabled"
sprite_over="StoneButtonFancyOver"
sprite_pressed="StoneButtonFancyGlow"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
/>
<style name="StoneButton"
sprite="StoneButton"
sprite_disabled="StoneButtonDisabled"
sprite_over="StoneButtonOver"
sprite_pressed="StoneButtonGlow"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
/>
<style name="MapPlayerList"
buffer_zone="8"
font="sans-14"
scrollbar="true"
scrollbar_style="ModernScrollBar"
scroll_bottom="false"
textcolor="white"
text_align="left"
text_valign="top"
/>
</styles>
binaries/data/mods/public/gui/page_civinfo.xml
+1 -2
View File
@@ -5,9 +5,8 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprites.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>civinfo/civinfo.xml</include>
<include>civinfo/setup.xml</include>
binaries/data/mods/public/gui/page_gamesetup.xml
+1 -2
View File
@@ -5,9 +5,8 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprites.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>gamesetup/setup.xml</include>
<include>gamesetup/sprites.xml</include>
binaries/data/mods/public/gui/page_loadgame.xml
+1 -2
View File
@@ -5,9 +5,8 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprites.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>savedgames/load.xml</include>
</page>
binaries/data/mods/public/gui/page_loading.xml
+1 -2
View File
@@ -5,9 +5,8 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprites.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/init.xml</include>
<include>loading/styles.xml</include>
binaries/data/mods/public/gui/page_pregame.xml
+1 -2
View File
@@ -5,9 +5,8 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprites.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/init.xml</include>
<include>pregame/backgrounds/</include>
binaries/data/mods/public/gui/page_replaymenu.xml
+1 -2
View File
@@ -5,9 +5,8 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprites.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>replaymenu/replay_menu.xml</include>
</page>
binaries/data/mods/public/gui/page_savegame.xml
+1 -2
View File
@@ -5,9 +5,8 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprites.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>savedgames/save.xml</include>
</page>
binaries/data/mods/public/gui/page_session.xml
+1 -2
View File
@@ -6,9 +6,8 @@
<include>common/setup.xml</include>
<include>common/setup_resources.xml</include>
<include>common/sprites.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/icon_sprites.xml</include>
<include>session/sprites.xml</include>
binaries/data/mods/public/gui/page_structree.xml
+1 -2
View File
@@ -5,9 +5,8 @@
<include>common/modern/sprites.xml</include>
<include>common/setup_resources.xml</include>
<include>common/sprites.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>structree/styles.xml</include>
<include>structree/sprites.xml</include>