Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: 修改快捷区域key值

Browse Source 
修改快捷区域key值

Log: 修改快捷区域获取数据的key值
Influence: 无
Task: https://pms.uniontech.com/task-view-96831.html
Change-Id: Ie405a9b45c173092f5c32a06d85f44ec88a1f54e
This commit is contained in:
donghualin 2022-11-04 04:51:48 +00:00
parent 9e60447a4d
commit 3a5e8c1ec6
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frame/window/quicksettingcontainer.cpp
View File

@ -169,7 +169,7 @@ void QuickSettingContainer::onItemDetailClick(PluginsItemInterface *pluginInter)
if (!quickItemWidget) if (!quickItemWidget)
return; return;
QWidget *widget = pluginInter->itemPopupApplet(QUICK_ITEM_DETAIL_KEY); QWidget *widget = pluginInter->itemPopupApplet(QUICK_ITEM_KEY);
if (!widget) if (!widget)
return; return;
@ -198,11 +198,11 @@ bool QuickSettingContainer::eventFilter(QObject *watched, QEvent *event)
if (!isApplet(plugin)) if (!isApplet(plugin))
continue; continue;
if (plugin->itemWidget(QUICK_ITEM_DETAIL_KEY) != watched) if (plugin->itemWidget(QUICK_ITEM_KEY) != watched)
continue; continue;
m_dragInfo->dragPosition = mouseEvent->pos(); m_dragInfo->dragPosition = mouseEvent->pos();
m_dragInfo->dragItem = plugin->itemWidget(QUICK_ITEM_DETAIL_KEY); m_dragInfo->dragItem = plugin->itemWidget(QUICK_ITEM_KEY);
m_dragInfo->pluginInter = plugin; m_dragInfo->pluginInter = plugin;
break; break;
} }
@ -240,7 +240,7 @@ QPoint QuickSettingContainer::hotSpot(const QPixmap &pixmap)
bool QuickSettingContainer::isApplet(PluginsItemInterface *itemInter) const bool QuickSettingContainer::isApplet(PluginsItemInterface *itemInter) const
{ {
if (!itemInter->itemWidget(QUICK_ITEM_DETAIL_KEY)) if (!itemInter->itemWidget(QUICK_ITEM_KEY))
return false; return false;
QJsonObject json = QuickSettingController::instance()->metaData(itemInter); QJsonObject json = QuickSettingController::instance()->metaData(itemInter);
@ -252,7 +252,7 @@ bool QuickSettingContainer::isApplet(PluginsItemInterface *itemInter) const
void QuickSettingContainer::onPluginInsert(PluginsItemInterface * itemInter) void QuickSettingContainer::onPluginInsert(PluginsItemInterface * itemInter)
{ {
QWidget *itemWidget = itemInter->itemWidget(QUICK_ITEM_DETAIL_KEY); QWidget *itemWidget = itemInter->itemWidget(QUICK_ITEM_KEY);
if (isApplet(itemInter)) { if (isApplet(itemInter)) {
// 如果存在这个窗体，就让其显示在下方 // 如果存在这个窗体，就让其显示在下方
DBlurEffectWidget *effectWidget = new DBlurEffectWidget(m_componentWidget); DBlurEffectWidget *effectWidget = new DBlurEffectWidget(m_componentWidget);
@ -278,7 +278,7 @@ void QuickSettingContainer::onPluginInsert(PluginsItemInterface * itemInter)
void QuickSettingContainer::onPluginRemove(PluginsItemInterface * itemInter) void QuickSettingContainer::onPluginRemove(PluginsItemInterface * itemInter)
{ {
QWidget *itemWidget = itemInter->itemWidget(QUICK_ITEM_DETAIL_KEY); QWidget *itemWidget = itemInter->itemWidget(QUICK_ITEM_KEY);
if (itemWidget) { if (itemWidget) {
for (int i = 0; i < m_componentWidget->layout()->count(); i++) { for (int i = 0; i < m_componentWidget->layout()->count(); i++) {
QLayoutItem *layoutItem = m_componentWidget->layout()->itemAt(i); QLayoutItem *layoutItem = m_componentWidget->layout()->itemAt(i);
@ -524,7 +524,7 @@ void QuickSettingContainer::onResizeView()
void QuickSettingContainer::onRequestAppletShow(PluginsItemInterface *itemInter, const QString &itemKey) void QuickSettingContainer::onRequestAppletShow(PluginsItemInterface *itemInter, const QString &itemKey)
{ {
if (itemKey == QUICK_ITEM_DETAIL_KEY) { if (itemKey == QUICK_ITEM_KEY) {
// 显示弹出的内容 // 显示弹出的内容
QWidget *itemApplet = itemInter->itemPopupApplet(itemKey); QWidget *itemApplet = itemInter->itemPopupApplet(itemKey);
if (!itemApplet) if (!itemApplet)

2
interfaces/pluginsiteminterface.h
View File

@ -35,7 +35,7 @@ enum class DockPart {
}; };
// 快捷面板详情页面的itemWidget对应的itemKey // 快捷面板详情页面的itemWidget对应的itemKey
#define QUICK_ITEM_DETAIL_KEY "quick_item_detail_key" #define QUICK_ITEM_KEY "quick_item_key"
/// ///
/// \brief The PluginsItemInterface class /// \brief The PluginsItemInterface class
/// the dock plugins item interface, all dock plugins should /// the dock plugins item interface, all dock plugins should

2
plugins/bluetooth/bluetoothplugin.cpp
View File

@ -104,7 +104,7 @@ QWidget *BluetoothPlugin::itemPopupApplet(const QString &itemKey)
return m_bluetoothItem->popupApplet(); return m_bluetoothItem->popupApplet();
} }
if (itemKey == QUICK_ITEM_DETAIL_KEY) { if (itemKey == QUICK_ITEM_KEY) {
return m_bluetoothItem->popupApplet(); return m_bluetoothItem->popupApplet();
} }

6
plugins/sound/soundplugin.cpp
View File

@ -63,7 +63,7 @@ void SoundPlugin::init(PluginProxyInterface *proxyInter)
if (!pluginIsDisable()) { if (!pluginIsDisable()) {
m_proxyInter->itemAdded(this, SOUND_KEY); m_proxyInter->itemAdded(this, SOUND_KEY);
connect(m_soundWidget.data(), &SoundWidget::rightIconClick, this, [ this, proxyInter ] { connect(m_soundWidget.data(), &SoundWidget::rightIconClick, this, [ this, proxyInter ] {
proxyInter->requestSetAppletVisible(this, QUICK_ITEM_DETAIL_KEY, true); proxyInter->requestSetAppletVisible(this, QUICK_ITEM_KEY, true);
}); });
} }
} }
@ -85,7 +85,7 @@ QWidget *SoundPlugin::itemWidget(const QString &itemKey)
if (itemKey == SOUND_KEY) if (itemKey == SOUND_KEY)
return m_soundItem.data(); return m_soundItem.data();
if (itemKey == QUICK_ITEM_DETAIL_KEY) if (itemKey == QUICK_ITEM_KEY)
return m_soundWidget.data(); return m_soundWidget.data();
return nullptr; return nullptr;
@ -104,7 +104,7 @@ QWidget *SoundPlugin::itemPopupApplet(const QString &itemKey)
if (itemKey == SOUND_KEY) { if (itemKey == SOUND_KEY) {
return m_soundItem->popupApplet(); return m_soundItem->popupApplet();
} }
if (itemKey == QUICK_ITEM_DETAIL_KEY) if (itemKey == QUICK_ITEM_KEY)
return m_soundDeviceWidget.data(); return m_soundDeviceWidget.data();
return nullptr; return nullptr;