aboutsummaryrefslogtreecommitdiff
path: root/lobby.cpp
diff options
context:
space:
mode:
authorDavid Skoland <davidskoland@gmail.com>2017-01-27 01:17:33 +0100
committerDavid Skoland <davidskoland@gmail.com>2017-01-27 01:17:33 +0100
commit9682087667e2de26e14406efde960b8c7f0c3c98 (patch)
treea2b2dbee3b1a3102499b3cb5c6529e6f01655f74 /lobby.cpp
parent5e2ea2b24c2c0151ff8b0354632aa00148e0e6d6 (diff)
implemented ooc chat and cleaned up some old headers
Diffstat (limited to 'lobby.cpp')
-rw-r--r--lobby.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/lobby.cpp b/lobby.cpp
index 37091146..8bc67bd4 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -1,7 +1,5 @@
#include "lobby.h"
-#include "path_functions.h"
-#include "text_file_functions.h"
#include "debug_functions.h"
#include "aoapplication.h"
#include "networkmanager.h"
@@ -27,6 +25,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
ui_description = new QPlainTextEdit(this);
ui_chatbox = new QPlainTextEdit(this);
ui_chatname = new QLineEdit(this);
+ ui_chatname->setPlaceholderText("Name");
ui_chatmessage = new QLineEdit(this);
ui_loading_background = new AOImage(this, ao_app);
ui_loading_text = new QTextEdit(ui_loading_background);
@@ -152,6 +151,13 @@ void Lobby::set_loading_text(QString p_text)
ui_loading_text->append(p_text);
}
+QString Lobby::get_chatlog()
+{
+ QString return_value = ui_chatbox->toPlainText();
+
+ return return_value;
+}
+
void Lobby::on_public_servers_clicked()
{
ui_public_servers->set_image("publicservers_selected.png");
@@ -260,6 +266,11 @@ void Lobby::on_server_list_clicked(QModelIndex p_model)
void Lobby::on_chatfield_return_pressed()
{
+ //no you can't send empty messages
+ if (ui_chatname->text() == "" || ui_chatmessage->text() == "")
+ return;
+
+
QString f_header = "CT";
QStringList f_contents{ui_chatname->text(), ui_chatmessage->text()};