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

fix: typo

Browse Source 
Change-Id: I2ed2597138c60bd18a7798942c2b5d0a4eef8f88
This commit is contained in:
listenerri 2018-12-04 09:50:56 +08:00
parent 091b52bccd
commit a87911ce80
Notes: gerrit 2018-12-05 11:41:05 +08:00 
Verified+1: <jenkins@deepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Wed, 05 Dec 2018 11:41:05 +0800
Reviewed-on: https://cr.deepin.io/40239
Project: dde/dde-dock
Branch: refs/heads/dev/fix-dock-hidden
9 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frame/controller/dockpluginscontroller.cpp
View File

@ -110,12 +110,12 @@ void DockPluginsController::requestWindowAutoHide(PluginsItemInterface * const i
Q_EMIT item->requestWindowAutoHide(autoHide); 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); PluginsItem *item = pluginItemAt(itemInter, itemKey);
Q_ASSERT(item); Q_ASSERT(item);
Q_EMIT item->requestRefershWindowVisible(); Q_EMIT item->requestRefreshWindowVisible();
} }
void DockPluginsController::startLoader() void DockPluginsController::startLoader()

2
frame/controller/dockpluginscontroller.h
View File

@ -47,7 +47,7 @@ public:
void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey); void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey);
void requestContextMenu(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 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); void saveValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant &value);
const QVariant getValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant& failback = QVariant()); const QVariant getValue(PluginsItemInterface *const itemInter, const QString &itemKey, const QVariant& failback = QVariant());

2
frame/item/dockitem.cpp
View File

@ -239,7 +239,7 @@ void DockItem::showContextMenu()
void DockItem::onContextMenuAccepted() void DockItem::onContextMenuAccepted()
{ {
emit requestRefershWindowVisible(); emit requestRefreshWindowVisible();
emit requestWindowAutoHide(true); emit requestWindowAutoHide(true);
} }

2
frame/item/dockitem.h
View File

@ -66,7 +66,7 @@ signals:
void dragStarted() const; void dragStarted() const;
void itemDropped(QObject *destination) const; void itemDropped(QObject *destination) const;
void requestWindowAutoHide(const bool autoHide) const; void requestWindowAutoHide(const bool autoHide) const;
void requestRefershWindowVisible() const; void requestRefreshWindowVisible() const;
protected: protected:
bool event(QEvent *event); bool event(QEvent *event);

2
frame/panel/mainpanel.cpp
View File

@ -337,7 +337,7 @@ void MainPanel::manageItem(DockItem *item)
{ {
connect(item, &DockItem::dragStarted, this, &MainPanel::itemDragStarted, Qt::UniqueConnection); connect(item, &DockItem::dragStarted, this, &MainPanel::itemDragStarted, Qt::UniqueConnection);
connect(item, &DockItem::itemDropped, this, &MainPanel::itemDropped, 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); connect(item, &DockItem::requestWindowAutoHide, this, &MainPanel::requestWindowAutoHide, Qt::UniqueConnection);
} }

2
interfaces/pluginproxyinterface.h
View File

@ -64,7 +64,7 @@ public:
virtual void requestContextMenu(PluginsItemInterface * const itemInter, const QString &itemKey) = 0; 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 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 /// \brief saveValue

2
plugins/tray/system-trays/systemtrayscontroller.cpp
View File

@ -99,7 +99,7 @@ void SystemTraysController::requestWindowAutoHide(PluginsItemInterface * const i
Q_EMIT item->requestWindowAutoHide(autoHide); 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); SystemTrayItem *item = pluginItemAt(itemInter, itemKey);
Q_ASSERT(item); Q_ASSERT(item);

2
plugins/tray/system-trays/systemtrayscontroller.h
View File

@ -44,7 +44,7 @@ public:
void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey); void itemRemoved(PluginsItemInterface * const itemInter, const QString &itemKey);
void requestContextMenu(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 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); void saveValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant &value);
const QVariant getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& failback = QVariant()); const QVariant getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& failback = QVariant());

14
plugins/tray/trayplugin.cpp
View File

@ -302,15 +302,6 @@ void TrayPlugin::addTrayWidget(const QString &itemKey, AbstractTrayWidget *trayW
return; 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)) { if (!m_trayMap.values().contains(trayWidget)) {
m_trayMap.insert(itemKey, 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_proxyInter->itemAdded(this, FASHION_MODE_ITEM);
m_fashionItem->trayWidgetAdded(itemKey, trayWidget); 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) void TrayPlugin::trayAdded(const QString &itemKey)
@ -444,7 +438,7 @@ void TrayPlugin::onRequestRefershWindowVisible()
return; return;
} }
m_proxyInter->requestRefershWindowVisible(this, itemKey); m_proxyInter->requestRefreshWindowVisible(this, itemKey);
} }
void TrayPlugin::loadIndicator() void TrayPlugin::loadIndicator()