Skip to content

Add timestamp colors you can change in courtroom_fonts.ini #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crystalwarrior merged 2 commits into from
Mar 25, 2022
Merged

Add timestamp colors you can change in courtroom_fonts.ini #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9a6ae9
Add ic_chatlog_timestamp_color and ic_chatlog_selftimestamp_color to …
Crystalwarrior Mar 24, 2022
1bc69e1
clang tidy. clang stronk.
Crystalwarrior Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/charselect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion src/courtroom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3172,6 +3172,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);
Expand All @@ -3180,6 +3182,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();
Expand All @@ -3198,9 +3202,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;
}
Expand Down