Cleanup lobby

include/aoapplication.h

@@ -210,6 +210,19 @@ class AOApplication : public QApplication {
    */
   QVector<server_type> read_legacy_favorite_servers();
 
+  /**
+   * @brief Reads the clients log folder and locates potential demo files to populate the demoserver list.
+   *
+   * @return A seperated list of servernames and demo logfile filenames.
+   *
+   * @details This is to remove the need of delimiters or deal with potential
+   * harmfully encoding or plattform differences. We always get a combo of servername and filename.
+   *
+   * Do note this function assumes all demo files have the .demo extension.
+   *
+   */
+  QMultiMap<QString, QString> load_demo_logs_list() const;
+
   // Returns the value of p_identifier in the design.ini file in p_design_path
   QString read_design_ini(QString p_identifier, VPath p_design_path);
   QString read_design_ini(QString p_identifier, QString p_design_path);

include/demoserver.h

@@ -22,6 +22,8 @@ class DemoServer : public QObject
     int port = 27088;
     int max_wait = -1;
 
+    void set_demo_file(QString filepath);
+
 private:
     void handle_packet(AOPacket *packet);
     void load_demo(QString filename);
@@ -39,6 +41,7 @@ class DemoServer : public QObject
     QString p_path;
     QTimer *timer;
     int elapsed_time = 0;
+    QString filename;
 
 private slots:
     void accept_connection();

include/lobby.h

@@ -1,22 +1,16 @@
 #ifndef LOBBY_H
 #define LOBBY_H
 
-#include "aobutton.h"
-#include "aoimage.h"
-#include "aopacket.h"
-#include "aotextarea.h"
-
+#include <QDebug>
 #include <QLabel>
 #include <QLineEdit>
-#include <QListWidget>
 #include <QMainWindow>
-#include <QPlainTextEdit>
-#include <QProgressBar>
+#include <QPushButton>
 #include <QTextBrowser>
 #include <QTreeWidget>
-#include <QDebug>
-#include <QScrollBar>
-#include <QHeaderView>
+
+#include "networkmanager.h"
+
 #ifdef ANDROID
 #include <QtAndroidExtras/QtAndroid>
 #endif
@@ -27,89 +21,74 @@ class Lobby : public QMainWindow {
   Q_OBJECT
 
 public:
-  Lobby(AOApplication *p_ao_app);
+  Lobby(AOApplication *p_ao_app, NetworkManager *p_net_man = nullptr);
+  ~Lobby();
 
-  void set_widgets();
-  void list_servers();
-  void list_favorites();
-  void get_motd();
-  void check_for_updates();
-  void append_chatmessage(QString f_name, QString f_message);
-  void append_error(QString f_message);
   void set_player_count(int players_online, int max_players);
-  void set_server_description(const QString& server_description);
-  void set_stylesheet(QWidget *widget);
-  void set_stylesheets();
-  void set_fonts();
-  void set_font(QWidget *widget, QString p_identifier);
-  void set_loading_text(QString p_text);
-  void show_loading_overlay() { ui_loading_background->show(); }
-  void hide_loading_overlay() { ui_loading_background->hide(); }
-  QString get_chatlog();
+  void set_server_description(const QString &server_description);
+  void list_servers();
   int get_selected_server();
-  void enable_connect_button();
-  void reset_selection();
-
-  void set_loading_value(int p_value);
 
-  bool public_servers_selected = true;
-  bool doubleclicked = false;
+signals:
+  void settings_requested();
 
-  ~Lobby();
 
 private:
   AOApplication *ao_app;
+  NetworkManager *net_manager;
 
-  AOImage *ui_background;
+  void list_favorites();
+  void list_demos();
+  void get_motd();
+  void check_for_updates();
+  void reset_selection();
 
-  AOButton *ui_public_servers;
-  AOButton *ui_favorites;
+  int last_index = -1;
 
-  AOButton *ui_refresh;
-  AOButton *ui_add_to_fav;
-  AOButton *ui_remove_from_fav;
-  AOButton *ui_connect;
+  enum TabPage { SERVER, FAVORITES, DEMOS };
 
-  QLabel *ui_version;
-  AOButton *ui_about;
+  // UI-file Lobby
 
-  AOButton *ui_settings;
+  // Top Row
+  QLabel *ui_game_version_lbl;
+  QPushButton *ui_settings_button;
+  QPushButton *ui_about_button;
 
-  QTreeWidget *ui_server_list;
-  QLineEdit *ui_server_search;
+  // Server, Favs and Demo lists
+  QTabWidget *ui_connections_tabview;
 
-  QLabel *ui_player_count;
-  AOTextArea *ui_description;
+  QTreeWidget *ui_serverlist_tree;
+  QLineEdit *ui_serverlist_search;
 
-  AOTextArea *ui_chatbox;
+  QTreeWidget *ui_favorites_tree;
+  QLineEdit *ui_favorites_search;
 
-  AOImage *ui_loading_background;
-  QTextEdit *ui_loading_text;
-  QProgressBar *ui_progress_bar;
-  AOButton *ui_cancel;
+  QTreeWidget *ui_demo_tree;
+  QLineEdit *ui_demo_search;
 
-  int last_index = -1;
+  QPushButton *ui_add_to_favorite_button;
+  QPushButton *ui_remove_from_favorites_button;
+  QPushButton *ui_refresh_button;
 
-  void set_size_and_pos(QWidget *p_widget, QString p_identifier);
+  // Serverinfo / MOTD Horizontal Row
+  QTextBrowser *ui_motd_text;
 
-private slots:
-  void on_public_servers_clicked();
-  void on_favorites_clicked();
+  QLabel *ui_server_player_count_lbl;
+  QTextBrowser *ui_server_description_text;
+  QPushButton *ui_connect_button;
 
-  void on_refresh_pressed();
+private slots:
+  void on_tab_changed(int index);
   void on_refresh_released();
-  void on_add_to_fav_pressed();
   void on_add_to_fav_released();
-  void on_remove_from_fav_pressed();
   void on_remove_from_fav_released();
-  void on_connect_pressed();
-  void on_connect_released();
   void on_about_clicked();
-  void on_settings_clicked();
   void on_server_list_clicked(QTreeWidgetItem *p_item, int column);
-  void on_server_list_doubleclicked(QTreeWidgetItem *p_item, int column);
-  void on_server_list_context_menu_requested(const QPoint &point);
+  void on_list_doubleclicked(QTreeWidgetItem *p_item, int column);
+  void on_favorite_list_context_menu_requested(const QPoint &point);
+  void on_favorite_tree_clicked(QTreeWidgetItem *p_item, int column);
   void on_server_search_edited(QString p_text);
+  void on_demo_clicked(QTreeWidgetItem *item, int column);
 };
 
 #endif // LOBBY_H

include/networkmanager.h

@@ -51,9 +51,13 @@ class NetworkManager : public QObject {
   void connect_to_server(server_type p_server);
   void disconnect_from_server();
 
+signals:
+  void server_connected(bool state);
+
 public slots:
   void get_server_list(const std::function<void()> &cb);
   void ship_server_packet(QString p_packet);
+  void join_to_server();
   void handle_server_packet(const QString& p_data);
 
   void request_document(MSDocumentType document_type,