Merge branch '0316' into 'yhkylin/v101'

fix bug 165961 165094

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

plugins/netconnect/deviceframe.cpp

@@ -18,6 +18,7 @@
  *
  */
 #include "deviceframe.h"
+#include <QPainterPath>
 
 #define LAYOUT_MARGINS 16,0,16,0
 #define FRAME_HEIGHT 58

plugins/wlanconnect/deviceframe.cpp

@@ -19,6 +19,7 @@
  */
 #include "deviceframe.h"
 #include <QPainter>
+#include <QPainterPath>
 
 #define LAYOUT_MARGINS 18,0,8,0
 #define FRAME_HEIGHT 58

plugins/wlanconnect/wlanitem.cpp

@@ -19,6 +19,7 @@
  */
 #include "wlanitem.h"
 #include <QPainter>
+#include <QPainterPath>
 #include <QApplication>
 #define FRAME_SPEED 150
 #define LIMIT_TIME 60*1000

src/frontend/mainwindow.cpp

@@ -25,6 +25,7 @@
 #include <QDBusReply>
 #include <QKeyEvent>
 #include <QProcess>
+#include <QPainterPath>
 
 #include "kylinnetworkdeviceresource.h"
 #include "../backend/dbus-interface/kylinagentinterface.h"
@@ -383,6 +384,7 @@ void MainWindow::initDbusConnnect()
 
     connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this,[&](WId activeWindowId){
         if (activeWindowId != this->winId() && activeWindowId != 0) {
+            qDebug() << "tray recieve KWindowSystem activeWindowChanged" << activeWindowId << this->winId();
             hideMainwindow();
         }
     });

src/frontend/tab-pages/lanpage.cpp

@@ -404,6 +404,12 @@ void LanPage::initLanArea()
         constructConnectionArea();
     }
 
+    if (!m_activeConnectionMap.isEmpty() && !m_activeConnectionMap.contains(EMPTY_CONNECT_UUID) && !setNetSpeed->isActive()) {
+        setNetSpeed->start();
+    } else {
+        setNetSpeed->stop();
+    }
+
     return;
 }
 

src/frontend/tab-pages/wlanpage.cpp

@@ -1163,7 +1163,10 @@ void WlanPage::onRefreshIconTimer()
         QString sortSsid = sortItem.m_NetSsid; //应该在第currentRow行的新的WiFi名称
         //qDebug()<< LOG_FLAG << "sort ssid"<< sortSsid << "active ssid" << activateSsid << "sort row"<< sortRow;
         if (sortSsid == activateSsid) { //排除已连接WiFi
-            refreshActiveConnectionIcon(activateSsid, sortItem.m_signalStrength);
+            int signalStrength = 0;
+            QString uni, secuType;
+            m_netDeviceResource->getActiveConnectionInfo(m_currentDevice, signalStrength, uni, secuType);
+            refreshActiveConnectionIcon(activateSsid, signalStrength);
             continue;
         }
 

src/frontend/tools/infobutton.cpp

@@ -20,6 +20,7 @@
 #include "infobutton.h"
 #include <QEvent>
 #include <QPainter>
+#include <QPainterPath>
 #include <QApplication>
 
 #define BUTTON_SIZE 36,36

src/frontend/tools/radioitembutton.cpp

@@ -19,6 +19,7 @@
  */
 #include "radioitembutton.h"
 #include <QPainter>
+#include <QPainterPath>
 #include <QSvgRenderer>
 #include <QApplication>
 #include <QStyle>

src/frontend/wificonfigdialog.cpp

@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <KWindowEffects>
+#include <QPainterPath>
 
 #include <QtConcurrent>