openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Bug #83125#83143#81343

This commit is contained in:
jinxujie 2021-09-29 14:21:56 +08:00
parent 96811a0673
commit bb1740e747
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontend/list-items/wlanlistitem.cpp
View File

@ -285,8 +285,9 @@ void WlanListItem::onNetButtonClicked()
} }
//有配置或者无密码的wifi直接连接 //有配置或者无密码的wifi直接连接
if (m_data->m_isConfigured || m_hasPwd == false) { if (m_data->m_isConfigured || m_hasPwd == false) {
m_connoperation->activeWirelessConnect(m_wlanDevice, m_data->m_connectUuid); this->onConnectButtonClicked();
qDebug()<<"Has configuration, will be activated. ssid = " << m_data->m_NetSsid << Q_FUNC_INFO << __LINE__; // m_connoperation->activeWirelessConnect(m_wlanDevice, m_data->m_connectUuid);//初始化没有uuid只有激活一次才有uuid
qDebug() << "Has configuration, will be activated. ssid = " << m_data->m_NetSsid << m_wlanDevice << m_data->m_connectUuid << Q_FUNC_INFO << __LINE__;
return; return;
} }
if (!this->m_connectButton->isVisible() && m_data->m_secuType != "") { if (!this->m_connectButton->isVisible() && m_data->m_secuType != "") {
@ -364,7 +365,9 @@ void WlanListItem::onShowPwdButtonClicked()
void WlanListItem::onConnectButtonClicked() void WlanListItem::onConnectButtonClicked()
{ {
if (!m_connectButton->isEnabled() || !m_data) { if (m_data->m_secuType.isEmpty() || m_data->m_secuType == "") {
qDebug() << "connect to no password wifi" << Q_FUNC_INFO << __LINE__;
} else if (!m_connectButton->isEnabled() || !m_data) {
return; return;
} }
KyWirelessConnectSetting settings; KyWirelessConnectSetting settings;

BIN
translations/kylin-nm_zh_CN.qm
View File

Binary file not shown.

8
translations/kylin-nm_zh_CN.ts
View File

@ -213,12 +213,12 @@
<message> <message>
<location filename="frontend/tab-pages/lanpage.cpp" line="507"/> <location filename="frontend/tab-pages/lanpage.cpp" line="507"/>
<source>LAN Disconnected Successfully</source> <source>LAN Disconnected Successfully</source>
<translation>有线连接断开成功</translation> <translation>有线网络断开</translation>
</message> </message>
<message> <message>
<location filename="frontend/tab-pages/lanpage.cpp" line="528"/> <location filename="frontend/tab-pages/lanpage.cpp" line="528"/>
<source>LAN Connected Successfully</source> <source>LAN Connected Successfully</source>
<translation>有线连接激活成功</translation> <translation>连接有线网络成功</translation>
</message> </message>
</context> </context>
<context> <context>
@ -532,12 +532,12 @@
<message> <message>
<location filename="frontend/tab-pages/wlanpage.cpp" line="464"/> <location filename="frontend/tab-pages/wlanpage.cpp" line="464"/>
<source>WLAN Connected Successfully</source> <source>WLAN Connected Successfully</source>
<translation>无线网络连接成功</translation> <translation>连接无线网络成功</translation>
</message> </message>
<message> <message>
<location filename="frontend/tab-pages/wlanpage.cpp" line="474"/> <location filename="frontend/tab-pages/wlanpage.cpp" line="474"/>
<source>WLAN Disconnected Successfully</source> <source>WLAN Disconnected Successfully</source>
<translation>无线连接断开成功</translation> <translation>断开无线网络</translation>
</message> </message>
</context> </context>
</TS> </TS>