Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion debian/control
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.48),
dde-application-manager-api (>> 1.2.51),
dde-api-dev (>> 6.0.39),
dde-tray-loader-dev (> 2.0.24),
extra-cmake-modules,
Expand Down
1 change: 1 addition & 0 deletions panels/dock/taskmanager/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ if (HAVE_DDE_API_EVENTLOGGER)
target_link_libraries(dock-taskmanager PRIVATE DDEAPI::EventLogger)
endif()


if (BUILD_WITH_X11)
target_compile_definitions(dock-taskmanager PRIVATE BUILD_WITH_X11=)
pkg_check_modules(TaskmanagerXcb REQUIRED IMPORTED_TARGET xcb xcb-res xcb-ewmh xcb-icccm)
Expand Down
8 changes: 6 additions & 2 deletions panels/dock/taskmanager/desktopfileamparser.cpp
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 @@ -194,7 +194,7 @@ void DesktopFileAMParser::launchWithAction(const QString& action)

void DesktopFileAMParser::launchWithUrls(const QStringList & urls)
{
m_applicationInterface->Launch(QString(), urls, QVariantMap());
m_applicationInterface->Launch(QString(), urls, QVariantMap{{QStringLiteral("_launch_type"), QStringLiteral("dde-shell")}});
}

void DesktopFileAMParser::requestQuit()
Expand Down Expand Up @@ -222,7 +222,11 @@ void DesktopFileAMParser::launchByAMTool(const QString &action)
QProcess process;
const auto path = m_applicationInterface->path();
process.setProcessChannelMode(QProcess::MergedChannels);
#ifdef HAVE_DDE_API_EVENTLOGGER
process.start("dde-am", {"--by-user", "--launch-type", "dde-shell", path, action});
#else
process.start("dde-am", {"--by-user", path, action});
#endif
if (!process.waitForFinished()) {
qWarning() << "Failed to launch the path:" << path << process.errorString();
return;
Expand Down
6 changes: 5 additions & 1 deletion panels/dock/taskmanager/dockglobalelementmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,11 @@ void DockGlobalElementModel::requestNewInstance(const QModelIndex &index, const
} else {
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
#ifdef HAVE_DDE_API_EVENTLOGGER
process.start("dde-am", {"--by-user", "--launch-type", "dde-shell", id, action});
#else
process.start("dde-am", {"--by-user", id, action});
#endif
process.waitForFinished();
}
}
Expand All @@ -463,7 +467,7 @@ void DockGlobalElementModel::requestOpenUrls(const QModelIndex &index, const QLi
Application appInterface(QStringLiteral("org.desktopspec.ApplicationManager1"), dbusPath, QDBusConnection::sessionBus());

if (appInterface.isValid()) {
appInterface.Launch(QString(), urlStrings, QVariantMap());
appInterface.Launch(QString(), urlStrings, QVariantMap{{QStringLiteral("_launch_type"), QStringLiteral("dde-shell")}});
}
}

Expand Down
6 changes: 5 additions & 1 deletion panels/dock/taskmanager/dockgroupmodel.cpp
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 @@ -206,7 +206,11 @@ void DockGroupModel::requestNewInstance(const QModelIndex &index, const QString
auto desktopId = index.data(TaskManager::DesktopIdRole).toString();
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
#ifdef HAVE_DDE_API_EVENTLOGGER
process.start("dde-am", {"--by-user", "--launch-type", "dde-shell", desktopId, action});
#else
process.start("dde-am", {"--by-user", desktopId, action});
#endif
process.waitForFinished();
return;
}
Expand Down
Loading