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(network): scan wireless

Browse Source 
Change-Id: Ie219e9a758afc2681a7c95f96d0aedd215f21d74
This commit is contained in:
listenerri 2018-07-31 15:05:03 +08:00
parent 81d7467430
commit 5de234e6cb
Notes: gerrit 2018-07-31 16:33:47 +08:00 
Verified+1: <jenkins@deepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Tue, 31 Jul 2018 16:33:46 +0800
Reviewed-on: https://cr.deepin.io/37273
Project: dde/dde-dock
Branch: refs/heads/master
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/network/item/applet/wirelesslist.cpp
View File

@ -101,7 +101,7 @@ WirelessList::WirelessList(WirelessDevice *deviceIter, QWidget *parent)
connect(m_device, &WirelessDevice::enableChanged, this, &WirelessList::onDeviceEnableChanged);
connect(m_controlPanel, &DeviceControlWidget::enableButtonToggled, this, &WirelessList::onEnableButtonToggle);
connect(m_controlPanel, &DeviceControlWidget::requestRefresh, this, &WirelessList::queryAccessPoints);
connect(m_controlPanel, &DeviceControlWidget::requestRefresh, this, &WirelessList::requestWirelessScan);
connect(m_updateAPTimer, &QTimer::timeout, this, &WirelessList::updateAPList);

2
plugins/network/item/applet/wirelesslist.h
View File

@ -60,7 +60,7 @@ signals:
void requestDeactiveAP(const QString &devPath) const;
void feedSecret(const QString &connectionPath, const QString &settingName, const QString &password, const bool autoConnect);
void cancelSecret(const QString &connectionPath, const QString &settingName);
void queryAccessPoints();
void requestWirelessScan();
private:
void loadAPList();

6
plugins/network/item/wirelessitem.cpp
View File

@ -112,6 +112,8 @@ bool WirelessItem::eventFilter(QObject *o, QEvent *e)
{
if (o == m_APList && e->type() == QEvent::Resize)
QMetaObject::invokeMethod(this, "adjustHeight", Qt::QueuedConnection);
if (o == m_APList && e->type() == QEvent::Show)
Q_EMIT requestWirelessScan();
return false;
}
@ -234,9 +236,7 @@ void WirelessItem::init()
connect(m_APList, &WirelessList::requestDeactiveAP, this, &WirelessItem::requestDeactiveAP);
connect(m_APList, &WirelessList::feedSecret, this, &WirelessItem::feedSecret);
connect(m_APList, &WirelessList::cancelSecret, this, &WirelessItem::cancelSecret);
connect(m_APList, &WirelessList::queryAccessPoints, [=]() {
Q_EMIT queryAccessPoints(m_device->path());
});
connect(m_APList, &WirelessList::requestWirelessScan, this, &WirelessItem::requestWirelessScan);
}
void WirelessItem::adjustHeight()

2
plugins/network/item/wirelessitem.h
View File

@ -57,7 +57,7 @@ Q_SIGNALS:
void feedSecret(const QString &connectionPath, const QString &settingName, const QString &password, const bool autoConnect);
void cancelSecret(const QString &connectionPath, const QString &settingName);
void queryActiveConnInfo();
void queryAccessPoints(const QString &path);
void requestWirelessScan();
protected:
bool eventFilter(QObject *o, QEvent *e);

5
plugins/network/networkplugin.cpp
View File

@ -185,8 +185,8 @@ void NetworkPlugin::onDeviceListChanged(const QList<NetworkDevice *> devices)
m_networkWorker, &NetworkWorker::feedSecret);
connect(static_cast<WirelessItem *>(item), &WirelessItem::cancelSecret,
m_networkWorker, &NetworkWorker::cancelSecret);
connect(static_cast<WirelessItem *>(item), &WirelessItem::queryAccessPoints,
m_networkWorker, &NetworkWorker::queryAccessPoints);
connect(static_cast<WirelessItem *>(item), &WirelessItem::requestWirelessScan,
m_networkWorker, &NetworkWorker::requestWirelessScan);
connect(m_networkModel, &NetworkModel::needSecrets,
static_cast<WirelessItem *>(item), &WirelessItem::onNeedSecrets);
@ -194,6 +194,7 @@ void NetworkPlugin::onDeviceListChanged(const QList<NetworkDevice *> devices)
static_cast<WirelessItem *>(item), &WirelessItem::onNeedSecretsFinished);
m_networkWorker->queryAccessPoints(path);
m_networkWorker->requestWirelessScan();
break;
default:
Q_UNREACHABLE();