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/QtEmojiCell.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/QtEmojiCell.h')
| -rw-r--r-- | Swift/QtUI/QtEmojiCell.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Swift/QtUI/QtEmojiCell.h b/Swift/QtUI/QtEmojiCell.h index 62f989b..250b10d 100644 --- a/Swift/QtUI/QtEmojiCell.h +++ b/Swift/QtUI/QtEmojiCell.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Isode Limited. + * Copyright (c) 2016-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -20,11 +20,16 @@ namespace Swift { public: QtEmojiCell(const QtEmojiCell& b); QtEmojiCell(QString shortname, QString text, QWidget* parent = nullptr); + QtEmojiCell(QIcon icon, QString text, QWidget* parent = nullptr); ~QtEmojiCell(); + signals: void emojiClicked(QString emojiAsText); private slots: void handleEmojiClicked(); + + private: + QString text_; }; } |