0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MP Lobby: few small layout tweaks

Browse source
This commit is contained in:
Charles Dang 2016-08-17 13:42:05 +11:00
parent df6ee9263a
commit 425ad0acd5
2 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
data/gui/window/lobby_main.cfg
View file

@ -3,11 +3,11 @@
### Definition of the lobby screen
###
#define GAMELISTBOX_BODY_LABEL ID LABEL
#define GAMELISTBOX_BODY_LABEL ID LABEL GROW_FACTOR
[column]
grow_factor = 1
grow_factor = {GROW_FACTOR}
horizontal_grow = "true"
border = "right"
border = "left,right"
border_size = 5
[label]
id = {ID}
@ -43,10 +43,12 @@
[/column]
#enddef
#define GAMELISTBOX_BODY_IMAGE ID LABEL TOOLTIP
#define GAMELISTBOX_BODY_IMAGE ID LABEL TOOLTIP GROW_FACTOR
[column]
grow_factor = {GROW_FACTOR}
horizontal_grow = "true"
border = "all"
border_size = 1
border_size = 5
[image]
id = {ID}
definition = "default"
@ -111,12 +113,13 @@
[grid]
[row]
[column]
horizontal_grow = "true"
grow_factor = 1
horizontal_grow = "true"
[grid]
[row]
[column]
grow_factor = 1
border = "left,right,bottom"
border_size = 5
horizontal_alignment = "left"
@ -127,6 +130,7 @@
[/column]
[column]
grow_factor = 0
border = "left,right,bottom"
border_size = 5
horizontal_alignment = "right"
@ -141,30 +145,29 @@
[/row]
[row]
[column]
horizontal_alignment = "left"
border = "left,right"
border_size = 5
grow_factor = 1
horizontal_grow = "true"
[grid]
[row]
grow_factor = 1
{GAMELISTBOX_BODY_LABEL "scenario" ""}
{GAMELISTBOX_BODY_LABEL "map_size_text" ""}
{GAMELISTBOX_BODY_LABEL "era" "Era"}
{GAMELISTBOX_BODY_LABEL "scenario" "" 0}
{GAMELISTBOX_BODY_LABEL "map_size_text" "" 0}
{GAMELISTBOX_BODY_LABEL "era" "Era" 1}
{GAMELISTBOX_BODY_IMAGE "observer_icon" "misc/eye.png" ""}
{GAMELISTBOX_BODY_IMAGE "shuffle_sides_icon" "misc/shuffle-sides.png" _"Assign sides to players at random"}
{GAMELISTBOX_BODY_IMAGE "needs_password" "misc/key.png" _"Requires a password to join"}
{GAMELISTBOX_BODY_IMAGE "use_map_settings" "misc/ums.png" _"Use map settings"}
{GAMELISTBOX_BODY_IMAGE "reloaded" "misc/reloaded.png" _"Reloaded game"}
{GAMELISTBOX_BODY_IMAGE "no_era" "misc/qmark.png" _"Unknown era"}
{GAMELISTBOX_BODY_IMAGE "vision_icon" "" ""}
{GAMELISTBOX_BODY_IMAGE "gold_icon" "themes/gold.png" _"Gold per village"}
{GAMELISTBOX_BODY_LABEL_TINY "gold_text" "265"}
{GAMELISTBOX_BODY_IMAGE "xp_icon" "themes/units.png" _"Experience modifier"}
{GAMELISTBOX_BODY_LABEL_TINY "xp_text" "70%"}
{GAMELISTBOX_BODY_IMAGE "time_limit_icon" "themes/sand-clock.png" _"Time limit"}
{GAMELISTBOX_BODY_LABEL_TINY "time_limit_text" ""}
{GAMELISTBOX_BODY_IMAGE "observer_icon" "misc/eye.png" "" 0}
{GAMELISTBOX_BODY_IMAGE "shuffle_sides_icon" "misc/shuffle-sides.png" _"Assign sides to players at random" 0}
{GAMELISTBOX_BODY_IMAGE "needs_password" "misc/key.png" _"Requires a password to join" 0}
{GAMELISTBOX_BODY_IMAGE "use_map_settings" "misc/ums.png" _"Use map settings" 0}
{GAMELISTBOX_BODY_IMAGE "reloaded" "misc/reloaded.png" _"Reloaded game" 0}
{GAMELISTBOX_BODY_IMAGE "no_era" "misc/qmark.png" _"Unknown era" 0}
{GAMELISTBOX_BODY_IMAGE "vision_icon" "" "" 0}
{GAMELISTBOX_BODY_IMAGE "gold_icon" "themes/gold.png" _"Gold per village" 0}
{GAMELISTBOX_BODY_LABEL_TINY "gold_text" "265"}
{GAMELISTBOX_BODY_IMAGE "xp_icon" "themes/units.png" _"Experience modifier" 0}
{GAMELISTBOX_BODY_LABEL_TINY "xp_text" "70%"}
{GAMELISTBOX_BODY_IMAGE "time_limit_icon" "themes/sand-clock.png" _"Time limit" 0}
{GAMELISTBOX_BODY_LABEL_TINY "time_limit_text" ""}
[/row]
[/grid]
[/column]

2
src/gui/dialogs/lobby/lobby.cpp
View file

@ -112,9 +112,9 @@ void tsub_player_list::update_player_count_label()
void tplayer_list::init(twindow& w)
{
active_game.init(w, _("Selected Game"));
other_games.init(w, _("Other Games"));
active_room.init(w, _("Current Room"));
other_rooms.init(w, _("Lobby"), true);
other_games.init(w, _("Other Games"));
sort_by_name = find_widget<ttoggle_button>(&w, "player_list_sort_name", false, true);
sort_by_relation = find_widget<ttoggle_button>(&w, "player_list_sort_relation", false, true);