diff --git a/CMakeLists.txt b/CMakeLists.txt index a9bac469..2b2471dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/debughelper.cpp b/debughelper.cpp index 6d3d5751..e37ae2fc 100644 --- a/debughelper.cpp +++ b/debughelper.cpp @@ -10,7 +10,7 @@ #include namespace { -Q_LOGGING_CATEGORY(logDebugHelper, "dde.launchpad.debug") +Q_LOGGING_CATEGORY(logDebugHelper, "org.deepin.dde.launchpad.debug") } DebugHelper::DebugHelper(QObject *parent) diff --git a/desktopintegration.cpp b/desktopintegration.cpp index 31d16dc5..49531866 100644 --- a/desktopintegration.cpp +++ b/desktopintegration.cpp @@ -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() diff --git a/dist/deepin-debug-config/org.deepin.dde.launchpad.json b/dist/deepin-debug-config/org.deepin.dde.launchpad.json new file mode 100644 index 00000000..5e4a496e --- /dev/null +++ b/dist/deepin-debug-config/org.deepin.dde.launchpad.json @@ -0,0 +1,11 @@ +{ + "name": "dde-launchpad", + "group": "dde", + "submodules": [ + { + "name": "org.deepin.dde.launchpad", + "exec": "org.deepin.dde.launchpad.sh" + } + ], + "version": "V1.0" +} diff --git a/dist/deepin-log-config/org.deepin.dde.launchpad.json b/dist/deepin-log-config/org.deepin.dde.launchpad.json new file mode 100644 index 00000000..39cd8f60 --- /dev/null +++ b/dist/deepin-log-config/org.deepin.dde.launchpad.json @@ -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" +} diff --git a/inputeventitem.cpp b/inputeventitem.cpp index 3ea4f25e..adda945f 100644 --- a/inputeventitem.cpp +++ b/inputeventitem.cpp @@ -4,7 +4,7 @@ #include "inputeventitem.h" #include namespace { -Q_LOGGING_CATEGORY(logInputEvent, "dde.launchpad.input") +Q_LOGGING_CATEGORY(logInputEvent, "org.deepin.dde.launchpad.input") } InputEventItem::InputEventItem() diff --git a/launchercontroller.cpp b/launchercontroller.cpp index 9adddd3f..cebc13f6 100644 --- a/launchercontroller.cpp +++ b/launchercontroller.cpp @@ -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) diff --git a/shell-launcher-applet/launcheritem.cpp b/shell-launcher-applet/launcheritem.cpp index b319842a..45186803 100644 --- a/shell-launcher-applet/launcheritem.cpp +++ b/shell-launcher-applet/launcheritem.cpp @@ -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 { diff --git a/src/ddeintegration/appearance.cpp b/src/ddeintegration/appearance.cpp index 24185f52..6957bbbe 100644 --- a/src/ddeintegration/appearance.cpp +++ b/src/ddeintegration/appearance.cpp @@ -13,7 +13,7 @@ #include "blurhash.hpp" #include "../launchercontroller.h" -Q_LOGGING_CATEGORY(logDdeIntegration, "dde.launchpad.integration") +Q_LOGGING_CATEGORY(logDdeIntegration, "org.deepin.dde.launchpad.integration") using Appearance1 = __Appearance1; diff --git a/src/gioutils/appinfo.cpp b/src/gioutils/appinfo.cpp index 849e266f..47e3ae3d 100644 --- a/src/gioutils/appinfo.cpp +++ b/src/gioutils/appinfo.cpp @@ -10,7 +10,7 @@ #include namespace { -Q_LOGGING_CATEGORY(logGioUtils, "dde.launchpad.gioutils") +Q_LOGGING_CATEGORY(logGioUtils, "org.deepin.dde.launchpad.gioutils") } diff --git a/src/gioutils/appinfomonitor.cpp b/src/gioutils/appinfomonitor.cpp index f196c97b..7e3dae08 100644 --- a/src/gioutils/appinfomonitor.cpp +++ b/src/gioutils/appinfomonitor.cpp @@ -10,7 +10,7 @@ #include namespace { -Q_LOGGING_CATEGORY(logGioUtilsMonitor, "dde.launchpad.gioutils.monitor") +Q_LOGGING_CATEGORY(logGioUtilsMonitor, "org.deepin.dde.launchpad.gioutils.monitor") } AppInfoMonitor::AppInfoMonitor(QObject *parent) diff --git a/src/gioutils/trashmonitor.cpp b/src/gioutils/trashmonitor.cpp index 8a0732a5..6cd10336 100644 --- a/src/gioutils/trashmonitor.cpp +++ b/src/gioutils/trashmonitor.cpp @@ -7,7 +7,7 @@ #include namespace { -Q_LOGGING_CATEGORY(logGioUtilsTrash, "dde.launchpad.gioutils.trash") +Q_LOGGING_CATEGORY(logGioUtilsTrash, "org.deepin.dde.launchpad.gioutils.trash") } TrashMonitor::TrashMonitor(QObject *parent) diff --git a/src/models/appitem.cpp b/src/models/appitem.cpp index 17f7f7c8..e4fb41bd 100644 --- a/src/models/appitem.cpp +++ b/src/models/appitem.cpp @@ -6,7 +6,7 @@ #include #include -Q_LOGGING_CATEGORY(logModels, "dde.launchpad.models") +Q_LOGGING_CATEGORY(logModels, "org.deepin.dde.launchpad.models") AppItem::AppItem(const QString &freedesktopId) : QStandardItem() diff --git a/src/quick/blurhashimageprovider.cpp b/src/quick/blurhashimageprovider.cpp index 22aca6c0..16ae93ca 100644 --- a/src/quick/blurhashimageprovider.cpp +++ b/src/quick/blurhashimageprovider.cpp @@ -9,7 +9,7 @@ #include "blurhash.hpp" -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. diff --git a/src/treelandintegration/personalizationmanager.cpp b/src/treelandintegration/personalizationmanager.cpp index 07db3325..e6c19c09 100644 --- a/src/treelandintegration/personalizationmanager.cpp +++ b/src/treelandintegration/personalizationmanager.cpp @@ -13,7 +13,7 @@ #include -Q_LOGGING_CATEGORY(logTreeland, "dde.launchpad.treeland") +Q_LOGGING_CATEGORY(logTreeland, "org.deepin.dde.launchpad.treeland") class PersonalizationManagerPrivate : public QWaylandClientExtensionTemplate, diff --git a/src/utils/categoryutils.cpp b/src/utils/categoryutils.cpp index 7f01a6e9..05e7a79c 100644 --- a/src/utils/categoryutils.cpp +++ b/src/utils/categoryutils.cpp @@ -7,7 +7,7 @@ #include #include -Q_LOGGING_CATEGORY(logUtils, "dde.launchpad.utils") +Q_LOGGING_CATEGORY(logUtils, "org.deepin.dde.launchpad.utils") CategoryUtils::Categorytype CategoryUtils::parseBestMatchedCategory(QStringList categories)