From 64882fd6de5b332850063dd173d9a8908f996cb6 Mon Sep 17 00:00:00 2001 From: BulbyVR <26726264+TheDrawingCoder-Gamer@users.noreply.github.com> Date: Sat, 23 Apr 2022 16:37:44 -0400 Subject: [PATCH] Unhardcode qml --- resources/qml/emoji/EmojiPicker.qml | 3 +-- resources/shortcodes.txt | 1 + src/emoji/Provider.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml index d47173c3..6d747f8c 100644 --- a/resources/qml/emoji/EmojiPicker.qml +++ b/resources/qml/emoji/EmojiPicker.qml @@ -146,8 +146,7 @@ Menu { width: 48 height: 48 hoverEnabled: true - // TODO: Do this based off of Qt::Tooltip role - ToolTip.text: model.unicodeName + ToolTip.text: model.toolTip ToolTip.visible: hovered // TODO: maybe add favorites at some point? onClicked: { diff --git a/resources/shortcodes.txt b/resources/shortcodes.txt index 62d5d44e..94e8ae21 100644 --- a/resources/shortcodes.txt +++ b/resources/shortcodes.txt @@ -7,3 +7,4 @@ rolling on the floor laughing:rofl face savoring food:yum smiling face with halo:innocent smiling face with open hands:hugging_face +high voltage:zap diff --git a/src/emoji/Provider.cpp b/src/emoji/Provider.cpp index d8b8b40e..f6dece45 100644 --- a/src/emoji/Provider.cpp +++ b/src/emoji/Provider.cpp @@ -11717,7 +11717,7 @@ const QVector emoji::Provider::emoji = { QStringLiteral(u"umbrella on ground"), emoji::Emoji::Category::Travel}, Emoji{QStringLiteral(u"\U000026A1"), - QStringLiteral(u"high_voltage"), + QStringLiteral(u"zap"), QStringLiteral(u"high voltage"), emoji::Emoji::Category::Travel}, Emoji{QStringLiteral(u"\U00002744\U0000FE0F"),