diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2021-12-30 20:31:44 -0600 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2021-12-30 20:31:44 -0600 |
| commit | ee76c2ce61f6996bfae3ef027eaee8485d455c95 (patch) | |
| tree | c70e266cad00d0adf27be8fa51a07e13de9828db /include/courtroom.h | |
| parent | ecfb791e483234308b1edacb87e499860a63e510 (diff) | |
| parent | 593bd54000be14c9a1455914285c1b2549b0fa51 (diff) | |
Merge branch 'master' into feature/http-ms
# Conflicts:
# src/networkmanager.cpp
Diffstat (limited to 'include/courtroom.h')
| -rw-r--r-- | include/courtroom.h | 14 |
1 files changed, 11 insertions, 3 deletions
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(); |
