Merge pull request #623 from AttorneyOnline/feature/debug-log

Remove MS chat and add debug log

3 files changed, 13 insertions, 4 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index 957d7f6b..ab738220 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -567,6 +567,10 @@ private slots:
 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/aotextarea.h b/include/aotextarea.h
index 453e9659..d9a960db 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 9df3b901..8a41b605 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -216,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);
 
@@ -630,7 +634,7 @@ private:
 
   QTextEdit *ui_ic_chatlog;
 
-  AOTextArea *ui_ms_chatlog;
+  AOTextArea *ui_debug_log;
   AOTextArea *ui_server_chatlog;
 
   QListWidget *ui_mute_list;