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

gui2/tpreferences: switch back to Alerts dialog (as opposed to tab) for now

Browse source
This commit is contained in:
Charles Dang 2016-02-02 01:42:46 +11:00
parent 1668b7518f
commit faf5d82a4e
2 changed files with 19 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

159
data/gui/default/window/preferences/04_multiplayer.cfg
View file

@ -166,6 +166,19 @@
#define _GUI_PREFERENCES_MP_PAGE_1_GRID_2
[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
vertical_alignment = "bottom"
[button]
id = mp_alerts
label = _ "Alerts"
tooltip = "Configure multiplayer notification settings"
[/button]
[/column]
[column]
border = "all"
border_size = 5
@ -250,7 +263,7 @@
grow_factor = 1
[column]
horizontal_grow = "true"
[grid]
[row]
[column]
@ -297,8 +310,8 @@
tooltip = _ "Add this username to your ignore list (add optional reason, e.g., 'player_name reason ignored')"
[/button]
[/column]
[column]
[column]
grow_factor = 0
border = "all"
border_size = 5
@ -386,128 +399,6 @@
[/row]
#enddef
#define _GUI_PREFERENCES_MP_PAGE_3
[row]
grow_factor = 1
[column]
horizontal_grow = "true"
vertical_grow = "true"
[grid]
[row]
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "default"
label = _ "Event:"
[/label]
[/column]
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "default"
label = _ "Play Sound:"
tooltip = _ "Play a sound for the event, specified in data/game_config.cfg"
[/label]
[/column]
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
id = "notification_label"
definition = "default"
label = _ "Desktop
Notification:"
tooltip = _ "Shows desktop/system tray notifications for turn change events or conversations when the game window is inactive"
[/label]
[/column]
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "default"
label = _ "Also in
lobby:"
tooltip = _ "Also take these actions in response to events in the main multiplayer lobby"
[/label]
[/column]
[/row]
{_GUI_LOBBY_SOUNDS_ENTRY "player_joins" ( _ "Player joins:") ( _ "When a player joins the lobby or game")}
{_GUI_LOBBY_SOUNDS_ENTRY "player_leaves" ( _ "Player leaves:") ( _ "When a player leaves the lobby or game")}
{_GUI_LOBBY_SOUNDS_ENTRY "private_message" ( _ "Private message:") ( _ "When a private message is received")}
{_GUI_LOBBY_SOUNDS_ENTRY "friend_message" ( _ "Friend message:") ( _ "When a message from a friend is received")}
{_GUI_LOBBY_SOUNDS_ENTRY "public_message" ( _ "Public message:") ( _ "When a public message is received")}
{_GUI_LOBBY_SOUNDS_ENTRY "server_message" ( _ "Server message:") ( _ "When a server message is received")}
{_GUI_LOBBY_SOUNDS_ENTRY "ready_for_start" ( _ "Ready to start game:") ( _ "When the game you are hosting is ready to start")}
{_GUI_LOBBY_SOUNDS_ENTRY "game_has_begun" ( _ "Game has begun:") ( _ "When the host (not you) has started the game")}
{_GUI_LOBBY_SOUNDS_ENTRY "turn_changed" ( _ "Turn changed:") ( _ "When a new turn has begun")}
[/grid]
[/column]
[/row]
[row]
grow_factor = 1
[column]
horizontal_grow="true"
[grid]
[row]
grow_factor = 1
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[button]
id = "revert_to_defaults"
definition = "default"
label = _ "Defaults"
tooltip = _"Reset all options to their default values"
[/button]
[/column]
[/row]
[/grid]
[/column]
[/row]
#enddef
#define _GUI_PREFERENCES_MP_SWITCH_ROW
[row]
[column]
@ -555,9 +446,9 @@ lobby:"
[row]
[column]
horizontal_grow = "true"
horizontal_alignment = "left"
vertical_alignment = "bottom"
[grid]
{_GUI_PREFERENCES_MP_PAGE_1_GRID_2}
[/grid]
@ -577,19 +468,6 @@ lobby:"
[/column]
[/row]
[/layer]
[layer]
[row]
[column]
horizontal_grow = "true"
vertical_alignment = "top"
[grid]
{_GUI_PREFERENCES_MP_PAGE_3}
[/grid]
[/column]
[/row]
[/layer]
[/stack]
[/stacked_widget]
[/column]
@ -610,5 +488,4 @@ lobby:"
#undef _GUI_PREFERENCES_MP_PAGE_1_GRID_1
#undef _GUI_PREFERENCES_MP_PAGE_1_GRID_2
#undef _GUI_PREFERENCES_MP_PAGE_2
#undef _GUI_PREFERENCES_MP_PAGE_3
#undef _GUI_PREFERENCES_MP_SWITCH_ROW

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

@ -792,7 +792,7 @@ void tpreferences::initialize_tabs(twindow& window)
tlistbox& tabs_multiplayer = find_widget<tlistbox>(&window, "mp_tab", false);
add_tab(tabs_multiplayer, _("Prefs tab^General"));
add_tab(tabs_multiplayer, _("Prefs tab^Friends"));
add_tab(tabs_multiplayer, _("Prefs tab^Alerts"));
//add_tab(tabs_multiplayer, _("Prefs tab^Alerts"));
tabs_multiplayer.set_callback_value_change(make_dialog_callback(
boost::bind(&tpreferences::on_tab_select, this, _1, "mp_tab")));