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

reorder playerlist sort buttons, move room close button...

Browse source 
...below the roomlist and conditionally enable it, kill the next room button
This commit is contained in:
Tomasz Śniatowski 2009-07-23 19:40:35 +01:00
parent 86723b7645
commit 2a1d540c74
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
data/gui/default/window/lobby_main.cfg
View file

@ -279,16 +279,16 @@
[/column]
[column]
[toggle_button]
id = "player_list_sort_name"
id = "player_list_sort_relation"
definition = "icon_small"
icon = "lobby/sort-az-off.png"
icon = "lobby/sort-friend-off.png"
[/toggle_button]
[/column]
[column]
[toggle_button]
id = "player_list_sort_relation"
id = "player_list_sort_name"
definition = "icon_small"
icon = "lobby/sort-friend-off.png"
icon = "lobby/sort-az-off.png"
[/toggle_button]
[/column]
[/row]
@ -455,7 +455,15 @@
#define _GUI_CHAT_AREA
{HORIZONTAL_BEGIN}
vertical_alignment = "top"
{ROOMLISTBOX}
{VERTICAL_BEGIN}
{ROOMLISTBOX}
{VERTICAL_SEP}
[button]
id = "close_window"
definition = "default"
label = _ "Close"
[/button]
{VERTICAL_END}
{HORIZONTAL_SEP}
grow_factor = 1
horizontal_alignment = "left"
@ -477,18 +485,6 @@
definition = "default"
label = _ "Send"
[/button]
{HORIZONTAL_SEP}
[button]
id = "next_window"
definition = "default"
label = _ "Next"
[/button]
{HORIZONTAL_SEP}
[button]
id = "close_window"
definition = "default"
label = _ "Close"
[/button]
{HORIZONTAL_END}
{VERTICAL_END}
{HORIZONTAL_END}

4
src/gui/dialogs/lobby_main.cpp
View file

@ -515,7 +515,6 @@ void tlobby_main::pre_show(CVideo& /*video*/, twindow& window)
GUI2_EASY_BUTTON_CALLBACK(show_preferences, tlobby_main);
GUI2_EASY_BUTTON_CALLBACK(join_global, tlobby_main);
GUI2_EASY_BUTTON_CALLBACK(observe_global, tlobby_main);
GUI2_EASY_BUTTON_CALLBACK(next_window, tlobby_main);
GUI2_EASY_BUTTON_CALLBACK(close_window, tlobby_main);
filter_friends_ = &window.get_widget<ttoggle_button>("filter_with_friends", false);
@ -536,6 +535,7 @@ void tlobby_main::pre_show(CVideo& /*video*/, twindow& window)
boost::bind(&tlobby_main::game_filter_keypress_callback, this, _1, _2, _3, _4));
room_window_open("lobby", true);
active_window_changed();
game_filter_reload();
}
@ -693,6 +693,8 @@ void tlobby_main::active_window_changed()
<< header.label() << " vs " << t.name << "\n";
}
}
window_->get_widget<tbutton>("close_window", false).set_active(t.whisper || t.name != "lobby");
update_playerlist();
}