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): refresh wireless list

Browse Source 
Change-Id: I56650fce618c35e013bbcdb25593f87956db5b8e
This commit is contained in:
listenerri 2018-07-27 11:16:00 +08:00
parent ac4b76c3e1
commit 590652c709
Notes: gerrit 2018-07-30 16:07:50 +08:00 
Verified+1: <jenkins@deepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Mon, 30 Jul 2018 16:07:50 +0800
Reviewed-on: https://cr.deepin.io/37157
Project: dde/dde-dock
Branch: refs/heads/master
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,6 @@ WirelessList::WirelessList(WirelessDevice *deviceIter, QWidget *parent)
m_centralLayout(new QVBoxLayout),
m_centralWidget(new QWidget),
m_controlPanel(new DeviceControlWidget)
//m_networkInter(new DBusNetwork(this))
{
setFixedHeight(WIDTH);
@ -78,7 +77,7 @@ WirelessList::WirelessList(WirelessDevice *deviceIter, QWidget *parent)
m_centralWidget->setFixedWidth(WIDTH);
m_centralWidget->setLayout(m_centralLayout);
// m_centralLayout->addWidget(m_controlPanel);
m_centralLayout->addWidget(m_controlPanel);
m_centralLayout->setSpacing(0);
m_centralLayout->setMargin(0);
@ -102,8 +101,7 @@ WirelessList::WirelessList(WirelessDevice *deviceIter, QWidget *parent)
connect(m_device, &WirelessDevice::enableChanged, this, &WirelessList::onDeviceEnableChanged);
connect(m_controlPanel, &DeviceControlWidget::enableButtonToggled, this, &WirelessList::onEnableButtonToggle);
/* TODO: <22-06-18, yourname> */
//connect(m_controlPanel, &DeviceControlWidget::requestRefresh, m_networkInter, &DBusNetwork::RequestWirelessScan);
connect(m_controlPanel, &DeviceControlWidget::requestRefresh, this, &WirelessList::queryAccessPoints);
connect(m_updateAPTimer, &QTimer::timeout, this, &WirelessList::updateAPList);

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

@ -60,6 +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();
private:
void loadAPList();

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

@ -234,6 +234,9 @@ 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());
});
}
void WirelessItem::adjustHeight()

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

@ -57,6 +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);
protected:
bool eventFilter(QObject *o, QEvent *e);

2
plugins/network/networkplugin.cpp
View File

@ -185,6 +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(m_networkModel, &NetworkModel::needSecrets,
static_cast<WirelessItem *>(item), &WirelessItem::onNeedSecrets);