Merge branch 'master' of github.com:wesnoth/wesnoth
This commit is contained in:
Alexander van Gessel
commit
c705047bfa
8 changed files with 430 additions and 376 deletions
|
|
@ -3,7 +3,7 @@
|
|||
### Definition of the lobby screen
|
||||
###
|
||||
|
||||
#define GAMELISTBOX
|
||||
#define _GUI_GAME_LIST
|
||||
[listbox]
|
||||
id = "game_list"
|
||||
definition = "default"
|
||||
|
|
@ -199,187 +199,198 @@
|
|||
[/listbox]
|
||||
#enddef
|
||||
|
||||
#define PLAYERLISTBOX
|
||||
[grid]
|
||||
[row]
|
||||
[column]
|
||||
horizontal_alignment = "left"
|
||||
[grid]
|
||||
[row]
|
||||
[column]
|
||||
grow_factor = 0
|
||||
horizontal_alignment = "left"
|
||||
border = "all"
|
||||
border_size = 5
|
||||
[label]
|
||||
definition = "default_small"
|
||||
label = _ "Sort players:"
|
||||
[/label]
|
||||
[/column]
|
||||
[column]
|
||||
grow_factor = 1
|
||||
horizontal_alignment = "left"
|
||||
border = "left,right"
|
||||
border_size = 5
|
||||
[toggle_button]
|
||||
id = "player_list_sort_relation"
|
||||
definition = "icon"
|
||||
icon = "lobby/sort-friend-off.png"
|
||||
tooltip = _ "Friends first, ignored people last"
|
||||
[/toggle_button]
|
||||
[/column]
|
||||
[column]
|
||||
grow_factor = 1
|
||||
horizontal_alignment = "left"
|
||||
border = "left,right"
|
||||
border_size = 5
|
||||
[toggle_button]
|
||||
id = "player_list_sort_name"
|
||||
definition = "icon"
|
||||
icon = "lobby/sort-az-off.png"
|
||||
tooltip = _ "Alphabetically"
|
||||
[/toggle_button]
|
||||
[/column]
|
||||
[/row]
|
||||
[/grid]
|
||||
[/column]
|
||||
[/row]
|
||||
#define _GUI_PLAYER_TREE_AREA
|
||||
[row]
|
||||
grow_factor = 0
|
||||
|
||||
[row]
|
||||
grow_factor = 1
|
||||
[column]
|
||||
border = "top"
|
||||
border_size = 5
|
||||
horizontal_alignment = "left"
|
||||
vertical_grow = true
|
||||
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
vertical_grow = true
|
||||
horizontal_grow = true
|
||||
[grid]
|
||||
|
||||
[tree_view]
|
||||
id = "player_tree"
|
||||
definition = "default"
|
||||
[row]
|
||||
|
||||
horizontal_scrollbar_mode = "never"
|
||||
vertical_scrollbar_mode = "auto"
|
||||
[column]
|
||||
grow_factor = 0
|
||||
border = "all"
|
||||
border_size = 5
|
||||
|
||||
# TODO: use 25?
|
||||
#indentation_step_size = 25
|
||||
indentation_step_size = 0
|
||||
[label]
|
||||
definition = "default_small"
|
||||
label = _ "Sort players:"
|
||||
[/label]
|
||||
[/column]
|
||||
|
||||
[node]
|
||||
id = "player_group"
|
||||
[node_definition]
|
||||
[column]
|
||||
grow_factor = 0
|
||||
border = "left,right"
|
||||
border_size = 5
|
||||
|
||||
[row]
|
||||
[toggle_button]
|
||||
id = "player_list_sort_relation"
|
||||
definition = "icon"
|
||||
icon = "lobby/sort-friend-off.png"
|
||||
tooltip = _ "Friends first, ignored people last"
|
||||
[/toggle_button]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 0
|
||||
[column]
|
||||
grow_factor = 0
|
||||
border = "left,right"
|
||||
border_size = 5
|
||||
|
||||
[toggle_button]
|
||||
id = "tree_view_node_toggle"
|
||||
definition = "tree_view_node"
|
||||
[/toggle_button]
|
||||
[toggle_button]
|
||||
id = "player_list_sort_name"
|
||||
definition = "icon"
|
||||
icon = "lobby/sort-az-off.png"
|
||||
tooltip = _ "Alphabetically"
|
||||
[/toggle_button]
|
||||
[/column]
|
||||
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
horizontal_grow = true
|
||||
border = "top,bottom,right"
|
||||
border_size = 5
|
||||
[/grid]
|
||||
|
||||
[label]
|
||||
id = "tree_view_node_label"
|
||||
definition = "default_small"
|
||||
label = "group"
|
||||
[/label]
|
||||
[/column]
|
||||
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
[column]
|
||||
grow_factor = 0
|
||||
horizontal_grow = true
|
||||
border = "top,bottom,right"
|
||||
border_size = 5
|
||||
[row]
|
||||
grow_factor = 1
|
||||
|
||||
[label]
|
||||
id = "player_count"
|
||||
definition = "default_small"
|
||||
label = "group"
|
||||
[/label]
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
vertical_grow = true
|
||||
horizontal_grow = true
|
||||
|
||||
[/column]
|
||||
[tree_view]
|
||||
id = "player_tree"
|
||||
definition = "default"
|
||||
|
||||
[/row]
|
||||
horizontal_scrollbar_mode = "never"
|
||||
vertical_scrollbar_mode = "auto"
|
||||
|
||||
[/node_definition]
|
||||
# TODO: use 25?
|
||||
#indentation_step_size = 25
|
||||
indentation_step_size = 0
|
||||
|
||||
[/node]
|
||||
[node]
|
||||
id = "player_group"
|
||||
[node_definition]
|
||||
|
||||
[node]
|
||||
id = "player"
|
||||
[node_definition]
|
||||
[row]
|
||||
|
||||
return_value_id = "ok"
|
||||
[row]
|
||||
[column]
|
||||
grow_factor = 0
|
||||
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
[toggle_button]
|
||||
id = "tree_view_node_toggle"
|
||||
definition = "tree_view_node"
|
||||
[/toggle_button]
|
||||
|
||||
[toggle_panel]
|
||||
id = "tree_view_node_label"
|
||||
definition = "default"
|
||||
[/column]
|
||||
|
||||
[grid]
|
||||
[column]
|
||||
grow_factor = 1
|
||||
horizontal_grow = true
|
||||
border = "top,bottom,right"
|
||||
border_size = 5
|
||||
|
||||
[row]
|
||||
[label]
|
||||
id = "tree_view_node_label"
|
||||
definition = "default_small"
|
||||
label = "group"
|
||||
[/label]
|
||||
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
vertical_alignment = "top"
|
||||
[/column]
|
||||
|
||||
[image]
|
||||
id = "icon"
|
||||
definition = "default"
|
||||
[/image]
|
||||
[column]
|
||||
grow_factor = 0
|
||||
horizontal_grow = true
|
||||
border = "top,bottom,right"
|
||||
border_size = 5
|
||||
|
||||
[/column]
|
||||
[label]
|
||||
id = "player_count"
|
||||
definition = "default_small"
|
||||
label = "group"
|
||||
[/label]
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
horizontal_grow = true
|
||||
[/column]
|
||||
|
||||
border = "right"
|
||||
border_size = 8
|
||||
[/row]
|
||||
|
||||
[label]
|
||||
id = "name"
|
||||
definition = "default"
|
||||
[/label]
|
||||
[/node_definition]
|
||||
|
||||
[/column]
|
||||
[/node]
|
||||
|
||||
[/row]
|
||||
[node]
|
||||
id = "player"
|
||||
[node_definition]
|
||||
|
||||
[/grid]
|
||||
return_value_id = "ok"
|
||||
[row]
|
||||
|
||||
[/toggle_panel]
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
|
||||
[/column]
|
||||
[toggle_panel]
|
||||
id = "tree_view_node_label"
|
||||
definition = "default"
|
||||
|
||||
[/row]
|
||||
[grid]
|
||||
|
||||
[/node_definition]
|
||||
[row]
|
||||
|
||||
[/node]
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
vertical_alignment = "top"
|
||||
|
||||
[/tree_view]
|
||||
[image]
|
||||
id = "icon"
|
||||
definition = "default"
|
||||
[/image]
|
||||
|
||||
[/column]
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
[column]
|
||||
grow_factor = 1
|
||||
horizontal_grow = true
|
||||
|
||||
[/grid]
|
||||
border = "right"
|
||||
border_size = 8
|
||||
|
||||
[label]
|
||||
id = "name"
|
||||
definition = "default"
|
||||
[/label]
|
||||
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[/grid]
|
||||
|
||||
[/toggle_panel]
|
||||
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[/node_definition]
|
||||
|
||||
[/node]
|
||||
|
||||
[/tree_view]
|
||||
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
#enddef
|
||||
|
||||
#define _GUI_FILTER_AREA
|
||||
|
|
@ -390,41 +401,49 @@
|
|||
horizontal_grow = true
|
||||
border = "all"
|
||||
border_size = 5
|
||||
|
||||
[text_box]
|
||||
definition = "filter"
|
||||
id = "filter_text"
|
||||
[/text_box]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
border = "all"
|
||||
border_size = 5
|
||||
|
||||
[toggle_button]
|
||||
definition = "default"
|
||||
id = "filter_with_friends"
|
||||
label = _ "Friends"
|
||||
[/toggle_button]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
border = "all"
|
||||
border_size = 5
|
||||
|
||||
[toggle_button]
|
||||
definition = "default"
|
||||
id = "filter_without_ignored"
|
||||
label = _ "No ignored"
|
||||
[/toggle_button]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
border = "all"
|
||||
border_size = 5
|
||||
|
||||
[toggle_button]
|
||||
definition = "default"
|
||||
id = "filter_vacant_slots"
|
||||
label = _ "Vacant slots"
|
||||
[/toggle_button]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
border = "all"
|
||||
|
|
@ -466,14 +485,7 @@
|
|||
[/button]
|
||||
[/column]
|
||||
[/row]
|
||||
[/grid]
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
[grid]
|
||||
[row]
|
||||
|
||||
[column]
|
||||
|
|
@ -497,14 +509,7 @@
|
|||
[/column]
|
||||
|
||||
[/row]
|
||||
[/grid]
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
[grid]
|
||||
[row]
|
||||
[column]
|
||||
border = "all"
|
||||
|
|
@ -555,44 +560,49 @@
|
|||
[/option]
|
||||
[/menu_button]
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
{GUI_HORIZONTAL_SPACER_LINE}
|
||||
[row]
|
||||
grow_factor = 1
|
||||
[column]
|
||||
border = "top"
|
||||
border_size = 5
|
||||
horizontal_grow = true
|
||||
vertical_grow = true
|
||||
{PLAYERLISTBOX}
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
{_GUI_PLAYER_TREE_AREA}
|
||||
|
||||
[/grid]
|
||||
#enddef
|
||||
|
||||
[window]
|
||||
id = "mp_lobby"
|
||||
description = "Lobby screen."
|
||||
|
||||
#
|
||||
# Low resolution
|
||||
#
|
||||
[resolution]
|
||||
|
||||
window_height = 600
|
||||
|
||||
definition = "borderless"
|
||||
|
||||
{GUI_WINDOW_FULLSCREEN}
|
||||
|
||||
[tooltip]
|
||||
id = "tooltip"
|
||||
[/tooltip]
|
||||
|
||||
[helptip]
|
||||
id = "tooltip"
|
||||
[/helptip]
|
||||
|
||||
[grid]
|
||||
|
||||
[row]
|
||||
grow_factor = 0
|
||||
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
|
||||
[grid]
|
||||
[row]
|
||||
grow_factor = 0
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
horizontal_alignment = "left"
|
||||
|
|
@ -634,11 +644,14 @@
|
|||
|
||||
[row]
|
||||
grow_factor = 0
|
||||
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
|
||||
[grid]
|
||||
[row]
|
||||
grow_factor = 0
|
||||
|
||||
[column]
|
||||
grow_factor = 0
|
||||
border = "all"
|
||||
|
|
@ -650,6 +663,7 @@
|
|||
label = _ "Preferences"
|
||||
[/button]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 0
|
||||
border = "all"
|
||||
|
|
@ -661,6 +675,7 @@
|
|||
label = _ "Create Game"
|
||||
[/button]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 0
|
||||
border = "all"
|
||||
|
|
@ -672,6 +687,7 @@
|
|||
label = _ "Join"
|
||||
[/button]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 0
|
||||
border = "all"
|
||||
|
|
@ -683,6 +699,7 @@
|
|||
label = _ "Observe"
|
||||
[/button]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
border = "all"
|
||||
|
|
@ -712,50 +729,66 @@
|
|||
[/grid]
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
grow_factor = 0
|
||||
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
vertical_grow = true
|
||||
border = "all"
|
||||
border_size = 5
|
||||
|
||||
{GUI_FORCE_WIDGET_MINIMUM_SIZE 0 "((screen_height * 35) / 100)" (
|
||||
{GAMELISTBOX}
|
||||
{_GUI_GAME_LIST}
|
||||
)}
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
grow_factor = 0
|
||||
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
|
||||
{_GUI_FILTER_AREA}
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
{GUI_HORIZONTAL_SPACER_LINE}
|
||||
|
||||
[row]
|
||||
grow_factor = 1
|
||||
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
vertical_grow = true
|
||||
|
||||
{GUI_FORCE_WIDGET_SIZE 0 "((screen_height * 20) / 100)" (
|
||||
[grid]
|
||||
[row]
|
||||
grow_factor = 1
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
horizontal_grow = true
|
||||
vertical_grow = true
|
||||
|
||||
[chatbox]
|
||||
id = "chat"
|
||||
[/chatbox]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 0
|
||||
border = "top"
|
||||
border_size = 5
|
||||
horizontal_grow = true
|
||||
vertical_grow = true
|
||||
{PLAYERLISTBOX}
|
||||
|
||||
[grid]
|
||||
{_GUI_PLAYER_TREE_AREA}
|
||||
[/grid]
|
||||
[/column]
|
||||
[/row]
|
||||
[/grid]
|
||||
|
|
@ -764,12 +797,16 @@
|
|||
[/row]
|
||||
[/grid]
|
||||
[/resolution]
|
||||
|
||||
#
|
||||
# Default resolution
|
||||
#
|
||||
[resolution]
|
||||
|
||||
window_height = 660
|
||||
|
||||
definition = "borderless"
|
||||
|
||||
{GUI_WINDOW_FULLSCREEN}
|
||||
|
||||
[tooltip]
|
||||
id = "tooltip"
|
||||
[/tooltip]
|
||||
|
|
@ -779,30 +816,39 @@
|
|||
[/helptip]
|
||||
|
||||
[grid]
|
||||
|
||||
[row]
|
||||
grow_factor = 0
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
horizontal_alignment = "left"
|
||||
border = "all"
|
||||
border_size = 5
|
||||
|
||||
[label]
|
||||
definition = "title"
|
||||
label = _ "Multiplayer Lobby"
|
||||
[/label]
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
grow_factor = 1
|
||||
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
vertical_grow = true
|
||||
|
||||
[grid]
|
||||
|
||||
[row]
|
||||
|
||||
[column]
|
||||
grow_factor = 1
|
||||
vertical_grow = true
|
||||
horizontal_grow = true
|
||||
|
||||
[grid]
|
||||
|
||||
[row]
|
||||
|
|
@ -824,7 +870,7 @@
|
|||
horizontal_grow = true
|
||||
vertical_grow = true
|
||||
|
||||
{GAMELISTBOX}
|
||||
{_GUI_GAME_LIST}
|
||||
[/column]
|
||||
[/row]
|
||||
|
||||
|
|
@ -832,9 +878,11 @@
|
|||
|
||||
[row]
|
||||
grow_factor = 0
|
||||
|
||||
[column]
|
||||
horizontal_grow = true
|
||||
vertical_grow = true
|
||||
|
||||
{GUI_FORCE_WIDGET_SIZE 0 "((screen_height * 25 / 100))" (
|
||||
[chatbox]
|
||||
id = "chat"
|
||||
|
|
@ -844,7 +892,9 @@
|
|||
[/row]
|
||||
[/grid]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
grow_factor = 0
|
||||
vertical_grow = true
|
||||
|
||||
{_GUI_CONTROL_AREA}
|
||||
|
|
@ -859,5 +909,5 @@
|
|||
|
||||
#undef _GUI_CONTROL_AREA
|
||||
#undef _GUI_FILTER_AREA
|
||||
#undef GAMELISTBOX
|
||||
#undef PLAYERLISTBOX
|
||||
#undef _GUI_GAME_LIST
|
||||
#undef _GUI_PLAYER_TREE_AREA
|
||||
|
|
|
|||
|
|
@ -96,8 +96,8 @@ def CheckOgg(context):
|
|||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <SDL2/SDL.h>
|
||||
#include <SDL2/SDL_mixer.h>
|
||||
#include <SDL.h>
|
||||
#include <SDL_mixer.h>
|
||||
|
||||
int main(int argc, char ** argv)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -171,6 +171,7 @@ private:
|
|||
/** Fires a draw event. */
|
||||
using events::sdl_handler::draw;
|
||||
void draw();
|
||||
void draw_everything();
|
||||
|
||||
/**
|
||||
* Fires a video resize event.
|
||||
|
|
@ -381,8 +382,9 @@ void sdl_event_handler::handle_event(const SDL_Event& event)
|
|||
case DRAW_EVENT:
|
||||
draw();
|
||||
break;
|
||||
|
||||
case DRAW_ALL_EVENT:
|
||||
draw();
|
||||
draw_everything();
|
||||
break;
|
||||
|
||||
case TIMER_EVENT:
|
||||
|
|
@ -540,6 +542,15 @@ void sdl_event_handler::draw()
|
|||
}
|
||||
}
|
||||
|
||||
void sdl_event_handler::draw_everything()
|
||||
{
|
||||
for(auto dispatcher : dispatchers_) {
|
||||
dynamic_cast<widget&>(*dispatcher).set_is_dirty(true);
|
||||
}
|
||||
|
||||
draw();
|
||||
}
|
||||
|
||||
void sdl_event_handler::video_resize(const point& new_size)
|
||||
{
|
||||
DBG_GUI_E << "Firing: " << SDL_VIDEO_RESIZE << ".\n";
|
||||
|
|
|
|||
|
|
@ -19,25 +19,25 @@
|
|||
|
||||
#include "gui/core/register_widget.hpp"
|
||||
#include "gui/widgets/button.hpp"
|
||||
#include "gui/widgets/listbox.hpp"
|
||||
#include "gui/widgets/label.hpp"
|
||||
#include "gui/widgets/text_box.hpp"
|
||||
#include "gui/widgets/settings.hpp"
|
||||
#include "gui/widgets/scroll_label.hpp"
|
||||
#include "gui/widgets/window.hpp"
|
||||
#include "gui/widgets/image.hpp"
|
||||
#include "gui/widgets/label.hpp"
|
||||
#include "gui/widgets/listbox.hpp"
|
||||
#include "gui/widgets/multi_page.hpp"
|
||||
#include "gui/widgets/scroll_label.hpp"
|
||||
#include "gui/widgets/settings.hpp"
|
||||
#include "gui/widgets/text_box.hpp"
|
||||
#include "gui/widgets/window.hpp"
|
||||
|
||||
#include "font/pango/escape.hpp"
|
||||
#include "formatter.hpp"
|
||||
#include "formula/string_utils.hpp"
|
||||
#include "gettext.hpp"
|
||||
#include "wesnothd_connection.hpp"
|
||||
#include "log.hpp"
|
||||
#include "preferences/credentials.hpp"
|
||||
#include "preferences/game.hpp"
|
||||
#include "preferences/lobby.hpp"
|
||||
#include "log.hpp"
|
||||
#include "scripting/plugins/manager.hpp"
|
||||
#include "wesnothd_connection.hpp"
|
||||
|
||||
static lg::log_domain log_lobby("lobby");
|
||||
#define DBG_LB LOG_STREAM(debug, log_lobby)
|
||||
|
|
@ -64,13 +64,29 @@ chatbox::chatbox(const implementation::builder_chatbox& builder)
|
|||
{
|
||||
}
|
||||
|
||||
void chatbox::finalize_setup()
|
||||
{
|
||||
roomlistbox_ = find_widget<listbox>(this, "room_list", false, true);
|
||||
|
||||
// We need to bind a lambda here since switch_to_window is overloaded.
|
||||
// A lambda alone would be more verbose because it'd need to specify all the parameters.
|
||||
connect_signal_notify_modified(*roomlistbox_,
|
||||
std::bind([this]() { switch_to_window(roomlistbox_->get_selected_row()); }));
|
||||
|
||||
chat_log_container_ = find_widget<multi_page>(this, "chat_log_container", false, true);
|
||||
|
||||
chat_input_ = find_widget<text_box>(this, "chat_input", false, true);
|
||||
|
||||
connect_signal_pre_key_press(*chat_input_,
|
||||
std::bind(&chatbox::chat_input_keypress_callback, this, _5));
|
||||
}
|
||||
|
||||
void chatbox::active_window_changed()
|
||||
{
|
||||
lobby_chat_window& t = open_windows_[active_window_];
|
||||
|
||||
// Clear pending messages notification in room listbox
|
||||
grid* grid = roomlistbox_->get_row_grid(active_window_);
|
||||
|
||||
find_widget<image>(grid, "pending_messages", false).set_visible(widget::visibility::hidden);
|
||||
|
||||
t.pending_messages = 0;
|
||||
|
|
@ -88,69 +104,49 @@ void chatbox::switch_to_window(lobby_chat_window* t)
|
|||
void chatbox::switch_to_window(size_t id)
|
||||
{
|
||||
active_window_ = id;
|
||||
|
||||
assert(active_window_ < open_windows_.size());
|
||||
|
||||
chat_log_container_->select_page(active_window_);
|
||||
roomlistbox_->select_row(active_window_);
|
||||
|
||||
active_window_changed();
|
||||
}
|
||||
|
||||
void chatbox::finalize_setup()
|
||||
void chatbox::chat_input_keypress_callback(const SDL_Keycode key)
|
||||
{
|
||||
roomlistbox_ = find_widget<listbox>(this, "room_list", false, true);
|
||||
|
||||
// We need to bind a lambda here since switch_to_window is overloaded.
|
||||
// A lambda alone would be more verbose because it'd need to specify all the parameters.
|
||||
connect_signal_notify_modified(*roomlistbox_,
|
||||
std::bind([this]() { switch_to_window(roomlistbox_->get_selected_row()); }));
|
||||
|
||||
chat_log_container_ = find_widget<multi_page>(this, "chat_log_container", false, true);
|
||||
|
||||
chat_input_ = find_widget<text_box>(this, "chat_input", false, true);
|
||||
|
||||
connect_signal_pre_key_press(*chat_input_,
|
||||
std::bind(&chatbox::chat_input_keypress_callback, this, _3, _4, _5));
|
||||
}
|
||||
|
||||
void chatbox::send_message_button_callback()
|
||||
{
|
||||
const std::string& input = chat_input_->get_value();
|
||||
std::string input = chat_input_->get_value();
|
||||
if(input.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(input[0] == '/') {
|
||||
// TODO: refactor do_speak so it uses context information about
|
||||
// opened window, so e.g. /ignore in a whisper session ignores
|
||||
// the other party without having to specify it's nick.
|
||||
chat_handler::do_speak(input);
|
||||
} else {
|
||||
lobby_chat_window& t = open_windows_[active_window_];
|
||||
|
||||
if(t.whisper) {
|
||||
send_whisper(t.name, input);
|
||||
add_whisper_sent(t.name, input);
|
||||
switch(key) {
|
||||
case SDLK_RETURN:
|
||||
case SDLK_KP_ENTER: {
|
||||
if(input[0] == '/') {
|
||||
// TODO: refactor do_speak so it uses context information about
|
||||
// opened window, so e.g. /ignore in a whisper session ignores
|
||||
// the other party without having to specify it's nick.
|
||||
chat_handler::do_speak(input);
|
||||
} else {
|
||||
send_chat_room_message(t.name, input);
|
||||
add_chat_room_message_sent(t.name, input);
|
||||
lobby_chat_window& t = open_windows_[active_window_];
|
||||
|
||||
if(t.whisper) {
|
||||
send_whisper(t.name, input);
|
||||
add_whisper_sent(t.name, input);
|
||||
} else {
|
||||
send_chat_room_message(t.name, input);
|
||||
add_chat_room_message_sent(t.name, input);
|
||||
}
|
||||
}
|
||||
|
||||
chat_input_->save_to_history();
|
||||
chat_input_->set_value("");
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
chat_input_->save_to_history();
|
||||
chat_input_->set_value("");
|
||||
}
|
||||
|
||||
|
||||
void chatbox::chat_input_keypress_callback(bool& handled, bool& halt, const SDL_Keycode key)
|
||||
{
|
||||
if(key == SDLK_RETURN || key == SDLK_KP_ENTER) {
|
||||
send_message_button_callback();
|
||||
handled = true;
|
||||
halt = true;
|
||||
} else if (key == SDLK_TAB) {
|
||||
std::string text = chat_input_->get_value();
|
||||
|
||||
case SDLK_TAB: {
|
||||
// TODO: very inefficient! Very! D:
|
||||
std::vector<std::string> matches;
|
||||
for(const auto& ui : lobby_info_->users()) {
|
||||
if(ui.name != preferences::login()) {
|
||||
|
|
@ -158,23 +154,26 @@ void chatbox::chat_input_keypress_callback(bool& handled, bool& halt, const SDL_
|
|||
}
|
||||
}
|
||||
|
||||
const bool line_start = utils::word_completion(text, matches);
|
||||
const bool line_start = utils::word_completion(input, matches);
|
||||
|
||||
if(matches.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(matches.size() == 1) {
|
||||
text.append(line_start ? ": " : " ");
|
||||
input.append(line_start ? ": " : " ");
|
||||
} else {
|
||||
std::string completion_list = utils::join(matches, " ");
|
||||
append_to_chatbox(completion_list);
|
||||
}
|
||||
|
||||
chat_input_->set_value(text);
|
||||
chat_input_->set_value(input);
|
||||
|
||||
handled = true;
|
||||
halt = true;
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -205,30 +204,12 @@ void chatbox::append_to_chatbox(const std::string& text, size_t id, const bool f
|
|||
}
|
||||
}
|
||||
|
||||
void chatbox::set_active(const bool /*active*/)
|
||||
void chatbox::send_chat_message(const std::string& message, bool /*allies_only*/)
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
bool chatbox::get_active() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void chatbox::set_self_active(const bool /*active*/)
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
void chatbox::send_chat_message(const std::string& message,
|
||||
bool /*allies_only*/)
|
||||
{
|
||||
::config c {"message", ::config {"message", message, "sender", preferences::login()}};
|
||||
add_chat_message(time(nullptr), preferences::login(), 0, message);
|
||||
|
||||
if(wesnothd_connection_) {
|
||||
wesnothd_connection_->send_data(c);
|
||||
}
|
||||
::config c {"message", ::config {"message", message, "sender", preferences::login()}};
|
||||
send_to_server(c);
|
||||
}
|
||||
|
||||
void chatbox::user_relation_changed(const std::string& /*name*/)
|
||||
|
|
@ -276,7 +257,7 @@ void chatbox::add_whisper_received(const std::string& sender, const std::string&
|
|||
do_notify(mp::NOTIFY_WHISPER, sender, message);
|
||||
} else {
|
||||
add_whisper_window_whisper(sender, message);
|
||||
increment_waiting_whsipers(sender);
|
||||
increment_waiting_whispers(sender);
|
||||
|
||||
do_notify(mp::NOTIFY_WHISPER_OTHER_WINDOW, sender, message);
|
||||
}
|
||||
|
|
@ -288,8 +269,7 @@ void chatbox::add_whisper_received(const std::string& sender, const std::string&
|
|||
}
|
||||
}
|
||||
|
||||
void chatbox::add_chat_room_message_sent(const std::string& room,
|
||||
const std::string& message)
|
||||
void chatbox::add_chat_room_message_sent(const std::string& room, const std::string& message)
|
||||
{
|
||||
lobby_chat_window* t = room_window_open(room, false);
|
||||
if(!t) {
|
||||
|
|
@ -356,15 +336,15 @@ bool chatbox::room_window_active(const std::string& room)
|
|||
|
||||
lobby_chat_window* chatbox::room_window_open(const std::string& room, const bool open_new, const bool allow_close)
|
||||
{
|
||||
return search_create_window(room, false, open_new, allow_close);
|
||||
return find_or_create_window(room, false, open_new, allow_close);
|
||||
}
|
||||
|
||||
lobby_chat_window* chatbox::whisper_window_open(const std::string& name, bool open_new)
|
||||
{
|
||||
return search_create_window(name, true, open_new, true);
|
||||
return find_or_create_window(name, true, open_new, true);
|
||||
}
|
||||
|
||||
lobby_chat_window* chatbox::search_create_window(const std::string& name,
|
||||
lobby_chat_window* chatbox::find_or_create_window(const std::string& name,
|
||||
const bool whisper,
|
||||
const bool open_new,
|
||||
const bool allow_close)
|
||||
|
|
@ -379,8 +359,11 @@ lobby_chat_window* chatbox::search_create_window(const std::string& name,
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
open_windows_.push_back(lobby_chat_window(name, whisper));
|
||||
open_windows_.emplace_back(name, whisper);
|
||||
|
||||
//
|
||||
// Add a new chat log page.
|
||||
//
|
||||
std::map<std::string, string_map> data;
|
||||
string_map item;
|
||||
|
||||
|
|
@ -399,6 +382,9 @@ lobby_chat_window* chatbox::search_create_window(const std::string& name,
|
|||
|
||||
chat_log_container_->add_page(data);
|
||||
|
||||
//
|
||||
// Add a new room window tab.
|
||||
//
|
||||
data.clear();
|
||||
|
||||
item["label"] = whisper ? font::escape_text("<" + name + ">") : name;
|
||||
|
|
@ -406,27 +392,30 @@ lobby_chat_window* chatbox::search_create_window(const std::string& name,
|
|||
|
||||
grid& row_grid = roomlistbox_->add_row(data);
|
||||
|
||||
//
|
||||
// Set up the Close Window button.
|
||||
//
|
||||
button& close_button = find_widget<button>(&row_grid, "close_window", false);
|
||||
connect_signal_mouse_left_click(close_button,
|
||||
std::bind(&chatbox::close_window_button_callback, this, open_windows_.back(), _3, _4));
|
||||
|
||||
if(!allow_close) {
|
||||
close_button.set_visible(widget::visibility::hidden);
|
||||
} else {
|
||||
connect_signal_mouse_left_click(close_button,
|
||||
std::bind(&chatbox::close_window_button_callback, this, open_windows_.back().name, _3, _4));
|
||||
}
|
||||
|
||||
return &open_windows_.back();
|
||||
}
|
||||
|
||||
void chatbox::close_window_button_callback(lobby_chat_window& chat_window, bool& handled, bool& halt)
|
||||
void chatbox::close_window_button_callback(std::string room_name, bool& handled, bool& halt)
|
||||
{
|
||||
const int index = std::find_if(open_windows_.begin(), open_windows_.end(), [&chat_window](const lobby_chat_window& room) {
|
||||
return room.name == chat_window.name;
|
||||
}) - open_windows_.begin();
|
||||
const int index = std::find_if(open_windows_.begin(), open_windows_.end(),
|
||||
[&room_name](const lobby_chat_window& room) { return room.name == room_name; }
|
||||
) - open_windows_.begin();
|
||||
|
||||
close_window(index);
|
||||
|
||||
handled = true;
|
||||
halt = true;
|
||||
handled = halt = true;
|
||||
}
|
||||
|
||||
void chatbox::send_to_server(const ::config& cfg)
|
||||
|
|
@ -436,17 +425,15 @@ void chatbox::send_to_server(const ::config& cfg)
|
|||
}
|
||||
}
|
||||
|
||||
void chatbox::increment_waiting_whsipers(const std::string& name)
|
||||
void chatbox::increment_waiting_whispers(const std::string& name)
|
||||
{
|
||||
if(lobby_chat_window* t = whisper_window_open(name, false)) {
|
||||
t->pending_messages++;
|
||||
++t->pending_messages;
|
||||
|
||||
if(t->pending_messages == 1) {
|
||||
DBG_LB << "do whisper pending mark row " << (t - &open_windows_[0]) << " with " << t->name << "\n";
|
||||
|
||||
grid* grid = roomlistbox_->get_row_grid(t - &open_windows_[0]);
|
||||
// this breaks for some reason
|
||||
// label& label = grid->get_widget<label>("room", false);
|
||||
// label.set_use_markup(true);
|
||||
// label.set_label(colorize("<" + t->name + ">", "red"));
|
||||
find_widget<image>(grid, "pending_messages", false).set_visible(widget::visibility::visible);
|
||||
}
|
||||
}
|
||||
|
|
@ -455,15 +442,14 @@ void chatbox::increment_waiting_whsipers(const std::string& name)
|
|||
void chatbox::increment_waiting_messages(const std::string& room)
|
||||
{
|
||||
if(lobby_chat_window* t = room_window_open(room, false)) {
|
||||
t->pending_messages++;
|
||||
++t->pending_messages;
|
||||
|
||||
if(t->pending_messages == 1) {
|
||||
int idx = t - &open_windows_[0];
|
||||
|
||||
DBG_LB << "do room pending mark row " << idx << " with " << t->name << "\n";
|
||||
|
||||
grid* grid = roomlistbox_->get_row_grid(idx);
|
||||
// this breaks for some reason
|
||||
// label& label = grid->get_widget<label>("room", false);
|
||||
// label.set_use_markup(true);
|
||||
// label.set_label(colorize(t->name, "red"));
|
||||
find_widget<image>(grid, "pending_messages", false).set_visible(widget::visibility::visible);
|
||||
}
|
||||
}
|
||||
|
|
@ -492,9 +478,10 @@ void chatbox::add_active_window_whisper(const std::string& sender,
|
|||
void chatbox::close_window(size_t idx)
|
||||
{
|
||||
const lobby_chat_window& t = open_windows_[idx];
|
||||
bool active_changed = idx == active_window_;
|
||||
|
||||
DBG_LB << "Close window " << idx << " - " << t.name << "\n";
|
||||
|
||||
// Can't close the lobby!
|
||||
if((t.name == "lobby" && t.whisper == false) || open_windows_.size() == 1) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -505,11 +492,15 @@ void chatbox::close_window(size_t idx)
|
|||
msg["room"] = t.name;
|
||||
msg["player"] = preferences::login();
|
||||
data.add_child("room_part", msg);
|
||||
|
||||
send_to_server(data);
|
||||
}
|
||||
|
||||
// Check if we're closing the currently-active window.
|
||||
const bool active_changed = idx == active_window_;
|
||||
|
||||
if(active_window_ == open_windows_.size() - 1) {
|
||||
active_window_--;
|
||||
--active_window_;
|
||||
}
|
||||
|
||||
if(t.whisper) {
|
||||
|
|
@ -553,7 +544,6 @@ void chatbox::add_active_window_message(const std::string& sender,
|
|||
append_to_chatbox(text, force_scroll);
|
||||
}
|
||||
|
||||
|
||||
mp::room_info* chatbox::active_window_room()
|
||||
{
|
||||
const lobby_chat_window& t = open_windows_[active_window_];
|
||||
|
|
@ -590,12 +580,15 @@ void chatbox::process_room_join(const ::config& data)
|
|||
} else {
|
||||
if(player == preferences::login()) {
|
||||
lobby_chat_window* t = room_window_open(room, true);
|
||||
|
||||
lobby_info_->open_room(room);
|
||||
r = lobby_info_->get_room(room);
|
||||
assert(r);
|
||||
|
||||
if(const auto& members = data.child("members")) {
|
||||
r->process_room_members(members);
|
||||
}
|
||||
|
||||
switch_to_window(t);
|
||||
|
||||
const std::string& topic = data["topic"];
|
||||
|
|
@ -705,7 +698,7 @@ void chatbox::process_message(const ::config& data, bool whisper /*= false*/)
|
|||
plugins_manager::get()->notify_event("chat", plugin_data);
|
||||
}
|
||||
|
||||
bool chatbox::process_network_data(const ::config& data)
|
||||
void chatbox::process_network_data(const ::config& data)
|
||||
{
|
||||
if(const ::config& message = data.child("message")) {
|
||||
process_message(message);
|
||||
|
|
@ -718,8 +711,6 @@ bool chatbox::process_network_data(const ::config& data)
|
|||
} else if(const ::config& room_query_response = data.child("room_query_response")) {
|
||||
process_room_query_response(room_query_response);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// }---------- DEFINITION ---------{
|
||||
|
|
|
|||
|
|
@ -13,11 +13,10 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "gui/widgets/container_base.hpp"
|
||||
#include "chat_events.hpp"
|
||||
#include "game_initialization/lobby_data.hpp"
|
||||
#include "game_initialization/lobby_info.hpp"
|
||||
|
||||
#include "chat_events.hpp"
|
||||
#include "gui/widgets/container_base.hpp"
|
||||
|
||||
#include <string>
|
||||
|
||||
|
|
@ -29,9 +28,7 @@ namespace gui2
|
|||
|
||||
// ------------ WIDGET -----------{
|
||||
|
||||
class button;
|
||||
class listbox;
|
||||
class label;
|
||||
class multi_page;
|
||||
class text_box;
|
||||
|
||||
|
|
@ -40,13 +37,13 @@ namespace implementation
|
|||
struct builder_chatbox;
|
||||
}
|
||||
|
||||
|
||||
struct lobby_chat_window
|
||||
{
|
||||
lobby_chat_window(const std::string& name, bool whisper)
|
||||
: name(name), whisper(whisper), pending_messages(0)
|
||||
{
|
||||
}
|
||||
|
||||
std::string name;
|
||||
bool whisper;
|
||||
int pending_messages;
|
||||
|
|
@ -60,33 +57,52 @@ public:
|
|||
explicit chatbox(const implementation::builder_chatbox& builder);
|
||||
|
||||
/** See @ref styled_widget::set_active. */
|
||||
virtual void set_active(const bool active) override;
|
||||
virtual void set_active(const bool /*active*/) override
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
/** See @ref styled_widget::get_active. */
|
||||
virtual bool get_active() const override;
|
||||
virtual bool get_active() const override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/** See @ref styled_widget::get_state. */
|
||||
virtual unsigned get_state() const override { return 0; }
|
||||
virtual unsigned get_state() const override
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void send_to_server(const ::config& cfg) override;
|
||||
|
||||
void set_active_window_changed_callback(const std::function<void(void)>& f) { active_window_changed_callback_ = f; }
|
||||
/** @todo: remove */
|
||||
void set_active_window_changed_callback(const std::function<void(void)>& f)
|
||||
{
|
||||
active_window_changed_callback_ = f;
|
||||
}
|
||||
|
||||
void set_lobby_info(mp::lobby_info& i) { lobby_info_ = &i; }
|
||||
void set_lobby_info(mp::lobby_info& i)
|
||||
{
|
||||
lobby_info_ = &i;
|
||||
}
|
||||
|
||||
void set_wesnothd_connection(wesnothd_connection& c) { wesnothd_connection_ = &c; }
|
||||
void set_wesnothd_connection(wesnothd_connection& c)
|
||||
{
|
||||
wesnothd_connection_ = &c;
|
||||
}
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Initializes the internal sub-widget pointers.
|
||||
* Should be called when building the window, so the pointers
|
||||
* are initialized when set_displayed_type() is called.
|
||||
* Should be called after initializing the widget's grid.
|
||||
*/
|
||||
void finalize_setup();
|
||||
|
||||
/** Inherited form @ref chat_handler */
|
||||
virtual void user_relation_changed(const std::string& name) override;
|
||||
|
||||
/** inherited form chat_handler */
|
||||
/** Inherited form @ref chat_handler */
|
||||
virtual void add_chat_message(const time_t& time,
|
||||
const std::string& speaker,
|
||||
int side,
|
||||
|
|
@ -94,24 +110,23 @@ protected:
|
|||
events::chat_handler::MESSAGE_TYPE type
|
||||
= events::chat_handler::MESSAGE_PRIVATE) override;
|
||||
|
||||
/** inherited form chat_handler */
|
||||
/** Inherited form @ref chat_handler */
|
||||
virtual void add_whisper_sent(const std::string& receiver,
|
||||
const std::string& message) override;
|
||||
|
||||
/** inherited form chat_handler */
|
||||
/** Inherited form @ref chat_handler */
|
||||
virtual void add_whisper_received(const std::string& sender,
|
||||
const std::string& message) override;
|
||||
|
||||
/** inherited form chat_handler */
|
||||
/** Inherited form @ref chat_handler */
|
||||
virtual void add_chat_room_message_sent(const std::string& room,
|
||||
const std::string& message) override;
|
||||
|
||||
/** inherited form chat_handler */
|
||||
/** Inherited form @ref chat_handler */
|
||||
virtual void add_chat_room_message_received(const std::string& room,
|
||||
const std::string& speaker,
|
||||
const std::string& message) override;
|
||||
|
||||
|
||||
private:
|
||||
listbox* roomlistbox_;
|
||||
|
||||
|
|
@ -127,84 +142,66 @@ private:
|
|||
|
||||
mp::lobby_info* lobby_info_;
|
||||
|
||||
mp::lobby_info& get_lobby_info() { return *lobby_info_; }
|
||||
|
||||
wesnothd_connection* wesnothd_connection_;
|
||||
|
||||
/** Inherited from styled_widget, implemented by REGISTER_WIDGET. */
|
||||
virtual const std::string& get_control_type() const override;
|
||||
|
||||
/** See @ref container_base::set_self_active. */
|
||||
virtual void set_self_active(const bool active) override;
|
||||
virtual void set_self_active(const bool /*active*/) override
|
||||
{
|
||||
/* DO NOTHING */
|
||||
}
|
||||
|
||||
void chat_input_keypress_callback(bool& handled, bool& halt, const SDL_Keycode key);
|
||||
void chat_input_keypress_callback(const SDL_Keycode key);
|
||||
|
||||
void append_to_chatbox(const std::string& text, const bool force_scroll = false);
|
||||
|
||||
void append_to_chatbox(const std::string& text, size_t id, const bool force_scroll = false);
|
||||
/**
|
||||
* @return true if the whisper window for "name" is the active window
|
||||
*/
|
||||
|
||||
/** @returns true if the whisper window for "name" is the active window. */
|
||||
bool whisper_window_active(const std::string& name);
|
||||
|
||||
/**
|
||||
* @return true if the room window for "room" is the active window
|
||||
*/
|
||||
/** @returns true if the room window for "room" is the active window. */
|
||||
bool room_window_active(const std::string& room);
|
||||
|
||||
/**
|
||||
* Mark the whisper window for "name" as having one more pending message
|
||||
*/
|
||||
void increment_waiting_whsipers(const std::string& name);
|
||||
/** Mark the whisper window for "name" as having one more pending message. */
|
||||
void increment_waiting_whispers(const std::string& name);
|
||||
|
||||
/**
|
||||
* Mark the room window for "room" as having one more pending message
|
||||
*/
|
||||
/** Mark the room window for "room" as having one more pending message. */
|
||||
void increment_waiting_messages(const std::string& room);
|
||||
|
||||
/**
|
||||
* Add a whisper message to the whisper window
|
||||
*/
|
||||
/** Add a whisper message to the whisper window. */
|
||||
void add_whisper_window_whisper(const std::string& sender,
|
||||
const std::string& message);
|
||||
|
||||
/**
|
||||
* Add a whisper message to the current window which is not the whisper
|
||||
* window
|
||||
* for "name".
|
||||
*/
|
||||
* Add a whisper message to the current window which is not the whisper window for "name".
|
||||
*/
|
||||
void add_active_window_whisper(const std::string& sender,
|
||||
const std::string& message,
|
||||
const bool force_scroll = false);
|
||||
|
||||
/**
|
||||
* Add a message to the window for room "room"
|
||||
*/
|
||||
/** Add a message to the window for room "room". */
|
||||
void add_room_window_message(const std::string& room,
|
||||
const std::string& sender,
|
||||
const std::string& message);
|
||||
|
||||
/**
|
||||
* Add a message to the window for room "room"
|
||||
*/
|
||||
/** Add a message to the window for room "room". */
|
||||
void add_active_window_message(const std::string& sender,
|
||||
const std::string& message,
|
||||
const bool force_scroll = false);
|
||||
|
||||
void close_window(size_t idx);
|
||||
|
||||
void send_message_button_callback();
|
||||
|
||||
public:
|
||||
|
||||
/** inherited form chat_handler */
|
||||
virtual void send_chat_message(const std::string& message,
|
||||
bool /*allies_only*/) override;
|
||||
/** Inherited form @ref chat_handler */
|
||||
virtual void send_chat_message(const std::string& message, bool allies_only) override;
|
||||
|
||||
/**
|
||||
* Switch to the window given by a valid pointer (e.g. received from a call
|
||||
* to *_window_open)
|
||||
*/
|
||||
* Switch to the window given by a valid pointer (e.g. received from a call
|
||||
* to *_window_open)
|
||||
*/
|
||||
void switch_to_window(lobby_chat_window* t);
|
||||
|
||||
void switch_to_window(size_t id);
|
||||
|
|
@ -212,35 +209,33 @@ public:
|
|||
void active_window_changed();
|
||||
|
||||
/**
|
||||
* Get the room* corresponding to the currently active window, or nullptr
|
||||
* if a whisper window is active at the moment
|
||||
*/
|
||||
* Get the room* corresponding to the currently active window, or nullptr
|
||||
* if a whisper window is active at the moment
|
||||
*/
|
||||
mp::room_info* active_window_room();
|
||||
|
||||
/**
|
||||
* Check if a room window for "room" is open, if open_new is true
|
||||
* then it will be created if not found. If allow_close is false, the
|
||||
* 'close' button will be disabled.
|
||||
* @return valid ptr if the window was found or added, null otherwise
|
||||
*/
|
||||
* Check if a room window for "room" is open, if open_new is true
|
||||
* then it will be created if not found. If allow_close is false, the
|
||||
* 'close' button will be disabled.
|
||||
* @return valid ptr if the window was found or added, null otherwise
|
||||
*/
|
||||
lobby_chat_window* room_window_open(const std::string& room,
|
||||
const bool open_new, const bool allow_close = true);
|
||||
|
||||
/**
|
||||
* Check if a whisper window for user "name" is open, if open_new is true
|
||||
* then it will be created if not found.
|
||||
* @return valid ptr if the window was found or added, null otherwise
|
||||
*/
|
||||
lobby_chat_window* whisper_window_open(const std::string& name,
|
||||
bool open_new);
|
||||
* Check if a whisper window for user "name" is open, if open_new is true
|
||||
* then it will be created if not found.
|
||||
* @return valid ptr if the window was found or added, null otherwise
|
||||
*/
|
||||
lobby_chat_window* whisper_window_open(const std::string& name, bool open_new);
|
||||
|
||||
/**
|
||||
* Helper function to find and open a new window, used by *_window_open
|
||||
*/
|
||||
lobby_chat_window* search_create_window(const std::string& name, const bool whisper, const bool open_new, const bool allow_close);
|
||||
|
||||
void close_window_button_callback(lobby_chat_window& chat_window, bool& handled, bool& halt);
|
||||
* Helper function to find and open a new window, used by *_window_open
|
||||
*/
|
||||
lobby_chat_window* find_or_create_window(const std::string& name, const bool whisper, const bool open_new, const bool allow_close);
|
||||
|
||||
void close_window_button_callback(std::string room_name, bool& handled, bool& halt);
|
||||
|
||||
void process_room_join(const ::config& data);
|
||||
|
||||
|
|
@ -250,14 +245,13 @@ public:
|
|||
|
||||
void process_message(const ::config& data, bool whisper = false);
|
||||
|
||||
bool process_network_data(const ::config& data);
|
||||
void process_network_data(const ::config& data);
|
||||
};
|
||||
|
||||
// }---------- DEFINITION ---------{
|
||||
|
||||
struct chatbox_definition : public styled_widget_definition
|
||||
{
|
||||
|
||||
explicit chatbox_definition(const config& cfg);
|
||||
|
||||
struct resolution : public resolution_definition
|
||||
|
|
|
|||
|
|
@ -697,11 +697,19 @@ std::vector<topic> generate_trait_topics(const bool sort_generated)
|
|||
for (std::map<t_string, const config>::iterator a = trait_list.begin(); a != trait_list.end(); ++a) {
|
||||
std::string id = "traits_" + a->first;
|
||||
const config trait = a->second;
|
||||
|
||||
std::string name = trait["male_name"].str();
|
||||
if (name.empty()) name = trait["female_name"].str();
|
||||
if (name.empty()) name = trait["name"].str();
|
||||
if (name.empty()) continue; // Hidden trait
|
||||
|
||||
std::stringstream text;
|
||||
if (trait["help_text"].empty()) {
|
||||
if (!trait["help_text"].empty()) {
|
||||
text << trait["help_text"];
|
||||
} else if (!trait["description"].empty()) {
|
||||
text << trait["description"];
|
||||
} else {
|
||||
text << trait["help_text"];
|
||||
text << _("No description available.");
|
||||
}
|
||||
text << "\n\n";
|
||||
if (trait["availability"] == "musthave") {
|
||||
|
|
@ -709,10 +717,6 @@ std::vector<topic> generate_trait_topics(const bool sort_generated)
|
|||
} else if (trait["availability"] == "none") {
|
||||
text << _("Availability: ") << _("Unavailable") << "\n";
|
||||
}
|
||||
std::string name = trait["male_name"].str();
|
||||
if (name.empty()) name = trait["female_name"].str();
|
||||
if (name.empty()) name = trait["name"].str();
|
||||
|
||||
topics.emplace_back(name, id, text.str());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -224,6 +224,7 @@ static void print_trait_list(std::stringstream & ss, const std::vector<trait_dat
|
|||
size_t i = 0;
|
||||
ss << make_link(l[i].first, l[i].second);
|
||||
|
||||
// This doesn't skip traits with empty names
|
||||
for(i++; i < l.size(); i++) {
|
||||
ss << ", " << make_link(l[i].first,l[i].second);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,8 +56,11 @@ public:
|
|||
private:
|
||||
EPOCH epoch;
|
||||
|
||||
unsigned int year = 0;
|
||||
|
||||
// TODO: Decide how many months and days there are!
|
||||
unsigned int year = 0, month = 0, day = 0;
|
||||
//unsigned int month = 0;
|
||||
//unsigned int day = 0;
|
||||
};
|
||||
|
||||
bool operator<(const irdya_date& a, const irdya_date& b);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue