Design clean up.

This commit is contained in:
fendrin 2013-06-13 23:42:16 +02:00
parent 3df3eba783
commit 8965c46d3e

View file

@ -87,20 +87,20 @@
xanchor=right
yanchor=top
[/panel]
# [panel]
# id=middle-right-panel
# image=themes/rightside-bg.png
# rect="=,+0,=,+421"
# xanchor=right
# yanchor=top
# [/panel]
# [panel]
# id=bottom-right-panel
# image=themes/rightside-bottom.png
# rect="=,+0,=,768"
# xanchor=right
# yanchor=bottom
# [/panel]
# [panel]
# id=middle-right-panel
# image=themes/rightside-bg.png
# rect="=,+0,=,+421"
# xanchor=right
# yanchor=top
# [/panel]
# [panel]
# id=bottom-right-panel
# image=themes/rightside-bottom.png
# rect="=,+0,=,768"
# xanchor=right
# yanchor=bottom
# [/panel]
[menu]
id=menu-main
@ -139,12 +139,12 @@
yanchor=fixed
[/panel]
# [panel]
# id=middle-right-panel
# image=themes/rightside-bg.png
# rect="=,+0,=,+421"
# xanchor=right
# yanchor=top
# [panel]
# id=middle-right-panel
# image=themes/rightside-bg.png
# rect="=,+0,=,+421"
# xanchor=right
# yanchor=top
# [/panel]
@ -155,7 +155,7 @@
xanchor=right
yanchor=fixed
[/mini_map]
[action]
id=zoom_default_button_editor
items=zoomdefault
@ -189,7 +189,7 @@
[action]
id=minimap_color_coding
items=minimap-color-coding
type=checkbox
type=checkbox
image=button_square/button_square_30
tooltip_name_prepend=yes
rect="=,+2,+30,+30"
@ -207,9 +207,9 @@
xanchor=right
yanchor=fixed
[/action]
[slider]
image=buttons/sliders/slider_arrow_gold
image=buttons/sliders/slider_arrow_gold
id=map-zoom-slider
black_line=yes
ref=mini-map
@ -217,7 +217,7 @@
xanchor=right
yanchor=fixed
[/slider]
[panel]
id=endturn-panel
image=themes/game/classic/endturn.png
@ -228,41 +228,88 @@
yanchor=fixed
[/panel]
[panel]
[action]
id=endturn1
image=button_square/button_square_30
ref=endturn-panel
items=cycle
rect="=+17,=+32,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[action]
id=endturn2
image=button_square/button_square_30
items=cycleback
rect="+0,=,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[action]
id=endturn3
image=button_square/button_square_30
items=holdposition
rect="+0,=,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[action]
id=endturn4
image=button_square/button_square_30
items=endunitturn
rect="+0,=,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[action]
id=endturn5
image=button_square/button_square_30
items=endunitturn
rect="+0,=,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[panel]
id=unitinfo-top-panel
image=themes/game/classic/unitinfo_top.png
ref=endturn-panel
rect="843,+3,+181,+170"
xanchor=right
yanchor=fixed
[/panel]
[panel]
[/panel]
[panel]
id=unitinfo-panel
image=themes/game/classic/unitinfo.png
ref=unitinfo-top-panel
rect="843,+0,+181,+170"
rect="843,+0,+181,+250"
xanchor=right
yanchor=fixed
yanchor=top
[/panel]
[panel]
id=unitinfo-panel
[panel]
id=unitinfo-panel-bottom
image=themes/game/classic/unitinfo_bottom.png
ref=unitinfo-panel
rect="843,+0,+181,+13"
xanchor=right
yanchor=fixed
yanchor=bottom
[/panel]
# [mini_map]
# id=mini-map
# ref=top-right-panel
# rect="=+10,=+7,=-7,+143"
# xanchor=right
# yanchor=fixed
# [/mini_map]
# [mini_map]
# id=mini-map
# ref=top-right-panel
# rect="=+10,=+7,=-7,+143"
# xanchor=right
# yanchor=fixed
# [/mini_map]
[action]
id=button-endturn
@ -322,14 +369,14 @@
{COUNTDOWN_THEME}
# HP/XP
# HP/XP/MP/lvl
[label]
id=label-hp
font_size={DEFAULT_FONT_TINY}
text= _ "HP"
ref=unitinfo-top-panel
#ref=unit_box-panel
rect="=+4,=+209,+54,+12"
rect="=+80,=+169,+54,+12"
xanchor=right
yanchor=fixed
[/label]
@ -338,7 +385,16 @@
font_size={DEFAULT_FONT_TINY}
text= _ "XP"
# FIXME: should be ref=unit-hp
rect="=,+14,=,+12"
rect="=,+4,=,+12"
xanchor=right
yanchor=fixed
[/label]
[label]
id=label-mp
font_size={DEFAULT_FONT_TINY}
text= _ "MP"
# FIXME: should be ref=unit-hp
rect="=,+4,=,+12"
xanchor=right
yanchor=fixed
[/label]
@ -510,84 +566,85 @@
[/observers]
#unit stats here
# [unit_image]
# id=unit-image
# ref=top-right-panel
# rect="=+9,=+215,+72,+72"
# xanchor=right
# yanchor=fixed
# [/unit_image]
[unit_name]
id=unit-description
font_size={DEFAULT_FONT_NORMAL}
ref=label-xp
rect="=+9,=+3,=-2,+18"
xanchor=right
yanchor=fixed
[/unit_name]
[unit_type]
id=unit-type
font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_type]
[unit_race]
id=unit-race
font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
prefix= " "
xanchor=right
yanchor=fixed
[/unit_race]
[unit_level]
id=unit-level
font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
prefix= _ "statuspanel^level"
prefix_literal=" "
xanchor=right
yanchor=fixed
[/unit_level]
[unit_alignment]
id=unit-alignment
font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_alignment]
[unit_traits]
id=unit-traits
font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_traits]
[unit_abilities]
id=unit-abilities
font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_abilities]
# [unit_image]
# id=unit-image
# ref=top-right-panel
# rect="=+9,=+215,+72,+72"
# xanchor=right
# yanchor=fixed
# [/unit_image]
# [unit_name]
# id=unit-description
# font_size={DEFAULT_FONT_NORMAL}
# ref=label-xp
# rect="=+9,=+45,+180,+18"
# xanchor=right
# yanchor=fixed
# [/unit_name]
# [unit_type]
# id=unit-type
# font_size={DEFAULT_FONT_SMALL}
# rect="=,+0,=,+16"
# xanchor=right
# yanchor=fixed
# [/unit_type]
# [unit_race]
# id=unit-race
# font_size={DEFAULT_FONT_SMALL}
# rect="=,+0,=,+16"
# prefix= " "
# xanchor=right
# yanchor=fixed
# [/unit_race]
# [unit_level]
# id=unit-level
# font_size={DEFAULT_FONT_SMALL}
# rect="=,+0,=,+16"
# prefix= _ "statuspanel^level"
# prefix_literal=" "
# xanchor=right
# yanchor=fixed
# [/unit_level]
# [unit_alignment]
# id=unit-alignment
# font_size={DEFAULT_FONT_SMALL}
# rect="=,+0,=,+16"
# xanchor=right
# yanchor=fixed
# [/unit_alignment]
# [unit_traits]
# id=unit-traits
# font_size={DEFAULT_FONT_SMALL}
# rect="=,+0,=,+16"
# xanchor=right
# yanchor=fixed
# [/unit_traits]
# [unit_abilities]
# id=unit-abilities
# font_size={DEFAULT_FONT_SMALL}
# rect="=,+0,=,+16"
# xanchor=right
# yanchor=fixed
# [/unit_abilities]
[unit_moves]
id=unit-moves
ref=label-mp
font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=+2,+16"
prefix= _ "statuspanel^moves"
prefix_literal=": "
rect="=-60,=+0,=+2,+16"
#prefix= _ "statuspanel^moves"
#prefix_literal=": "
xanchor=right
yanchor=fixed
[/unit_moves]
[unit_defense]
id=unit-defense
font_size={DEFAULT_FONT_SMALL}
rect="=,+0,=,+16"
prefix= _ "statuspanel^terrain def."
prefix_literal=": "
xanchor=right
yanchor=fixed
[/unit_defense]
# [unit_defense]
# id=unit-defense
# font_size={DEFAULT_FONT_SMALL}
# rect="=,+0,=,+16"
# prefix= _ "statuspanel^terrain def."
# prefix_literal=": "
# xanchor=right
# yanchor=fixed
# [/unit_defense]
[unit_vision]
id=unit-vision
font_size={DEFAULT_FONT_SMALL}
@ -597,36 +654,36 @@
xanchor=right
yanchor=fixed
[/unit_vision]
# [unit_hp]
# id=unit-hp
# font_size={DEFAULT_FONT_SMALL}
# ref=label-hp
# rect="=,+0,+54,+14"
# #prefix=hp
# #prefix_literal=" "
# xanchor=right
# yanchor=fixed
# [/unit_hp]
# [unit_xp]
# id=unit-xp
# font_size={DEFAULT_FONT_SMALL}
# ref=label-xp
# rect="=,+0,+54,+14"
# #prefix=xp
# #prefix_literal=" "
# xanchor=right
# yanchor=fixed
# [/unit_xp]
# current position not usable, overlays with the status indication (like slow)
# please find a better place (yes, I know that this is barely possible...)
# [unit_side]
# id=unit-side
# font_size={DEFAULT_FONT_SMALL}
# ref=unit-xp
# rect="=,+0,=,+16"
# xanchor=right
# yanchor=fixed
# [/unit_side]
[unit_hp]
id=unit-hp
font_size={DEFAULT_FONT_SMALL}
ref=label-hp
rect="=-60,=+0,+54,+14"
#prefix=hp
#prefix_literal=" "
xanchor=right
yanchor=fixed
[/unit_hp]
[unit_xp]
id=unit-xp
font_size={DEFAULT_FONT_SMALL}
ref=label-xp
rect="=-60,=+0,+54,+14"
#prefix=xp
#prefix_literal=" "
xanchor=right
yanchor=fixed
[/unit_xp]
#current position not usable, overlays with the status indication (like slow)
#please find a better place (yes, I know that this is barely possible...)
# [unit_side]
# id=unit-side
# font_size={DEFAULT_FONT_SMALL}
# ref=unit-xp
# rect="=,+0,=,+16"
# xanchor=right
# yanchor=fixed
# [/unit_side]
[unit_weapons]
id=unit-weapons
font_size={DEFAULT_FONT_SMALL}
@ -635,14 +692,14 @@
xanchor=right
yanchor=top
[/unit_weapons]
[unit_status]
id=unit-status
font_size={DEFAULT_FONT_SMALL}
ref=unit-xp
rect="=+1,+3,=,+16"
xanchor=right
yanchor=fixed
[/unit_status]
# [unit_status]
# id=unit-status
# font_size={DEFAULT_FONT_SMALL}
# ref=unit-xp
# rect="=+1,+3,=,+16"
# xanchor=right
# yanchor=fixed
# [/unit_status]
[/status]
{REPLAY_THEME {DEFAULT_FONT_SMALL}}