bug#83877#83495#83487#83312 10-08

src/frontend/list-items/wlanlistitem.cpp

@@ -201,6 +201,7 @@ void WlanListItem::initWlanConnection()
     connect(m_resource, &KyWirelessNetResource::connectionRemove, this, &WlanListItem::onConnectionRemove);
     connect(this->m_infoButton, &InfoButton::clicked, this, &WlanListItem::onInfoButtonClicked);
     connect(m_connectResource, &KyActiveConnectResourse::stateChangeReason, this, &WlanListItem::onWlanStatusChange);
+    connect(m_netButton, &RadioItemButton::animationStoped, this, &WlanListItem::refreshIcon);
 }
 
 void WlanListItem::refreshIcon()
@@ -367,7 +368,7 @@ void WlanListItem::onConnectButtonClicked()
 {
     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) {
+    } else if ((!m_connectButton->isEnabled()&&m_connectButton->isVisible()) || !m_data) {
         return;
     }
     KyWirelessConnectSetting settings;

src/frontend/new-mainwindow.cpp

@@ -357,7 +357,7 @@ void MainWindow::onRefreshTrayIcon()
     } else if (m_wlanWidget->m_wlanIsConnected == true && m_lanWidget->m_isLanConnected == false){
         m_trayIcon->setIcon(QIcon::fromTheme("network-wireless-signal-excellent-symbolic"));
     } else if (m_wlanWidget->m_wlanIsConnected == false && m_lanWidget->m_isLanConnected == false){
-        m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic"));
+        m_trayIcon->setIcon(QIcon::fromTheme("network-wired-disconnected-symbolic"));
     }
 }
 

src/frontend/tab-pages/wlanpage.cpp

@@ -32,6 +32,7 @@ WlanPage::WlanPage(QWidget *parent) : TabPage(parent)
 
     connect(m_wirelessConnectOpreation, &KyWirelessConnectOperation::activateConnectionError, this, &WlanPage::activateFailed);
     connect(m_wirelessConnectOpreation, &KyWirelessConnectOperation::addAndActivateConnectionError, this, &WlanPage::activateFailed);
+    connect(this, &WlanPage::activateFailed, this, &WlanPage::onActiveFailed);
     connect(m_wirelessConnectOpreation, &KyWirelessConnectOperation::deactivateConnectionError, this, &WlanPage::deactivateFailed);
 
     connect(this, &WlanPage::hiddenWlanClicked, this, &WlanPage::onHiddenWlanClicked);
@@ -402,6 +403,7 @@ void WlanPage::onDeviceAdd(QString deviceName, NetworkManager::Device::Type devi
     m_devList << deviceName;
     if (getDefaultDevice().isEmpty())
     {
+        m_devList.clear();
         updateDefaultDevice(deviceName);
         setDefaultDevice(WIRELESS, deviceName);
 
@@ -695,6 +697,11 @@ void WlanPage::onWifiEnabledChanged(bool isWifiOn)
     }
 }
 
+void WlanPage::onActiveFailed(QString errorMessage)
+{
+    qDebug() << "active failed and the message is: " << errorMessage << Q_FUNC_INFO << __LINE__;
+}
+
 void WlanPage::updateByStrength()
 {
     if (m_expandedItem) {

src/frontend/tab-pages/wlanpage.h

@@ -123,6 +123,7 @@ private slots:
     void onHiddenWlanClicked();
     void showControlCenter();
     void onWifiEnabledChanged(bool isWifiOn);
+    void onActiveFailed(QString errorMessage);
 
 //    void onRefreshIconTimer();
 

src/frontend/tools/radioitembutton.cpp

@@ -102,6 +102,7 @@ void RadioItemButton::onLoadingStopped()
         return;
     } else {
         m_animation->stop();
+        emit this->animationStoped();
     }
 
 }

src/frontend/tools/radioitembutton.h

@@ -30,6 +30,7 @@ public:
 signals:
     void requestStartLoading();
     void requestStopLoading();
+    void animationStoped();
 
 protected:
     void paintEvent(QPaintEvent *event);