From 23c5b35bdcce4dcadd06f2d8f7646f553666ba98 Mon Sep 17 00:00:00 2001
From: chenlelin <chenlelin@kylinos.cn>
Date: Tue, 24 Sep 2019 13:12:41 +0800
Subject: [PATCH] kylin-nm 1.0.4

---
 backthread.cpp    | 20 ++++++++++++++------
 debian/changelog  |  7 +++++++
 kylin-nm.pro.user |  2 +-
 mainwindow.cpp    |  4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/backthread.cpp b/backthread.cpp
index fdf74b94..302c7e8c 100644
--- a/backthread.cpp
+++ b/backthread.cpp
@@ -106,11 +106,20 @@ void BackThread::execDisWifi(){
 }
 
 void BackThread::execConnLan(QString connName){
-    QFile sys_carrier("/sys/class/net/enp3s0/carrier");
-    if(!sys_carrier.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        qDebug()<<"Can't open the system file carrier!"<<endl;
+    QString net_card = "ifconfig>/tmp/kylin-nm-ifconfig";
+    system(net_card.toUtf8().data());
+    QFile file("/tmp/kylin-nm-ifconfig");
+    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qDebug()<<"Can't open the file kylin-nm-ifconfig!"<<endl;
     }
+    QString txt = file.readLine();
+    QString strType = txt.mid(0, 6);
+    QString carrierPath ="/sys/class/net/" + strType + "/carrier";
+    QFile sys_carrier(carrierPath);
+    if(!sys_carrier.open(QIODevice::ReadOnly | QIODevice::Text)){
+        qDebug()<<"Can't open the file carrier in documentary enp1s0"<<endl;
+    }
+
     QString sys_line = sys_carrier.readLine();
     sys_carrier.close();
     if(sys_line.indexOf("1") != -1){
@@ -125,8 +134,7 @@ void BackThread::execConnLan(QString connName){
 }
 
 void BackThread::execConnWifi(QString connName){
-//    QString cmd = "/usr/share/kylin-nm/shell/connup.sh '" + connName + "'";
-    QString cmd = "/home/chenlelin/kylin-nm/kylin-nm/connup.sh '" + connName + "'";
+    QString cmd = "/usr/share/kylin-nm/shell/connup.sh '" + connName + "'";
     system(cmd.toUtf8().data());
 
     QFile file("/tmp/kylin-nm-btoutput_");
diff --git a/debian/changelog b/debian/changelog
index a99c389e..c662c8b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kylin-nm (1.0.4-0ubuntu1) eoan; urgency=medium
+
+  * Bug-fix:
+    - Fix the bug which can not show correct icon size when change the height of taskbar
+
+ -- handsome_feng <jianfengli@ubuntukylin.com>  Mon, 23 Sep 2019 16:51:40 +0800
+
 kylin-nm (1.0.3-0ubuntu1) eoan; urgency=medium
 
   * Bug-fix:
diff --git a/kylin-nm.pro.user b/kylin-nm.pro.user
index f4080128..cb7bebe7 100644
--- a/kylin-nm.pro.user
+++ b/kylin-nm.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.6.2, 2019-09-16T09:14:14. -->
+<!-- Written by QtCreator 4.6.2, 2019-09-24T13:06:38. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 245aa7c5..9a094fd6 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -180,8 +180,8 @@ void MainWindow::createTrayIcon()
     trayIcon->setContextMenu(trayIconMenu);
 
     // 初始化托盘所有Icon
-    QString iconDir = "/usr/share/icons/ukui-icon-theme/16x16/panel/";
-    iconLanOnline = QIcon(iconDir + "nm-device-wired.png");
+    QString iconDir = "/usr/share/icons/ukui-icon-theme/48x48/status/";
+    iconLanOnline = QIcon(iconDir + "nm-device-wire.png");
     iconLanOffline = QIcon(iconDir + "nm-no-connection.png");
     iconWifiFull = QIcon(iconDir + "nm-signal-100.png");
     iconWifiHigh = QIcon(iconDir + "nm-signal-75.png");