mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-12 23:18:57 +00:00
Theme WML cleanup inspired by a wmlindent pass
Mostly comments and indentation only. Also removed a big mid-line whitespace chunk.
This commit is contained in:
Ignacio R. Morelle
parent
88dda7bedd
commit
4c39592471
@ -7,13 +7,13 @@
|
||||
# http://www.wesnoth.org/forum/viewtopic.php?p=213708#213708
|
||||
|
||||
#define DEFAULT_FONT_NORMAL
|
||||
14 #enddef
|
||||
14 #enddef
|
||||
#define DEFAULT_FONT_SMALL
|
||||
12 #enddef
|
||||
12 #enddef
|
||||
#define DEFAULT_FONT_TINY
|
||||
10 #enddef
|
||||
10 #enddef
|
||||
#define DEFAULT_FONT_REALLYTINY
|
||||
9 #enddef
|
||||
9 #enddef
|
||||
|
||||
{themes/macros.cfg}
|
||||
|
||||
@ -60,8 +60,6 @@
|
||||
|
||||
# rightside panel
|
||||
|
||||
|
||||
|
||||
{STATUS_BOX =+1 =+3 794 271 minimap sidebar-panel fixed fixed}
|
||||
|
||||
[mini_map]
|
||||
@ -72,15 +70,15 @@
|
||||
yanchor=fixed
|
||||
[/mini_map]
|
||||
|
||||
# [slider]
|
||||
# image=buttons/sliders/slider_arrow_gold@2x
|
||||
# id=map-zoom-slider
|
||||
# black_line=yes
|
||||
# ref=mini-map
|
||||
# rect="=+32,+1,+117,+18"
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
# [/slider]
|
||||
#[slider]
|
||||
# image=buttons/sliders/slider_arrow_gold@2x
|
||||
# id=map-zoom-slider
|
||||
# black_line=yes
|
||||
# ref=mini-map
|
||||
# rect="=+32,+1,+117,+18"
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
#[/slider]
|
||||
|
||||
[action]
|
||||
ref=minimap-box-botright
|
||||
@ -107,14 +105,14 @@
|
||||
|
||||
{STATUS_BOX +2 =+0 +127 +30 terrain-info cycle-button fixed fixed}
|
||||
{STATUS_BOX = +0 +127 +18 terrain-position terrain-info-box-botleft fixed fixed}
|
||||
{STATUS_BOX =+2 +2 +72 +72 unit cycle-button fixed fixed}
|
||||
{STATUS_BOX =+2 +2 +72 +72 unit cycle-button fixed fixed}
|
||||
|
||||
[menu]
|
||||
id=menu-main
|
||||
title= _ "Menu"
|
||||
image=button_square/button_square_60
|
||||
items=objectives,statistics,unitlist,statustable,save,savereplay,load,preferences,chatlog,AUTOSAVES,help,stopnetwork,startnetwork,quit, undo,redo,wbexecuteallactions,wbexecuteaction,wbdeleteaction,speak,recruit,recall,showenemymoves,bestenemymoves,wbtoggle,delayshroud,updateshroud
|
||||
#,endturn
|
||||
items=objectives,statistics,unitlist,statustable,save,savereplay,load,preferences,chatlog,AUTOSAVES,help,stopnetwork,startnetwork,quit,undo,redo,wbexecuteallactions,wbexecuteaction,wbdeleteaction,speak,recruit,recall,showenemymoves,bestenemymoves,wbtoggle,delayshroud,updateshroud
|
||||
#,endturn
|
||||
ref=sidebar-panel
|
||||
font_size=30
|
||||
rect="=+2,-62,+60,+60"
|
||||
@ -123,7 +121,6 @@
|
||||
[/menu]
|
||||
|
||||
{STATUS_BOX +4 =+15 +122 +36 tod menu-main fixed fixed}
|
||||
|
||||
|
||||
{STATUS_BOX =-2 +2 +57 +15 gold zoom-default-button fixed fixed}
|
||||
{STATUS_BOX = =+1 +57 +15 income gold-box-botleft fixed fixed}
|
||||
@ -160,17 +157,17 @@ Turn"
|
||||
auto_tooltip=yes
|
||||
[/action]
|
||||
|
||||
# [menu]
|
||||
# id=actions-menu
|
||||
# title= _ "Actions"
|
||||
# image=button_menu/menu_button_copper_H20
|
||||
# items=undo,redo,wbexecuteallactions,wbexecuteaction,wbdeleteaction,cycle,speak,recruit,recall,showenemymoves,bestenemymoves,wbtoggle,delayshroud,updateshroud,endturn
|
||||
# rect="+2,=,+100,="
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
# [/menu]
|
||||
#[menu]
|
||||
# id=actions-menu
|
||||
# title= _ "Actions"
|
||||
# image=button_menu/menu_button_copper_H20
|
||||
# items=undo,redo,wbexecuteallactions,wbexecuteaction,wbdeleteaction,cycle,speak,recruit,recall,showenemymoves,bestenemymoves,wbtoggle,delayshroud,updateshroud,endturn
|
||||
# rect="+2,=,+100,="
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
#[/menu]
|
||||
|
||||
# {COUNTDOWN_THEME}
|
||||
#{COUNTDOWN_THEME}
|
||||
[menu]
|
||||
is_context_menu=true
|
||||
items=wml,undo,redo,wbexecuteaction,wbdeleteaction,wbbumpupaction,wbbumpdownaction,wbsupposedead,describeterrain,describeunit,renameunit,createunit,changeside,killunit,labelteamterrain,labelterrain,clearlabels,speak,continue,recruit,recall,wbtoggle,delayshroud,updateshroud,cycle,endturn
|
||||
@ -185,9 +182,8 @@ Turn"
|
||||
xanchor=fixed
|
||||
yanchor=fixed
|
||||
[/label]
|
||||
|
||||
[status]
|
||||
|
||||
[status]
|
||||
## The size of these rectangles only accommodates hex coordinates
|
||||
## up to 999.
|
||||
[position]
|
||||
@ -222,7 +218,7 @@ Turn"
|
||||
yanchor=fixed
|
||||
[/tod_stats]
|
||||
|
||||
# #put the side playing indicator next to the turn indicator
|
||||
#put the side playing indicator next to the turn indicator
|
||||
[side_playing]
|
||||
id=icon-sideplaying
|
||||
ref=turn-box-center
|
||||
@ -232,7 +228,7 @@ Turn"
|
||||
yanchor=fixed
|
||||
[/side_playing]
|
||||
|
||||
# # the game status
|
||||
# the game status
|
||||
[turn]
|
||||
id=turn
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
@ -245,7 +241,7 @@ Turn"
|
||||
[gold]
|
||||
id=gold
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
# font_size={DEFAULT_FONT_SMALL}
|
||||
#font_size={DEFAULT_FONT_SMALL}
|
||||
ref=gold-icon
|
||||
rect="+1,=0,+40,+14"
|
||||
xanchor=fixed
|
||||
@ -273,13 +269,13 @@ Turn"
|
||||
yanchor=fixed
|
||||
[/report_countdown]
|
||||
|
||||
# [observers]
|
||||
# id=observers
|
||||
# font_size={DEFAULT_FONT_SMALL}
|
||||
# rect="+4,=,+16,+16"
|
||||
# xanchor=right
|
||||
# yanchor=fixed
|
||||
# [/observers]
|
||||
#[observers]
|
||||
# id=observers
|
||||
# font_size={DEFAULT_FONT_SMALL}
|
||||
# rect="+4,=,+16,+16"
|
||||
# xanchor=right
|
||||
# yanchor=fixed
|
||||
#[/observers]
|
||||
|
||||
## unit stats here
|
||||
[unit_image]
|
||||
@ -289,13 +285,13 @@ Turn"
|
||||
xanchor=fixed
|
||||
yanchor=fixed
|
||||
[/unit_image]
|
||||
# [unit_traits]
|
||||
# id=unit-traits
|
||||
# font_size={DEFAULT_FONT_SMALL}
|
||||
# rect="=+0,+0,+170,+16"
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
# [/unit_traits]
|
||||
#[unit_traits]
|
||||
# id=unit-traits
|
||||
# font_size={DEFAULT_FONT_SMALL}
|
||||
# rect="=+0,+0,+170,+16"
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
#[/unit_traits]
|
||||
[unit_name]
|
||||
id=unit-description
|
||||
font_size={DEFAULT_FONT_NORMAL}
|
||||
@ -306,7 +302,7 @@ Turn"
|
||||
[/unit_name]
|
||||
[unit_hp]
|
||||
id=unit-hp
|
||||
# font_size={DEFAULT_FONT_NORMAL}
|
||||
#font_size={DEFAULT_FONT_NORMAL}
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
rect="=,+3,+60,+18"
|
||||
#prefix="HP "
|
||||
@ -316,8 +312,8 @@ Turn"
|
||||
[/unit_hp]
|
||||
[unit_xp]
|
||||
id=unit-xp
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
# font_size={DEFAULT_FONT_NORMAL}
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
#font_size={DEFAULT_FONT_NORMAL}
|
||||
rect="=,+0,+60,+18"
|
||||
#prefix="XP "
|
||||
#prefix_literal=" "
|
||||
@ -326,8 +322,8 @@ Turn"
|
||||
[/unit_xp]
|
||||
[unit_moves]
|
||||
id=unit-moves
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
# font_size={DEFAULT_FONT_NORMAL}
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
#font_size={DEFAULT_FONT_NORMAL}
|
||||
rect="=,+0,+45,+18"
|
||||
#prefix="MP "
|
||||
#prefix= _ "statuspanel^moves"
|
||||
@ -343,29 +339,27 @@ Turn"
|
||||
yanchor=fixed
|
||||
[/unit_status]
|
||||
[unit_alignment]
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
ref=unit-moves
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
ref=unit-moves
|
||||
id=unit-alignment
|
||||
rect="=-10,+0,+45,+18"
|
||||
xanchor=fixed
|
||||
yanchor=fixed
|
||||
[/unit_alignment]
|
||||
# [unit_defense]
|
||||
# id=unit-defense
|
||||
# font_size=16
|
||||
# rect="=,+0,=,+18"
|
||||
# prefix="def"
|
||||
# # prefix= _ "statuspanel^terrain def."
|
||||
# prefix_literal=": "
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
# [/unit_defense]
|
||||
|
||||
#[unit_defense]
|
||||
# id=unit-defense
|
||||
# font_size=16
|
||||
# rect="=,+0,=,+18"
|
||||
# prefix="def"
|
||||
# # prefix= _ "statuspanel^terrain def."
|
||||
# prefix_literal=": "
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
#[/unit_defense]
|
||||
[/status]
|
||||
|
||||
# {REPLAY_THEME {DEFAULT_FONT_SMALL}}
|
||||
#{REPLAY_THEME {DEFAULT_FONT_SMALL}}
|
||||
[/resolution]
|
||||
|
||||
[/theme]
|
||||
|
||||
#undef DEFAULT_FONT_NORMAL
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user