aboutsummaryrefslogtreecommitdiff
path: root/lobby.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lobby.cpp')
-rw-r--r--lobby.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/lobby.cpp b/lobby.cpp
index 9761cc03..28da1fa9 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -5,9 +5,6 @@
#include "networkmanager.h"
#include "aosfxplayer.h"
-#include <QDebug>
-#include <QScrollBar>
-
Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
{
ao_app = p_ao_app;
@@ -52,6 +49,8 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
connect(ui_chatmessage, SIGNAL(returnPressed()), this, SLOT(on_chatfield_return_pressed()));
connect(ui_cancel, SIGNAL(clicked()), ao_app, SLOT(loading_cancelled()));
+ ui_connect->setEnabled(false);
+
set_widgets();
}
@@ -315,6 +314,8 @@ void Lobby::on_server_list_clicked(QModelIndex p_model)
ui_player_count->setText("Offline");
+ ui_connect->setEnabled(false);
+
ao_app->net_manager->connect_to_server(f_server);
}
@@ -361,7 +362,7 @@ void Lobby::list_favorites()
void Lobby::append_chatmessage(QString f_name, QString f_message)
{
- ui_chatbox->append_chatmessage(f_name, f_message);
+ ui_chatbox->append_chatmessage(f_name, f_message, ao_app->get_color("ooc_default_color", "courtroom_design.ini").name());
}
void Lobby::append_error(QString f_message)
@@ -375,6 +376,11 @@ void Lobby::set_player_count(int players_online, int max_players)
ui_player_count->setText(f_string);
}
+void Lobby::enable_connect_button()
+{
+ ui_connect->setEnabled(true);
+}
+
Lobby::~Lobby()
{