Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #369 from skyedeving/fix-showname-toggle

Browse Source 
Fix timestamps when toggling showname
This commit is contained in:
oldmud0 2021-01-05 21:07:48 -06:00 committed by GitHub
commit 9486f44770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/courtroom.h
View File

@ -226,7 +226,7 @@ public:
// selected // selected
// or the user isn't already scrolled to the top // or the user isn't already scrolled to the top
void append_ic_text(QString p_text, QString p_name = "", QString action = "", void append_ic_text(QString p_text, QString p_name = "", QString action = "",
int color = 0); int color = 0, QDateTime timestamp = QDateTime::currentDateTime());
// prints who played the song to IC chat and plays said song(if found on local // prints who played the song to IC chat and plays said song(if found on local
// filesystem) takes in a list where the first element is the song name and // filesystem) takes in a list where the first element is the song name and

17
src/courtroom.cpp
View File

@ -2619,7 +2619,7 @@ void Courtroom::log_ic_text(QString p_name, QString p_showname,
} }
void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action,
int color) int color, QDateTime timestamp)
{ {
QTextCharFormat bold; QTextCharFormat bold;
QTextCharFormat normal; QTextCharFormat normal;
@ -2645,10 +2645,14 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action,
} }
// Timestamp if we're doing that meme // Timestamp if we're doing that meme
if (log_timestamp) if (log_timestamp) {
ui_ic_chatlog->textCursor().insertText( if (timestamp.isValid()) {
"[" + QDateTime::currentDateTime().toString("h:mm:ss AP") + "] ", ui_ic_chatlog->textCursor().insertText(
normal); "[" + timestamp.toString("h:mm:ss AP") + "] ", normal);
} else {
qDebug() << "could not insert invalid timestamp";
}
}
// Format the name of the actor // Format the name of the actor
ui_ic_chatlog->textCursor().insertText(p_name, bold); ui_ic_chatlog->textCursor().insertText(p_name, bold);
@ -4788,7 +4792,8 @@ void Courtroom::regenerate_ic_chatlog()
append_ic_text(item.get_message(), append_ic_text(item.get_message(),
ui_showname_enable->isChecked() ? item.get_showname() ui_showname_enable->isChecked() ? item.get_showname()
: item.get_name(), : item.get_name(),
item.get_action(), item.get_chat_color()); item.get_action(), item.get_chat_color(),
item.get_datetime().toLocalTime());
} }
} }