From cbdc79ff24b4a0539fb95e4d24d99914f70e5131 Mon Sep 17 00:00:00 2001 From: zhangyuanyuan1 Date: Mon, 24 Jul 2023 16:50:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug184235=20ui=E4=BA=A4=E4=BA=92=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/list-items/wlanlistitem.cpp | 21 --------------------- src/frontend/list-items/wlanlistitem.h | 3 --- 2 files changed, 24 deletions(-) diff --git a/src/frontend/list-items/wlanlistitem.cpp b/src/frontend/list-items/wlanlistitem.cpp index 2dbbcbe9..ad6577e5 100644 --- a/src/frontend/list-items/wlanlistitem.cpp +++ b/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); } diff --git a/src/frontend/list-items/wlanlistitem.h b/src/frontend/list-items/wlanlistitem.h index c0d085e0..d5443ee9 100644 --- a/src/frontend/list-items/wlanlistitem.h +++ b/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; From ee8b31641ce56f8bf0ba4fa2ff8c4a83256e0e02 Mon Sep 17 00:00:00 2001 From: zhangyuanyuan1 Date: Mon, 24 Jul 2023 16:57:18 +0800 Subject: [PATCH 2/2] update changelog --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4bfc4d3d..121dfbc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +kylin-nm (3.24.0.0-0k2.10) v101; urgency=medium + + * BUG号: + -#180228 【网络连接】删除有线网络，点击未连接网络后一直处于选中状态 + -#183854 【网络连接】点击设置-有线网络-添加有线网络，无法打开添加网络界面，任务栏网络崩溃重启 + -#184235 【走查】【网络】登录锁屏与托盘Wi-Fi网络输入密码界面交互形式统一 + * 需求号： + * 其他改动： + * 影响域：自身 + + -- zhangyuanyuan1 Mon, 24 Jul 2023 16:50:28 +0800 + kylin-nm (3.24.0.0-0k2.9) v101; urgency=medium * BUG号：