From 7efdb2e7973393d67040bed6a2310472aad6716f Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Tue, 19 Oct 2021 10:47:06 +0800 Subject: [PATCH] fix error --- src/backend/dbus-interface/kywirelessconnectoperation.cpp | 4 ++-- src/frontend/netdetails/detailpage.cpp | 1 + src/frontend/netdetails/ipv4page.cpp | 2 +- src/frontend/netdetails/netdetail.cpp | 1 + src/frontend/netdetails/securitypage.cpp | 1 - 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/backend/dbus-interface/kywirelessconnectoperation.cpp b/src/backend/dbus-interface/kywirelessconnectoperation.cpp index db08a2fe..3b2c0e50 100644 --- a/src/backend/dbus-interface/kywirelessconnectoperation.cpp +++ b/src/backend/dbus-interface/kywirelessconnectoperation.cpp @@ -476,7 +476,7 @@ void KyWirelessConnectOperation::addAndActiveWirelessConnect(QString & devIface, break; case NetworkManager::WpaPsk: case NetworkManager::Wpa2Psk: - settings = assembleWpaXPskSettings(access_point, connSettingInfo.m_psk, connSettingInfo.isAutoConnect; + settings = assembleWpaXPskSettings(access_point, connSettingInfo.m_psk, connSettingInfo.isAutoConnect); if (nullptr != settings) { map_settings = settings->toMap(); } else { @@ -486,7 +486,7 @@ void KyWirelessConnectOperation::addAndActiveWirelessConnect(QString & devIface, break; //TODO: other types... case NetworkManager::SAE: - settings = assembleSaeSettings(access_point, connSettingInfo.m_psk, connSettingInfo.isAutoConnect; + settings = assembleSaeSettings(access_point, connSettingInfo.m_psk, connSettingInfo.isAutoConnect); if (nullptr != settings) { map_settings = settings->toMap(); } else { diff --git a/src/frontend/netdetails/detailpage.cpp b/src/frontend/netdetails/detailpage.cpp index 4b8b3f94..de743dd0 100644 --- a/src/frontend/netdetails/detailpage.cpp +++ b/src/frontend/netdetails/detailpage.cpp @@ -161,6 +161,7 @@ void DetailPage::initUI() { QSpacerItem *horizontalSpacer; horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + mAutoLayout->addSpacing(20); mAutoLayout->addWidget(forgetNetBox); mAutoLayout->addWidget(autoConnect); mAutoLayout->addSpacerItem(horizontalSpacer); diff --git a/src/frontend/netdetails/ipv4page.cpp b/src/frontend/netdetails/ipv4page.cpp index 0f0bf9c8..abb220a8 100644 --- a/src/frontend/netdetails/ipv4page.cpp +++ b/src/frontend/netdetails/ipv4page.cpp @@ -170,7 +170,7 @@ bool Ipv4Page::checkConnectBtnIsEnabled() return false; } - if (netMaskEdit->text().isEmpty() || !getNetMaskState(netMaskEdit->text())) { + if (netMaskEdit->text().isEmpty() || !netMaskIsValide(netMaskEdit->text())) { qDebug() << "ipv4 netMask empty or invalid"; return false; } diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp index 0123e62e..2e69c9b1 100644 --- a/src/frontend/netdetails/netdetail.cpp +++ b/src/frontend/netdetails/netdetail.cpp @@ -832,6 +832,7 @@ bool NetDetail::updateConnect() bool securityChange = false; if (isWlan) { securityChange = securityPage->checkIsChanged(m_info); + qDebug() << "securityChange" << securityChange; if (securityChange) { KySecuType secuType; KyEapMethodType enterpriseType; diff --git a/src/frontend/netdetails/securitypage.cpp b/src/frontend/netdetails/securitypage.cpp index bac45d63..af1e220f 100644 --- a/src/frontend/netdetails/securitypage.cpp +++ b/src/frontend/netdetails/securitypage.cpp @@ -338,7 +338,6 @@ void SecurityPage::getSecuType(KySecuType &secuType, KyEapMethodType &enterprise bool SecurityPage::checkIsChanged(const ConInfo info) { - qDebug() << "SecurityPage checkIsChanged"; if (info.secType != secuTypeCombox->currentData().toInt()) { return true; } else {