From ee4dcef90f285f49ee27fec13afb486d93781b8b Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Wed, 13 May 2020 00:35:26 -0400 Subject: Add new QML-based emoji picker (work in progress) This is necessary to support having a picker within QML. Eventually, this should replace the existing widget-based one. --- src/timeline/TimelineViewManager.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/timeline/TimelineViewManager.cpp') diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index f17e3090..3f8a5b76 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -13,6 +13,8 @@ #include "MxcImageProvider.h" #include "UserSettingsPage.h" #include "dialogs/ImageOverlay.h" +#include "emoji/EmojiModel.h" +#include "emoji/Provider.h" Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents) @@ -72,6 +74,12 @@ TimelineViewManager::TimelineViewManager(QSharedPointer userSettin qmlRegisterType("im.nheko", 1, 0, "DelegateChoice"); qmlRegisterType("im.nheko", 1, 0, "DelegateChooser"); qRegisterMetaType(); + qmlRegisterType("im.nheko.EmojiModel", 1, 0, "EmojiModel"); + qmlRegisterType("im.nheko.EmojiModel", 1, 0, "EmojiProxyModel"); + qmlRegisterUncreatableType( + "im.nheko.EmojiModel", 1, 0, "QAbstractItemModel", "Used by proxy models"); + qmlRegisterUncreatableType( + "im.nheko.EmojiModel", 1, 0, "Emoji", "Used by emoji models"); #ifdef USE_QUICK_VIEW view = new QQuickView(); @@ -290,7 +298,7 @@ TimelineViewManager::queueReactionMessage(const QString &roomId, mtx::events::msg::Reaction reaction; reaction.relates_to.rel_type = mtx::common::RelationType::Annotation; reaction.relates_to.event_id = reactedEvent.toStdString(); - reaction.relates_to.key = reactionKey.toStdString(); + reaction.relates_to.key = reactionKey.toStdString(); auto model = models.value(roomId); model->sendMessage(reaction); -- cgit 1.5.1