Skip to content

pr1 #482

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 2 commits into from
Dec 18, 2025
Merged

pr1 #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fc76d5
fix: 通过dconfig屏蔽进程暂停与恢复进程功能
myk1343 Sep 6, 2024
196346e
chore: redirect crash log to cache path.
itsXuSt Dec 13, 2024
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
10 changes: 10 additions & 0 deletions assets/configs/org.deepin.system-monitor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@
"description[zh_CN]": "启用DKapture eBPF监控进行进程数据收集",
"permissions": "readwrite",
"visibility": "public"
},
"displayMenuPauseAndRecovery": {
"value": 0,
"serial": 0,
"flags": ["global"],
"name": "Display pause recovery process",
"name[zh_CN]": "显示暂停恢复进程",
"description": "显示暂停恢复进程",
"permissions": "readwrite",
"visibility": "public"
}
}
}
8 changes: 8 additions & 0 deletions deepin-system-monitor-main/gui/process_table_view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,14 @@ void ProcessTableView::initConnections(bool settingsLoaded)
// ALT + C
resumeProcAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_C));
connect(resumeProcAction, &QAction::triggered, this, &ProcessTableView::resumeProcess);
DConfig *config = DConfig::create("org.deepin.system-monitor", "org.deepin.system-monitor");
if(config) {
QVariant varMenu = config->value("displayMenuPauseAndRecovery");
if(varMenu.isValid() && varMenu.toInt() == 0) {
pauseProcAction->setVisible(false);
resumeProcAction->setVisible(false);
}
}

// change priority dialog
auto *chgProcPrioMenu = m_contextMenu->addMenu(
Expand Down
6 changes: 5 additions & 1 deletion deepin-system-monitor-main/stack_trace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include <stdlib.h>
#include <unistd.h>

#include <QStandardPaths>

namespace util {

#define MAX_BACKTRACE_FRAMES 128
Expand Down Expand Up @@ -52,7 +54,9 @@ static inline void printStacktrace(int signum)
logstr[len] = 0;

// open log output stream
std::string logN {"/tmp/"};
auto cachePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
if (!cachePath.endsWith("/")) cachePath.append("/");
std::string logN {cachePath.toStdString()};
logN.append(logstr);
std::ofstream log(logN, std::ios::out);

Expand Down