kylin-nm 1.0.9

2019-09-26 18:23:39 +08:00 · 2019-09-26 18:23:39 +08:00 · e2e5e04cea
parent 9a7530edb6 2dcfe08b37
commit e2e5e04cea
4 changed files with 107 additions and 6 deletions
--- a/backthread.cpp
+++ b/backthread.cpp
@ -139,7 +139,8 @@ void BackThread::execConnLan(QString connName){
 }

 void BackThread::execConnWifi(QString connName){
-    QString cmd = "/usr/share/kylin-nm/shell/connup.sh '" + connName + "'";
+//    QString cmd = "/usr/share/kylin-nm/shell/connup.sh '" + connName + "'";
+    QString cmd = "/home/chenlelin/kylin-nm/kylin-nm/connup.sh '" + connName + "'";
    system(cmd.toUtf8().data());

    QFile file("/tmp/kylin-nm-btoutput_");
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,4 @@
+<<<<<<< HEAD
 kylin-nm (1.0.9-0ubuntu1) eoan; urgency=medium

  * reUpload
@ -10,6 +11,18 @@ kylin-nm (1.0.8-0ubuntu1) eoan; urgency=medium

 -- handsome_feng <jianfengli@ubuntukylin.com>  Thu, 26 Sep 2019 17:11:40 +0800

+=======
+<<<<<<< HEAD
+kylin-nm (1.0.8-0ubuntu1) eoan; urgency=medium
+
+  * Change a sentence in backthread.cpp, this sentence is wrong in 1.0.8-0ubuntu1
+
+ -- handsome_feng <jianfengli@ubuntukylin.com>  Thu, 26 Sep 2019 17:11:40 +0800
+
+=======
+<<<<<<< HEAD
+>>>>>>> 0dba7561c8feee9f728396f4a556ce3ae4ddbfce
+>>>>>>> 2dcfe08b3728cb301434d252094852955617e8eb
 kylin-nm (1.0.7-0ubuntu1) eoan; urgency=medium

  * Bug-fix:
@ -17,6 +30,14 @@ kylin-nm (1.0.7-0ubuntu1) eoan; urgency=medium

 -- handsome_feng <jianfengli@ubuntukylin.com>  Thu, 26 Sep 2019 16:51:40 +0800

+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> f394204a0029c50a72582ef39f3437ef9b0e3089
+>>>>>>> 0dba7561c8feee9f728396f4a556ce3ae4ddbfce
+>>>>>>> 2dcfe08b3728cb301434d252094852955617e8eb
 kylin-nm (1.0.6-0ubuntu1) eoan; urgency=medium

    * Use ukui-icon-theme to set the tray icon of kylin-nm
--- a/kylin-nm.pro.user
+++ b/kylin-nm.pro.user
@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
+<<<<<<< HEAD
 <!-- Written by QtCreator 4.6.2, 2019-09-26T18:17:25. -->
+=======
+<<<<<<< HEAD
+<!-- Written by QtCreator 4.6.2, 2019-09-26T17:22:10. -->
+=======
+<<<<<<< HEAD
+<!-- Written by QtCreator 4.6.2, 2019-09-26T16:20:24. -->
+=======
+<!-- Written by QtCreator 4.6.2, 2019-09-25T08:50:23. -->
+>>>>>>> f394204a0029c50a72582ef39f3437ef9b0e3089
+>>>>>>> 0dba7561c8feee9f728396f4a556ce3ae4ddbfce
+>>>>>>> 2dcfe08b3728cb301434d252094852955617e8eb
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>
@ -66,7 +78,7 @@
   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/chenlelin/kylin-nm/build-kylin-nm-unknown-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/chenlelin/test/build-kylin-nm-unknown-Debug</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -126,7 +138,7 @@
    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
   </valuemap>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/chenlelin/kylin-nm/build-kylin-nm-unknown-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/chenlelin/test/build-kylin-nm-unknown-Release</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -186,7 +198,7 @@
    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
   </valuemap>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/chenlelin/kylin-nm/build-kylin-nm-unknown-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/chenlelin/test/build-kylin-nm-unknown-Profile</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -304,13 +316,17 @@
    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">kylin-nm</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/chenlelin/kylin-nm/kylin-nm/kylin-nm.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/chenlelin/test/kylin-nm/kylin-nm.pro</value>
    <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">kylin-nm.pro</value>
    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/chenlelin/kylin-nm/build-kylin-nm-unknown-Debug</value>
+<<<<<<< HEAD
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
+=======
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/chenlelin/test/build-kylin-nm-unknown-Debug</value>
+>>>>>>> f394204a0029c50a72582ef39f3437ef9b0e3089
    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@ -180,6 +180,24 @@ void MainWindow::createTrayIcon()
    trayIcon->setContextMenu(trayIconMenu);

    // 初始化托盘所有Icon
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+//    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");
+//    iconWifiMedium = QIcon(iconDir + "nm-signal-50.png");
+//    iconWifiLow = QIcon(iconDir + "nm-signal-25.png");
+//    iconConnecting = QIcon(iconDir + ".png");
+
+>>>>>>> f394204a0029c50a72582ef39f3437ef9b0e3089
+>>>>>>> 0dba7561c8feee9f728396f4a556ce3ae4ddbfce
+>>>>>>> 2dcfe08b3728cb301434d252094852955617e8eb
    iconLanOnline = QIcon::fromTheme("nm-device-wired");
    iconLanOffline = QIcon::fromTheme("nm-no-connection");
    iconWifiFull = QIcon::fromTheme("nm-signal-100");
@ -1414,6 +1432,13 @@ void MainWindow::disWifiDone(){

 void MainWindow::keepDisWifiState()
 {
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 0dba7561c8feee9f728396f4a556ce3ae4ddbfce
+>>>>>>> 2dcfe08b3728cb301434d252094852955617e8eb
    if(this->is_btnNetList_clicked == 1) {
        ui->lbWifiImg->setStyleSheet("QLabel{background-image:url(:/res/x/wifi-offline.png);}");
        ui->lbBtnWifiBG->setStyleSheet(btnOffQss);
@ -1449,4 +1474,42 @@ void MainWindow::keepDisWifiState()

        this->stopLoading();
    }
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+=======
+    QList<OneConnForm *> wifiList = wifiListWidget->findChildren<OneConnForm *>();
+    for(int i = 0; i < wifiList.size(); i ++){
+        OneConnForm *ocf = wifiList.at(i);
+        if(ocf->isActive == true){
+            ocf->setSelected(false);
+            ocf->setName(tr("Not connected"));//"当前未连接任何 Wifi"
+            ocf->setSafe("--");
+            ocf->setSignal("0");
+            ocf->setSafeString("--");
+            ocf->setConnedString(tr("Disconnected"));//"未连接"
+            ocf->setShowPoint(false);
+            disconnect(ocf, SIGNAL(selectedOneWifiForm(QString)), this, SLOT(oneWifiFormSelected(QString)));
+        }else{
+            ocf->deleteLater();
+        }
+    }
+    lbWifiList->move(12, 68);
+
+    ui->lbWifiImg->setStyleSheet("QLabel{background-image:url(:/res/x/wifi-offline.png);}");
+    ui->lbBtnWifiBG->setStyleSheet(btnOffQss);
+    ui->lbBtnWifiT1->setText(tr("Disabled"));//"已关闭"
+
+    this->lanListWidget->hide();
+    this->wifiListWidget->show();
+    this->scrollAreal->hide();
+    this->scrollAreaw->show();
+
+    on_btnWifiList_clicked();
+
+    this->stopLoading();
+>>>>>>> f394204a0029c50a72582ef39f3437ef9b0e3089
+>>>>>>> 0dba7561c8feee9f728396f4a556ce3ae4ddbfce
+>>>>>>> 2dcfe08b3728cb301434d252094852955617e8eb
 }