jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-15 06:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge e9600b5ea1 into ca73033aea

Browse source
This commit is contained in:
lilyhuang-github 2025-04-20 22:25:24 -07:00 • committed by GitHub
commit 3c841fe03b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 59 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/server/message_log_widget.cpp
View file

@ -12,6 +12,11 @@
#include <utility>
const QString MessageLogWidget::getCurrentTime()
{
return ChatView::getCurrentTime();
}
const QString &MessageLogWidget::tableConstant() const
{
static const QString constant("table");
@ -615,14 +620,13 @@ void MessageLogWidget::logSetActivePhase(int phaseNumber)
soundEngine->playSound(phase.soundFileName);
appendHtml("<font color=\"" + phase.color + "\"><b>" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") +
phase.getName() + "</b></font>");
appendHtml("<font color=\"" + phase.color + "\"><b>" + getCurrentTime() + phase.getName() + "</b></font>");
}
void MessageLogWidget::logSetActivePlayer(Player *player)
{
appendHtml("<br><font color=\"green\"><b>" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") +
QString(tr("%1's turn.")).arg(player->getName()) + "</b></font><br>");
appendHtml("<br><font color=\"green\"><b>" + getCurrentTime() + QString(tr("%1's turn.")).arg(player->getName()) +
"</b></font><br>");
}
void MessageLogWidget::logSetAnnotation(Player *player, CardItem *card, QString newAnnotation)