diff options
| -rw-r--r-- | src/charselect.cpp | 6 | ||||
| -rw-r--r-- | src/courtroom.cpp | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/charselect.cpp b/src/charselect.cpp index dce675a5..7b9308a4 100644 --- a/src/charselect.cpp +++ b/src/charselect.cpp @@ -189,8 +189,12 @@ void Courtroom::char_clicked(int n_char) set_courtroom_size(); } - if (n_char != -1) + if (n_char != -1) { ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name); + } + else { + ui_ic_chat_name->setPlaceholderText("Spectator"); + } } void Courtroom::put_button_in_place(int starting, int chars_on_this_page) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index c60bf68f..8e60994f 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3162,6 +3162,8 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, QTextCharFormat italics; QTextCharFormat own_name; QTextCharFormat other_name; + QTextCharFormat timestamp_format; + QTextCharFormat selftimestamp_format; QTextBlockFormat format; bold.setFontWeight(QFont::Bold); normal.setFontWeight(QFont::Normal); @@ -3170,6 +3172,8 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, own_name.setForeground(ao_app->get_color("ic_chatlog_selfname_color", "courtroom_fonts.ini")); other_name.setFontWeight(QFont::Bold); other_name.setForeground(ao_app->get_color("ic_chatlog_showname_color", "courtroom_fonts.ini")); + timestamp_format.setForeground(ao_app->get_color("ic_chatlog_timestamp_color", "courtroom_fonts.ini")); + selftimestamp_format.setForeground(ao_app->get_color("ic_chatlog_selftimestamp_color", "courtroom_fonts.ini")); format.setTopMargin(log_margin); const QTextCursor old_cursor = ui_ic_chatlog->textCursor(); const int old_scrollbar_value = ui_ic_chatlog->verticalScrollBar()->value(); @@ -3188,9 +3192,11 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, // Timestamp if we're doing that meme if (log_timestamp) { + // Format the timestamp + QTextCharFormat format = selfname ? selftimestamp_format : timestamp_format; if (timestamp.isValid()) { ui_ic_chatlog->textCursor().insertText( - "[" + timestamp.toString(log_timestamp_format) + "] ", normal); + "[" + timestamp.toString(log_timestamp_format) + "] ", format); } else { qCritical() << "could not insert invalid timestamp" << timestamp; } |