Skip to content

feat: add desktop source path support for app items #1480

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

Merged
deepin-bot merged 1 commit into from
Mar 5, 2026
Merged

feat: add desktop source path support for app items #1480

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion applets/dde-apps/amappitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -83,6 +83,9 @@ AMAppItem::AMAppItem(const QDBusObjectPath &path, const ObjectInterfaceMap &sour

auto execs = qdbus_cast<QStringMap>(appInfo.value(u8"Execs"));
AppItem::setExecs(execs);

auto desktopSourcePath = appInfo.value(u8"DesktopSourcePath").toString();
AppItem::setDesktopSourcePath(desktopSourcePath);
}

void AMAppItem::launch(const QString &action, const QStringList &fields, const QVariantMap &options)
Expand Down
50 changes: 30 additions & 20 deletions applets/dde-apps/appitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -36,17 +36,17 @@

void AppItem::setAppId(const QString &appid)
{
return setData(appid, AppItemModel::DesktopIdRole);
setData(appid, AppItemModel::DesktopIdRole);
}

AppItemModel::AppTypes AppItem::appType() const

Check warning on line 42 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'appType' is never used.
{
return data(AppItemModel::AppTypeRole).value<AppItemModel::AppTypes>();
}

void AppItem::setAppType(AppItemModel::AppTypes appType)
{
return setData(appType, AppItemModel::AppTypeRole);
setData(appType, AppItemModel::AppTypeRole);
}

QString AppItem::appName() const
Expand All @@ -56,57 +56,57 @@

void AppItem::setAppName(const QString &appName)
{
return setData(appName, AppItemModel::NameRole);
setData(appName, AppItemModel::NameRole);
}

QString AppItem::appIconName() const

Check warning on line 62 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'appIconName' is never used.
{
return data(AppItemModel::IconNameRole).toString();
}

void AppItem::setAppIconName(const QString &appIconName)

Check warning on line 67 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'setAppIconName' is never used.
{
return setData(appIconName, AppItemModel::IconNameRole);
setData(appIconName, AppItemModel::IconNameRole);
}

QString AppItem::startupWMClass() const

Check warning on line 72 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'startupWMClass' is never used.
{
return data(AppItemModel::StartUpWMClassRole).toString();
}

void AppItem::setStartupWMclass(const QString &wmClass)

Check warning on line 77 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'setStartupWMclass' is never used.
{
return setData(wmClass, AppItemModel::StartUpWMClassRole);
setData(wmClass, AppItemModel::StartUpWMClassRole);
}

bool AppItem::noDisplay() const

Check warning on line 82 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'noDisplay' is never used.
{
return data(AppItemModel::NoDisplayRole).toBool();
}

void AppItem::setNoDisPlay(bool noDisplay)

Check warning on line 87 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'setNoDisPlay' is never used.
{
return setData(noDisplay, AppItemModel::NoDisplayRole);
setData(noDisplay, AppItemModel::NoDisplayRole);
}

AppItemModel::DDECategories AppItem::ddeCategories() const

Check warning on line 92 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'ddeCategories' is never used.
{
return data(AppItemModel::DDECategoryRole).value<AppItemModel::DDECategories>();
}

void AppItem::setDDECategories(const AppItemModel::DDECategories &categories)

Check warning on line 97 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'setDDECategories' is never used.
{
return setData(categories, AppItemModel::DDECategoryRole);
setData(categories, AppItemModel::DDECategoryRole);
}

QStringList AppItem::categories() const

Check warning on line 102 in applets/dde-apps/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'categories' is never used.
{
return data(AppItemModel::CategoriesRole).toStringList();
}

void AppItem::setCategories(const QStringList &categories)
{
return setData(categories, AppItemModel::CategoriesRole);
setData(categories, AppItemModel::CategoriesRole);
}

QString AppItem::actions() const
Expand All @@ -116,7 +116,7 @@

void AppItem::setActions(const QString &actions)
{
return setData(actions, AppItemModel::ActionsRole);
setData(actions, AppItemModel::ActionsRole);
}

quint64 AppItem::lastLaunchedTime() const
Expand All @@ -126,7 +126,7 @@

void AppItem::setLastLaunchedTime(const quint64 &time)
{
return setData(time, AppItemModel::LastLaunchedTimeRole);
setData(time, AppItemModel::LastLaunchedTimeRole);
}

quint64 AppItem::installedTime() const
Expand All @@ -136,7 +136,7 @@

void AppItem::setInstalledTime(const quint64 &time)
{
return setData(time, AppItemModel::InstalledTimeRole);
setData(time, AppItemModel::InstalledTimeRole);
}

quint64 AppItem::launchedTimes() const
Expand All @@ -147,7 +147,7 @@
void AppItem::setLaunchedTimes(const quint64 &times)
{
AppsLaunchTimesHelper::instance()->setLaunchTimesFor(appId(), times);
return setData(times, AppItemModel::LaunchedTimesRole);
setData(times, AppItemModel::LaunchedTimesRole);
}

bool AppItem::docked() const
Expand All @@ -158,7 +158,7 @@
void AppItem::setDocked(bool docked)
{
AppsDockedHelper::instance()->setDocked(appId(), docked);
return setData(docked, AppItemModel::DockedRole);
setData(docked, AppItemModel::DockedRole);
}

bool AppItem::onDesktop() const
Expand All @@ -168,7 +168,7 @@

void AppItem::setOnDesktop(bool on)
{
return setData(on, AppItemModel::OnDesktopRole);
setData(on, AppItemModel::OnDesktopRole);
}

bool AppItem::autoStart() const
Expand All @@ -178,7 +178,7 @@

void AppItem::setAutoStart(bool start)
{
return setData(start, AppItemModel::AutoStartRole);
setData(start, AppItemModel::AutoStartRole);
}

bool AppItem::XLingLong() const
Expand All @@ -188,7 +188,7 @@

void AppItem::setXLingLong(const bool &isLingLong)
{
return setData(isLingLong, AppItemModel::XLingLongRole);
setData(isLingLong, AppItemModel::XLingLongRole);
}

QString AppItem::id() const
Expand All @@ -198,7 +198,7 @@

void AppItem::setId(const QString &id)
{
return setData(id, AppItemModel::IdRole);
setData(id, AppItemModel::IdRole);
}

QString AppItem::XCreatedBy() const
Expand All @@ -208,7 +208,7 @@

void AppItem::setXCreatedBy(const QString &XCreatedBy)
{
return setData(XCreatedBy, AppItemModel::XCreatedByRole);
setData(XCreatedBy, AppItemModel::XCreatedByRole);
}

QStringMap AppItem::execs() const
Expand All @@ -218,6 +218,16 @@

void AppItem::setExecs(const QStringMap &execs)
{
return setData(QVariant::fromValue<QStringMap>(execs), AppItemModel::ExecsRole);
setData(QVariant::fromValue<QStringMap>(execs), AppItemModel::ExecsRole);
}

QString AppItem::desktopSourcePath() const
{
return data(AppItemModel::DesktopSourcePathRole).toString();
}

void AppItem::setDesktopSourcePath(const QString &desktopSourcePath)
{
setData(desktopSourcePath, AppItemModel::DesktopSourcePathRole);
}
}
5 changes: 4 additions & 1 deletion applets/dde-apps/appitem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -75,5 +75,8 @@ class AppItem : public QStandardItem

QStringMap execs() const;
void setExecs(const QStringMap &execs);

QString desktopSourcePath() const;
void setDesktopSourcePath(const QString &desktopSourcePath);
};
}
5 changes: 3 additions & 2 deletions applets/dde-apps/appitemmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -31,6 +31,7 @@ QHash<int, QByteArray> AppItemModel::roleNames() const
{AppItemModel::XLingLongRole, QByteArrayLiteral("isLingLong")},
{AppItemModel::IdRole, QByteArrayLiteral("id")},
{AppItemModel::XCreatedByRole, QByteArrayLiteral("xCreatedBy")},
{AppItemModel::ExecsRole, QByteArrayLiteral("execs")}};
{AppItemModel::ExecsRole, QByteArrayLiteral("execs")},
{AppItemModel::DesktopSourcePathRole, QByteArrayLiteral("desktopSourcePath")}};
}
}
3 changes: 2 additions & 1 deletion applets/dde-apps/appitemmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -31,6 +31,7 @@ class AppItemModel : public QStandardItemModel
XCreatedByRole,
ExecsRole,
CategoriesRole,
DesktopSourcePathRole,
};
Q_ENUM(Roles)

Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer: Deepin Packages Builder <packages@deepin.com>
Build-Depends:
debhelper-compat (= 13),
cmake,
dde-application-manager-api (>= 1.2.23),
dde-application-manager-api (>= 1.2.48),
dde-tray-loader-dev (> 2.0.24),
extra-cmake-modules,
libdtk6core-bin,
Expand Down
3 changes: 2 additions & 1 deletion panels/dock/taskmanager/taskmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -63,6 +63,7 @@ class TaskManager : public DS_NAMESPACE::DContainment, public AbstractTaskManage
XCreatedByRole,
ExecsRole,
CategoriesRole,
DesktopSourcePathRole,
};
Q_ENUM(Roles)

Expand Down