Skip to content
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

Jump to bottom

chore: 使用am启动deepin-system-monitor #359

Merged
merged 1 commit into from
Jul 29, 2024
Merged

chore: 使用am启动deepin-system-monitor #359

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
18 changes: 16 additions & 2 deletions deepin-system-monitor-plugin/gui/monitor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,22 @@ double MonitorPlugin::autoRateUnits(qlonglong speed, RateUnit &unit)

void MonitorPlugin::openSystemMonitor()
{
QProcess::startDetached("/usr/bin/deepin-system-monitor");

auto launchProcessByAM = [](){
QDBusMessage message = QDBusMessage::createMethodCall(
"org.desktopspec.ApplicationManager1",
"/org/desktopspec/ApplicationManager1/deepin_2dsystem_2dmonitor",
"org.desktopspec.ApplicationManager1.Application",
"Launch");

message << QString("") << QStringList() << QVariantMap();

QDBusMessage reply = QDBusConnection::sessionBus().call(message);
if (reply.type() != QDBusMessage::ReplyMessage) {
qCWarning(app) << "Launch deepin-system-monitor main process error:" << reply.errorMessage();
return;
}
};
launchProcessByAM();
//QString cmd("qdbus com.deepin.SystemMonitorMain /com/deepin/SystemMonitorMain com.deepin.SystemMonitorMain.slotRaiseWindow");
QString cmd("gdbus call -e -d com.deepin.SystemMonitorMain -o /com/deepin/SystemMonitorMain -m com.deepin.SystemMonitorMain.slotRaiseWindow");
QTimer::singleShot(200, this, [=]() { QProcess::startDetached(cmd); });
Expand Down
16 changes: 15 additions & 1 deletion deepin-system-monitor-server/src/dbusserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,22 @@ void DBusServer::showMemoryAlarmNotify(const QString &argument)
void DBusServer::showDeepinSystemMoniter()
{
// 显示系统监视器
QProcess::startDetached("/usr/bin/deepin-system-monitor");
auto launchProcessByAM = [](){
QDBusMessage message = QDBusMessage::createMethodCall(
"org.desktopspec.ApplicationManager1",
"/org/desktopspec/ApplicationManager1/deepin_2dsystem_2dmonitor",
"org.desktopspec.ApplicationManager1.Application",
"Launch");

message << QString("") << QStringList() << QVariantMap();

QDBusMessage reply = QDBusConnection::sessionBus().call(message);
if (reply.type() != QDBusMessage::ReplyMessage) {
qWarning() << "Launch deepin-system-monitor main process error:" << reply.errorMessage();
return;
}
};
launchProcessByAM();
// QString cmd("qdbus com.deepin.SystemMonitorMain /com/deepin/SystemMonitorMain com.deepin.SystemMonitorMain.slotRaiseWindow");
QString cmd("gdbus call -e -d com.deepin.SystemMonitorMain -o /com/deepin/SystemMonitorMain -m com.deepin.SystemMonitorMain.slotRaiseWindow");
QTimer::singleShot(100, this, [ = ]() {
Expand Down
Loading