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/QtEmojisGrid.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/QtEmojisGrid.h')
| -rw-r--r-- | Swift/QtUI/QtEmojisGrid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/QtUI/QtEmojisGrid.h b/Swift/QtUI/QtEmojisGrid.h index b7ba87f..5e6c770 100644 --- a/Swift/QtUI/QtEmojisGrid.h +++ b/Swift/QtUI/QtEmojisGrid.h @@ -1,32 +1,33 @@ /* * Copyright (c) 2016-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <QString> #include <QVector> #include <SwifTools/EmojiMapper.h> #include <Swift/QtUI/FlowLayout.h> namespace Swift { class QtEmojisGrid : public FlowLayout { Q_OBJECT public: explicit QtEmojisGrid(); explicit QtEmojisGrid(QString categoryName); protected: void setEmojis(const QVector<QString>& emojis); + void addEmoticon(QIcon icon, QString text); private: void clearEmojis(); signals: void onEmojiSelected(QString emoji); }; } |