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

network: disable connect btn when no pwd

Browse Source 
Change-Id: I4d7a190e1e8f442f8427c370d1e014e2b1d8b95f
This commit is contained in:
石博文 2017-08-29 12:05:41 +08:00
parent 984a269d48
commit dceb21dbcf
Notes: Deepin Code Review 2017-08-29 13:37:21 +08:00 
Verified+1: Anonymous Coward #1000004
Verified+1: <zhaofangfang@linuxdeepin.com>
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Tue, 29 Aug 2017 13:37:21 +0800
Reviewed-on: https://cr.deepin.io/25913
Project: dde/dde-dock
Branch: refs/heads/master
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ WirelessList::WirelessList(const QSet<NetworkDevice>::const_iterator &deviceIter
m_autoConnBox->setText(tr("Auto-connect"));
m_pwdDialog->setTextEchoMode(QLineEdit::Password);
m_pwdDialog->setWindowFlags(Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::Dialog);
m_pwdDialog->setTextEchoMode(DLineEdit::Password);
m_pwdDialog->setIcon(QIcon::fromTheme("notification-network-wireless-full"));
@ -72,7 +73,7 @@ WirelessList::WirelessList(const QSet<NetworkDevice>::const_iterator &deviceIter
connect(this, &WirelessList::activeAPChanged, m_updateAPTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
connect(m_networkInter, &DBusNetwork::NeedSecretsFinished, m_pwdDialog, &DInputDialog::close);
connect(m_pwdDialog, &DInputDialog::textValueChanged, [this] {m_pwdDialog->setTextAlert(false);});
connect(m_pwdDialog, &DInputDialog::textValueChanged, this, &WirelessList::onPwdDialogTextChanged);
connect(m_pwdDialog, &DInputDialog::cancelButtonClicked, this, &WirelessList::pwdDialogCanceled);
connect(m_pwdDialog, &DInputDialog::accepted, this, &WirelessList::pwdDialogAccepted);
@ -319,6 +320,12 @@ void WirelessList::pwdDialogCanceled()
m_pwdDialog->close();
}
void WirelessList::onPwdDialogTextChanged(const QString &text)
{
m_pwdDialog->setTextAlert(false);
m_pwdDialog->setOkButtonEnabled(!text.isEmpty());
}
void WirelessList::deviceEnabled(const QString &devPath, const bool enable)
{
if (devPath != m_device.path())
@ -357,7 +364,6 @@ void WirelessList::deactiveAP()
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("SettingName").toString();
const QString ssid = infoObject.value("ConnectionId").toString();
@ -384,8 +390,9 @@ void WirelessList::needSecrets(const QString &info)
m_pwdDialog->setTitle(tr("Password required to connect to <font color=\"#faca57\">%1</font>").arg(ssid));
// clear old config
m_pwdDialog->setTextEchoMode(QLineEdit::Password);
m_pwdDialog->setTextValue(QString());
m_pwdDialog->setTextAlert(true);
m_pwdDialog->setOkButtonEnabled(false);
// check if controlcenter handle this request
// QDBusInterface iface("com.deepin.dde.ControlCenter",

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

@ -45,6 +45,7 @@ private slots:
void onActiveAPChanged();
void pwdDialogAccepted();
void pwdDialogCanceled();
void onPwdDialogTextChanged(const QString &text);
void deviceEnabled(const QString &devPath, const bool enable);
void activateAP(const QDBusObjectPath &apPath, const QString &ssid);
void deactiveAP();