Merge branch '2309bug-0724' into 'yhkylin/v101'

update changelog & 删除无用代码bug184235

See merge request kylinos-src/kylin-nm!227

debian/changelog

@@ -1,3 +1,15 @@
+kylin-nm (3.24.0.0-0k2.10) v101; urgency=medium
+
+  * BUG号:
+     -#180228 【网络连接】删除有线网络，点击未连接网络后一直处于选中状态
+     -#183854 【网络连接】点击设置-有线网络-添加有线网络，无法打开添加网络界面，任务栏网络崩溃重启
+     -#184235 【走查】【网络】登录锁屏与托盘Wi-Fi网络输入密码界面交互形式统一
+  * 需求号：
+  * 其他改动：
+  * 影响域：自身
+
+ -- zhangyuanyuan1 <zhangyuanyuan1@kylinos.cn>  Mon, 24 Jul 2023 16:50:28 +0800
+
 kylin-nm (3.24.0.0-0k2.9) v101; urgency=medium
 
   * BUG号：

src/frontend/list-items/wlanlistitem.cpp

@@ -199,7 +199,6 @@ void WlanListItem::onRightButtonClicked()
 void WlanListItem::enterEvent(QEvent *event)
 {
     //qDebug()<< LOG_FLAG <<"enterEvent" << m_wirelessNetItem.m_NetSsid;
-//    m_mouseIsOut = false;
     if (m_pwdFrame != nullptr && !m_pwdFrame->isVisible()) {
         if (Deactivated != m_connectState) {
             m_hoverButton->setProperty("useButtonPalette", true);
@@ -223,7 +222,6 @@ void WlanListItem::enterEvent(QEvent *event)
 void WlanListItem::leaveEvent(QEvent *event)
 {
     //qDebug()<< LOG_FLAG <<"leaveEvent"<< m_wirelessNetItem.m_NetSsid;
-//    m_mouseIsOut = true;
     m_hoverButton->hide();
     if (m_connectState == Activated || m_connectState == Deactivating) {
         m_nameLabel->setLabelMaximumWidth(NAMELABLE_MAX_WIDTH_ACTIVATED);
@@ -234,12 +232,6 @@ void WlanListItem::leaveEvent(QEvent *event)
     } else {
         m_nameLabel->setLabelMaximumWidth(NAMELABLE_MAX_WIDTH_DEACTIVATED);
     }
-//    if (m_pwdFrame && m_pwdFrame->isVisible()) {
-//        if (m_focusIsOut) {
-//            setExpanded(false);
-//        }
-//        return QFrame::leaveEvent(event);
-//    }
 
     return ListItem::leaveEvent(event);
 }
@@ -252,19 +244,6 @@ bool WlanListItem::eventFilter(QObject *watched, QEvent *event)
         }
     }
 
-//    if (watched == m_pwdLineEdit) {
-//        if (event->type() == QEvent::FocusOut) {
-//            m_focusIsOut = true;
-//            //qDebug()<< LOG_FLAG <<"focusOutEvent" << m_wirelessNetItem.m_NetSsid;
-//            if (m_mouseIsOut) {
-//                setExpanded(false);
-//            }
-//        } else if (event->type() == QEvent::FocusIn) {
-//            //qDebug()<< LOG_FLAG <<"focusInEvent" << m_wirelessNetItem.m_NetSsid;
-//            m_focusIsOut = false;
-//        }
-//    }
-
     return QFrame::eventFilter(watched, event);
 }
 

src/frontend/list-items/wlanlistitem.h

@@ -122,9 +122,6 @@ private:
     QCheckBox *m_autoConnectCheckBox = nullptr;
     QLabel *m_autoConnectLabel = nullptr;
 
-    //bool m_focusIsOut = true;
-    //bool m_mouseIsOut = true;
-
     bool m_forgetConnection = false;
     bool m_isApMode = false;
     bool m_isShowWifi6Plus = true;