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

MP Lobby: removed individual Join/Observe buttons for each game

Browse source
This commit is contained in:
Charles Dang 2018-05-04 13:04:20 +11:00
parent c87aa0c5b2
commit 9dc1dd4655
3 changed files with 2 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.md
View file

@ -5,6 +5,8 @@
### Language and i18n
* Updated translations: French, Galician, German, Italian, Slovak, Spanish
* Fixed Logging Options tooltips not being translatable (issue #2837).
### User Interface
* Removed individual Join/Observe buttons for each game in the MP Lobby.
### Units
* Changed the plural name for the merfolk race from Mermen to Merfolk (issue #2940)
and replaced a few instances in core unit or terrain descriptions accordingly.

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

@ -146,18 +146,6 @@
[/image]
[/column]
[column]
grow_factor = 1
horizontal_alignment = "right"
border = "top,left,right"
border_size = 5
[button]
id = "join"
definition = "default"
label = _ "Join"
[/button]
[/column]
[/row]
[row]
@ -174,19 +162,6 @@
label = "misc/eye.png"
[/image]
[/column]
[column]
grow_factor = 1
horizontal_alignment = "right"
border = "all"
border_size = 5
[button]
id = "observe"
definition = "default"
label = _ "Observe"
[/button]
[/column]
[/row]
[/grid]
[/column]

12
src/gui/dialogs/multiplayer/lobby.cpp
View file

@ -523,24 +523,12 @@ void mp_lobby::adjust_game_row_contents(const mp::game_info& game, grid* grid, b
map.set_config(&game_config_);
map.set_map_data(game.map_data);
button& join_button = find_widget<button>(grid, "join", false);
button& observe_button = find_widget<button>(grid, "observe", false);
join_button.set_active(game.can_join());
observe_button.set_active(game.can_observe());
if(!add_callbacks) {
return;
}
connect_signal_mouse_left_double_click(row_panel,
std::bind(&mp_lobby::enter_game_by_id, this, game.id, DO_EITHER));
connect_signal_mouse_left_click(join_button,
std::bind(&mp_lobby::enter_game_by_id, this, game.id, DO_JOIN));
connect_signal_mouse_left_click(observe_button,
std::bind(&mp_lobby::enter_game_by_id, this, game.id, DO_OBSERVE));
}
void mp_lobby::update_gamelist_filter()