From b682d69e494acdbf5fc97a81109faa667ad1918f Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sun, 13 Jun 2021 22:16:41 -0500 Subject: Use new HTTP-based master server client --- src/lobby.cpp | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) (limited to 'src/lobby.cpp') diff --git a/src/lobby.cpp b/src/lobby.cpp index 5cdb94a3..feb922ca 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -101,6 +101,8 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() ui_connect->setEnabled(false); list_servers(); + get_motd(); + check_for_updates(); set_widgets(); } @@ -324,9 +326,13 @@ void Lobby::on_refresh_released() { ui_refresh->set_image("refresh"); - AOPacket *f_packet = new AOPacket("ALL#%"); - - ao_app->send_ms_packet(f_packet); + if (public_servers_selected) { + ao_app->net_manager->get_server_list(std::bind(&Lobby::list_servers, this)); + get_motd(); + } else { + ao_app->set_favorite_list(); + list_favorites(); + } } void Lobby::on_add_to_fav_pressed() @@ -492,9 +498,10 @@ void Lobby::on_chatfield_return_pressed() QString f_header = "CT"; QStringList f_contents{ui_chatname->text(), ui_chatmessage->text()}; - AOPacket *f_packet = new AOPacket(f_header, f_contents); + append_chatmessage("", "Stubbed lmao"); - ao_app->send_ms_packet(f_packet); +// AOPacket *f_packet = new AOPacket(f_header, f_contents); +// ao_app->send_ms_packet(f_packet); ui_chatmessage->clear(); } @@ -537,6 +544,34 @@ void Lobby::list_favorites() ui_server_list->setSortingEnabled(true); } +void Lobby::get_motd() +{ + ao_app->net_manager->request_document(MSDocumentType::Motd, + [this](QString document) { + if (document.isEmpty()) + document = tr("Couldn't get the message of the day."); + bool isHtml = document.startsWith("", Qt::CaseInsensitive); + if (isHtml) { + ui_chatbox->setHtml(document); + } else { + ui_chatbox->setMarkdown(document); + } + }); +} + +void Lobby::check_for_updates() +{ + ao_app->net_manager->request_document(MSDocumentType::ClientVersion, + [this](QString version) { + const QString current_version = ao_app->get_version_string(); + if (!version.isEmpty() && version != current_version) { + ui_version->setText(tr("Version: %1 (!)").arg(current_version)); + ui_version->setToolTip(tr("New version available: %1").arg(version)); + } + }); +} + void Lobby::append_chatmessage(QString f_name, QString f_message) { ui_chatbox->append_chatmessage( -- cgit From d1370221742b2accf2cd8bfc129ca72c2ca09595 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 18 Dec 2021 22:02:30 -0600 Subject: Remove another markdown thing --- src/lobby.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/lobby.cpp') diff --git a/src/lobby.cpp b/src/lobby.cpp index feb922ca..ad4ebb70 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -548,15 +548,10 @@ void Lobby::get_motd() { ao_app->net_manager->request_document(MSDocumentType::Motd, [this](QString document) { - if (document.isEmpty()) + if (document.isEmpty()) { document = tr("Couldn't get the message of the day."); - bool isHtml = document.startsWith("", Qt::CaseInsensitive); - if (isHtml) { - ui_chatbox->setHtml(document); - } else { - ui_chatbox->setMarkdown(document); } + ui_chatbox->setHtml(document); }); } -- cgit From cf12168ebd426d7658d7f7021c47be519caa215a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 18 Dec 2021 22:22:30 -0600 Subject: Qt 5.9 compat; remove dead code --- src/lobby.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/lobby.cpp') diff --git a/src/lobby.cpp b/src/lobby.cpp index ad4ebb70..5c3ff116 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -495,14 +495,6 @@ void Lobby::on_chatfield_return_pressed() if (ui_chatname->text() == "" || ui_chatmessage->text() == "") return; - QString f_header = "CT"; - QStringList f_contents{ui_chatname->text(), ui_chatmessage->text()}; - - append_chatmessage("", "Stubbed lmao"); - -// AOPacket *f_packet = new AOPacket(f_header, f_contents); -// ao_app->send_ms_packet(f_packet); - ui_chatmessage->clear(); } -- cgit From 8822db8e828b9d5fbb4f21124b5fb41d1acdeb55 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Thu, 30 Dec 2021 21:46:24 -0600 Subject: Remove lobby chat Goodbye, lobby chat :( --- src/lobby.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'src/lobby.cpp') diff --git a/src/lobby.cpp b/src/lobby.cpp index 44496032..b3371e61 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -59,12 +59,6 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() ui_chatbox = new AOTextArea(this); ui_chatbox->setOpenExternalLinks(true); ui_chatbox->setObjectName("ui_chatbox"); - ui_chatname = new QLineEdit(this); - ui_chatname->setPlaceholderText(tr("Name")); - ui_chatname->setText(ao_app->get_ooc_name()); - ui_chatname->setObjectName("ui_chatname"); - ui_chatmessage = new QLineEdit(this); - ui_chatmessage->setObjectName("ui_chatmessage"); ui_loading_background = new AOImage(this, ao_app); ui_loading_background->setObjectName("ui_loading_background"); ui_loading_text = new QTextEdit(ui_loading_background); @@ -95,8 +89,6 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() this, &Lobby::on_server_list_doubleclicked); connect(ui_server_search, &QLineEdit::textChanged, this, &Lobby::on_server_search_edited); - connect(ui_chatmessage, &QLineEdit::returnPressed, this, - &Lobby::on_chatfield_return_pressed); connect(ui_cancel, &AOButton::clicked, ao_app, &AOApplication::loading_cancelled); ui_connect->setEnabled(false); @@ -175,10 +167,6 @@ void Lobby::set_widgets() set_size_and_pos(ui_chatbox, "chatbox"); ui_chatbox->setReadOnly(true); - set_size_and_pos(ui_chatname, "chatname"); - - set_size_and_pos(ui_chatmessage, "chatmessage"); - ui_loading_background->resize(this->width(), this->height()); ui_loading_background->set_image("loadingbackground"); @@ -221,8 +209,6 @@ void Lobby::set_fonts() set_font(ui_player_count, "player_count"); set_font(ui_description, "description"); set_font(ui_chatbox, "chatbox"); - set_font(ui_chatname, "chatname"); - set_font(ui_chatmessage, "chatmessage"); set_font(ui_loading_text, "loading_text"); set_font(ui_server_list, "server_list"); } @@ -496,15 +482,6 @@ void Lobby::on_server_search_edited(QString p_text) } } -void Lobby::on_chatfield_return_pressed() -{ - // no you can't send empty messages - if (ui_chatname->text() == "" || ui_chatmessage->text() == "") - return; - - ui_chatmessage->clear(); -} - void Lobby::list_servers() { public_servers_selected = true; -- cgit From 7b4d1e96c67d506fbbf765344f6cbe8eac1a7c50 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Fri, 31 Dec 2021 10:40:21 -0600 Subject: Disambiguate settings with lobby_settings and courtroom_settings --- src/lobby.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lobby.cpp') diff --git a/src/lobby.cpp b/src/lobby.cpp index b3371e61..44d483c4 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -150,7 +150,7 @@ void Lobby::set_widgets() set_size_and_pos(ui_settings, "settings"); ui_settings->setText(tr("Settings")); - ui_settings->set_image("settings"); + ui_settings->set_image("lobby_settings"); ui_settings->setToolTip( tr("Allows you to change various aspects of the client.")); -- cgit