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

network: change needsecrets interface

Browse Source 
Change-Id: I0815119d5722e4a6eab02b1caf176c598522537d
This commit is contained in:
石博文 2017-01-17 16:46:00 +08:00
parent aa56bf8423
commit 9299d1785b
Notes: Deepin Code Review 2017-01-17 17:09:04 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Tue, 17 Jan 2017 17:09:03 +0800
Reviewed-on: https://cr.deepin.io/19708
Project: dde/dde-dock
Branch: refs/heads/master
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frame/window/mainwindow.cpp
View File

@ -32,7 +32,6 @@ MainWindow::MainWindow(QWidget *parent)
m_mainPanel->setFixedSize(m_settings->windowSize());
updatePanelVisible();
// setStyleSheet("background-color:red;");
connect(m_mainPanel, &MainPanel::geometryChanged, this, &MainWindow::panelGeometryChanged);
}

2
plugins/network/dbus/dbusnetwork.h
View File

@ -262,7 +262,7 @@ Q_SIGNALS: // SIGNALS
void AccessPointPropertiesChanged(const QString &in0, const QString &in1);
void AccessPointRemoved(const QString &in0, const QString &in1);
void DeviceEnabled(const QString &in0, bool in1);
void NeedSecrets(const QString &in0, const QString &in1, const QString &in2, bool in3);
void NeedSecrets(const QString &in0);
void NeedSecretsFinished(const QString &in0, const QString &in1);
// begin property changed signals
void ActiveConnectionsChanged();

9
plugins/network/item/applet/wirelessapplet.cpp
View File

@ -355,8 +355,15 @@ void WirelessList::deactiveAP()
m_networkInter->DisconnectDevice(QDBusObjectPath(m_device.path()));
}
void WirelessList::needSecrets(const QString &connPath, const QString &security, const QString &ssid, const bool defaultAutoConnect)
void WirelessList::needSecrets(const QString &info)
{
const QJsonObject infoObject = QJsonDocument::fromJson(info.toUtf8()).object();
const QString connPath = infoObject.value("ConnectionPath").toString();
const QString security = infoObject.value("KeyType").toString();
const QString ssid = infoObject.value("ConnectionId").toString();
const bool defaultAutoConnect = infoObject.value("AutoConnect").toBool();
// check is our device' ap
QString connHwAddr;
QJsonDocument conns = QJsonDocument::fromJson(m_networkInter->connections().toUtf8());

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

@ -48,7 +48,7 @@ private slots:
void deviceEnabled(const QString &devPath, const bool enable);
void activateAP(const QDBusObjectPath &apPath, const QString &ssid);
void deactiveAP();
void needSecrets(const QString &connPath, const QString &security, const QString &ssid, const bool defaultAutoConnect);
void needSecrets(const QString &info);
private:
NetworkDevice m_device;