wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/data/themes default.cfg


From: Yann Dirson
Subject: [Wesnoth-cvs-commits] wesnoth/data/themes default.cfg
Date: Fri, 18 Feb 2005 15:03:51 -0500

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/02/18 20:03:50

Modified files:
        data/themes    : default.cfg 

Log message:
        use #defines for font sizes in default theme

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/themes/default.cfg.diff?tr1=1.79&tr2=1.80&r1=text&r2=text

Patches:
Index: wesnoth/data/themes/default.cfg
diff -u wesnoth/data/themes/default.cfg:1.79 
wesnoth/data/themes/default.cfg:1.80
--- wesnoth/data/themes/default.cfg:1.79        Fri Feb 11 14:53:03 2005
+++ wesnoth/data/themes/default.cfg     Fri Feb 18 20:03:50 2005
@@ -14,6 +14,13 @@
 width=1024
 height=768
 
+#define FONT_NORMAL
+14 #enddef
+#define FONT_SMALL
+12 #enddef
+#define FONT_TINY
+10 #enddef
+
        [screen]
        # this is only useful as a ref for other rects
        id=screen
@@ -149,7 +156,7 @@
        # HP/XP
        [label]
        id=label-hp
-       font_size=10
+       font_size={FONT_TINY}
        text= _ "HP"
        ref=top-right-panel
        rect==+84,=+209,+54,+12
@@ -158,7 +165,7 @@
        [/label]
        [label]
        id=label-xp
-       font_size=10
+       font_size={FONT_TINY}
        text= _ "XP"
        // FIXME: should be ref=unit-hp
        rect==,+14,=,+12
@@ -234,7 +241,7 @@
                # the game status
                [turn]
                id=turn
-               font_size=12
+               font_size={FONT_SMALL}
                rect=+4,=,+68,+16
                xanchor=proportional
                yanchor=fixed
@@ -243,7 +250,7 @@
                [/turn]
                [gold]
                id=gold
-               font_size=12
+               font_size={FONT_SMALL}
                ref=gold-icon
                rect=+4,=,+65,+16
                xanchor=proportional
@@ -253,7 +260,7 @@
                [/gold]
                [villages]
                id=villages
-               font_size=12
+               font_size={FONT_SMALL}
                ref=villages-icon
                rect=+4,=,+55,+16
                xanchor=proportional
@@ -263,7 +270,7 @@
                [/villages]
                [num_units]
                id=num-units
-               font_size=12
+               font_size={FONT_SMALL}
                ref=units-icon
                rect=+4,=,+55,+16
                xanchor=proportional
@@ -273,7 +280,7 @@
                [/num_units]
                [upkeep]
                id=status-upkeep
-               font_size=12
+               font_size={FONT_SMALL}
                ref=upkeep-icon
                rect=+4,=,+40,+16
                xanchor=proportional
@@ -283,7 +290,7 @@
                [/upkeep]
                [income]
                id=status-income
-               font_size=12
+               font_size={FONT_SMALL}
                ref=income-icon
                rect=+4,=,+40,+16
                xanchor=proportional
@@ -293,14 +300,14 @@
                [/income]
                [terrain]
                id=status-terrain
-               font_size=12
+               font_size={FONT_SMALL}
                rect=+5,=,+120,+16
                xanchor=proportional
                yanchor=fixed
                [/terrain]
                [position]
                id=status-position
-               font_size=12
+               font_size={FONT_SMALL}
                rect=+5,=,+105,+16
                xanchor=proportional
                yanchor=fixed
@@ -308,7 +315,7 @@
 
                [observers]
                id=observers
-               font_size=12
+               font_size={FONT_SMALL}
                rect=+4,=-1,+16,+16
                xanchor=proportional
                yanchor=fixed
@@ -324,7 +331,7 @@
                [/unit_image]
                [unit_description]
                id=unit-description
-               font_size=14
+               font_size={FONT_NORMAL}
                ref=middle-right-panel
                rect==+9,=+3,=-2,+18
                xanchor=right
@@ -332,14 +339,14 @@
                [/unit_description]
                [unit_type]
                id=unit-type
-               font_size=12
+               font_size={FONT_SMALL}
                rect==,+0,=,+16
                xanchor=right
                yanchor=fixed
                [/unit_type]
                [unit_level]
                id=unit-level
-               font_size=12
+               font_size={FONT_SMALL}
                rect==,+0,=,+16
                prefix= _ "statuspanel^level"
                prefix_literal=" "
@@ -348,28 +355,28 @@
                [/unit_level]
                [unit_alignment]
                id=unit-alignment
-               font_size=12
+               font_size={FONT_SMALL}
                rect==,+0,=,+16
                xanchor=right
                yanchor=fixed
                [/unit_alignment]
                [unit_traits]
                id=unit-traits
-               font_size=12
+               font_size={FONT_SMALL}
                rect==,+0,=,+16
                xanchor=right
                yanchor=fixed
                [/unit_traits]
                [unit_abilities]
                id=unit-abilities
-               font_size=12
+               font_size={FONT_SMALL}
                rect==,+0,=,+16
                xanchor=right
                yanchor=fixed
                [/unit_abilities]
                [unit_moves]
                id=unit-moves
-               font_size=12
+               font_size={FONT_SMALL}
                ref=unit-abilities
                rect==,+0,=+2,+16
                prefix= _ "statuspanel^movement"
@@ -379,7 +386,7 @@
                [/unit_moves]
                [unit_hp]
                id=unit-hp
-               font_size=12
+               font_size={FONT_SMALL}
                ref=label-hp
                rect==,+0,+40,+14
                #prefix=hp
@@ -389,7 +396,7 @@
                [/unit_hp]
                [unit_xp]
                id=unit-xp
-               font_size=12
+               font_size={FONT_SMALL}
                ref=label-xp
                rect==,+0,+40,+14
                #prefix=xp
@@ -399,7 +406,7 @@
                [/unit_xp]
                [unit_weapons]
                id=unit-weapons
-               font_size=12
+               font_size={FONT_SMALL}
                ref=unit-moves
                rect==,+0,=,594
                xanchor=right
@@ -407,7 +414,7 @@
                [/unit_weapons]
                [unit_status]
                id=unit-status
-               font_size=12
+               font_size={FONT_SMALL}
                ref=unit-xp
                rect==+1,+3,=,+16
                xanchor=right
@@ -465,6 +472,13 @@
 height=240
 inherits=800x600
 
+#define FONT_NORMAL2
+8 #enddef
+#define FONT_SMALL2
+6 #enddef
+#define FONT_TINY2
+6 #enddef
+
        [change]
        id=top-panel
        rect==,=,=,+13
@@ -509,7 +523,7 @@
                [menu]
                id=zoom-in
                title=+
-               font_size=6
+               font_size={FONT_SMALL2}
                items=zoomin
                ref=top-panel
                rect=980,=,+6,=
@@ -519,7 +533,7 @@
                [menu]
                id=zoom-out
                title=-
-               font_size=6
+               font_size={FONT_SMALL2}
                items=zoomout
                rect==+11,=,+6,=
                xanchor=right
@@ -563,12 +577,12 @@
 
        [change]
        id=label-hp
-       font_size=6
+       font_size={FONT_TINY2}
        rect==+40,=+93,+12,+8
        [/change]
        [change]
        id=label-xp
-       font_size=6
+       font_size={FONT_TINY2}
        ref=label-hp
        rect==,+0,=,+8
        [/change]
@@ -606,37 +620,37 @@
 
        [change]
                id=turn
-               font_size=6
+               font_size={FONT_SMALL2}
                rect=+4,=,+58,+8
        [/change]
        [change]
                id=gold
-               font_size=6
+               font_size={FONT_SMALL2}
                rect=+4,=,+58,+8
        [/change]
        [change]
                id=villages
-               font_size=6
+               font_size={FONT_SMALL2}
                rect=+4,=,+58,+8
        [/change]
        [change]
                id=num-units
-               font_size=6
+               font_size={FONT_SMALL2}
                rect=+4,=,+58,+8
        [/change]
        [change]
                id=status-upkeep
-               font_size=6
+               font_size={FONT_SMALL2}
                rect=+4,=,+58,+8
        [/change]
        [change]
                id=status-income
-               font_size=6
+               font_size={FONT_SMALL2}
                rect=+4,=,+58,+8
        [/change]
        [change]
                id=status-position
-               font_size=6
+               font_size={FONT_SMALL2}
                rect=+5,=,+130,+8
        [/change]
        [change]
@@ -649,59 +663,59 @@
        [/change]
        [change]
                id=unit-description
-               font_size=8
+               font_size={FONT_NORMAL2}
                rect==+6,=,=-2,+10
        [/change]
        [change]
                id=unit-type
-               font_size=6
+               font_size={FONT_SMALL2}
                rect==,+0,=,+8
        [/change]
        [change]
                id=unit-level
-               font_size=6
+               font_size={FONT_SMALL2}
                rect==,+0,=,+8
        [/change]
        [change]
                id=unit-alignment
-               font_size=6
+               font_size={FONT_SMALL2}
                rect==,+0,=,+8
        [/change]
        [change]
                id=unit-traits
-               font_size=6
+               font_size={FONT_SMALL2}
                rect==,+0,=,+8
        [/change]
        [change]
                id=unit-abilities
-               font_size=6
+               font_size={FONT_SMALL2}
                rect==,+0,=,+8
        [/change]
        [change]
                id=unit-moves
-               font_size=6
+               font_size={FONT_SMALL2}
                rect==,+0,=,+8
        [/change]
        [change]
                id=unit-hp
-               font_size=6
+               font_size={FONT_SMALL2}
                ref=label-hp
                rect=+0,=,1022,+8
        [/change]
        [change]
                id=unit-xp
-               font_size=6
+               font_size={FONT_SMALL2}
                ref=label-xp
                rect=+0,=,1022,+8
        [/change]
        [change]
                id=unit-weapons
-               font_size=6
+               font_size={FONT_SMALL2}
                rect==,+0,=,768
        [/change]
        [change]
                id=unit-status
-               font_size=6
+               font_size={FONT_SMALL2}
                ref=label-xp
                rect==,+2,=,+8
        [/change]




reply via email to

[Prev in Thread] Current Thread [Next in Thread]