rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add more aliases, start on regional indicators

Browse Source
This commit is contained in:
BulbyVR 2022-04-22 21:42:29 -04:00
parent 22f90874cc
commit 209865e882
6 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
resources/extra_emoji.txt Normal file
View File

@ -0,0 +1,27 @@
# group: Symbols
1F1E6 ; fully-qualified # ๐Ÿ‡ฆ E6.0 regional indicator a
1F1E7 ; fully-qualified # ๐Ÿ‡ง E6.0 regional indicator b
1F1E8 ; fully-qualified # ๐Ÿ‡จ E6.0 regional indicator c
1F1E9 ; fully-qualified # ๐Ÿ‡ฉ E6.0 regional indicator d
1F1EA ; fully-qualified # ๐Ÿ‡ช E6.0 regional indicator e
1F1EB ; fully-qualified # ๐Ÿ‡ซ E6.0 regional indicator f
1F1EC ; fully-qualified # ๐Ÿ‡ฌ E6.0 regional indicator g
1F1ED ; fully-qualified # ๐Ÿ‡ญ E6.0 regional indicator h
1F1EE ; fully-qualified # ๐Ÿ‡ฎ E6.0 regional indicator i
1F1EF ; fully-qualified # ๐Ÿ‡ฏ E6.0 regional indicator j
1F1F0 ; fully-qualified # ๐Ÿ‡ฐ E6.0 regional indicator k
1F1F1 ; fully-qualified # ๐Ÿ‡ฑ E6.0 regional indicator l
1F1F2 ; fully-qualified # ๐Ÿ‡ฒ E6.0 regional indicator m
1F1F3 ; fully-qualified # ๐Ÿ‡ณ E6.0 regional indicator n
1F1F4 ; fully-qualified # ๐Ÿ‡ด E6.0 regional indicator o
1F1F5 ; fully-qualified # ๐Ÿ‡ต E6.0 regional indicator p
1F1F6 ; fully-qualified # ๐Ÿ‡ถ E6.0 regional indicator q
1F1F7 ; fully-qualified # ๐Ÿ‡ท E6.0 regional indicator r
1F1F8 ; fully-qualified # ๐Ÿ‡ธ E6.0 regional indicator s
1F1F9 ; fully-qualified # ๐Ÿ‡น E6.0 regional indicator t
1F1FA ; fully-qualified # ๐Ÿ‡บ E6.0 regional indicator u
1F1FB ; fully-qualified # ๐Ÿ‡ป E6.0 regional indicator v
1F1FC ; fully-qualified # ๐Ÿ‡ผ E6.0 regional indicator w
1F1FD ; fully-qualified # ๐Ÿ‡ฝ E6.0 regional indicator x
1F1FE ; fully-qualified # ๐Ÿ‡พ E6.0 regional indicator y
1F1FF ; fully-qualified # ๐Ÿ‡ฟ E6.0 regional indicator z

3
resources/shortcodes.txt
View File

@ -4,3 +4,6 @@ downcast face with sweat:sweat
grinning face with sweat:sweat_smile grinning face with sweat:sweat_smile
grinning face with smiling eyes:smile grinning face with smiling eyes:smile
rolling on the floor laughing:rofl rolling on the floor laughing:rofl
face savoring food:yum
smiling face with halo:innocent
smiling face with open hands:hugging_face

2
scripts/codegen.sh
View File

@ -2,6 +2,6 @@
ROOT=$(realpath "$PWD/$(dirname "$0")/..") ROOT=$(realpath "$PWD/$(dirname "$0")/..")
cd $ROOT cd $ROOT
cat resources/provider-header.txt > src/emoji/Provider.cpp cat resources/provider-header.txt > src/emoji/Provider.cpp
# cat resources/extra_emoji.txt resources/emoji-test.txt > resources/complete-emoji.txt
scripts/emoji_codegen.py resources/emoji-test.txt resources/shortcodes.txt >> src/emoji/Provider.cpp scripts/emoji_codegen.py resources/emoji-test.txt resources/shortcodes.txt >> src/emoji/Provider.cpp
cd - > /dev/null cd - > /dev/null

2
scripts/emoji_codegen.py
View File

@ -78,7 +78,7 @@ if __name__ == '__main__':
continue continue
char, name = re.match(r'^(\S+) E\d+\.\d+ (.*)$', charAndName).groups() char, name = re.match(r'^(\S+) E\d+\.\d+ (.*)$', charAndName.strip()).groups()
shortname = name shortname = name
#TODO: Handle skintone modifiers in a sane way #TODO: Handle skintone modifiers in a sane way

4
src/emoji/EmojiModel.cpp
View File

@ -59,10 +59,10 @@ EmojiModel::data(const QModelIndex &index, int role) const
return Provider::emoji[index.row()].unicode; return Provider::emoji[index.row()].unicode;
case Qt::ToolTipRole: case Qt::ToolTipRole:
case CompletionModel::SearchRole: case CompletionModel::SearchRole2:
case static_cast<int>(EmojiModel::Roles::UnicodeName): case static_cast<int>(EmojiModel::Roles::UnicodeName):
return Provider::emoji[index.row()].unicodeName; return Provider::emoji[index.row()].unicodeName;
case CompletionModel::SearchRole2: case CompletionModel::SearchRole:
case static_cast<int>(EmojiModel::Roles::ShortName): case static_cast<int>(EmojiModel::Roles::ShortName):
return Provider::emoji[index.row()].shortName; return Provider::emoji[index.row()].shortName;
case static_cast<int>(EmojiModel::Roles::Category): case static_cast<int>(EmojiModel::Roles::Category):

6
src/emoji/Provider.cpp
View File

@ -62,7 +62,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
QStringLiteral(u"smiling face with smiling eyes"), QStringLiteral(u"smiling face with smiling eyes"),
emoji::Emoji::Category::People}, emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F607"), Emoji{QStringLiteral(u"\U0001F607"),
QStringLiteral(u"smiling_face_with_halo"), QStringLiteral(u"innocent"),
QStringLiteral(u"smiling face with halo"), QStringLiteral(u"smiling face with halo"),
emoji::Emoji::Category::People}, emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F970"), Emoji{QStringLiteral(u"\U0001F970"),
@ -102,7 +102,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
QStringLiteral(u"smiling face with tear"), QStringLiteral(u"smiling face with tear"),
emoji::Emoji::Category::People}, emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F60B"), Emoji{QStringLiteral(u"\U0001F60B"),
QStringLiteral(u"face_savoring_food"), QStringLiteral(u"yum"),
QStringLiteral(u"face savoring food"), QStringLiteral(u"face savoring food"),
emoji::Emoji::Category::People}, emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F61B"), Emoji{QStringLiteral(u"\U0001F61B"),
@ -126,7 +126,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
QStringLiteral(u"money-mouth face"), QStringLiteral(u"money-mouth face"),
emoji::Emoji::Category::People}, emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F917"), Emoji{QStringLiteral(u"\U0001F917"),
QStringLiteral(u"smiling_face_with_open_hands"), QStringLiteral(u"hugging_face"),
QStringLiteral(u"smiling face with open hands"), QStringLiteral(u"smiling face with open hands"),
emoji::Emoji::Category::People}, emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F92D"), Emoji{QStringLiteral(u"\U0001F92D"),