Skip to content

chore: adapt debugging settings function #667

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 #667

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
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,5 +145,10 @@ install(
FILES dist/org.deepin.dde.shell.launchpad.appdata.xml
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo"
)
# debug config file
install(FILES ${CMAKE_SOURCE_DIR}/dist/deepin-debug-config/org.deepin.dde.launchpad.json
DESTINATION ${CMAKE_INSTALL_DATADIR}/deepin-debug-config/deepin-debug-config.d)
install(FILES ${CMAKE_SOURCE_DIR}/dist/deepin-log-config/org.deepin.dde.launchpad.json
DESTINATION ${CMAKE_INSTALL_DATADIR}/deepin-log-viewer/deepin-log.conf.d)

add_subdirectory(shell-launcher-applet)
2 changes: 1 addition & 1 deletion debughelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include <QDir>
#include <QSettings>
#include <QStandardPaths>
#include <QLoggingCategory>

Check warning on line 10 in debughelper.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.

namespace {
Q_LOGGING_CATEGORY(logDebugHelper, "dde.launchpad.debug")
Q_LOGGING_CATEGORY(logDebugHelper, "org.deepin.dde.launchpad.debug")
}

DebugHelper::DebugHelper(QObject *parent)
Expand Down
2 changes: 1 addition & 1 deletion desktopintegration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
DCORE_USE_NAMESPACE

namespace {
Q_LOGGING_CATEGORY(logDesktopIntegration, "dde.launchpad.desktop")
Q_LOGGING_CATEGORY(logDesktopIntegration, "org.deepin.dde.launchpad.desktop")
}

QString DesktopIntegration::currentDE()
Expand Down
11 changes: 11 additions & 0 deletions dist/deepin-debug-config/org.deepin.dde.launchpad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "dde-launchpad",
"group": "dde",
"submodules": [
{
"name": "org.deepin.dde.launchpad",
"exec": "org.deepin.dde.launchpad.sh"
}
],
"version": "V1.0"
}
74 changes: 74 additions & 0 deletions dist/deepin-log-config/org.deepin.dde.launchpad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"name": "dde-launchpad",
"group": "dde",
"submodules": [
{
"name": "launchpad.debug",
"filter": "org.deepin.dde.launchpad.debug",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.desktop",
"filter": "org.deepin.dde.launchpad.desktop",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.input",
"filter": "org.deepin.dde.launchpad.input",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.controller",
"filter": "org.deepin.dde.launchpad.controller",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.applet",
"filter": "org.deepin.dde.launchpad.applet",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.integration",
"filter": "org.deepin.dde.launchpad.integration",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.gioutils",
"filter": "org.deepin.dde.launchpad.gioutils",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.models",
"filter": "org.deepin.dde.launchpad.models",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.quick",
"filter": "org.deepin.dde.launchpad.quick",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.treeland",
"filter": "org.deepin.dde.launchpad.treeland",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
},
{
"name": "launchpad.utils",
"filter": "org.deepin.dde.launchpad.utils",
"exec": "/usr/bin/dde-shell",
"logType": "journal"
}
],
"visible": 1,
"version": "V1.0"
}
2 changes: 1 addition & 1 deletion inputeventitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
#include "inputeventitem.h"
#include <QLoggingCategory>

Check warning on line 5 in inputeventitem.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.
namespace {
Q_LOGGING_CATEGORY(logInputEvent, "dde.launchpad.input")
Q_LOGGING_CATEGORY(logInputEvent, "org.deepin.dde.launchpad.input")
}

InputEventItem::InputEventItem()
Expand Down
2 changes: 1 addition & 1 deletion launchercontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
DGUI_USE_NAMESPACE

namespace {
Q_LOGGING_CATEGORY(logController, "dde.launchpad.controller")
Q_LOGGING_CATEGORY(logController, "org.deepin.dde.launchpad.controller")
}

LauncherController::LauncherController(QObject *parent)
Expand Down
2 changes: 1 addition & 1 deletion shell-launcher-applet/launcheritem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

DS_USE_NAMESPACE
namespace {
Q_LOGGING_CATEGORY(logApplet, "dde.launchpad.applet")
Q_LOGGING_CATEGORY(logApplet, "org.deepin.dde.launchpad.applet")
}

namespace dock {
Expand Down
2 changes: 1 addition & 1 deletion src/ddeintegration/appearance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
#include <QLoggingCategory>

#include "Appearance1.h"
#include "blurhash.hpp"

Check warning on line 13 in src/ddeintegration/appearance.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "blurhash.hpp" not found.
#include "../launchercontroller.h"

Check warning on line 14 in src/ddeintegration/appearance.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "../launchercontroller.h" not found.

Q_LOGGING_CATEGORY(logDdeIntegration, "dde.launchpad.integration")
Q_LOGGING_CATEGORY(logDdeIntegration, "org.deepin.dde.launchpad.integration")

using Appearance1 = __Appearance1;

Expand Down
2 changes: 1 addition & 1 deletion src/gioutils/appinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#include <gio/gdesktopappinfo.h>
#define signals Q_SIGNALS

#include <QLoggingCategory>

Check warning on line 11 in src/gioutils/appinfo.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.
namespace {
Q_LOGGING_CATEGORY(logGioUtils, "dde.launchpad.gioutils")
Q_LOGGING_CATEGORY(logGioUtils, "org.deepin.dde.launchpad.gioutils")
}


Expand Down
2 changes: 1 addition & 1 deletion src/gioutils/appinfomonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include <gio/gdesktopappinfo.h>

#include <QHash>
#include <QLoggingCategory>

Check warning on line 10 in src/gioutils/appinfomonitor.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.

namespace {
Q_LOGGING_CATEGORY(logGioUtilsMonitor, "dde.launchpad.gioutils.monitor")
Q_LOGGING_CATEGORY(logGioUtilsMonitor, "org.deepin.dde.launchpad.gioutils.monitor")
}

AppInfoMonitor::AppInfoMonitor(QObject *parent)
Expand Down
2 changes: 1 addition & 1 deletion src/gioutils/trashmonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#include "trashmonitor.h"

#include <QLoggingCategory>

Check warning on line 7 in src/gioutils/trashmonitor.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.

namespace {
Q_LOGGING_CATEGORY(logGioUtilsTrash, "dde.launchpad.gioutils.trash")
Q_LOGGING_CATEGORY(logGioUtilsTrash, "org.deepin.dde.launchpad.gioutils.trash")
}

TrashMonitor::TrashMonitor(QObject *parent)
Expand Down
2 changes: 1 addition & 1 deletion src/models/appitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

#include "appitem.h"

#include <QFileInfo>

Check warning on line 7 in src/models/appitem.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

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

Check warning on line 8 in src/models/appitem.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(logModels, "dde.launchpad.models")
Q_LOGGING_CATEGORY(logModels, "org.deepin.dde.launchpad.models")

AppItem::AppItem(const QString &freedesktopId)
: QStandardItem()
Expand Down
2 changes: 1 addition & 1 deletion src/quick/blurhashimageprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#include <QString>
#include <QLoggingCategory>

#include "blurhash.hpp"

Check warning on line 10 in src/quick/blurhashimageprovider.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "blurhash.hpp" not found.

Q_LOGGING_CATEGORY(logQuick, "dde.launchpad.quick")
Q_LOGGING_CATEGORY(logQuick, "org.deepin.dde.launchpad.quick")

/*
* Qt unfortunately re-encodes the base83 string in QML.
Expand Down
2 changes: 1 addition & 1 deletion src/treelandintegration/personalizationmanager.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>

Q_LOGGING_CATEGORY(logTreeland, "dde.launchpad.treeland")
Q_LOGGING_CATEGORY(logTreeland, "org.deepin.dde.launchpad.treeland")


class PersonalizationManagerPrivate : public QWaylandClientExtensionTemplate<PersonalizationManagerPrivate>,
Expand Down
2 changes: 1 addition & 1 deletion src/utils/categoryutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <QMultiMap>
#include <QLoggingCategory>

Q_LOGGING_CATEGORY(logUtils, "dde.launchpad.utils")
Q_LOGGING_CATEGORY(logUtils, "org.deepin.dde.launchpad.utils")


CategoryUtils::Categorytype CategoryUtils::parseBestMatchedCategory(QStringList categories)
Expand Down