From 70e141f2170dd95cf1f1c8310bc441883e1fff06 Mon Sep 17 00:00:00 2001
From: kangshuning <kangshuning@kylinos.cn>
Date: Fri, 5 Nov 2021 17:39:34 +0800
Subject: [PATCH] bug#89001

---
 src/frontend/list-items/wlanlistitem.cpp |   2 +-
 src/frontend/tab-pages/wlanpage.cpp      |   3 ++-
 translations/kylin-nm_zh_CN.qm           | Bin 7267 -> 7279 bytes
 translations/kylin-nm_zh_CN.ts           |   6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/frontend/list-items/wlanlistitem.cpp b/src/frontend/list-items/wlanlistitem.cpp
index cd027073..8d050712 100644
--- a/src/frontend/list-items/wlanlistitem.cpp
+++ b/src/frontend/list-items/wlanlistitem.cpp
@@ -515,7 +515,7 @@ void WlanListItem::onMenuTriggered(QAction *action)
 
 void WlanListItem::forgetPwd()
 {
-    if (!m_wirelessNetItem.m_isConfigured) {
+    if (!this->isConfigured()) {
         m_pwdLineEdit->setText("");
         return;
     }
diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp
index d3949034..876b61e3 100644
--- a/src/frontend/tab-pages/wlanpage.cpp
+++ b/src/frontend/tab-pages/wlanpage.cpp
@@ -10,6 +10,7 @@
 #define ICON_REFRESH_INTERVAL (5*1000)
 #define EMPTY_SSID "emptyssid"
 #define LOG_FLAG  "[WlanPage]"
+#define LAN_PAGE_INDEX 0
 
 WlanPage::WlanPage(QWidget *parent) : TabPage(parent)
 {
@@ -1264,7 +1265,7 @@ void WlanPage::onMainWindowVisibleChanged(const bool &visible)
 
 void WlanPage::onWlanPageVisibleChanged(int index)
 {
-    if (index == 0) {
+    if (index == LAN_PAGE_INDEX) {
         qDebug() << "wlanpage not visible";
         showNonePwd();
     }
diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm
index 8356eb85af1a5c99d9727659dbf662128a9e7f42..e0f0357845378f32871ddb16ec008b182bd6cb3d 100644
GIT binary patch
delta 654
zcmY+BT}V@L7{;ITwa>HDj%_<BZHF!_>;ny@8F*DpT<fAi({>|W%w*9AAqigSEDI_#
z)PHjpVnjt53xzrR7B3poMX-WI$VO2Y3W)>-X(7FJyz%PC`{(_?&-1+Rm+GbJ-kk{v
z;?+?=u7o(#18hjIF%QXn9dJ|;2Z)W3{Ko-dAEf#KP;?B^R3l)&X;AwOO+HNZ3bdNt
zfN};Eyce)_8FXAS=nkO5-A;Ye2+o(#9KHqz_9OwZ)u4Q?@1?G)m`Pm*tP?1x2LV^K
zZ?W9^gzFh_1MYjQl+)v3e%I7pz|v~a^HB&jWJ&n3keX|wAU}k~1~RA~5#<&i1(+9W
z`?pho(_-&PDX?)`91Ol7-TemTsF=S0hZgZx9PMf#mG9z&f0h0Zu}7T7rCE;C_a2p+
zy~TjDQtG^N0npA%HyAlmou+NCeiC!0?7M$U8Z#}qKGO`Rx%*)Ug)C!UUbjXpRZ4`y
z6j*?&9?Q2*nxU++lf1^M>>}@vw%cO)H{{`gtts@CysgpVHEK`Tc01GznCor1@gV8_
zve%}b0-H|QV<U7FSJHlGFh|)mdpcQ0nI{bvJ!5V`-;$Sy>YB*Sg8ZCop%auFbhpXx
z>t55ZYb-)tTOG^dS;{!8$odEJvaA>f-JvY3kSEV(mK1c;p*YEA*(ZxHGb_Yx4(D+H
k@U29+W3GELaf*f1l1xk~@avy5A$82W{^@_GuQ(w51@Y&wWdHyG

delta 624
zcmX|;Ur1AN6vw~!-*$I*cjs)|ZNheukSGfcq8ZprG1*!{LUR-$Jt($dL`Z`kEI}9a
zXQ2JurqDytpcclW=^#oHa!?O~1&yE(rGf%wy(knB9l6odhXd!F@ArF7z2kGo*q*B#
z#9JjmZG%|L0M5cczJ_F-037Ya9Pu=y;CVne45=psH1<N8?*;5RlX@MxdXnl*=$-oj
zErE944=5uh9it{ahtTdBqP|y%d~2dTd?$_`$O2-@q&hS{XSi&r<*x&_3YJ~R0C)HJ
zdYf&A%j7(OXNt9OMk2)Toi6}#%B1(L5RK20a7oC2x=caVg!MQXbe#~@!2ktV5xZ{h
zrT`bjv0@9b?WH&wc|p2IOsX+)`oV8H#G+UliId7#u@d}4^Aqebr*n5%l`{^Wkp}!e
zprKV7zA*~uDQSw4BbRL1xv)W;v&_ERI?@wM-MvaXWb4gGS14pN^Ye!7xV&GBQJ5MF
zQI(e0hG~bk$&$RzNi59=PhC{{mKMoFLFtcvA#V>&%6^mHka90N09bpJ>P&?6e%QP6
z&w%Y`?R`ahiaTS!KUt-0PWyCr7iF%PY<$W*g3-L7-U;`Un^pBWH%KpNHR(yJ@566s
z>KcntSCiwXc!@GDX{zy&yliOZLw9K3e~~9|1Ir4AC7dAHB3qFI<qtwaVQHt%0zS2T
TPFv>x7fDynx>b||zHZ?!MwOit

diff --git a/translations/kylin-nm_zh_CN.ts b/translations/kylin-nm_zh_CN.ts
index 1bda8836..c0409085 100644
--- a/translations/kylin-nm_zh_CN.ts
+++ b/translations/kylin-nm_zh_CN.ts
@@ -550,7 +550,7 @@
     <message>
         <location filename="../src/frontend/list-items/listitem.cpp" line="63"/>
         <source>Kylin NM</source>
-        <translation>麒麟网络工具</translation>
+        <translation>麒麟网络设置工具</translation>
     </message>
     <message>
         <location filename="../src/frontend/list-items/listitem.cpp" line="66"/>
@@ -595,7 +595,7 @@
     <message>
         <location filename="../src/frontend/netdetails/netdetail.cpp" line="30"/>
         <source>Kylin NM</source>
-        <translation>麒麟网络工具</translation>
+        <translation>麒麟网络设置工具</translation>
     </message>
     <message>
         <location filename="../src/frontend/netdetails/netdetail.cpp" line="33"/>
@@ -891,7 +891,7 @@
     <message>
         <location filename="../src/frontend/tab-pages/tabpage.cpp" line="127"/>
         <source>Kylin NM</source>
-        <translation>麒麟网络工具</translation>
+        <translation>麒麟网络设置工具</translation>
     </message>
     <message>
         <location filename="../src/frontend/tab-pages/tabpage.cpp" line="130"/>