Merge branch 'master' of https://github.com/TheDrawingCoder-Gamer/nheko into TheDrawingCoder-Gamer-master
4 files changed, 93 insertions, 1 deletions
diff --git a/resources/extra_emoji.txt b/resources/extra_emoji.txt
new file mode 100644
index 00000000..2b0ff7ff
--- /dev/null
+++ b/resources/extra_emoji.txt
@@ -0,0 +1,27 @@
+# group: Symbols
+200C 1F1E6 200C ; fully-qualified # โ๐ฆโ E6.0 regional indicator a
+200C 1F1E7 200C ; fully-qualified # โ๐งโ E6.0 regional indicator b
+200C 1F1E8 200C ; fully-qualified # โ๐จโ E6.0 regional indicator c
+200C 1F1E9 200C ; fully-qualified # โ๐ฉโ E6.0 regional indicator d
+200C 1F1EA 200C ; fully-qualified # โ๐ชโ E6.0 regional indicator e
+200C 1F1EB 200C ; fully-qualified # โ๐ซโ E6.0 regional indicator f
+200C 1F1EC 200C ; fully-qualified # โ๐ฌโ E6.0 regional indicator g
+200C 1F1ED 200C ; fully-qualified # โ๐ญโ E6.0 regional indicator h
+200C 1F1EE 200C ; fully-qualified # โ๐ฎโ E6.0 regional indicator i
+200C 1F1EF 200C ; fully-qualified # โ๐ฏโ E6.0 regional indicator j
+200C 1F1F0 200C ; fully-qualified # โ๐ฐโ E6.0 regional indicator k
+200C 1F1F1 200C ; fully-qualified # โ๐ฑโ E6.0 regional indicator l
+200C 1F1F2 200C ; fully-qualified # โ๐ฒโ E6.0 regional indicator m
+200C 1F1F3 200C ; fully-qualified # โ๐ณโ E6.0 regional indicator n
+200C 1F1F4 200C ; fully-qualified # โ๐ดโ E6.0 regional indicator o
+200C 1F1F5 200C ; fully-qualified # โ๐ตโ E6.0 regional indicator p
+200C 1F1F6 200C ; fully-qualified # โ๐ถโ E6.0 regional indicator q
+200C 1F1F7 200C ; fully-qualified # โ๐ทโ E6.0 regional indicator r
+200C 1F1F8 200C ; fully-qualified # โ๐ธโ E6.0 regional indicator s
+200C 1F1F9 200C ; fully-qualified # โ๐นโ E6.0 regional indicator t
+200C 1F1FA 200C ; fully-qualified # โ๐บโ E6.0 regional indicator u
+200C 1F1FB 200C ; fully-qualified # โ๐ปโ E6.0 regional indicator v
+200C 1F1FC 200C ; fully-qualified # โ๐ผโ E6.0 regional indicator w
+200C 1F1FD 200C ; fully-qualified # โ๐ฝโ E6.0 regional indicator x
+200C 1F1FE 200C ; fully-qualified # โ๐พโ E6.0 regional indicator y
+200C 1F1FF 200C ; fully-qualified # โ๐ฟโ E6.0 regional indicator z
diff --git a/resources/provider-header.txt b/resources/provider-header.txt
new file mode 100644
index 00000000..c947eec4
--- /dev/null
+++ b/resources/provider-header.txt
@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+// SPDX-FileCopyrightText: 2022 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "emoji/Provider.h"
+
+using namespace emoji;
+
+
diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml
index dc813566..6d747f8c 100644
--- a/resources/qml/emoji/EmojiPicker.qml
+++ b/resources/qml/emoji/EmojiPicker.qml
@@ -146,7 +146,7 @@ Menu {
width: 48
height: 48
hoverEnabled: true
- ToolTip.text: model.shortName
+ 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
new file mode 100644
index 00000000..057a5abe
--- /dev/null
+++ b/resources/shortcodes.txt
@@ -0,0 +1,55 @@
+1F62D:sob
+1F631:scream
+1F613:sweat
+1F605:sweat_smile
+1F604:smile
+1F923:rofl
+1F60B:yum
+1F607:innocent
+1F917:hugging_face
+26A1:zap
+203C FE0F:bangbang
+2049 FE0F:interrobang
+2753:question
+2757:exclamation
+2754:white_question
+2755:white_exclamation
+1F520:big_abcd
+1F521:abcd
+1F522:1234
+1F523:symbols
+1F524:abc
+1F60D:heart_eyes
+1F927:cry_smile
+1F608:smiling_imp
+1F47F:imp
+1F261:rage
+1F624:triumph
+1F63A:smiley_cat
+1F638:smile_cat
+1F639:joy_cat
+1F63B:heart_eyes_cat
+1F63C:smirk_cat
+1F640:scream_cat
+1F4AF:100
+1F44B:wave
+1F448:point_left
+1F449:point_right
+1F446:point_up_2
+1F447:point_down
+261D FE0F:point_up
+1FAF5:point_you
+1F937:shrug
+0023 FE0F 20E3:hash
+002A FE0F 20E3:asterisk
+0030 FE0F 20E3:zero
+0031 FE0F 20E3:one
+0032 FE0F 20E3:two
+0033 FE0F 20E3:three
+0034 FE0F 20E3:four
+0035 FE0F 20E3:five
+0036 FE0F 20E3:six
+0037 FE0F 20E3:seven
+0038 FE0F 20E3:eight
+0039 FE0F 20E3:nine
+1F51F:ten
|
