diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index 079a5749e..ccffc1cdb 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -1101,8 +1101,7 @@ MessagesSettingsPage::MessagesSettingsPage() &SettingsCache::setShowMessagePopups); localTimeCheckBox.setChecked(SettingsCache::instance().getLocalTime()); - connect(&localTimeCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), - &SettingsCache::setLocalTime); + connect(&localTimeCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), &SettingsCache::setLocalTime); mentionPopups.setChecked(SettingsCache::instance().getShowMentionPopup()); connect(&mentionPopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), @@ -1116,9 +1115,6 @@ MessagesSettingsPage::MessagesSettingsPage() connect(customAlertString, SIGNAL(textChanged(QString)), &SettingsCache::instance(), SLOT(setHighlightWords(QString))); - - - auto *chatGrid = new QGridLayout; chatGrid->addWidget(&chatMentionCheckBox, 0, 0); chatGrid->addWidget(&invertMentionForeground, 0, 1); diff --git a/cockatrice/src/dialogs/dlg_settings.h b/cockatrice/src/dialogs/dlg_settings.h index d70478d31..a601e5023 100644 --- a/cockatrice/src/dialogs/dlg_settings.h +++ b/cockatrice/src/dialogs/dlg_settings.h @@ -253,7 +253,7 @@ private: QLabel hexHighlightLabel; QLabel customAlertStringLabel; QLabel explainMessagesLabel; - + void storeSettings(); void updateMentionPreview(); void updateHighlightPreview(); diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp index 6463854a6..876abb300 100644 --- a/cockatrice/src/server/chat_view/chat_view.cpp +++ b/cockatrice/src/server/chat_view/chat_view.cpp @@ -103,9 +103,10 @@ void ChatView::appendHtml(const QString &html) void ChatView::appendHtmlServerMessage(const QString &html, bool optionalIsBold, QString optionalFontColor) { bool atBottom = verticalScrollBar()->value() >= verticalScrollBar()->maximum(); - QString htmlText = "" + getCurrentTime() + html + ""; - + QString htmlText = + "" + + getCurrentTime() + html + ""; + if (optionalIsBold) htmlText = "" + htmlText + ""; diff --git a/cockatrice/src/server/message_log_widget.cpp b/cockatrice/src/server/message_log_widget.cpp index 69eb79eda..77116191f 100644 --- a/cockatrice/src/server/message_log_widget.cpp +++ b/cockatrice/src/server/message_log_widget.cpp @@ -632,14 +632,13 @@ void MessageLogWidget::logSetActivePhase(int phaseNumber) soundEngine->playSound(phase.soundFileName); - appendHtml("" + getCurrentTime() + - phase.name + ""); + appendHtml("" + getCurrentTime() + phase.name + ""); } void MessageLogWidget::logSetActivePlayer(Player *player) { - appendHtml("
" + getCurrentTime() + - QString(tr("%1's turn.")).arg(player->getName()) + "
"); + appendHtml("
" + getCurrentTime() + QString(tr("%1's turn.")).arg(player->getName()) + + "
"); } void MessageLogWidget::logSetAnnotation(Player *player, CardItem *card, QString newAnnotation)