chore: adapt debugging settings function #1336
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reviewer's GuideThis PR enhances the debugging settings by installing new JSON-based debug and log configurations via CMake, standardizes all QLoggingCategory identifiers to the "org.deepin.dde.shell" namespace across modules, and updates REUSE.toml to include JSON files in its compliance patterns. Entity relationship diagram for REUSE.toml compliance patterns updateerDiagram
REUSE_TOML {
path string
precedence string
SPDX-FileCopyrightText string
SPDX-LicenseIdentifier string
}
REUSE_TOML ||--o| JSON_FILE : includes
REUSE_TOML ||--o| SERVICE_FILE : includes
JSON_FILE {
file string
}
SERVICE_FILE {
file string
}
Class diagram for QLoggingCategory usage after namespace standardizationclassDiagram
class AppGroup {
+QLoggingCategory appGroupLog : "org.deepin.dde.shell.dde-apps.appgroup"
}
class AmAppItemModel {
+QLoggingCategory appsLog : "org.deepin.dde.shell.dde-apps.amappitemmodel"
}
class DockPanel {
+QLoggingCategory dockLog : "org.deepin.dde.shell.dock"
}
class DockSettings {
+QLoggingCategory dockSettingsLog : "org.deepin.dde.shell.dock.docksettings"
}
class ShowDesktop {
+QLoggingCategory showDesktop : "org.deepin.dde.shell.dock.showdesktop"
}
class AppItem {
+QLoggingCategory appitemLog : "org.deepin.dde.shell.dock.taskmanger.appitem"
}
class DesktopFileAbstractParser {
+QLoggingCategory abstractdesktopfileLog : "org.deepin.dde.shell.dock.abstractdesktopfile"
}
class DockGlobalElementModel {
+QLoggingCategory dockGlobalElementModelLog : "org.deepin.dde.shell.dock.taskmanager.dockglobalelementmodel"
}
class TaskManager {
+QLoggingCategory taskManagerLog : "org.deepin.dde.shell.dock.taskmanager"
}
class X11Window {
+QLoggingCategory x11windowLog : "org.deepin.dde.shell.dock.taskmanager.x11window"
}
class X11WindowMonitor {
+QLoggingCategory x11Log : "org.deepin.dde.shell.dock.taskmanager.x11windowmonitor"
}
class DockX11Helper {
+QLoggingCategory dockX11Log : "org.deepin.dde.shell.dock.x11"
}
class NotifyDBAccessor {
+QLoggingCategory notifyDBLog : "org.deepin.dde.shell.notification.db"
}
class NotifyEntity {
+QLoggingCategory notifyLog : "org.deepin.dde.shell.notification"
}
class NotificationContainment {
+QLoggingCategory notifyLog : "org.deepin.dde.shell.notification"
}
class OsdPanel {
+QLoggingCategory osdLog : "org.deepin.dde.shell.osd"
}
class DisplayModeApplet {
+QLoggingCategory osdDPLog : "org.deepin.dde.shell.osd.display"
}
class KbLayoutApplet {
+QLoggingCategory osdKBLog : "org.deepin.dde.shell.osd.kblayout"
}
class DSQuickDrag {
+QLoggingCategory dsDragLog : "org.deepin.dde.shell.drag"
}
class DSPluginMetaData {
+QLoggingCategory dsLog : "org.deepin.dde.shell"
}
class DSLoader {
+QLoggingCategory dsLoaderLog : "org.deepin.dde.shell.loader"
}
class LayerShellWindow {
+QLoggingCategory layershellwindow : "org.deepin.dde.shell.layershell.window"
}
class LayerShellSurface {
+QLoggingCategory layershellsurface : "org.deepin.dde.shell.layershell.surface"
}
class LayerShellEmulation {
+QLoggingCategory layershell : "org.deepin.dde.shell.layershell"
}
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey there - I've reviewed your changes - here's some feedback:
- In CMakeLists.txt you’re using DCC_PROJECT_ROOT_DIR to locate shell JSON files—consider defining and using a project‐specific variable (or CMAKE_SOURCE_DIR) to avoid coupling with the control‐center project.
- There are typos in some logging category identifiers (for example "taskmanger" instead of "taskmanager"); please correct those to keep category names consistent.
- The REUSE.toml update switches to an array for the path field—verify that the REUSE toolchain supports this syntax to prevent license validation breaks.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- In CMakeLists.txt you’re using DCC_PROJECT_ROOT_DIR to locate shell JSON files—consider defining and using a project‐specific variable (or CMAKE_SOURCE_DIR) to avoid coupling with the control‐center project.
- There are typos in some logging category identifiers (for example "taskmanger" instead of "taskmanager"); please correct those to keep category names consistent.
- The REUSE.toml update switches to an array for the path field—verify that the REUSE toolchain supports this syntax to prevent license validation breaks.
## Individual Comments
### Comment 1
<location> `panels/dock/taskmanager/appitem.cpp:19` </location>
<code_context>
#include <QLoggingCategory>
-Q_LOGGING_CATEGORY(appitemLog, "dde.shell.dock.taskmanger.appitem")
+Q_LOGGING_CATEGORY(appitemLog, "org.deepin.dde.shell.dock.taskmanger.appitem")
namespace dock {
</code_context>
<issue_to_address>
**issue (typo):** Typo in logging category: 'taskmanger' should be 'taskmanager'.
This typo may cause issues when filtering logs by category.
```suggestion
Q_LOGGING_CATEGORY(appitemLog, "org.deepin.dde.shell.dock.taskmanager.appitem")
```
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Using linuxdeepin/dde-control-center f86903a87b52048189d0d869c1828fc13da28c03 as reference. Log:
deepin pr auto review我来对这段代码修改进行审查分析：
改进建议：
总体来说，这次修改是积极的，提高了代码的可维护性和规范性，没有发现明显的安全隐患或性能问题。 |
wjyrich
reviewed
Nov 10, 2025
| "submodules": [ | ||
| { | ||
| "name": "org.deepin.dde.shell", | ||
| "exec": "org.deepin.dde.shell.sh" |
Contributor
There was a problem hiding this comment.
好像要给 deepin-debug-config 加上这个玩意
Member
Author
There was a problem hiding this comment.
对，这个就是我不清楚的地方。我看别的项目（比如控制中心）也没放这个 sh 文件，deepin-debug-config 好像是另外的仓库。
Contributor
There was a problem hiding this comment.
deepin-debug-config 好像就是要给这个仓库提供相应的sh进去， 我看到他存在控制中心的.sh
caixr23
approved these changes
Nov 11, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: BLumia, caixr23 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using linuxdeepin/dde-control-center@f86903a as reference.
Summary by Sourcery
Add installation of debug and log configuration files, extend license annotations to JSON files, and standardize logging category identifiers across the shell components
Enhancements:
Build:
Documentation: