1 files changed, 13 insertions, 4 deletions
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 361d7c6..b876d1e 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
@@ -32,10 +32,11 @@ class QTextEdit;
 class QLineEdit;
 class QComboBox;
 class QLabel;
 class QSplitter;
 class QPushButton;
+class QTimer;
 
 namespace Swift {
     class QtChatView;
     class QtOccupantListWidget;
     class QtChatTheme;
@@ -91,10 +92,11 @@ namespace Swift {
             void addPresenceMessage(const ChatMessage& message, Direction direction);
             void addErrorMessage(const ChatMessage& message);
 
             void replaceMessage(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time);
             void replaceWithAction(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time);
+            void resendMessage(const std::string& id);
             // File transfer related stuff
             std::string addFileTransfer(const std::string& senderName, const std::string& avatarPath, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes, const std::string& description);
             void setFileTransferProgress(std::string id, const int percentageDone);
             void setFileTransferStatus(std::string id, const FileTransferState state, const std::string& msg);
 
@@ -102,11 +104,11 @@ namespace Swift {
             void setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state);
 
             void show();
             bool isVisible() const;
             void activate();
-            void setUnreadMessageCount(int count);
+            void setUnreadMessageCount(size_t count);
             void convertToMUC(MUCType mucType);
 //            TreeWidget *getTreeWidget();
             void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels);
             void setSecurityLabelsEnabled(bool enabled);
             void setSecurityLabelsError();
@@ -115,11 +117,11 @@ namespace Swift {
             void setOnline(bool online);
             QtTabbable::AlertType getWidgetAlertState();
             void setContactChatState(ChatState::ChatStateType state);
             void setRosterModel(Roster* roster);
             void setTabComplete(TabComplete* completer);
-            int getCount();
+            size_t getCount();
             virtual void replaceSystemMessage(const ChatMessage& message, const std::string& id, const TimestampBehaviour timestampBehaviour);
             void replaceLastMessage(const ChatMessage& message, const TimestampBehaviour timestampBehaviour);
             void setAckState(const std::string& id, AckState state);
 
             // message receipts
@@ -192,12 +194,16 @@ namespace Swift {
 
             static std::vector<JID> jidListFromQByteArray(const QByteArray& dataBytes);
 
             void resetDayChangeTimer();
 
+            void setChatSecurityMarking(const std::string& markingValue, const std::string& markingForegroundColorValue, const std::string& markingBackgroundColorValue);
+            void removeChatSecurityMarking();
+            void handleFocusTimerTick();
+
         private:
-            int unreadCount_;
+            size_t unreadCount_;
             bool contactIsTyping_;
             LastLineTracker lastLineTracker_;
             std::string id_;
             QString contact_;
             QString lastSentMessage_;
@@ -239,7 +245,10 @@ namespace Swift {
             RoomBookmarkState roomBookmarkState_;
             std::unique_ptr<QMenu> emojisMenu_;
             QPointer<QtEmojisSelector> emojisGrid_;
             std::map<std::string, std::string> emoticonsMap_;
             QTimer* dayChangeTimer = nullptr;
+            QHBoxLayout* securityMarkingLayout_ = nullptr;
+            QLabel* securityMarkingDisplay_ = nullptr;
+            std::unique_ptr<QTimer> focusTimer_;
     };
 }