Merge branch 'up-dbus' into 'dbus-interface'

signal add parameter

See merge request kylin-desktop/kylin-nm!354

src/backend/dbusadaptor.h

@@ -98,7 +98,7 @@ Q_SIGNALS: // SIGNALS
     void deactivateFailed(QString errorMessage);
     //设备插拔
     void deviceStatusChanged();
-    void deviceNameChanged(QString oldName, QString newName);
+    void deviceNameChanged(QString oldName, QString newName, int type);
     //热点断开
     void hotspotDeactivated(QString devName, QString ssid);
     //热点连接

src/frontend/mainwindow.h

@@ -60,7 +60,7 @@ signals:
     //设备插拔
     void deviceStatusChanged();
     //设备名称变化
-    void deviceNameChanged(QString oldName, QString newName);
+    void deviceNameChanged(QString oldName, QString newName, int type);
     //有线无线列表更新（有线增删、无线增加减少）
     void lanAdd(QString devName, QStringList info);
     void lanRemove(QString dbusPath);

src/frontend/tab-pages/lanpage.cpp

@@ -675,7 +675,7 @@ void LanPage::onDeviceNameUpdate(QString oldName, QString newName)
             initLanArea();
         }
 
-        emit deviceNameChanged(oldName, newName);
+        emit deviceNameChanged(oldName, newName, WIRED);
     }
 }
 

src/frontend/tab-pages/tabpage.h

@@ -60,7 +60,7 @@ public:
 
 signals:
     void deviceStatusChanged();
-    void deviceNameChanged(QString oldName, QString newName);
+    void deviceNameChanged(QString oldName, QString newName, int type);
     void activateFailed(QString errorMessage);
     void deactivateFailed(QString errorMessage);
 

src/frontend/tab-pages/wlanpage.cpp

@@ -715,7 +715,7 @@ void WlanPage::onDeviceNameUpdate(QString oldName, QString newName)
         initWlanArea();
     }
 
-    emit deviceNameChanged(oldName, newName);
+    emit deviceNameChanged(oldName, newName, WIRELESS);
 }
 
 void WlanPage::sendApStateChangeSignal(QString uuid,