d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup some small emoji things

Browse source
This commit is contained in:
Nicolas Werner 2022-05-06 16:14:47 +02:00
parent d4b7712a66
commit 535ad22b7d
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
4 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/shortcodes.txt
View file

@ -53,3 +53,5 @@
0038 FE0F 20E3:eight 0038 FE0F 20E3:eight
0039 FE0F 20E3:nine 0039 FE0F 20E3:nine
1F51F:ten 1F51F:ten
1F4A5:boom
1F389:tada

12
scripts/emoji_codegen.py
View file

@ -77,15 +77,13 @@ if __name__ == '__main__':
if qualification != 'fully-qualified': if qualification != 'fully-qualified':
continue continue
char, name = re.match(r'^(\S+) E\d+\.\d+ (.*)$', charAndName).groups() char, name = re.match(r'^(\S+) E\d+\.\d+ (.*)$', charAndName).groups()
shortname = name shortname = name
# until skin tone is handled, keep them around # until skin tone is handled, keep them around
# discard skin tone variants for sanity ## discard skin tone variants for sanity
# __contains__ is so stupid i hate prototype languages # if "skin tone" in name and qualification != 'component':
# if name.__contains__("skin tone") and qualification != 'component':
# continue # continue
# if qualification == 'component' and not name.__contains__("skin tone"): # if qualification == 'component' and not "skin tone" in name:
# continue # continue
#TODO: Handle skintone modifiers in a sane way #TODO: Handle skintone modifiers in a sane way
basicallyTheSame = False basicallyTheSame = False
@ -133,6 +131,6 @@ if __name__ == '__main__':
categories[current_category].append(Emoji(code, shortname, name)) categories[current_category].append(Emoji(code, shortname, name))
# Use xclip to pipe the output to clipboard. # Use xclip to pipe the output to clipboard.
# e.g ./codegen.py emoji.json | xclip -sel clip # e.g ./emoji_codegen.py emoji.json | xclip -sel clip
# alternatively - delete the var from src/emoji/Provider.cpp, and do ./codegen.py emojis shortcodes >> src/emoji/Provider.cpp # alternatively - delete the var from src/emoji/Provider.cpp, and do ./codegen.sh emojis shortcodes >> ../src/emoji/Provider.cpp
generate_qml_list(people=people, nature=nature, food=food, activity=activity, travel=travel, objects=objects, symbols=symbols, flags=flags) generate_qml_list(people=people, nature=nature, food=food, activity=activity, travel=travel, objects=objects, symbols=symbols, flags=flags)

2
src/emoji/EmojiModel.cpp
View file

@ -59,6 +59,8 @@ 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:
return Provider::emoji[index.row()].shortName + ", " +
Provider::emoji[index.row()].unicodeName;
case CompletionModel::SearchRole2: 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;

4
src/emoji/Provider.cpp
View file

@ -614,7 +614,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
QStringLiteral(u"anger symbol"), QStringLiteral(u"anger symbol"),
emoji::Emoji::Category::People}, emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F4A5"), Emoji{QStringLiteral(u"\U0001F4A5"),
QStringLiteral(u"collision"), QStringLiteral(u"boom"),
QStringLiteral(u"collision"), QStringLiteral(u"collision"),
emoji::Emoji::Category::People}, emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F4AB"), Emoji{QStringLiteral(u"\U0001F4AB"),
@ -10560,7 +10560,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
QStringLiteral(u"balloon"), QStringLiteral(u"balloon"),
emoji::Emoji::Category::Activity}, emoji::Emoji::Category::Activity},
Emoji{QStringLiteral(u"\U0001F389"), Emoji{QStringLiteral(u"\U0001F389"),
QStringLiteral(u"party_popper"), QStringLiteral(u"tada"),
QStringLiteral(u"party popper"), QStringLiteral(u"party popper"),
emoji::Emoji::Category::Activity}, emoji::Emoji::Category::Activity},
Emoji{QStringLiteral(u"\U0001F38A"), Emoji{QStringLiteral(u"\U0001F38A"),