diff --git a/src/frontend/list-items/wlanlistitem.cpp b/src/frontend/list-items/wlanlistitem.cpp index ac0a6110..4c2ade07 100644 --- a/src/frontend/list-items/wlanlistitem.cpp +++ b/src/frontend/list-items/wlanlistitem.cpp @@ -276,6 +276,10 @@ void WlanListItem::onNetButtonClicked() qDebug() << "On wlan clicked! But there is no wlan connect!" << Q_FUNC_INFO << __LINE__; return; } + if ((m_state == NetworkManager::ActiveConnection::State::Activating || m_state == NetworkManager::ActiveConnection::State::Deactivating)) { + qDebug() << "On wlan clicked! But there is nothing to do because it is already activating/deactivating!" << Q_FUNC_INFO << __LINE__; + return; + } //执行连接或断开 if (m_isActive) { @@ -367,6 +371,12 @@ void WlanListItem::onConnectButtonClicked() if (!m_connectButton->isEnabled() || !m_data) { return; } + + if ((m_state == NetworkManager::ActiveConnection::State::Activating || m_state == NetworkManager::ActiveConnection::State::Deactivating)) { + qDebug() << "On wlan clicked! But there is nothing to do because it is already activating/deactivating!" << Q_FUNC_INFO << __LINE__; + return; + } + KyWirelessConnectSetting settings; settings.m_connectName = m_data->m_NetSsid; settings.m_ssid = m_data->m_NetSsid; @@ -410,6 +420,7 @@ void WlanListItem::onWlanStatusChange(QString uuid, NetworkManager::ActiveConnec m_resource->getSsidByUuid(uuid, ssid, devName); if (m_data->m_NetSsid == ssid) { qDebug() << "[WlanPage] State changed to :" << state << Q_FUNC_INFO <<__LINE__; + m_state = state; if ((state == NetworkManager::ActiveConnection::State::Activating || state == NetworkManager::ActiveConnection::State::Deactivating) && devName == m_wlanDevice) { m_netButton->startLoading(); diff --git a/src/frontend/tools/infobutton.cpp b/src/frontend/tools/infobutton.cpp index 48059e57..3af96e09 100644 --- a/src/frontend/tools/infobutton.cpp +++ b/src/frontend/tools/infobutton.cpp @@ -61,6 +61,8 @@ void InfoButton::paintEvent(QPaintEvent *event) painter.fillPath(outerPath, pal.color(QPalette::Text)); painter.setPen(m_foregroundColor); + QFont font("Noto Sans CJK SC", 11, QFont::Normal, false); + painter.setFont(font); painter.drawText(TEXT_POS, "i"); } diff --git a/src/frontend/tools/radioitembutton.cpp b/src/frontend/tools/radioitembutton.cpp index 4d8cf9db..b399cf22 100644 --- a/src/frontend/tools/radioitembutton.cpp +++ b/src/frontend/tools/radioitembutton.cpp @@ -101,6 +101,7 @@ void RadioItemButton::onLoadingStopped() qWarning() << "Stop loading failed, m_animation is null pointer!" << Q_FUNC_INFO << __LINE__; return; } else { + m_iconLabel->setPixmap(m_pixmap); m_animation->stop(); }