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/QtEmojisSelector.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/QtEmojisSelector.h')
| -rw-r--r-- | Swift/QtUI/QtEmojisSelector.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Swift/QtUI/QtEmojisSelector.h b/Swift/QtUI/QtEmojisSelector.h index 1065aa0..7ac11d0 100644 --- a/Swift/QtUI/QtEmojisSelector.h +++ b/Swift/QtUI/QtEmojisSelector.h @@ -6,6 +6,9 @@ #pragma once +#include <map> +#include <string> + #include <QSettings> #include <QTabWidget> @@ -17,7 +20,7 @@ namespace Swift { class QtEmojisSelector : public QTabWidget { Q_OBJECT public: - QtEmojisSelector(QSettings* settings, QWidget * parent = 0); + QtEmojisSelector(QSettings* settings, const std::map<std::string, std::string>& emoticonsMap, QWidget * parent = 0); ~QtEmojisSelector(); public slots: @@ -32,9 +35,12 @@ class QtEmojisSelector : public QTabWidget { void loadSettings(); void writeSettings(); + void setupEmoticonsTab(); + private: QSettings* settings_ = nullptr; QtRecentEmojisGrid* recentEmojisGrid_ = nullptr; + std::map<std::string, std::string> emoticonsMap_; }; } |