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

formatting

Browse source
This commit is contained in:
Lily 2025-03-13 12:25:05 -04:00
parent 5d8625761c
commit 5742cf5c15
No known key found for this signature in database
GPG key ID: D916CEDDF4F93CE7
4 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/dialogs/dlg_settings.cpp
View file

@ -1101,8 +1101,7 @@ MessagesSettingsPage::MessagesSettingsPage()
&SettingsCache::setShowMessagePopups); &SettingsCache::setShowMessagePopups);
localTimeCheckBox.setChecked(SettingsCache::instance().getLocalTime()); localTimeCheckBox.setChecked(SettingsCache::instance().getLocalTime());
connect(&localTimeCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), connect(&localTimeCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), &SettingsCache::setLocalTime);
&SettingsCache::setLocalTime);
mentionPopups.setChecked(SettingsCache::instance().getShowMentionPopup()); mentionPopups.setChecked(SettingsCache::instance().getShowMentionPopup());
connect(&mentionPopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), connect(&mentionPopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
@ -1116,9 +1115,6 @@ MessagesSettingsPage::MessagesSettingsPage()
connect(customAlertString, SIGNAL(textChanged(QString)), &SettingsCache::instance(), connect(customAlertString, SIGNAL(textChanged(QString)), &SettingsCache::instance(),
SLOT(setHighlightWords(QString))); SLOT(setHighlightWords(QString)));
auto *chatGrid = new QGridLayout; auto *chatGrid = new QGridLayout;
chatGrid->addWidget(&chatMentionCheckBox, 0, 0); chatGrid->addWidget(&chatMentionCheckBox, 0, 0);
chatGrid->addWidget(&invertMentionForeground, 0, 1); chatGrid->addWidget(&invertMentionForeground, 0, 1);

5
cockatrice/src/server/chat_view/chat_view.cpp
View file

@ -103,8 +103,9 @@ void ChatView::appendHtml(const QString &html)
void ChatView::appendHtmlServerMessage(const QString &html, bool optionalIsBold, QString optionalFontColor) void ChatView::appendHtmlServerMessage(const QString &html, bool optionalIsBold, QString optionalFontColor)
{ {
bool atBottom = verticalScrollBar()->value() >= verticalScrollBar()->maximum(); bool atBottom = verticalScrollBar()->value() >= verticalScrollBar()->maximum();
QString htmlText = "<font color=" + ((optionalFontColor.size() > 0) ? optionalFontColor : serverMessageColor.name()) + QString htmlText =
">" + getCurrentTime() + html + "</font>"; "<font color=" + ((optionalFontColor.size() > 0) ? optionalFontColor : serverMessageColor.name()) + ">" +
getCurrentTime() + html + "</font>";
if (optionalIsBold) if (optionalIsBold)
htmlText = "<b>" + htmlText + "</b>"; htmlText = "<b>" + htmlText + "</b>";

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

@ -632,14 +632,13 @@ void MessageLogWidget::logSetActivePhase(int phaseNumber)
soundEngine->playSound(phase.soundFileName); soundEngine->playSound(phase.soundFileName);
appendHtml("<font color=\"" + phase.color + "\"><b>" + getCurrentTime() + appendHtml("<font color=\"" + phase.color + "\"><b>" + getCurrentTime() + phase.name + "</b></font>");
phase.name + "</b></font>");
} }
void MessageLogWidget::logSetActivePlayer(Player *player) void MessageLogWidget::logSetActivePlayer(Player *player)
{ {
appendHtml("<br><font color=\"green\"><b>" + getCurrentTime() + appendHtml("<br><font color=\"green\"><b>" + getCurrentTime() + QString(tr("%1's turn.")).arg(player->getName()) +
QString(tr("%1's turn.")).arg(player->getName()) + "</b></font><br>"); "</b></font><br>");
} }
void MessageLogWidget::logSetAnnotation(Player *player, CardItem *card, QString newAnnotation) void MessageLogWidget::logSetAnnotation(Player *player, CardItem *card, QString newAnnotation)