diff --git a/frame/item/launcheritem.cpp b/frame/item/launcheritem.cpp index 449c281f5..6b277a687 100644 --- a/frame/item/launcheritem.cpp +++ b/frame/item/launcheritem.cpp @@ -101,7 +101,7 @@ void LauncherItem::mousePressEvent(QMouseEvent *e) .service("com.deepin.dde.Launcher") .interface("com.deepin.dde.Launcher") .path("/com/deepin/dde/Launcher") - .method("com.deepin.dde.Launcher.Toggle") + .method("Toggle") .call(); } diff --git a/plugins/sound/CMakeLists.txt b/plugins/sound/CMakeLists.txt index b7e35269c..019d75db1 100644 --- a/plugins/sound/CMakeLists.txt +++ b/plugins/sound/CMakeLists.txt @@ -9,6 +9,7 @@ file(GLOB_RECURSE SRCS "*.h" "*.cpp") find_package(PkgConfig REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Svg REQUIRED) +find_package(Qt5DBus REQUIRED) find_package(DtkWidget REQUIRED) pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus) @@ -18,15 +19,16 @@ add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN") add_library(${PLUGIN_NAME} SHARED ${SRCS} resources/resources.qrc) set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../) target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} - ${DFrameworkDBus_INCLUDE_DIRS} - ${QGSettings_INCLUDE_DIRS} - ../../interfaces) + ${DFrameworkDBus_INCLUDE_DIRS} + ${QGSettings_INCLUDE_DIRS} + ../../interfaces) target_link_libraries(${PLUGIN_NAME} PRIVATE - ${DtkWidget_LIBRARIES} - ${DFrameworkDBus_LIBRARIES} - ${QGSettings_LIBRARIES} - ${Qt5Widgets_LIBRARIES} - ${Qt5Svg_LIBRARIES} + ${DtkWidget_LIBRARIES} + ${DFrameworkDBus_LIBRARIES} + ${QGSettings_LIBRARIES} + ${Qt5DBus_LIBRARIES} + ${Qt5Widgets_LIBRARIES} + ${Qt5Svg_LIBRARIES} ) install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins) diff --git a/plugins/sound/sounditem.cpp b/plugins/sound/sounditem.cpp index e1455f77f..9f0a183d4 100644 --- a/plugins/sound/sounditem.cpp +++ b/plugins/sound/sounditem.cpp @@ -27,6 +27,8 @@ #include #include +#include + // menu actions #define MUTE "mute" #define SETTINS "settings" @@ -103,7 +105,13 @@ void SoundItem::invokeMenuItem(const QString menuId, const bool checked) if (menuId == MUTE) m_sinkInter->SetMuteQueued(!m_sinkInter->mute()); else if (menuId == SETTINS) - QProcess::startDetached("dbus-send --print-reply --dest=com.deepin.dde.ControlCenter /com/deepin/dde/ControlCenter com.deepin.dde.ControlCenter.ShowModule \"string:sound\""); + DDBusSender() + .service("com.deepin.dde.ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .method(QString("ShowModule")) + .arg(QString("sound")) + .call(); } QSize SoundItem::sizeHint() const