aboutsummaryrefslogtreecommitdiff
path: root/src/lobby.cpp
diff options
context:
space:
mode:
authorLeifa <26681464+TrickyLeifa@users.noreply.github.com>2024-07-09 13:07:30 +0200
committerGitHub <noreply@github.com>2024-07-09 13:07:30 +0200
commitefd2571459924f40718130f7edd28a72a76b12d7 (patch)
tree91751194abb0bfe1306976d676740b43a53dd81b /src/lobby.cpp
parent662d4781d2653e02b9f3727a9299ded8c7b1eaa2 (diff)
Remove TCP entry point (#1007)
* Remove TCP entry point Resolve #987 * Remove TCP entry point * Servers that do not support WebSocket will be marked as `Legacy` * Removal of TCP connection from the master will follow later. * Tweaked error message
Diffstat (limited to 'src/lobby.cpp')
-rw-r--r--src/lobby.cpp39
1 files changed, 34 insertions, 5 deletions
diff --git a/src/lobby.cpp b/src/lobby.cpp
index aba9f606..9918ca3d 100644
--- a/src/lobby.cpp
+++ b/src/lobby.cpp
@@ -238,8 +238,7 @@ void Lobby::on_add_server_to_fave_released()
void Lobby::on_edit_favorite_released()
{
const int index = get_selected_server();
- ServerEditorDialog dialog;
- dialog.loadServerInfo(Options::getInstance().favorites().at(index));
+ ServerEditorDialog dialog(Options::getInstance().favorites().at(index));
if (dialog.exec())
{
Options::getInstance().updateFavorite(dialog.currentServerInfo(), index);
@@ -428,7 +427,7 @@ void Lobby::on_demo_clicked(QTreeWidgetItem *item, int column)
QString l_filepath = (get_app_path() + "/logs/%1/%2").arg(item->data(0, Qt::DisplayRole).toString(), item->data(1, Qt::DisplayRole).toString());
ao_app->demo_server->start_server();
ServerInfo demo_server;
- demo_server.ip = "127.0.0.1";
+ demo_server.address = "127.0.0.1";
demo_server.port = ao_app->demo_server->port();
ao_app->demo_server->set_demo_file(l_filepath);
net_manager->connect_to_server(demo_server);
@@ -462,7 +461,22 @@ void Lobby::list_servers()
{
QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui_serverlist_tree);
treeItem->setData(0, Qt::DisplayRole, i);
- treeItem->setText(1, i_server.name);
+
+ if (i_server.legacy)
+ {
+ treeItem->setText(1, "(Legacy) " + i_server.name);
+ treeItem->setBackground(0, Qt::darkRed);
+ treeItem->setBackground(1, Qt::darkRed);
+
+ QString tooltip = tr("Unable to connect to server. Server is missing WebSocket support.");
+ treeItem->setToolTip(0, tooltip);
+ treeItem->setToolTip(1, tooltip);
+ }
+ else
+ {
+ treeItem->setText(1, i_server.name);
+ }
+
i++;
}
ui_serverlist_tree->setSortingEnabled(true);
@@ -480,7 +494,22 @@ void Lobby::list_favorites()
{
QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui_favorites_tree);
treeItem->setData(0, Qt::DisplayRole, i);
- treeItem->setText(1, i_server.name);
+
+ if (i_server.legacy)
+ {
+ treeItem->setText(1, "(Legacy) " + i_server.name);
+ treeItem->setBackground(0, Qt::darkRed);
+ treeItem->setBackground(1, Qt::darkRed);
+
+ QString tooltip = tr("Unable to connect to server. Server is missing WebSocket support.");
+ treeItem->setToolTip(0, tooltip);
+ treeItem->setToolTip(1, tooltip);
+ }
+ else
+ {
+ treeItem->setText(1, i_server.name);
+ }
+
i++;
}
ui_favorites_tree->setSortingEnabled(true);