Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-03-07 19:32:56 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-03-07 19:33:22 (GMT) |
| commit | 121361e37bc2cc8ab1eae2f2aea92975a62e5511 (patch) | |
| tree | 99860dadea0a8622c83ebc2cc1feada7b8e7e4b2 /Swift/QtUI/QtChatWindow.h | |
| parent | 639db5f27911c4bc994e6a040561d596a0f77113 (diff) | |
| download | swift-121361e37bc2cc8ab1eae2f2aea92975a62e5511.zip swift-121361e37bc2cc8ab1eae2f2aea92975a62e5511.tar.bz2 | |
Use text-based emoticons on Linux and Windows
The new unicode-based emoji dialog currently only provides
a good experience on macOS.
This commit enables the unicode-based emoji dialog on macOS
and uses the text-based emoticons on Linux and Windows.
Test-Information:
Tested on macOS 10.12.3 with Qt 5.5.1 and Windows 8 with Qt
5.5.1.
Change-Id: Ibee20eacafa5788bcdf5a46e1ceac713a28a0383
Diffstat (limited to 'Swift/QtUI/QtChatWindow.h')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h index 4c64c84..fca4aec 100644 --- a/Swift/QtUI/QtChatWindow.h +++ b/Swift/QtUI/QtChatWindow.h @@ -7,6 +7,7 @@ #pragma once #include <map> +#include <string> #include <QMap> #include <QMenu> @@ -81,7 +82,7 @@ namespace Swift { Q_OBJECT public: - QtChatWindow(const QString& contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings, QtSettingsProvider* qtOnlySettings); + QtChatWindow(const QString& contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings, QtSettingsProvider* qtOnlySettings, const std::map<std::string, std::string>& emoticonsMap); virtual ~QtChatWindow(); std::string addMessage(const ChatMessage& message, const std::string &senderName, bool senderIsSelf, std::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time); std::string addAction(const ChatMessage& message, const std::string &senderName, bool senderIsSelf, std::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time); @@ -236,5 +237,6 @@ namespace Swift { RoomBookmarkState roomBookmarkState_; std::unique_ptr<QMenu> emojisMenu_; QPointer<QtEmojisSelector> emojisGrid_; + std::map<std::string, std::string> emoticonsMap_; }; } |