Author: esr
Date: Fri Apr 6 10:26:27 2007
New Revision: 16630
URL: http://svn.gna.org/viewcvs/wesnoth?rev=16630&view=rev
Log:
Avoid multiple definitions of the same macro.
Modified:
trunk/data/themes/default.cfg
trunk/data/themes/experimental.cfg
trunk/data/themes/macros.cfg
Modified: trunk/data/themes/default.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/themes/default.cfg?rev=16630&r1=16629&r2=16630&view=diff
==============================================================================
--- trunk/data/themes/default.cfg (original)
+++ trunk/data/themes/default.cfg Fri Apr 6 10:26:27 2007
@@ -9,18 +9,18 @@
[theme]
name=Default
-#define FONT_NORMAL
+#define DEFAULT_FONT_NORMAL
14 #enddef
-#define FONT_SMALL
+#define DEFAULT_FONT_SMALL
12 #enddef
-#define FONT_TINY
+#define DEFAULT_FONT_TINY
10 #enddef
-#define FONT320_NORMAL
+#define DEFAULT_FONT320_NORMAL
8 #enddef
-#define FONT320_SMALL
+#define DEFAULT_FONT320_SMALL
7 #enddef
-#define FONT320_TINY
+#define DEFAULT_FONT320_TINY
7 #enddef
{themes/macros.cfg}
@@ -167,7 +167,7 @@
# HP/XP
[label]
id=label-hp
- font_size={FONT_TINY}
+ font_size={DEFAULT_FONT_TINY}
text= _ "HP"
ref=top-right-panel
rect="=+84,=+209,+54,+12"
@@ -176,7 +176,7 @@
[/label]
[label]
id=label-xp
- font_size={FONT_TINY}
+ font_size={DEFAULT_FONT_TINY}
text= _ "XP"
# FIXME: should be ref=unit-hp
rect="=,+14,=,+12"
@@ -252,7 +252,7 @@
# the game status
[turn]
id=turn
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
rect="+4,=,+55,+16"
xanchor=proportional
yanchor=fixed
@@ -261,7 +261,7 @@
[/turn]
[gold]
id=gold
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=gold-icon
rect="+4,=,+55,+16"
xanchor=proportional
@@ -271,7 +271,7 @@
[/gold]
[villages]
id=villages
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=villages-icon
rect="+4,=,+55,+16"
xanchor=proportional
@@ -281,7 +281,7 @@
[/villages]
[num_units]
id=num-units
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=units-icon
rect="+4,=,+55,+16"
xanchor=proportional
@@ -291,7 +291,7 @@
[/num_units]
[upkeep]
id=status-upkeep
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=upkeep-icon
rect="+4,=,+40,+16"
xanchor=proportional
@@ -301,7 +301,7 @@
[/upkeep]
[income]
id=status-income
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=income-icon
rect="+4,=,+40,+16"
xanchor=proportional
@@ -310,18 +310,18 @@
prefix_literal=""
[/income]
- {COUNTDOWN_THEME_STATUS}
+ {COUNTDOWN_THEME_STATUS DEFAULT_FONT_SMALL}
[terrain]
id=status-terrain
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
rect="+10,=,+115,+16"
xanchor=proportional
yanchor=fixed
[/terrain]
[position]
id=status-position
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
rect="+5,=,+95,+16"
xanchor=proportional
yanchor=fixed
@@ -329,7 +329,7 @@
[observers]
id=observers
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
rect="+4,=-1,+16,+16"
xanchor=right
yanchor=fixed
@@ -345,7 +345,7 @@
[/unit_image]
[unit_description]
id=unit-description
- font_size={FONT_NORMAL}
+ font_size={DEFAULT_FONT_NORMAL}
ref=middle-right-panel
rect="=+9,=+3,=-2,+18"
xanchor=right
@@ -353,14 +353,14 @@
[/unit_description]
[unit_type]
id=unit-type
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_type]
[unit_level]
id=unit-level
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
prefix= _ "statuspanel^level"
prefix_literal=" "
@@ -369,28 +369,28 @@
[/unit_level]
[unit_alignment]
id=unit-alignment
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_alignment]
[unit_traits]
id=unit-traits
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_traits]
[unit_abilities]
id=unit-abilities
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_abilities]
[unit_moves]
id=unit-moves
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=unit-abilities
rect="=,+0,=+2,+16"
prefix= _ "statuspanel^movement"
@@ -400,7 +400,7 @@
[/unit_moves]
[unit_hp]
id=unit-hp
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=label-hp
rect="=,+0,+54,+14"
#prefix=hp
@@ -410,7 +410,7 @@
[/unit_hp]
[unit_xp]
id=unit-xp
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=label-xp
rect="=,+0,+54,+14"
#prefix=xp
@@ -420,7 +420,7 @@
[/unit_xp]
[unit_weapons]
id=unit-weapons
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=unit-moves
rect="=,+0,=,594"
xanchor=right
@@ -428,7 +428,7 @@
[/unit_weapons]
[unit_status]
id=unit-status
- font_size={FONT_SMALL}
+ font_size={DEFAULT_FONT_SMALL}
ref=unit-xp
rect="=+1,+3,=,+16"
xanchor=right
@@ -436,7 +436,7 @@
[/unit_status]
[/status]
- {REPLAY_THEME}
+ {REPLAY_THEME DEFAULT_FONT_SMALL}
[/resolution]
@@ -546,7 +546,7 @@
[menu]
id=zoom-in
title="+"
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
items=zoomin
ref=top-panel
rect="982,=,5,="
@@ -556,7 +556,7 @@
[menu]
id=zoom-out
title="-"
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
items=zoomout
rect="=+15,=,5,="
xanchor=right
@@ -600,12 +600,12 @@
[change]
id=label-hp
- font_size={FONT320_TINY}
+ font_size={DEFAULT_FONT320_TINY}
rect="=+45,=+93,+12,+8"
[/change]
[change]
id=label-xp
- font_size={FONT320_TINY}
+ font_size={DEFAULT_FONT320_TINY}
ref=label-hp
rect="=,+0,=,+8"
[/change]
@@ -643,37 +643,37 @@
[change]
id=turn
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="+15,=,+58,+8"
[/change]
[change]
id=gold
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[change]
id=villages
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[change]
id=num-units
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[change]
id=status-upkeep
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[change]
id=status-income
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[remove]
id=status-position
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="+15,=,+130,+8"
[/remove]
[remove]
@@ -686,59 +686,59 @@
[/change]
[change]
id=unit-description
- font_size={FONT320_NORMAL}
+ font_size={DEFAULT_FONT320_NORMAL}
rect="=+6,=,=-2,+10"
[/change]
[change]
id=unit-type
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-level
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-alignment
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-traits
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-abilities
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-moves
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-hp
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
ref=label-hp
rect="+0,=,1022,+8"
[/change]
[change]
id=unit-xp
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
ref=label-xp
rect="+0,=,1022,+8"
[/change]
[change]
id=unit-weapons
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
rect="=+8,+0,=,768"
[/change]
[change]
id=unit-status
- font_size={FONT320_SMALL}
+ font_size={DEFAULT_FONT320_SMALL}
ref=label-xp
rect="=+8,+2,=,+8"
[/change]
Modified: trunk/data/themes/experimental.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/themes/experimental.cfg?rev=16630&r1=16629&r2=16630&view=diff
==============================================================================
--- trunk/data/themes/experimental.cfg (original)
+++ trunk/data/themes/experimental.cfg Fri Apr 6 10:26:27 2007
@@ -9,18 +9,18 @@
[theme]
name=Experimental
-#define FONT_NORMAL
+#define EXPERIMENTAL_FONT_NORMAL
14 #enddef
-#define FONT_SMALL
+#define EXPERIMENTAL_FONT_SMALL
12 #enddef
-#define FONT_TINY
+#define EXPERIMENTAL_FONT_TINY
10 #enddef
-#define FONT320_NORMAL
+#define EXPERIMENTAL_FONT320_NORMAL
8 #enddef
-#define FONT320_SMALL
+#define EXPERIMENTAL_FONT320_SMALL
6 #enddef
-#define FONT320_TINY
+#define EXPERIMENTAL_FONT320_TINY
6 #enddef
[resolution]
@@ -152,7 +152,7 @@
# HP/XP
[label]
id=label-hp
- font_size={FONT_TINY}
+ font_size={EXPERIMENTAL_FONT_TINY}
text= _ "HP"
ref=top-right-panel
rect="=+84,=+230,+54,+12"
@@ -161,7 +161,7 @@
[/label]
[label]
id=label-xp
- font_size={FONT_TINY}
+ font_size={EXPERIMENTAL_FONT_TINY}
text= _ "XP"
rect="=,+14,=,+12"
xanchor=right
@@ -237,7 +237,7 @@
[turn]
id=turn
ref=top-right-panel
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
rect="=+27,=+203,+65,+16"
xanchor=right
yanchor=fixed
@@ -246,7 +246,7 @@
[/turn]
[gold]
id=gold
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=gold-icon
rect="+4,=+1,+75,+16"
xanchor=proportional
@@ -256,7 +256,7 @@
[/gold]
[villages]
id=villages
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=villages-icon
rect="+4,=+1,+65,+16"
xanchor=proportional
@@ -266,7 +266,7 @@
[/villages]
[num_units]
id=num-units
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=units-icon
rect="+4,=+1,+65,+16"
xanchor=proportional
@@ -276,7 +276,7 @@
[/num_units]
[upkeep]
id=status-upkeep
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=upkeep-icon
rect="+4,=+1,+60,+16"
xanchor=proportional
@@ -286,7 +286,7 @@
[/upkeep]
[income]
id=status-income
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=income-icon
rect="+4,=+1,+50,+16"
xanchor=proportional
@@ -295,12 +295,12 @@
prefix_literal=""
[/income]
- {COUNTDOWN_THEME_STATUS}
+ {COUNTDOWN_THEME_STATUS EXPERIMENTAL_FONT_SMALL}
[observers]
id=observers
ref=actions-menu
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
rect="+9,=+3,+16,+16"
xanchor=proportional
yanchor=fixed
@@ -316,7 +316,7 @@
[/unit_image]
[unit_description]
id=unit-description
- font_size={FONT_NORMAL}
+ font_size={EXPERIMENTAL_FONT_NORMAL}
ref=middle-right-panel
rect="=+9,=+3,=-2,+18"
xanchor=right
@@ -324,14 +324,14 @@
[/unit_description]
[unit_type]
id=unit-type
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_type]
[unit_level]
id=unit-level
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
rect="=,+0,=,+16"
prefix= _ "statuspanel^level"
prefix_literal=" "
@@ -340,28 +340,28 @@
[/unit_level]
[unit_alignment]
id=unit-alignment
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_alignment]
[unit_traits]
id=unit-traits
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_traits]
[unit_abilities]
id=unit-abilities
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_abilities]
[unit_moves]
id=unit-moves
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=unit-abilities
rect="=,+0,=+2,+16"
prefix= _ "statuspanel^movement"
@@ -371,7 +371,7 @@
[/unit_moves]
[unit_hp]
id=unit-hp
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=label-hp
rect="=,+0,+54,+14"
#prefix=hp
@@ -381,7 +381,7 @@
[/unit_hp]
[unit_xp]
id=unit-xp
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=label-xp
rect="=,+0,+54,+14"
#prefix=xp
@@ -391,7 +391,7 @@
[/unit_xp]
[unit_weapons]
id=unit-weapons
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=unit-moves
rect="=,+0,=,560"
xanchor=right
@@ -399,7 +399,7 @@
[/unit_weapons]
[unit_status]
id=unit-status
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
ref=unit-xp
rect="=+1,+3,=,+16"
xanchor=right
@@ -408,7 +408,7 @@
[terrain]
id=status-terrain
ref=top-right-panel
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
rect="=+9,730,=-2,+16"
xanchor=right
yanchor=bottom
@@ -416,7 +416,7 @@
[position]
id=status-position
ref=top-right-panel
- font_size={FONT_SMALL}
+ font_size={EXPERIMENTAL_FONT_SMALL}
rect="=+9,747,=-2,+16"
xanchor=right
yanchor=bottom
Modified: trunk/data/themes/macros.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/themes/macros.cfg?rev=16630&r1=16629&r2=16630&view=diff
==============================================================================
--- trunk/data/themes/macros.cfg (original)
+++ trunk/data/themes/macros.cfg Fri Apr 6 10:26:27 2007
@@ -19,7 +19,7 @@
#enddef
-#define COUNTDOWN_THEME_STATUS
+#define COUNTDOWN_THEME_STATUS FONT_SMALL
[report_countdown]
id=report_timeout
font_size={FONT_SMALL}
@@ -29,7 +29,7 @@
yanchor=fixed
[/report_countdown]
#enddef
-#define REPLAY_THEME
+#define REPLAY_THEME FONT_SMALL
[replay]
[change]
id=main-map
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
