[Top][All Lists]
[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: |
Thu, 16 Dec 2004 02:10:09 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 04/12/16 06:59:30
Modified files:
data/themes : default.cfg
Log message:
adapted 320x240 to nex theme capabilities
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/themes/default.cfg.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
Patches:
Index: wesnoth/data/themes/default.cfg
diff -u wesnoth/data/themes/default.cfg:1.72
wesnoth/data/themes/default.cfg:1.73
--- wesnoth/data/themes/default.cfg:1.72 Sat Dec 11 01:25:10 2004
+++ wesnoth/data/themes/default.cfg Thu Dec 16 06:59:30 2004
@@ -30,7 +30,8 @@
[/panel]
[main_map]
- rect==,+0,882,768
+ id=main-map
+ rect==,+0,+882,768
xanchor=left
yanchor=top
[/main_map]
@@ -84,6 +85,7 @@
items=undo,redo,describeunit,renameunit,createunit,changeside,labelterrain,speak,continue,recruit,recall,delayshroud,updateshroud,cycle,endturn
[/menu]
[mini_map]
+ id=mini-map
ref=top-right-panel
rect==+10,=+7,=-7,+143
xanchor=right
@@ -91,6 +93,7 @@
[/mini_map]
[menu]
+ id=button-endturn
title= _ "End Turn"
items=endturn
ref=bottom-right-panel
@@ -145,15 +148,19 @@
# HP/XP
[label]
+ id=label-hp
font_size=10
text= _ "HP"
- rect=967,234,1022,+12
+ ref=top-right-panel
+ rect==+15,=+209,1022,+12
xanchor=right
yanchor=fixed
[/label]
[label]
+ id=label-xp
font_size=10
text= _ "XP"
+ // FIXME: should be ref=unit-hp
rect==,+14,=,+12
xanchor=right
yanchor=fixed
@@ -208,6 +215,7 @@
[status]
# the time of day image
[time_of_day]
+ id=image-tod
ref=top-right-panel
rect==+10,=+159,=-7,+39
xanchor=right
@@ -216,6 +224,7 @@
#put the side playing indicator next to the turn indicator
[side_playing]
+ id=icon-sideplaying
ref=turn-panel
rect==+3,=+2,+15,+16
xanchor=proportional
@@ -224,6 +233,7 @@
# the game status
[turn]
+ id=turn
font_size=12
rect=+4,=,+68,+16
xanchor=proportional
@@ -232,6 +242,7 @@
prefix_literal=""
[/turn]
[gold]
+ id=gold
font_size=12
ref=gold-icon
rect=+4,=,+65,+16
@@ -241,6 +252,7 @@
prefix_literal=""
[/gold]
[villages]
+ id=villages
font_size=12
ref=villages-icon
rect=+4,=,+55,+16
@@ -250,6 +262,7 @@
prefix_literal=""
[/villages]
[num_units]
+ id=num-units
font_size=12
ref=units-icon
rect=+4,=,+55,+16
@@ -294,6 +307,7 @@
[/position]
[observers]
+ id=observers
font_size=12
rect=+4,=-1,+16,+16
xanchor=proportional
@@ -302,11 +316,14 @@
#unit stats here
[unit_image]
- rect=891,235,+72,+72
+ id=unit-image
+ ref=top-right-panel
+ rect==+9,=+215,+72,+72
xanchor=right
yanchor=fixed
[/unit_image]
[unit_description]
+ id=unit-description
font_size=14
ref=middle-right-panel
rect==+9,=+3,=-2,+18
@@ -314,12 +331,14 @@
yanchor=fixed
[/unit_description]
[unit_type]
+ id=unit-type
font_size=12
rect==,+0,=,+16
xanchor=right
yanchor=fixed
[/unit_type]
[unit_level]
+ id=unit-level
font_size=12
rect==,+0,=,+16
prefix= _ "statuspanel^level"
@@ -328,60 +347,72 @@
yanchor=fixed
[/unit_level]
[unit_alignment]
+ id=unit-alignment
font_size=12
rect==,+0,=,+16
xanchor=right
yanchor=fixed
[/unit_alignment]
[unit_traits]
+ id=unit-traits
font_size=12
rect==,+0,=,+16
xanchor=right
yanchor=fixed
[/unit_traits]
[unit_abilities]
+ id=unit-abilities
font_size=12
rect==,+0,=,+16
xanchor=right
yanchor=fixed
[/unit_abilities]
- [unit_status]
- font_size=12
- rect=968,289,1020,+16
- xanchor=right
- yanchor=fixed
- [/unit_status]
[unit_moves]
+ id=unit-moves
font_size=12
- rect=891,410,1022,+16
+ ref=unit-abilities
+ rect==,+0,=+2,+16
prefix= _ "statuspanel^movement"
prefix_literal=": "
xanchor=right
yanchor=fixed
[/unit_moves]
[unit_hp]
+ id=unit-hp
font_size=12
- rect=967,246,=,+14
+ ref=label-hp
+ rect==,+0,1022,+14
#prefix=hp
#prefix_literal=" "
xanchor=right
yanchor=fixed
[/unit_hp]
[unit_xp]
+ id=unit-xp
font_size=12
- rect==,+12,=,+14
+ ref=label-xp
+ rect==,+0,1022,+14
#prefix=xp
#prefix_literal=" "
xanchor=right
yanchor=fixed
[/unit_xp]
[unit_weapons]
+ id=unit-weapons
font_size=12
- #rect=900,452,1020,620
- rect=891,426,=,594
+ ref=unit-moves
+ rect==,+0,=,594
xanchor=right
yanchor=fixed
[/unit_weapons]
+ [unit_status]
+ id=unit-status
+ font_size=12
+ ref=unit-xp
+ rect==+1,+3,=,+16
+ xanchor=right
+ yanchor=fixed
+ [/unit_status]
[/status]
[/resolution]
@@ -429,350 +460,228 @@
[/change]
[/partialresolution]
-[resolution]
+[partialresolution]
width=320
height=240
+inherits=800x600
- # top panel
- [panel]
- image=misc/top-bg.png
- rect=0,0,1024,13
- xanchor=top
- yanchor=fixed
- [/panel]
+ [change]
+ id=top-panel
+ rect==,=,=,+13
+ [/change]
- [main_map]
- rect=0,13,946,768
- xanchor=left
- yanchor=top
- [/main_map]
+ [change]
+ id=main-map
+ rect==,+0,+946,768
+ [/change]
- # rightside panel
- [panel]
- image=misc/rightside.png
- rect=946,25,1024,150
- xanchor=right
- yanchor=fixed
- [/panel]
- [panel]
- image=misc/rightside-bg.png
- rect=946,150,1024,768
- xanchor=right
- yanchor=top
- [/panel]
-[comment]
- [panel]
- image=misc/rightside-bottom.png
- rect=946,752,0,768
- xanchor=right
- yanchor=bottom
- [/panel]
-[/comment]
+ [change]
+ id=top-right-panel
+ rect=+0,=-1,1024,+125
+ [/change]
- [menu]
- title= _ "Menu"
- image=lite
-
items=objectives,statistics,unitlist,statustable,save,load,preferences,chatlog,help,quit
- rect=2,0,40,21
- xanchor=fixed
- yanchor=fixed
- [/menu]
+ [change]
+ id=middle-right-panel
+ rect==,+0,=,768
+ [/change]
- [menu]
- title= _ "Actions"
- image=lite
-
items=undo,redo,cycle,speak,recruit,recall,showenemymoves,bestenemymoves,delayshroud,updateshroud,endturn
- rect=28,0,80,21
- xanchor=fixed
- yanchor=fixed
- [/menu]
+ [remove]
+ id=bottom-right-panel
+ [/remove]
- [menu]
- is_context_menu=true
-
items=undo,redo,describeunit,renameunit,createunit,changeside,labelterrain,speak,continue,recruit,recall,delayshroud,updateshroud,cycle,endturn
- [/menu]
+ [change]
+ id=menu-main
+ rect==+2,=,+5,=-2
+ [/change]
- [mini_map]
- rect=951,28,1020,92
- xanchor=right
- yanchor=fixed
- [/mini_map]
+ [change]
+ id=actions-menu
+ rect==+26,=,+5,=
+ [/change]
- [menu]
- title= _ "End Turn"
- items=endturn
- rect=980,0,1022,21
- xanchor=right
+ [change]
+ id=mini-map
+ rect==+5,=+3,=-4,+64
+ [/change]
+
+ [change]
+ id=button-endturn
+ ref=top-panel
+ rect=980,=,=-2,=
yanchor=top
- [/menu]
+ [/change]
- # side/turn panel
- [panel]
- image=misc/status-bg.png
- rect=200,1,280,11
- xanchor=proportional
- yanchor=fixed
- [/panel]
- # gold panel
- [panel]
- image=misc/status-bg.png
- rect=285,1,365,11
- xanchor=proportional
- yanchor=fixed
- [/panel]
- # villages panel
- [panel]
- image=misc/status-bg.png
- rect=370,1,450,11
- xanchor=proportional
- yanchor=fixed
- [/panel]
- # units panel
- [panel]
- image=misc/status-bg.png
- rect=455,1,535,11
- xanchor=proportional
- yanchor=fixed
- [/panel]
- # upkeep panel
- [panel]
- image=misc/status-bg.png
- rect=540,1,620,11
- xanchor=proportional
- yanchor=fixed
- [/panel]
- # income panel
- [panel]
- image=misc/status-bg.png
- rect=625,1,705,11
- xanchor=proportional
- yanchor=fixed
- [/panel]
+ [change]
+ id=turn-panel
+ ref=top-panel
+ rect==+200,=+1,+80,=-1
+ [/change]
+ [change]
+ id=gold-panel
+ rect=+5,=,+80,=
+ [/change]
+ [change]
+ id=villages-panel
+ rect=+5,=,+80,=
+ [/change]
+ [change]
+ id=units-panel
+ rect=+5,=,+80,=
+ [/change]
+ [change]
+ id=upkeep-panel
+ rect=+5,=,+80,=
+ [/change]
+ [change]
+ id=income-panel
+ rect=+5,=,+80,=
+ [/change]
- # HP/XP
- [label]
+ [change]
+ id=label-hp
font_size=5
- text= _ "HP"
- rect=986,118,1022,125
- xanchor=right
- yanchor=fixed
- [/label]
- [label]
+ rect==+40,=+93,1022,+7
+ [/change]
+ [change]
+ id=label-xp
font_size=5
- text= _ "XP"
- rect=986,133,1022,140
- xanchor=right
- yanchor=fixed
- [/label]
-
- # gold icon
- [label]
- icon=misc/gold.png
- text= _ "gold"
- rect=288,2,304,10
- xanchor=proportional
- yanchor=fixed
- [/label]
- # villages icon
- [label]
- icon=misc/villages.png
- text= _ "villages"
- rect=373,2,385,10
- xanchor=proportional
- yanchor=fixed
- [/label]
- # units icon
- [label]
- icon=misc/units.png
- text= _ "units"
- rect=458,2,474,10
- xanchor=proportional
- yanchor=fixed
- [/label]
- # upkeep icon
- [label]
- icon=misc/upkeep.png
- text= _ "upkeep"
- rect=543,2,559,10
- xanchor=proportional
- yanchor=fixed
- [/label]
- # income icon
- [label]
- icon=misc/income.png
- text= _ "income"
- rect=628,2,644,10
- xanchor=proportional
- yanchor=fixed
- [/label]
+ ref=label-hp
+ rect==,+0,=,+7
+ [/change]
- [status]
- # the time of day image
- [time_of_day]
- rect=951,96,1020,113
- xanchor=right
- yanchor=fixed
- [/time_of_day]
+ [change]
+ id=gold-icon
+ rect==+3,=+1,+8,+8
+ [/change]
+ [change]
+ id=villages-icon
+ rect==+3,=+1,+8,+8
+ [/change]
+ [change]
+ id=units-icon
+ rect==+3,=+1,+8,+8
+ [/change]
+ [change]
+ id=upkeep-icon
+ rect==+3,=+1,+16,+8
+ [/change]
+ [change]
+ id=income-icon
+ rect==+3,=+1,+16,+8
+ [/change]
- [observers]
- font_size=12
- rect=1004,2,1020,19
- xanchor=proportional
- yanchor=fixed
- [/observers]
+ [change]
+ id=image-tod
+ rect==+5,=+71,=-4,+17
+ [/change]
- #put the side playing indicator next to the turn indicator
- [side_playing]
- rect=203,2,218,10
- xanchor=proportional
- yanchor=fixed
- [/side_playing]
+ [change]
+ id=icon-sideplaying
+ rect==+3,=+1,+8,+8
+ [/change]
- # the game status
- [turn]
- font_size=6
- rect=222,2,280,10
- xanchor=proportional
- yanchor=fixed
- prefix=
- prefix_literal=""
- [/turn]
- [gold]
+ [change]
+ id=turn
font_size=6
- rect=307,2,365,10
- xanchor=proportional
- yanchor=fixed
- prefix=
- prefix_literal=""
- [/gold]
- [villages]
+ rect=+4,=,+58,+8
+ [/change]
+ [change]
+ id=gold
font_size=6
- rect=392,2,450,10
- xanchor=proportional
- yanchor=fixed
- prefix=
- prefix_literal=""
- [/villages]
- [num_units]
+ rect=+4,=,+58,+8
+ [/change]
+ [change]
+ id=villages
font_size=6
- rect=477,2,535,10
- xanchor=proportional
- yanchor=fixed
- prefix=
- prefix_literal=""
- [/num_units]
- [upkeep]
+ rect=+4,=,+58,+8
+ [/change]
+ [change]
+ id=num-units
font_size=6
- rect=562,2,620,10
- xanchor=proportional
- yanchor=fixed
- prefix=
- prefix_literal=""
- [/upkeep]
- [income]
+ rect=+4,=,+58,+8
+ [/change]
+ [change]
+ id=status-upkeep
font_size=6
- rect=647,2,705,10
- xanchor=proportional
- yanchor=fixed
- prefix=
- prefix_literal=""
- [/income]
- [comment]
- [terrain]
+ rect=+4,=,+58,+8
+ [/change]
+ [change]
+ id=status-income
font_size=6
- rect=770,4,890,20
- xanchor=proportional
- yanchor=fixed
- [/terrain]
- [/comment]
- [position]
+ rect=+4,=,+58,+8
+ [/change]
+ [change]
+ id=status-position
font_size=6
- rect=720,2,850,10
- xanchor=proportional
- yanchor=fixed
- [/position]
-
- #unit stats here
- [unit_image]
- rect=952,125,963,140
- xanchor=right
- yanchor=fixed
- [/unit_image]
- [unit_description]
+ rect=+5,=,+130,+8
+ [/change]
+ [change]
+ id=observers
+ rect=+5,=,+8,+8
+ [/change]
+ [change]
+ id=unit-image
+ rect==+12,=+100,+20,+20
+ [/change]
+ [change]
+ id=unit-description
font_size=8
- rect=952,150,1022,160
- xanchor=right
- yanchor=fixed
- [/unit_description]
- [unit_type]
+ rect==+6,=,=-2,+10
+ [/change]
+ [change]
+ id=unit-type
font_size=6
- rect=952,160,1022,168
- xanchor=right
- yanchor=fixed
- [/unit_type]
- [unit_level]
+ rect==,+0,=,+8
+ [/change]
+ [change]
+ id=unit-level
font_size=6
- rect=952,168,1022,176
- prefix= _ "statuspanel^level"
- prefix_literal=" "
- xanchor=right
- yanchor=fixed
- [/unit_level]
- [unit_alignment]
+ rect==,+0,=,+8
+ [/change]
+ [change]
+ id=unit-alignment
font_size=6
- rect=952,176,1022,184
- xanchor=right
- yanchor=fixed
- [/unit_alignment]
- [unit_traits]
+ rect==,+0,=,+8
+ [/change]
+ [change]
+ id=unit-traits
font_size=6
- rect=952,184,1022,192
- xanchor=right
- yanchor=fixed
- [/unit_traits]
- [unit_abilities]
+ rect==,+0,=,+8
+ [/change]
+ [change]
+ id=unit-abilities
font_size=6
- rect=952,192,1022,200
- xanchor=right
- yanchor=fixed
- [/unit_abilities]
- [unit_status]
+ rect==,+0,=,+8
+ [/change]
+ [change]
+ id=unit-moves
font_size=6
- rect=988,150,1020,166
- xanchor=right
- yanchor=fixed
- [/unit_status]
- [unit_moves]
+ rect==,+0,=,+8
+ [/change]
+ [change]
+ id=unit-hp
font_size=6
- rect=952,200,1022,208
- prefix= _ "statuspanel^movement"
- prefix_literal=": "
- xanchor=right
- yanchor=fixed
- [/unit_moves]
- [unit_hp]
+ ref=label-hp
+ rect=+0,=,1022,+8
+ [/change]
+ [change]
+ id=unit-xp
font_size=6
- rect=986,125,1022,133
- #prefix=hp
- #prefix_literal=" "
- xanchor=right
- yanchor=fixed
- [/unit_hp]
- [unit_xp]
+ ref=label-xp
+ rect=+0,=,1022,+8
+ [/change]
+ [change]
+ id=unit-weapons
font_size=6
- rect=986,140,1022,148
- #prefix=xp
- #prefix_literal=" "
- xanchor=right
- yanchor=fixed
- [/unit_xp]
- [unit_weapons]
+ rect==,+0,=,768
+ [/change]
+ [change]
+ id=unit-status
font_size=6
- rect=952,208,1022,594
- xanchor=right
- yanchor=fixed
- [/unit_weapons]
- [/status]
-[/resolution]
+ ref=label-xp
+ rect==,+2,=,+8
+ [/change]
+
+[/partialresolution]
[/theme]