added more widgets to lobby and made masterserverchat work

7 files changed, 208 insertions, 12 deletions

diff --git a/aoapplication.h b/aoapplication.h
index 14ad5ce8..f1bc56b7 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -34,6 +34,7 @@ public:
   void destruct_courtroom();
 
   QVector<server_type> server_list;
+  QVector<server_type> favorite_list;
 
   void ms_packet_received(AOPacket *p_packet);
 };
diff --git a/lobby.cpp b/lobby.cpp
index d38baa7a..c7f27af2 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -26,6 +26,9 @@ Lobby::Lobby(AOApplication *parent) : QMainWindow()
   ui_server_list = new QListWidget(this);
   ui_player_count = new QLabel(this);
   ui_description = new QPlainTextEdit(this);
+  ui_chatbox = new QPlainTextEdit(this);
+  ui_chatname = new QLineEdit(this);
+  ui_chatmessage = new QLineEdit(this);
 
   connect(ui_public_servers, SIGNAL(clicked()), this, SLOT(on_public_servers_clicked()));
   connect(ui_favorites, SIGNAL(clicked()), this, SLOT(on_favorites_clicked()));
@@ -35,8 +38,9 @@ Lobby::Lobby(AOApplication *parent) : QMainWindow()
   connect(ui_add_to_fav, SIGNAL(released()), this, SLOT(on_add_to_fav_released()));
   connect(ui_connect, SIGNAL(pressed()), this, SLOT(on_connect_pressed()));
   connect(ui_connect, SIGNAL(released()), this, SLOT(on_connect_released()));
-
   connect(ui_about, SIGNAL(clicked()), this, SLOT(on_about_clicked()));
+  connect(ui_server_list, SIGNAL(clicked(QModelIndex)), this, SLOT(on_server_list_clicked(QModelIndex)));
+  connect(ui_chatmessage, SIGNAL(returnPressed()), this, SLOT(on_chatfield_return_pressed()));
 
   set_widgets();
 }
@@ -94,8 +98,25 @@ void Lobby::set_widgets()
 
   ui_description->move(337, 109);
   ui_description->resize(173, 245);
+  ui_description->setReadOnly(true);
   ui_description->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
                                 "color: white;");
+
+  ui_chatbox->move(2, 445);
+  ui_chatbox->resize(515, 198);
+  ui_chatbox->setReadOnly(true);
+  ui_chatbox->setStyleSheet("background-color: rgba(0, 0, 0, 0);");
+
+  ui_chatname->move(3, 646);
+  ui_chatname->resize(85, 19);
+  ui_chatname->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
+                             "selection-background-color: rgba(0, 0, 0, 0);");
+
+  ui_chatmessage->move(93, 646);
+  ui_chatmessage->resize(424, 19);
+  ui_chatmessage->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
+                                "selection-background-color: rgba(0, 0, 0, 0);");
+
 }
 
 void Lobby::on_public_servers_clicked()
@@ -103,7 +124,9 @@ void Lobby::on_public_servers_clicked()
   ui_public_servers->set_image("publicservers_selected.png");
   ui_favorites->set_image("favorites.png");
 
-  //T0D0: clear server list and show public servers
+  list_servers();
+
+  public_servers_selected = true;
 }
 
 void Lobby::on_favorites_clicked()
@@ -111,7 +134,11 @@ void Lobby::on_favorites_clicked()
   ui_favorites->set_image("favorites_selected.png");
   ui_public_servers->set_image("publicservers.png");
 
-  //T0D0: clear server list and show favorites from serverlist.txt
+  ao_app->favorite_list = read_serverlist_txt();
+
+  list_favorites();
+
+  public_servers_selected = false;
 }
 
 void Lobby::on_refresh_pressed()
@@ -139,7 +166,22 @@ void Lobby::on_add_to_fav_released()
 {
   ui_add_to_fav->set_image("addtofav.png");
 
-  //T0D0, add selected element to serverlist.txt
+  //you cant add favorites from favorites m8
+  if (!public_servers_selected)
+    return;
+
+  int n_server = ui_server_list->currentRow();
+
+  if (n_server < 0 || n_server >= ao_app->server_list.size())
+    return;
+
+  server_type fav_server = ao_app->server_list.at(n_server);
+
+  QString str_port = QString::number(fav_server.port);
+
+  QString server_line = fav_server.ip + ":" + str_port + ":" + fav_server.name;
+
+  write_to_serverlist_txt(server_line);
 }
 
 void Lobby::on_connect_pressed()
@@ -160,6 +202,51 @@ void Lobby::on_about_clicked()
   call_error("YEBOIIII");
 }
 
+void Lobby::on_server_list_clicked(QModelIndex p_model)
+{
+  server_type f_server;
+  int n_server = p_model.row();
+
+  if (n_server < 0)
+    return;
+
+  if (public_servers_selected)
+  {
+    if (n_server >= ao_app->server_list.size())
+      return;
+
+    f_server = ao_app->server_list.at(p_model.row());
+  }
+  else
+  {
+    if (n_server >= ao_app->favorite_list.size())
+      return;
+
+    f_server = ao_app->favorite_list.at(p_model.row());
+  }
+
+  ui_description->clear();
+  ui_description->appendPlainText(f_server.desc);
+
+  ui_description->moveCursor(QTextCursor::Start);
+  ui_description->ensureCursorVisible();
+
+  //T0D0: uncomment when implemented
+  //ao_app->net_manager->connect_to_server(f_server.ip, f_server.port);
+}
+
+void Lobby::on_chatfield_return_pressed()
+{
+  QString raw_packet = "CT#" + ui_chatname->text() + "#" + ui_chatmessage->text() + "#%";
+  AOPacket *f_packet = new AOPacket(raw_packet);
+
+  ao_app->net_manager->send_ms_packet(f_packet);
+
+  ui_chatmessage->clear();
+
+  delete f_packet;
+}
+
 void Lobby::list_servers()
 {
   ui_server_list->clear();
@@ -169,3 +256,18 @@ void Lobby::list_servers()
     ui_server_list->addItem(i_server.name);
   }
 }
+
+void Lobby::list_favorites()
+{
+  ui_server_list->clear();
+
+  for (server_type i_server : ao_app->favorite_list)
+  {
+    ui_server_list->addItem(i_server.name);
+  }
+}
+
+void Lobby::append_chat_message(QString p_message_line)
+{
+  ui_chatbox->appendPlainText(p_message_line);
+}
diff --git a/lobby.h b/lobby.h
index 8b33b977..16573c19 100644
--- a/lobby.h
+++ b/lobby.h
@@ -5,6 +5,7 @@
 #include <QListWidget>
 #include <QLabel>
 #include <QPlainTextEdit>
+#include <QLineEdit>
 
 #include "aoimage.h"
 #include "aobutton.h"
@@ -22,6 +23,8 @@ public:
 
   void set_widgets();
   void list_servers();
+  void list_favorites();
+  void append_chat_message(QString p_message_line);
 
 private:
   AOApplication *ao_app;
@@ -42,10 +45,17 @@ private:
   QLabel *ui_player_count;
   QPlainTextEdit *ui_description;
 
+  QPlainTextEdit *ui_chatbox;
+
+  QLineEdit *ui_chatname;
+  QLineEdit *ui_chatmessage;
+
   const int m_lobby_width = 517;
   const int m_lobby_height = 666;
 
-public slots:
+  bool public_servers_selected = true;
+
+private slots:
   void on_public_servers_clicked();
   void on_favorites_clicked();
 
@@ -55,8 +65,9 @@ public slots:
   void on_add_to_fav_released();
   void on_connect_pressed();
   void on_connect_released();
-
   void on_about_clicked();
+  void on_server_list_clicked(QModelIndex p_model);
+  void on_chatfield_return_pressed();
 };
 
 #endif // LOBBY_H
diff --git a/networkmanager.cpp b/networkmanager.cpp
index 31942647..daca0f36 100644
--- a/networkmanager.cpp
+++ b/networkmanager.cpp
@@ -35,15 +35,13 @@ void NetworkManager::send_ms_packet(AOPacket *p_packet)
   QString f_packet = p_packet->to_string();
 
   ms_socket->write(f_packet.toLocal8Bit());
-  //qDebug() << "S(ms):" << f_packet;
+  qDebug() << "S(ms):" << f_packet;
 }
 
 void NetworkManager::send_server_packet(AOPacket *p_packet)
 {
   QString f_packet = p_packet->to_string();
 
-  delete p_packet;
-
   ms_socket->write(f_packet.toLocal8Bit());
   qDebug() << "S(ms):" << f_packet;
 }
diff --git a/packet_distribution.cpp b/packet_distribution.cpp
index bd713bbd..5990d257 100644
--- a/packet_distribution.cpp
+++ b/packet_distribution.cpp
@@ -39,4 +39,27 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
       w_lobby->list_servers();
     }
   }
+  else if (header == "CT")
+  {
+    QStringList f_contents = p_packet->get_contents();
+
+    QString message_line;
+
+    if (f_contents.size() == 1)
+      message_line = f_contents.at(0);
+    else if (f_contents.size() >= 2)
+      message_line = f_contents.at(0) + ": " + f_contents.at(1);
+    else
+      return;
+
+    if (lobby_constructed)
+    {
+      w_lobby->append_chat_message(message_line);
+    }
+    if (courtroom_constructed)
+    {
+      //T0D0: uncomment this when it's implemented
+      //w_courtroom->append_chat_message(message_line);
+    }
+  }
 }
diff --git a/text_file_functions.cpp b/text_file_functions.cpp
index 336b76c4..18f1aa0b 100644
--- a/text_file_functions.cpp
+++ b/text_file_functions.cpp
@@ -1,9 +1,11 @@
-#include <QTextStream>
-#include <QStringList>
+#include "text_file_functions.h"
 
 #include "path_functions.h"
+#include "file_functions.h"
 
-#include "text_file_functions.h"
+#include <QTextStream>
+#include <QStringList>
+#include <QVector>
 
 QString get_user_theme(){
   QFile config_file(get_base_path() + "config.ini");
@@ -27,3 +29,58 @@ QString get_user_theme(){
 
   return "default";
 }
+
+void write_to_serverlist_txt(QString p_line)
+{
+  QFile serverlist_txt;
+  QString serverlist_txt_path = get_base_path() + "serverlist.txt";
+
+  serverlist_txt.setFileName(serverlist_txt_path);
+
+  if (!serverlist_txt.open(QIODevice::WriteOnly | QIODevice::Append))
+  {
+    return;
+  }
+
+  QTextStream out(&serverlist_txt);
+
+  out << p_line << '\n';
+
+  serverlist_txt.close();
+}
+
+QVector<server_type> read_serverlist_txt()
+{
+  QVector<server_type> f_server_list;
+
+  QFile serverlist_txt;
+  QString serverlist_txt_path = get_base_path() + "serverlist.txt";
+
+  serverlist_txt.setFileName(serverlist_txt_path);
+
+  if (!serverlist_txt.open(QIODevice::ReadOnly))
+  {
+    return f_server_list;
+  }
+
+  QTextStream in(&serverlist_txt);
+
+  while(!in.atEnd())
+  {
+    QString line = in.readLine();
+    server_type f_server;
+    QStringList line_contents = line.split(":");
+
+    if (line_contents.size() < 3)
+        continue;
+
+    f_server.ip = line_contents.at(0);
+    f_server.port = line_contents.at(1).toInt();
+    f_server.name = line_contents.at(2);
+    f_server.desc = "";
+
+    f_server_list.append(f_server);
+  }
+
+  return f_server_list;
+}
diff --git a/text_file_functions.h b/text_file_functions.h
index 99abe089..96cb941f 100644
--- a/text_file_functions.h
+++ b/text_file_functions.h
@@ -1,9 +1,13 @@
 #ifndef TEXT_FILE_FUNCTIONS_H
 #define TEXT_FILE_FUNCTIONS_H
 
+#include "datatypes.h"
+
 #include <QString>
 #include <QFile>
 
 QString get_user_theme();
+void write_to_serverlist_txt(QString p_line);
+QVector<server_type> read_serverlist_txt();
 
 #endif // TEXT_FILE_FUNCTIONS_H