diff --git a/kylin-nm.pro b/kylin-nm.pro index bff63462..f8b6933a 100644 --- a/kylin-nm.pro +++ b/kylin-nm.pro @@ -14,14 +14,13 @@ LANGUAGE = C++ CONFIG += c++14 CONFIG += qt warn_on -CONFIG += release +#CONFIG += release #CONFIG += link_pkgconfig #PKGCONFIG += glib-2.0 gio-2.0 gsettings-qt LIBS += -L/usr/lib/ -lgsettings-qt -lX11 #LIBS += -lkysec - target.path = /usr/bin target.source += $$TARGET desktop.path = /etc/xdg/autostart/ diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 356b1da1..770b6c76 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -887,12 +887,14 @@ void MainWindow::on_showWindowAction() void MainWindow::startLoading() { + qDebug()<<"Start loading..."; loading->startLoading(); setTrayLoading(true); } void MainWindow::stopLoading() { + qDebug()<<"Stop loading!"; loading->stopLoading(); setTrayLoading(false); getActiveInfoAndSetTrayIcon(); @@ -1810,6 +1812,7 @@ void MainWindow::getWifiListDone(QStringList slist) qDebug()<<"Reconnect finished, cmd = "<showDesktopNotify(txt); - } - if (isWifiBeConnUp) { - //QString txt(tr("WiFi already connected external")); - //objKyDBus->showDesktopNotify(txt); +// if (!isWifiBeConnUp) { +// //QString txt(tr("WiFi already disconnect")); +// //objKyDBus->showDesktopNotify(txt); +// } +// if (isWifiBeConnUp) { +// //QString txt(tr("WiFi already connected external")); +// //objKyDBus->showDesktopNotify(txt); +// } + if (m_connected_by_self) { + m_connected_by_self = false; + return; } if (is_btnWifiList_clicked) { diff --git a/src/mainwindow.h b/src/mainwindow.h index 55245065..4708c7b4 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -358,6 +358,7 @@ private: // QString hasStarWifiName; bool hasWifiConnected;//当前是否有wifi连接 + bool m_connected_by_self = false; //是否在本进程执行的连接操作 QDBusInterface *mDbusXrandInter; QDBusInterface *kdsDbus;