From 47f858178820d53dd6f32b664dacc7f4f554d0ad Mon Sep 17 00:00:00 2001 From: donghualin Date: Wed, 16 Nov 2022 13:48:41 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 除了电池插件保留右键菜单，其他在快捷区域的插件不显示右键菜单 Log: 去掉插件的右键菜单 Influence: 右键蓝牙、声音等插件，观察是否有右键菜单 Bug: https://pms.uniontech.com/bug-view-171753.html Change-Id: Ied821bb2f2e1b6e6e6fe7952ee15745d793e7e7d --- plugins/bluetooth/bluetoothplugin.cpp | 9 --------- plugins/bluetooth/bluetoothplugin.h | 1 - plugins/onboard/onboardplugin.cpp | 20 -------------------- plugins/onboard/onboardplugin.h | 1 - plugins/sound/soundplugin.cpp | 9 --------- plugins/sound/soundplugin.h | 1 - 6 files changed, 41 deletions(-) diff --git a/plugins/bluetooth/bluetoothplugin.cpp b/plugins/bluetooth/bluetoothplugin.cpp index ce4c6e178..7b70444fa 100644 --- a/plugins/bluetooth/bluetoothplugin.cpp +++ b/plugins/bluetooth/bluetoothplugin.cpp @@ -111,15 +111,6 @@ QWidget *BluetoothPlugin::itemPopupApplet(const QString &itemKey) return nullptr; } -const QString BluetoothPlugin::itemContextMenu(const QString &itemKey) -{ - if (itemKey == BLUETOOTH_KEY) { - return m_bluetoothItem->contextMenu(); - } - - return QString(); -} - void BluetoothPlugin::invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) { if (itemKey == BLUETOOTH_KEY) { diff --git a/plugins/bluetooth/bluetoothplugin.h b/plugins/bluetooth/bluetoothplugin.h index 094eb4bf4..567c5fc2d 100644 --- a/plugins/bluetooth/bluetoothplugin.h +++ b/plugins/bluetooth/bluetoothplugin.h @@ -49,7 +49,6 @@ public: QWidget *itemWidget(const QString &itemKey) override; QWidget *itemTipsWidget(const QString &itemKey) override; QWidget *itemPopupApplet(const QString &itemKey) override; - const QString itemContextMenu(const QString &itemKey) override; void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override; int itemSortKey(const QString &itemKey) override; void setSortKey(const QString &itemKey, const int order) override; diff --git a/plugins/onboard/onboardplugin.cpp b/plugins/onboard/onboardplugin.cpp index ba46219b6..c1c5b51e6 100644 --- a/plugins/onboard/onboardplugin.cpp +++ b/plugins/onboard/onboardplugin.cpp @@ -102,26 +102,6 @@ const QString OnboardPlugin::itemCommand(const QString &itemKey) return QString("dbus-send --print-reply --dest=org.onboard.Onboard /org/onboard/Onboard/Keyboard org.onboard.Onboard.Keyboard.ToggleVisible"); } -const QString OnboardPlugin::itemContextMenu(const QString &itemKey) -{ - Q_UNUSED(itemKey); - - QList items; - - QMap onboardSettings; - onboardSettings["itemId"] = "onboard-settings"; - onboardSettings["itemText"] = tr("Settings"); - onboardSettings["isActive"] = true; - items.push_back(onboardSettings); - - QMap menu; - menu["items"] = items; - menu["checkableMenu"] = false; - menu["singleCheck"] = false; - - return QJsonDocument::fromVariant(menu).toJson(); -} - void OnboardPlugin::invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) { Q_UNUSED(itemKey) diff --git a/plugins/onboard/onboardplugin.h b/plugins/onboard/onboardplugin.h index 3d08b1795..ca79e2463 100644 --- a/plugins/onboard/onboardplugin.h +++ b/plugins/onboard/onboardplugin.h @@ -51,7 +51,6 @@ public: QWidget *itemWidget(const QString &itemKey) override; QWidget *itemTipsWidget(const QString &itemKey) override; const QString itemCommand(const QString &itemKey) override; - const QString itemContextMenu(const QString &itemKey) override; void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override; void displayModeChanged(const Dock::DisplayMode displayMode) override; diff --git a/plugins/sound/soundplugin.cpp b/plugins/sound/soundplugin.cpp index 5e97e5f01..38f8b712b 100644 --- a/plugins/sound/soundplugin.cpp +++ b/plugins/sound/soundplugin.cpp @@ -110,15 +110,6 @@ QWidget *SoundPlugin::itemPopupApplet(const QString &itemKey) return nullptr; } -const QString SoundPlugin::itemContextMenu(const QString &itemKey) -{ - if (itemKey == SOUND_KEY) { - return m_soundItem->contextMenu(); - } - - return QString(); -} - void SoundPlugin::invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) { if (itemKey == SOUND_KEY) { diff --git a/plugins/sound/soundplugin.h b/plugins/sound/soundplugin.h index f14f5020a..29c1ad3e4 100644 --- a/plugins/sound/soundplugin.h +++ b/plugins/sound/soundplugin.h @@ -46,7 +46,6 @@ public: QWidget *itemWidget(const QString &itemKey) override; QWidget *itemTipsWidget(const QString &itemKey) override; QWidget *itemPopupApplet(const QString &itemKey) override; - const QString itemContextMenu(const QString &itemKey) override; void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override; int itemSortKey(const QString &itemKey) override; void setSortKey(const QString &itemKey, const int order) override;