From c78f101e84cd23f9d1da06595d278149dccd9fd6 Mon Sep 17 00:00:00 2001 From: donghualin Date: Tue, 16 Aug 2022 10:29:10 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=8E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=A0=8F=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E4=B8=AD=E5=BF=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 由于控制中心适配了v23的接口，所以需要在任务栏增加USE_AM宏的控制，未使用USE_AM宏的调用com.deepin.dde.ControlCenter接口，使用USE_AM宏的使用org.deepin.dde.ControlCenter1接口。 Log: 优化任务栏打开控制中心的问题 Influence: 任务栏-任务栏设置-打开控制中心 任务栏-蓝牙-蓝牙设置 任务栏-日期-日期时间设置 任务栏-电源-电源设置 任务栏-关机-关机设置 任务栏-声音-声音设置 观察是否正常打开控制中心 Bug: https://pms.uniontech.com/bug-view-149189.html Change-Id: I3373fc641c35e7589730a7cd595f2f55929ad2ec --- frame/util/menuworker.cpp | 15 ++++++++++--- .../window/components/volumedeviceswidget.cpp | 13 ++++++++--- plugins/airplane-mode/airplanemodeitem.cpp | 17 +++++++++++--- plugins/bluetooth/bluetoothitem.cpp | 16 +++++++++++--- .../bluetooth/componments/bluetoothapplet.cpp | 17 ++++++++++---- plugins/datetime/datetimeplugin.cpp | 16 +++++++++++--- plugins/keyboard-layout/dbusadaptors.cpp | 17 +++++++++++--- plugins/power/powerplugin.cpp | 22 +++++++++++++++---- plugins/shutdown/shutdownplugin.cpp | 16 +++++++++++--- plugins/sound/sounditem.cpp | 16 +++++++++++--- 10 files changed, 133 insertions(+), 32 deletions(-) diff --git a/frame/util/menuworker.cpp b/frame/util/menuworker.cpp index ab321ed0a..583775480 100644 --- a/frame/util/menuworker.cpp +++ b/frame/util/menuworker.cpp @@ -158,12 +158,21 @@ QMenu *MenuWorker::createMenu(QMenu *settingsMenu) void MenuWorker::onDockSettingsTriggered() { - DDBusSender().service("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") - .interface("org.deepin.dde.ControlCenter") +#ifdef USE_AM + DDBusSender().service("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") + .method("ShowPage") + .arg(QString("personalization/desktop/dock")) + .call(); +#else + DDBusSender().service("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .interface("com.deepin.dde.ControlCenter") .method("ShowPage") .arg(QString("personalization/dock")) .call(); +#endif } void MenuWorker::showDockSettingsMenu(QMenu *menu) diff --git a/frame/window/components/volumedeviceswidget.cpp b/frame/window/components/volumedeviceswidget.cpp index 0ec36aff2..615ce1736 100644 --- a/frame/window/components/volumedeviceswidget.cpp +++ b/frame/window/components/volumedeviceswidget.cpp @@ -194,10 +194,17 @@ void VolumeDevicesWidget::initConnection() m_deviceList->update(); } else { // 打开控制中心的声音模块 - DDBusSender().service("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") - .interface("org.deepin.dde.ControlCenter") +#ifdef USE_AM + DDBusSender().service("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") .method("ShowPage").arg(QString("sound")).call(); +#else + DDBusSender().service("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .method("ShowPage").arg(QString("sound")).call(); +#endif hide(); } }); diff --git a/plugins/airplane-mode/airplanemodeitem.cpp b/plugins/airplane-mode/airplanemodeitem.cpp index bcbaa206d..c78c94370 100644 --- a/plugins/airplane-mode/airplanemodeitem.cpp +++ b/plugins/airplane-mode/airplanemodeitem.cpp @@ -113,14 +113,25 @@ void AirplaneModeItem::invokeMenuItem(const QString menuId, const bool checked) if (menuId == SHIFT) m_airplaneModeInter->Enable(!m_airplaneModeInter->enabled()); else if (menuId == SETTINGS) +#ifdef USE_AM DDBusSender() - .service("org.deepin.dde.ControlCenter") - .interface("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") + .service("org.deepin.dde.ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") .method(QString("ShowPage")) .arg(QString("network")) .arg(QString("Airplane Mode")) .call(); +#else + DDBusSender() + .service("com.deepin.dde.ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .method(QString("ShowPage")) + .arg(QString("network")) + .arg(QString("Airplane Mode")) + .call(); +#endif */ } diff --git a/plugins/bluetooth/bluetoothitem.cpp b/plugins/bluetooth/bluetoothitem.cpp index a2ca2ac11..560fc9921 100644 --- a/plugins/bluetooth/bluetoothitem.cpp +++ b/plugins/bluetooth/bluetoothitem.cpp @@ -117,13 +117,23 @@ void BluetoothItem::invokeMenuItem(const QString menuId, const bool checked) if (menuId == SHIFT) { m_applet->setAdapterPowered(!m_adapterPowered); } else if (menuId == SETTINGS) { +#ifdef USE_AM DDBusSender() - .service("org.deepin.dde.ControlCenter") - .interface("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") + .service("org.deepin.dde.ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") .method(QString("ShowPage")) .arg(QString("bluetooth")) .call(); +#else + DDBusSender() + .service("com.deepin.dde.ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .method(QString("ShowPage")) + .arg(QString("bluetooth")) + .call(); +#endif } } diff --git a/plugins/bluetooth/componments/bluetoothapplet.cpp b/plugins/bluetooth/componments/bluetoothapplet.cpp index 9f579e3f3..fdc6d871b 100644 --- a/plugins/bluetooth/componments/bluetoothapplet.cpp +++ b/plugins/bluetooth/componments/bluetoothapplet.cpp @@ -274,15 +274,24 @@ void BluetoothApplet::initConnect() { connect(m_adaptersManager, &AdaptersManager::adapterIncreased, this, &BluetoothApplet::onAdapterAdded); connect(m_adaptersManager, &AdaptersManager::adapterDecreased, this, &BluetoothApplet::onAdapterRemoved); - connect(m_settingLabel, &SettingLabel::clicked, this, [ = ] { +#ifdef USE_AM DDBusSender() - .service("org.deepin.dde.ControlCenter") - .interface("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") + .service("org.deepin.dde.ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") .method(QString("ShowPage")) .arg(QString("bluetooth")) .call(); +#else + DDBusSender() + .service("com.deepin.dde.ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .method(QString("ShowPage")) + .arg(QString("bluetooth")) + .call(); +#endif }); connect(DApplicationHelper::instance(), &DApplicationHelper::themeTypeChanged, this, &BluetoothApplet::updateIconTheme); connect(m_airPlaneModeInter, &DBusAirplaneMode::EnabledChanged, this, &BluetoothApplet::setAirplaneModeEnabled); diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index c6ddf01af..5b33e482e 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -190,13 +190,23 @@ void DatetimePlugin::invokedMenuItem(const QString &itemKey, const QString &menu Q_UNUSED(checked) if (menuId == "open") { +#ifdef USE_AM DDBusSender() - .service("org.deepin.dde.ControlCenter") - .interface("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") + .service("org.deepin.dde.ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") .method(QString("ShowPage")) .arg(QString("datetime")) .call(); +#else + DDBusSender() + .service("com.deepin.dde.ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .method(QString("ShowPage")) + .arg(QString("datetime")) + .call(); +#endif } else { const bool value = timedateInterface()->property(TIME_FORMAT_KEY).toBool(); timedateInterface()->setProperty(TIME_FORMAT_KEY, !value); diff --git a/plugins/keyboard-layout/dbusadaptors.cpp b/plugins/keyboard-layout/dbusadaptors.cpp index 0e2f45b97..1ecdfc82d 100644 --- a/plugins/keyboard-layout/dbusadaptors.cpp +++ b/plugins/keyboard-layout/dbusadaptors.cpp @@ -173,14 +173,25 @@ void DBusAdaptors::refreshMenuSelection() void DBusAdaptors::handleActionTriggered(QAction *action) { if (action == m_addLayoutAction) { +#ifdef USE_AM DDBusSender() - .service("org.deepin.dde.ControlCenter") - .interface("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") + .service("org.deepin.dde.ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") .method("ShowPage") .arg(QString("keyboard")) .arg(QString("Keyboard Layout/Add Keyboard Layout")) .call(); +#else + DDBusSender() + .service("com.deepin.dde.ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .method("ShowPage") + .arg(QString("keyboard")) + .arg(QString("Keyboard Layout/Add Keyboard Layout")) + .call(); +#endif } const QString layout = action->objectName(); diff --git a/plugins/power/powerplugin.cpp b/plugins/power/powerplugin.cpp index 3a9252eaf..14d138709 100644 --- a/plugins/power/powerplugin.cpp +++ b/plugins/power/powerplugin.cpp @@ -113,7 +113,11 @@ bool PowerPlugin::pluginIsDisable() const QString PowerPlugin::itemCommand(const QString &itemKey) { if (itemKey == POWER_KEY) - return QString("dbus-send --print-reply --dest=org.deepin.dde.ControlCenter /org/deepin/dde/ControlCenter org.deepin.dde.ControlCenter.ShowPage \"string:power\""); +#ifdef USE_AM + return QString("dbus-send --print-reply --dest=org.deepin.dde.ControlCenter1 /org/deepin/dde/ControlCenter1 org.deepin.dde.ControlCenter1.ShowPage \"string:power\""); +#else + return QString("dbus-send --print-reply --dest=com.deepin.dde.ControlCenter /com/deepin/dde/ControlCenter com.deepin.dde.ControlCenter.ShowPage \"string:power\""); +#endif return QString(); } @@ -149,13 +153,23 @@ void PowerPlugin::invokedMenuItem(const QString &itemKey, const QString &menuId, Q_UNUSED(checked) if (menuId == "power") { +#ifdef USE_AM DDBusSender() - .service("org.deepin.dde.ControlCenter") - .interface("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") + .service("org.deepin.dde.ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") .method(QString("ShowPage")) .arg(QString("power")) .call(); +#else + DDBusSender() + .service("com.deepin.dde.ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .method(QString("ShowPage")) + .arg(QString("power")) + .call(); +#endif } } diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp index fc5d5dd7d..81dec6047 100644 --- a/plugins/shutdown/shutdownplugin.cpp +++ b/plugins/shutdown/shutdownplugin.cpp @@ -233,13 +233,23 @@ void ShutdownPlugin::invokedMenuItem(const QString &itemKey, const QString &menu QCoreApplication::processEvents(QEventLoop::AllEvents, 200); if (menuId == "power") { +#ifdef USE_AM DDBusSender() - .service("org.deepin.dde.ControlCenter") - .interface("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") + .service("org.deepin.dde.ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") .method(QString("ShowPage")) .arg(QString("power")) .call(); +#else + DDBusSender() + .service("com.deepin.dde.ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .method(QString("ShowPage")) + .arg(QString("power")) + .call(); +#endif } else if (menuId == "Lock") { if (QFile::exists(ICBC_CONF_FILE)) { QDBusMessage send = QDBusMessage::createMethodCall("com.deepin.dde.lockFront", "/com/deepin/dde/lockFront", "com.deepin.dde.lockFront", "SwitchTTYAndShow"); diff --git a/plugins/sound/sounditem.cpp b/plugins/sound/sounditem.cpp index 2e878066b..1ac357979 100644 --- a/plugins/sound/sounditem.cpp +++ b/plugins/sound/sounditem.cpp @@ -128,13 +128,23 @@ void SoundItem::invokeMenuItem(const QString menuId, const bool checked) if (menuId == MUTE) m_sinkInter->SetMuteQueued(!m_sinkInter->mute()); else if (menuId == SETTINGS) +#ifdef USE_AM DDBusSender() - .service("org.deepin.dde.ControlCenter") - .interface("org.deepin.dde.ControlCenter") - .path("/org/deepin/dde/ControlCenter") + .service("org.deepin.dde.ControlCenter1") + .interface("org.deepin.dde.ControlCenter1") + .path("/org/deepin/dde/ControlCenter1") .method(QString("ShowPage")) .arg(QString("sound")) .call(); +#else + DDBusSender() + .service("com.deepin.dde.ControlCenter") + .interface("com.deepin.dde.ControlCenter") + .path("/com/deepin/dde/ControlCenter") + .method(QString("ShowPage")) + .arg(QString("sound")) + .call(); +#endif } void SoundItem::resizeEvent(QResizeEvent *e)