Skip to content

fix: keep default generic name for launcher search functionality #1717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wjyrich wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −20
Open

fix: keep default generic name for launcher search functionality #1717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions applets/dde-apps/amappitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,19 @@ AMAppItem::AMAppItem(const QDBusObjectPath &path, const ObjectInterfaceMap &sour
if (appInfo.isEmpty())
return;

auto name = getLocaleOrDefaultValue(qdbus_cast<QStringMap>(appInfo.value(u8"Name")), locale, DEFAULT_KEY);
auto genericName = getLocaleOrDefaultValue(qdbus_cast<QStringMap>(appInfo.value(u8"GenericName")), locale, DEFAULT_KEY);
const auto nameMap = qdbus_cast<QStringMap>(appInfo.value(u8"Name"));
const auto genericNameMap = qdbus_cast<QStringMap>(appInfo.value(u8"GenericName"));
const auto localizedName = getLocaleOrDefaultValue(nameMap, locale, DEFAULT_KEY);
const auto localizedGenericName = getLocaleOrDefaultValue(genericNameMap, locale, DEFAULT_KEY);
auto xDeepinVendor = appInfo.value(u8"X_Deepin_Vendor").toString();
AppItem::setGenericName(genericName);
// Keep the default generic name for launchpad's English search while NameRole remains localized.
AppItem::setGenericName(genericNameMap.value(DEFAULT_KEY));
AppItem::setVendor(xDeepinVendor);

if (QStringLiteral("deepin") == xDeepinVendor && !genericName.isEmpty()) {
AppItem::setAppName(genericName);
if (QStringLiteral("deepin") == xDeepinVendor && !localizedGenericName.isEmpty()) {
AppItem::setAppName(localizedGenericName);
} else {
AppItem::setAppName(name);
AppItem::setAppName(localizedName);
}

auto iconName = getLocaleOrDefaultValue(qdbus_cast<QStringMap>(appInfo.value(u8"Icons")), DESKTOP_ENTRY_ICON_KEY, "");
Expand Down Expand Up @@ -156,24 +159,23 @@ void AMAppItem::onPropertyChanged(const QDBusMessage &msg)

if (contains(QLatin1String("Name")) || contains(QLatin1String("GenericName"))
|| contains(QLatin1String("X_Deepin_Vendor"))) {
const QString name = getLocaleOrDefaultValue(
contains(QLatin1String("Name"))
? qdbus_cast<QStringMap>(value(QLatin1String("Name")))
: Application::name(),
locale,
DEFAULT_KEY);
const QString genericName = getLocaleOrDefaultValue(
contains(QLatin1String("GenericName"))
? qdbus_cast<QStringMap>(value(QLatin1String("GenericName")))
: Application::genericName(),
locale,
DEFAULT_KEY);
const QStringMap nameMap = contains(QLatin1String("Name"))
? qdbus_cast<QStringMap>(value(QLatin1String("Name")))
: Application::name();
const QStringMap genericNameMap = contains(QLatin1String("GenericName"))
? qdbus_cast<QStringMap>(value(QLatin1String("GenericName")))
: Application::genericName();
const QString localizedName = getLocaleOrDefaultValue(nameMap, locale, DEFAULT_KEY);
const QString localizedGenericName = getLocaleOrDefaultValue(genericNameMap, locale, DEFAULT_KEY);
const QString vendor = contains(QLatin1String("X_Deepin_Vendor"))
? value(QLatin1String("X_Deepin_Vendor")).toString()
: Application::x_Deepin_Vendor();
AppItem::setGenericName(genericName);
// Keep the default generic name for launchpad's English search while NameRole remains localized.
AppItem::setGenericName(genericNameMap.value(DEFAULT_KEY));
AppItem::setVendor(vendor);
AppItem::setAppName(vendor == QLatin1String("deepin") && !genericName.isEmpty() ? genericName : name);
AppItem::setAppName(vendor == QLatin1String("deepin") && !localizedGenericName.isEmpty()
? localizedGenericName
: localizedName);
}

if (contains(QLatin1String("Icons"))) {
Expand Down
Loading