💄 Show name instead of duplicating the icon
This commit is contained in:
@@ -24,12 +24,13 @@ static const QString VALUE_CODE = u"code"_s;
|
|||||||
struct GitmojiItem : Item
|
struct GitmojiItem : Item
|
||||||
{
|
{
|
||||||
QString id_;
|
QString id_;
|
||||||
|
QString name_;
|
||||||
QString emoji_;
|
QString emoji_;
|
||||||
QString code_;
|
QString code_;
|
||||||
QString description_;
|
QString description_;
|
||||||
|
|
||||||
GitmojiItem(const QString& emoji, const QString& code, const QString& description)
|
GitmojiItem(const QString& name, const QString& emoji, const QString& code, const QString& description)
|
||||||
: emoji_(emoji), code_(code), description_(description)
|
: name_(name), emoji_(emoji), code_(code), description_(description)
|
||||||
{
|
{
|
||||||
id_ = code.mid(1, code.length() - 2);
|
id_ = code.mid(1, code.length() - 2);
|
||||||
}
|
}
|
||||||
@@ -38,7 +39,7 @@ struct GitmojiItem : Item
|
|||||||
|
|
||||||
QString text() const override
|
QString text() const override
|
||||||
{
|
{
|
||||||
return u"%1 %2"_s.arg(emoji_, code_);
|
return name_;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString subtext() const override
|
QString subtext() const override
|
||||||
@@ -109,6 +110,7 @@ Plugin::Plugin()
|
|||||||
if (abort) return r;
|
if (abort) return r;
|
||||||
|
|
||||||
QJsonObject gitmoji = value.toObject();
|
QJsonObject gitmoji = value.toObject();
|
||||||
|
QString name = gitmoji[u"name"_s].toString();
|
||||||
QString emoji = gitmoji[u"emoji"_s].toString();
|
QString emoji = gitmoji[u"emoji"_s].toString();
|
||||||
QString code = gitmoji[u"code"_s].toString();
|
QString code = gitmoji[u"code"_s].toString();
|
||||||
QString description = gitmoji[u"description"_s].toString();
|
QString description = gitmoji[u"description"_s].toString();
|
||||||
@@ -116,9 +118,8 @@ Plugin::Plugin()
|
|||||||
if (emoji.isEmpty() || code.isEmpty())
|
if (emoji.isEmpty() || code.isEmpty())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
auto item = make_shared<GitmojiItem>(emoji, code, description);
|
auto item = make_shared<GitmojiItem>(name, emoji, code, description);
|
||||||
|
|
||||||
QString name = gitmoji[u"name"_s].toString();
|
|
||||||
QString searchable = u"%1 %2"_s.arg(name, description);
|
QString searchable = u"%1 %2"_s.arg(name, description);
|
||||||
|
|
||||||
r.emplace_back(item, searchable);
|
r.emplace_back(item, searchable);
|
||||||
|
|||||||
Reference in New Issue
Block a user