From a87911ce8051dcd4ad74a5a8e379ba1e10c63f50 Mon Sep 17 00:00:00 2001 From: listenerri Date: Tue, 4 Dec 2018 09:50:56 +0800 Subject: [PATCH] fix: typo Change-Id: I2ed2597138c60bd18a7798942c2b5d0a4eef8f88 --- frame/controller/dockpluginscontroller.cpp | 4 ++-- frame/controller/dockpluginscontroller.h | 2 +- frame/item/dockitem.cpp | 2 +- frame/item/dockitem.h | 2 +- frame/panel/mainpanel.cpp | 2 +- interfaces/pluginproxyinterface.h | 2 +- .../tray/system-trays/systemtrayscontroller.cpp | 2 +- plugins/tray/system-trays/systemtrayscontroller.h | 2 +- plugins/tray/trayplugin.cpp | 14 ++++---------- 9 files changed, 13 insertions(+), 19 deletions(-) diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp index b88e215bd..c89f954f3 100644 --- a/frame/controller/dockpluginscontroller.cpp +++ b/frame/controller/dockpluginscontroller.cpp @@ -110,12 +110,12 @@ void DockPluginsController::requestWindowAutoHide(PluginsItemInterface * const i Q_EMIT item->requestWindowAutoHide(autoHide); } -void DockPluginsController::requestRefershWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) +void DockPluginsController::requestRefreshWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) { PluginsItem *item = pluginItemAt(itemInter, itemKey); Q_ASSERT(item); - Q_EMIT item->requestRefershWindowVisible(); + Q_EMIT item->requestRefreshWindowVisible(); } void DockPluginsController::startLoader() diff --git a/frame/controller/dockpluginscontroller.h b/frame/controller/dockpluginscontroller.h index 88545861c..d4ba1ba23 100644 --- a/frame/controller/dockpluginscontroller.h +++ b/frame/controller/dockpluginscontroller.h @@ -47,7 +47,7 @@ public: void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey); void requestContextMenu(PluginsItemInterface * const itemInter, const QString &itemKey); void requestWindowAutoHide(PluginsItemInterface * const itemInter, const QString &itemKey, const bool autoHide) Q_DECL_OVERRIDE; - void requestRefershWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; + void requestRefreshWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; void saveValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant &value); const QVariant getValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant& failback = QVariant()); diff --git a/frame/item/dockitem.cpp b/frame/item/dockitem.cpp index 49b868ccc..c6cee4483 100644 --- a/frame/item/dockitem.cpp +++ b/frame/item/dockitem.cpp @@ -239,7 +239,7 @@ void DockItem::showContextMenu() void DockItem::onContextMenuAccepted() { - emit requestRefershWindowVisible(); + emit requestRefreshWindowVisible(); emit requestWindowAutoHide(true); } diff --git a/frame/item/dockitem.h b/frame/item/dockitem.h index fc3987cac..95c47054a 100644 --- a/frame/item/dockitem.h +++ b/frame/item/dockitem.h @@ -66,7 +66,7 @@ signals: void dragStarted() const; void itemDropped(QObject *destination) const; void requestWindowAutoHide(const bool autoHide) const; - void requestRefershWindowVisible() const; + void requestRefreshWindowVisible() const; protected: bool event(QEvent *event); diff --git a/frame/panel/mainpanel.cpp b/frame/panel/mainpanel.cpp index 1d7480a36..5b6a198e2 100644 --- a/frame/panel/mainpanel.cpp +++ b/frame/panel/mainpanel.cpp @@ -337,7 +337,7 @@ void MainPanel::manageItem(DockItem *item) { connect(item, &DockItem::dragStarted, this, &MainPanel::itemDragStarted, Qt::UniqueConnection); connect(item, &DockItem::itemDropped, this, &MainPanel::itemDropped, Qt::UniqueConnection); - connect(item, &DockItem::requestRefershWindowVisible, this, &MainPanel::requestRefershWindowVisible, Qt::UniqueConnection); + connect(item, &DockItem::requestRefreshWindowVisible, this, &MainPanel::requestRefershWindowVisible, Qt::UniqueConnection); connect(item, &DockItem::requestWindowAutoHide, this, &MainPanel::requestWindowAutoHide, Qt::UniqueConnection); } diff --git a/interfaces/pluginproxyinterface.h b/interfaces/pluginproxyinterface.h index c6a56eaf4..d526d99a9 100644 --- a/interfaces/pluginproxyinterface.h +++ b/interfaces/pluginproxyinterface.h @@ -64,7 +64,7 @@ public: virtual void requestContextMenu(PluginsItemInterface * const itemInter, const QString &itemKey) = 0; virtual void requestWindowAutoHide(PluginsItemInterface * const itemInter, const QString &itemKey, const bool autoHide) = 0; - virtual void requestRefershWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) = 0; + virtual void requestRefreshWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) = 0; /// /// \brief saveValue diff --git a/plugins/tray/system-trays/systemtrayscontroller.cpp b/plugins/tray/system-trays/systemtrayscontroller.cpp index df63a4c70..04138f36d 100644 --- a/plugins/tray/system-trays/systemtrayscontroller.cpp +++ b/plugins/tray/system-trays/systemtrayscontroller.cpp @@ -99,7 +99,7 @@ void SystemTraysController::requestWindowAutoHide(PluginsItemInterface * const i Q_EMIT item->requestWindowAutoHide(autoHide); } -void SystemTraysController::requestRefershWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) +void SystemTraysController::requestRefreshWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) { SystemTrayItem *item = pluginItemAt(itemInter, itemKey); Q_ASSERT(item); diff --git a/plugins/tray/system-trays/systemtrayscontroller.h b/plugins/tray/system-trays/systemtrayscontroller.h index 3853f50b0..7ed54d97e 100644 --- a/plugins/tray/system-trays/systemtrayscontroller.h +++ b/plugins/tray/system-trays/systemtrayscontroller.h @@ -44,7 +44,7 @@ public: void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey); void requestContextMenu(PluginsItemInterface * const itemInter, const QString &itemKey); void requestWindowAutoHide(PluginsItemInterface * const itemInter, const QString &itemKey, const bool autoHide) Q_DECL_OVERRIDE; - void requestRefershWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; + void requestRefreshWindowVisible(PluginsItemInterface * const itemInter, const QString &itemKey) Q_DECL_OVERRIDE; void saveValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant &value); const QVariant getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& failback = QVariant()); diff --git a/plugins/tray/trayplugin.cpp b/plugins/tray/trayplugin.cpp index 3090a6c69..1a10f94ba 100644 --- a/plugins/tray/trayplugin.cpp +++ b/plugins/tray/trayplugin.cpp @@ -302,15 +302,6 @@ void TrayPlugin::addTrayWidget(const QString &itemKey, AbstractTrayWidget *trayW return; } - connect(trayWidget, &AbstractTrayWidget::requestWindowAutoHide, this, [=](const bool autoHide) { - const QString &key = displayMode() == Dock::DisplayMode::Fashion ? FASHION_MODE_ITEM : itemKey; - m_proxyInter->requestWindowAutoHide(this, key, autoHide); - }, Qt::UniqueConnection); - connect(trayWidget, &AbstractTrayWidget::requestRefershWindowVisible, this, [=] { - const QString &key = displayMode() == Dock::DisplayMode::Fashion ? FASHION_MODE_ITEM : itemKey; - m_proxyInter->requestRefershWindowVisible(this, key); - }, Qt::UniqueConnection); - if (!m_trayMap.values().contains(trayWidget)) { m_trayMap.insert(itemKey, trayWidget); } @@ -321,6 +312,9 @@ void TrayPlugin::addTrayWidget(const QString &itemKey, AbstractTrayWidget *trayW m_proxyInter->itemAdded(this, FASHION_MODE_ITEM); m_fashionItem->trayWidgetAdded(itemKey, trayWidget); } + + connect(trayWidget, &AbstractTrayWidget::requestWindowAutoHide, this, &TrayPlugin::onRequestWindowAutoHide, Qt::UniqueConnection); + connect(trayWidget, &AbstractTrayWidget::requestRefershWindowVisible, this, &TrayPlugin::onRequestRefershWindowVisible, Qt::UniqueConnection); } void TrayPlugin::trayAdded(const QString &itemKey) @@ -444,7 +438,7 @@ void TrayPlugin::onRequestRefershWindowVisible() return; } - m_proxyInter->requestRefershWindowVisible(this, itemKey); + m_proxyInter->requestRefreshWindowVisible(this, itemKey); } void TrayPlugin::loadIndicator()