Merge branch 'master' into feature/http-ms

# Conflicts:
#	src/networkmanager.cpp

6 files changed, 34 insertions, 10 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index d8d3c9a..1102ffd 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -503,8 +503,11 @@ public:
   // Get the message for the CM for casing alerts.
   QString get_casing_can_host_cases();
 
-  // Get if automatic logging is enabled
-  bool get_auto_logging_enabled();
+  // Get if text file logging is enabled
+  bool get_text_logging_enabled();
+
+  // Get if demo logging is enabled
+  bool get_demo_logging_enabled();
 
   // Get the subtheme from settings
   QString get_subtheme();
@@ -563,6 +566,10 @@ private:
 public slots:
   void server_disconnected();
   void loading_cancelled();
+
+signals:
+  void qt_log_message(QtMsgType type, const QMessageLogContext &context,
+                      const QString &msg);
 };
 
 #endif // AOAPPLICATION_H
diff --git a/include/aoemotebutton.h b/include/aoemotebutton.h
index 58e7e74..add9b43 100644
--- a/include/aoemotebutton.h
+++ b/include/aoemotebutton.h
@@ -14,7 +14,7 @@ public:
                 int p_w, int p_h);
 
   void set_image(QString p_image, QString p_emote_comment);
-  void set_char_image(QString p_char, int p_emote, QString suffix);
+  void set_char_image(QString p_char, int p_emote, bool on);
 
   void set_id(int p_id) { m_id = p_id; }
   int get_id() { return m_id; }
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index f899b9a..7c9bfb3 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -10,6 +10,8 @@
 #include <QDebug>
 #include <QWidget>
 #include <string.h>
+#include <QFuture>
+#include <QFutureWatcher>
 
 class AOMusicPlayer {
 public:
@@ -24,8 +26,10 @@ public:
   int loop_start[4] = {0, 0, 0, 0};
   int loop_end[4] = {0, 0, 0, 0};
 
+  QFutureWatcher<QString> music_watcher;
+
 public slots:
-  int play(QString p_song, int channel = 0, bool loop = false,
+  QString play(QString p_song, int channel = 0, bool loop = false,
             int effect_flags = 0);
   void stop(int channel = 0);
 
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index 84a9648..9c4d0d9 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -125,6 +125,12 @@ private:
   QLabel *ui_category_stop_lbl;
   QCheckBox *ui_category_stop_cb;
 
+  QLabel *ui_log_text_lbl;
+  QCheckBox *ui_log_text_cb;
+
+  QLabel *ui_log_demo_lbl;
+  QCheckBox *ui_log_demo_cb;
+
   QWidget *ui_callwords_tab;
   QWidget *ui_callwords_widget;
   QVBoxLayout *ui_callwords_layout;
@@ -175,8 +181,6 @@ private:
   QCheckBox *ui_casing_cm_cb;
   QLabel *ui_casing_cm_cases_lbl;
   QLineEdit *ui_casing_cm_cases_textbox;
-  QLabel *ui_log_lbl;
-  QCheckBox *ui_log_cb;
 
   QWidget *ui_assets_tab;
   QVBoxLayout *ui_assets_tab_layout;
diff --git a/include/aotextarea.h b/include/aotextarea.h
index 453e965..d9a960d 100644
--- a/include/aotextarea.h
+++ b/include/aotextarea.h
@@ -12,7 +12,8 @@ public:
   AOTextArea(QWidget *p_parent = nullptr);
 
   void append_linked(QString p_message);
-  void append_chatmessage(QString p_name, QString p_message, QString p_colur);
+  void append_chatmessage(QString p_name, QString p_message,
+                          QString p_name_colour, QString p_color = QString());
   void append_error(QString p_message);
 
 private:
diff --git a/include/courtroom.h b/include/courtroom.h
index 4bc8624..8a41b60 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -57,6 +57,8 @@
 #include <QTextCharFormat>
 #include <QElapsedTimer>
 
+#include <QFuture>
+
 #include <algorithm>
 #include <stack>
 
@@ -214,8 +216,12 @@ public:
   void list_music();
   void list_areas();
 
-  // these are for OOC chat
-  void append_ms_chatmessage(QString f_name, QString f_message);
+  // Debug log (formerly master server chat log)
+  void debug_message_handler(QtMsgType type, const QMessageLogContext &context,
+                             const QString &msg);
+  void append_debug_message(QString f_message);
+
+  // OOC chat log
   void append_server_chatmessage(QString p_name, QString p_message,
                                  QString p_color);
 
@@ -628,7 +634,7 @@ private:
 
   QTextEdit *ui_ic_chatlog;
 
-  AOTextArea *ui_ms_chatlog;
+  AOTextArea *ui_debug_log;
   AOTextArea *ui_server_chatlog;
 
   QListWidget *ui_mute_list;
@@ -814,6 +820,8 @@ public slots:
                    bool steno);
   void on_reload_theme_clicked();
 
+  void update_ui_music_name();
+
 private slots:
   void start_chat_ticking();
   void play_sfx();