Skip to content

chore: adapt debugging settings function #1336

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
BLumia merged 1 commit into from
Nov 11, 2025
Merged

chore: adapt debugging settings function #1336

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
2 changes: 1 addition & 1 deletion REUSE.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ SPDX-FileCopyrightText = "None"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "misc/**.service"
path = ["misc/**.service", "misc/**.json"]
precedence = "aggregate"
SPDX-FileCopyrightText = "None"
SPDX-License-Identifier = "CC0-1.0"
Expand Down
2 changes: 1 addition & 1 deletion applets/dde-apps/amappitemmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#include "appitemmodel.h"
#include "objectmanager1interface.h"

#include <DUtil>

Check warning on line 11 in applets/dde-apps/amappitemmodel.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DUtil> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QtConcurrent>

Check warning on line 12 in applets/dde-apps/amappitemmodel.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtConcurrent> not found. Please note: Cppcheck does not need standard library headers to get proper results.

Q_LOGGING_CATEGORY(appsLog, "dde.shell.dde-apps.amappitemmodel")
Q_LOGGING_CATEGORY(appsLog, "org.deepin.dde.shell.dde-apps.amappitemmodel")

namespace apps
{
Expand Down
2 changes: 1 addition & 1 deletion applets/dde-apps/appgroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include "appitemmodel.h"
#include "itemspage.h"

#include <QLoggingCategory>

Check warning on line 10 in applets/dde-apps/appgroup.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QLoggingCategory> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <algorithm>

Check warning on line 11 in applets/dde-apps/appgroup.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <algorithm> not found. Please note: Cppcheck does not need standard library headers to get proper results.

Q_LOGGING_CATEGORY(appGroupLog, "org.deepin.ds.dde-apps.appgroup")
Q_LOGGING_CATEGORY(appGroupLog, "org.deepin.dde.shell.dde-apps.appgroup")

namespace apps {
AppGroup::AppGroup(const QString &groupId, const QString &name, const QList<QStringList> &appIDs)
Expand Down
2 changes: 1 addition & 1 deletion frame/layershell/dlayershellwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "x11dlayershellemulation.h"
#endif

Q_LOGGING_CATEGORY(layershellwindow, "dde.shell.layershell.window")
Q_LOGGING_CATEGORY(layershellwindow, "org.deepin.dde.shell.layershell.window")

DS_BEGIN_NAMESPACE

Expand Down
2 changes: 1 addition & 1 deletion frame/layershell/qwaylandlayershellsurface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include <QLoggingCategory>

#include <QtWaylandClient/private/qwaylandscreen_p.h>
#include <QtWaylandClient/private/qwaylandsurface_p.h>

Check warning on line 15 in frame/layershell/qwaylandlayershellsurface.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtWaylandClient/private/qwaylandsurface_p.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QtWaylandClient/private/qwaylandwindow_p.h>

Check warning on line 16 in frame/layershell/qwaylandlayershellsurface.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtWaylandClient/private/qwaylandwindow_p.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.

Q_LOGGING_CATEGORY(layershellsurface, "dde.shell.layershell.surface")
Q_LOGGING_CATEGORY(layershellsurface, "org.deepin.dde.shell.layershell.surface")

DS_BEGIN_NAMESPACE

Expand Down
2 changes: 1 addition & 1 deletion frame/layershell/x11dlayershellemulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

DS_BEGIN_NAMESPACE

Q_LOGGING_CATEGORY(layershell, "dde.shell.layershell")
Q_LOGGING_CATEGORY(layershell, "org.deepin.dde.shell.layershell")

LayerShellEmulation::LayerShellEmulation(QWindow* window, QObject *parent)
: QObject(parent)
Expand Down
2 changes: 1 addition & 1 deletion frame/pluginmetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

DS_BEGIN_NAMESPACE

Q_LOGGING_CATEGORY(dsLog, "dde.shell")
Q_LOGGING_CATEGORY(dsLog, "org.deepin.dde.shell")

class DPluginMetaDataPrivate : public QSharedData
{
Expand Down
2 changes: 1 addition & 1 deletion frame/quick/dsquickdrag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

DS_BEGIN_NAMESPACE

Q_LOGGING_CATEGORY(dsDragLog, "dde.shell.drag")
Q_LOGGING_CATEGORY(dsDragLog, "org.deepin.dde.shell.drag")

class DragWindowEventFilter : public QObject {
public:
Expand Down
11 changes: 11 additions & 0 deletions misc/deepin-debug-config/org.deepin.dde.shell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "dde-shell",
"group": "dde",
"submodules": [
{
"name": "org.deepin.dde.shell",
"exec": "org.deepin.dde.shell.sh"
Copy link
Contributor

@wjyrich wjyrich Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个是给到了哪里？

Copy link
Contributor

@wjyrich wjyrich Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好像要给 deepin-debug-config 加上这个玩意

Copy link
Member Author

@BLumia BLumia Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

对，这个就是我不清楚的地方。我看别的项目（比如控制中心）也没放这个 sh 文件，deepin-debug-config 好像是另外的仓库。

Copy link
Contributor

@wjyrich wjyrich Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deepin-debug-config 好像就是要给这个仓库提供相应的sh进去， 我看到他存在控制中心的.sh

}
],
"version": "V1.0"
}
152 changes: 152 additions & 0 deletions misc/deepin-log-config/org.deepin.dde.shell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"name": "dde-shell",
"group": "dde",
"submodules": [
{
"name": "shell.dde-apps.amappitemmodel",
"filter": "org.deepin.dde.shell.dde-apps.amappitemmodel",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dde-apps.appgroup",
"filter": "org.deepin.dde.shell.dde-apps.appgroup",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell",
"filter": "org.deepin.dde.shell",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.layershell.window",
"filter": "org.deepin.dde.shell.layershell.window",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.layershell.surface",
"filter": "org.deepin.dde.shell.layershell.surface",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.layershell",
"filter": "org.deepin.dde.shell.layershell",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.drag",
"filter": "org.deepin.dde.shell.drag",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock",
"filter": "org.deepin.dde.shell.dock",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.docksettings",
"filter": "org.deepin.dde.shell.dock.docksettings",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.x11",
"filter": "org.deepin.dde.shell.dock.x11",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.showdesktop",
"filter": "org.deepin.dde.shell.dock.showdesktop",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.abstractdesktopfile",
"filter": "org.deepin.dde.shell.dock.abstractdesktopfile",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.amdesktopfile",
"filter": "org.deepin.dde.shell.dock.amdesktopfile",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.taskmanager.dockglobalelementmodel",
"filter": "org.deepin.dde.shell.dock.taskmanager.dockglobalelementmodel",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.taskmanager",
"filter": "org.deepin.dde.shell.dock.taskmanager",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.taskmanager.treelandwindow",
"filter": "org.deepin.dde.shell.dock.taskmanager.treelandwindow",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.taskmanager.x11WindowPreview",
"filter": "org.deepin.dde.shell.dock.taskmanager.x11WindowPreview",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.taskmanager.x11utils",
"filter": "org.deepin.dde.shell.dock.taskmanager.x11utils",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.taskmanager.x11window",
"filter": "org.deepin.dde.shell.dock.taskmanager.x11window",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.dock.taskmanager.x11windowmonitor",
"filter": "org.deepin.dde.shell.dock.taskmanager.x11windowmonitor",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.notification",
"filter": "org.deepin.dde.shell.notification",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.osd",
"filter": "org.deepin.dde.shell.osd",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.osd.kblayout",
"filter": "org.deepin.dde.shell.osd.kblayout",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "shell.loader",
"filter": "org.deepin.dde.shell.loader",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
}
],
"visible": 1,
"version": "V1.0"
}
2 changes: 1 addition & 1 deletion panels/dock/dockpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#define SETTINGS DockSettings::instance()

Q_LOGGING_CATEGORY(dockLog, "dde.shell.dock")
Q_LOGGING_CATEGORY(dockLog, "org.deepin.dde.shell.dock")

namespace dock {

Expand Down
2 changes: 1 addition & 1 deletion panels/dock/docksettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#include "constants.h"
#include "docksettings.h"

#include <QTimer>

Check warning on line 9 in panels/dock/docksettings.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QTimer> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QLoggingCategory>

Check warning on line 10 in panels/dock/docksettings.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QLoggingCategory> not found. Please note: Cppcheck does not need standard library headers to get proper results.

Q_LOGGING_CATEGORY(dockSettingsLog, "dde.shell.dock.docksettings")
Q_LOGGING_CATEGORY(dockSettingsLog, "org.deepin.dde.shell.dock.docksettings")

const static QString keyPosition = "Position";
const static QString keyHideMode = "Hide_Mode";
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/showdesktop/showdesktop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

DCORE_USE_NAMESPACE

Q_LOGGING_CATEGORY(showDesktop, "dde.shell.dock.showdesktop")
Q_LOGGING_CATEGORY(showDesktop, "org.deepin.dde.shell.dock.showdesktop")

namespace dock {

Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/appitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <QStringLiteral>
#include <QLoggingCategory>

Q_LOGGING_CATEGORY(appitemLog, "dde.shell.dock.taskmanger.appitem")
Q_LOGGING_CATEGORY(appitemLog, "org.deepin.dde.shell.dock.taskmanger.appitem")

namespace dock {
AppItem::AppItem(QString id, QObject *parent)
Expand Down
3 changes: 1 addition & 2 deletions panels/dock/taskmanager/desktopfileabstractparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

#include <fstream>

Q_LOGGING_CATEGORY(abstractdesktopfileLog, "dde.shell.dock.abstractdesktopfile")

Q_LOGGING_CATEGORY(abstractdesktopfileLog, "org.deepin.dde.shell.dock.abstractdesktopfile")

namespace dock {

Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/desktopfileamparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <QDBusConnection>
#include <QLoggingCategory>

Q_LOGGING_CATEGORY(amdesktopfileLog, "dde.shell.dock.amdesktopfile")
Q_LOGGING_CATEGORY(amdesktopfileLog, "org.deepin.dde.shell.dock.amdesktopfile")

// AM static string
static const QString AM_DBUS_PATH = "org.desktopspec.ApplicationManager1";
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/dockglobalelementmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include <QDBusConnection>
#include <QJsonDocument>
#include <QJsonObject>
#include <QLoggingCategory>

Check warning on line 15 in panels/dock/taskmanager/dockglobalelementmodel.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QLoggingCategory> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QProcess>

Check warning on line 16 in panels/dock/taskmanager/dockglobalelementmodel.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QProcess> not found. Please note: Cppcheck does not need standard library headers to get proper results.

Q_LOGGING_CATEGORY(dockGlobalElementModelLog, "dde.shell.dock.taskmanager.dockglobalelementmodel")
Q_LOGGING_CATEGORY(dockGlobalElementModelLog, "org.deepin.dde.shell.dock.taskmanager.dockglobalelementmodel")

#include <algorithm>
#include <tuple>
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/taskmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "x11utils.h"
#endif

Q_LOGGING_CATEGORY(taskManagerLog, "dde.shell.dock.taskmanager", QtDebugMsg)
Q_LOGGING_CATEGORY(taskManagerLog, "org.deepin.dde.shell.dock.taskmanager", QtDebugMsg)

#define Settings TaskManagerSettings::instance()

Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/treelandwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <private/qwaylandwindow_p.h>
#include <private/qwaylandnativeinterface_p.h>

Q_LOGGING_CATEGORY(waylandwindowLog, "dde.shell.dock.taskmanager.treelandwindow")
Q_LOGGING_CATEGORY(waylandwindowLog, "org.deepin.dde.shell.dock.taskmanager.treelandwindow")

namespace dock {
ForeignToplevelHandle::ForeignToplevelHandle(struct ::treeland_foreign_toplevel_handle_v1 *object)
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/x11preview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <DWindowManagerHelper>
#include <DGuiApplicationHelper>

Q_LOGGING_CATEGORY(x11WindowPreview, "dde.shell.dock.taskmanager.x11WindowPreview")
Q_LOGGING_CATEGORY(x11WindowPreview, "org.deepin.dde.shell.dock.taskmanager.x11WindowPreview")

#define PREVIEW_TITLE_HEIGHT 24
#define PREVIEW_TITLE_BOTTOMMARGIN 8
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/x11utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <QGuiApplication>
#include <QLoggingCategory>

Q_LOGGING_CATEGORY(x11UtilsLog, "dde.shell.dock.taskmanager.x11utils")
Q_LOGGING_CATEGORY(x11UtilsLog, "org.deepin.dde.shell.dock.taskmanager.x11utils")

namespace dock {

Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/x11window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#define X11 X11Utils::instance()

Q_LOGGING_CATEGORY(x11windowLog, "dde.shell.dock.taskmanager.x11window")
Q_LOGGING_CATEGORY(x11windowLog, "org.deepin.dde.shell.dock.taskmanager.x11window")

namespace dock {
X11Window::X11Window(xcb_window_t winid, QObject *parent)
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/x11windowmonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#define X11 X11Utils::instance()

Q_LOGGING_CATEGORY(x11Log, "dde.shell.dock.taskmanager.x11windowmonitor")
Q_LOGGING_CATEGORY(x11Log, "org.deepin.dde.shell.dock.taskmanager.x11windowmonitor")

namespace dock {
static QPointer<X11WindowMonitor> monitor;
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/x11dockhelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <QDBusReply>

namespace dock {
Q_LOGGING_CATEGORY(dockX11Log, "dde.shell.dock.x11")
Q_LOGGING_CATEGORY(dockX11Log, "org.deepin.dde.shell.dock.x11")

const uint16_t monitorSize = 15;
const uint32_t allWorkspace = 0xffffffff;
Expand Down
2 changes: 1 addition & 1 deletion panels/notification/common/dbaccessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace notification {
Q_DECLARE_LOGGING_CATEGORY(notifyLog)
}
namespace notification {
Q_LOGGING_CATEGORY(notifyDBLog, "dde.shell.notification.db", QtMsgType::QtWarningMsg)
Q_LOGGING_CATEGORY(notifyDBLog, "org.deepin.dde.shell.notification.db", QtMsgType::QtWarningMsg)

static const QString TableName = "notifications";
static const QString TableName_v2 = "notifications2";
Expand Down
2 changes: 1 addition & 1 deletion panels/notification/common/notifyentity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <QLoggingCategory>

namespace notification {
Q_LOGGING_CATEGORY(notifyLog, "dde.shell.notification")
Q_LOGGING_CATEGORY(notifyLog, "org.deepin.dde.shell.notification")

#define ACTION_SEGMENT ("|")
#define HINT_SEGMENT ("|")
Expand Down
2 changes: 1 addition & 1 deletion panels/notification/notificationcontainment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "pluginfactory.h"

DS_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(notifyLog, "dde.shell.notification")
Q_LOGGING_CATEGORY(notifyLog, "org.deepin.dde.shell.notification")

NotificationContainment::NotificationContainment(QObject *parent)
: DContainment(parent)
Expand Down
2 changes: 1 addition & 1 deletion panels/notification/osd/displaymode/displaymodeapplet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <DConfig>
#include <DDBusSender>

Q_LOGGING_CATEGORY(osdDPLog, "dde.shell.osd.display")
Q_LOGGING_CATEGORY(osdDPLog, "org.deepin.dde.shell.osd.display")

namespace osd {

Expand Down
Loading