1 files changed, 45 insertions, 3 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 874f710..5981f9c 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -111,7 +111,7 @@ QtChatWindow::QtChatWindow(const QString& contact, QtChatTheme* theme, UIEventSt
         messageLog_ = new QtPlainChatView(this, eventStream_);
     }
     else {
-        messageLog_ = new QtWebKitChatView(this, eventStream_, theme, this); // I accept that passing the ChatWindow in so that the view can call the signals is somewhat inelegant, but it saves a lot of boilerplate. This patch is unpleasant enough already. So let's fix this soon (it at least needs fixing by the time history is sorted), but not now.
+        messageLog_ = new QtWebKitChatView(this, eventStream_, theme, this, settings); // I accept that passing the ChatWindow in so that the view can call the signals is somewhat inelegant, but it saves a lot of boilerplate. This patch is unpleasant enough already. So let's fix this soon (it at least needs fixing by the time history is sorted), but not now.
     }
     logRosterSplitter_->addWidget(messageLog_);
 
@@ -693,7 +693,7 @@ void QtChatWindow::handleEmojisButtonClicked() {
     emojisLayout->setContentsMargins(style()->pixelMetric(QStyle::PM_MenuHMargin),style()->pixelMetric(QStyle::PM_MenuVMargin),
                                      style()->pixelMetric(QStyle::PM_MenuHMargin),style()->pixelMetric(QStyle::PM_MenuVMargin));
     emojisLayout->addWidget(emojisGrid_);
-    emojisMenu_ = std::unique_ptr<QMenu>(new QMenu());
+    emojisMenu_ = std::make_unique<QMenu>();
     emojisMenu_->setLayout(emojisLayout);
     emojisMenu_->adjustSize();
 
@@ -984,4 +984,46 @@ void QtChatWindow::setBookmarkState(RoomBookmarkState bookmarkState) {
     roomBookmarkState_ = bookmarkState;
 }
 
+void QtChatWindow::setChatSecurityMarking(const std::string& markingValue, const std::string& markingForegroundColorValue, const std::string& markingBackgroundColorValue) {
+    auto layout = static_cast<QBoxLayout*>(this->layout());
+
+    if (securityMarkingLayout_) {
+        layout->removeItem(securityMarkingLayout_);
+        securityMarkingLayout_->removeWidget(securityMarkingDisplay_);
+        delete securityMarkingLayout_;
+    }
+    delete securityMarkingDisplay_;
+
+    securityMarkingLayout_ = new QHBoxLayout();
+    securityMarkingDisplay_ = new QLabel(P2QSTRING(markingValue));
+
+    securityMarkingLayout_->addWidget(securityMarkingDisplay_);
+    layout->insertLayout(1, securityMarkingLayout_);
+
+    auto palette = securityMarkingDisplay_->palette();
+    palette.setColor(securityMarkingDisplay_->foregroundRole(), P2QSTRING(markingForegroundColorValue));
+    palette.setColor(securityMarkingDisplay_->backgroundRole(), P2QSTRING(markingBackgroundColorValue));
+
+    securityMarkingDisplay_->setPalette(palette);
+    securityMarkingDisplay_->setContentsMargins(4,4,4,4);
+    securityMarkingDisplay_->setAutoFillBackground(true);
+    securityMarkingDisplay_->setAlignment(Qt::AlignCenter);
+}
+
+void QtChatWindow::removeChatSecurityMarking() {
+    if (!securityMarkingLayout_) {
+        return;
+    }
+
+    auto layout = static_cast<QBoxLayout*>(this->layout());
+
+    layout->removeItem(securityMarkingLayout_);
+    securityMarkingLayout_->removeWidget(securityMarkingDisplay_);
+
+    delete securityMarkingDisplay_;
+    delete securityMarkingLayout_;
+    securityMarkingDisplay_ = nullptr;
+    securityMarkingLayout_ = nullptr;
+}
+
 }