diff --git a/kylin-nm.pro b/kylin-nm.pro index 44bc4ba4..9b1a4dcf 100644 --- a/kylin-nm.pro +++ b/kylin-nm.pro @@ -55,7 +55,6 @@ SOURCES += \ src/loadingdiv.cpp \ src/main.cpp \ src/mainwindow.cpp \ - src/notifysend.cpp \ src/oneconnform.cpp \ src/onelancform.cpp \ src/utils.cpp \ @@ -81,7 +80,6 @@ HEADERS += \ src/kylin-network-interface.h \ src/loadingdiv.h \ src/mainwindow.h \ - src/notifysend.h \ src/oneconnform.h \ src/onelancform.h \ src/utils.h \ @@ -101,7 +99,6 @@ HEADERS += \ FORMS += \ src/confform.ui \ src/mainwindow.ui \ - src/notifysend.ui \ src/oneconnform.ui \ src/onelancform.ui \ wireless-security/dlgconnhidwifi.ui \ diff --git a/src/backthread.cpp b/src/backthread.cpp index ac63c999..8830385a 100644 --- a/src/backthread.cpp +++ b/src/backthread.cpp @@ -29,7 +29,8 @@ #include #include -BackThread::BackThread(QObject *parent) : QObject(parent){ +BackThread::BackThread(QObject *parent) : QObject(parent) +{ cmdConnWifi = new QProcess(this); connect(cmdConnWifi , SIGNAL(readyReadStandardOutput()) , this , SLOT(on_readoutput())); connect(cmdConnWifi , SIGNAL(readyReadStandardError()) , this , SLOT(on_readerror())); @@ -41,8 +42,10 @@ BackThread::~BackThread() { cmdConnWifi->close(); } - -IFace* BackThread::execGetIface(){ +\ +//get the connection state of wired and wireles network +IFace* BackThread::execGetIface() +{ IFace *iface = new IFace(); QStringList homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation); @@ -51,13 +54,14 @@ IFace* BackThread::execGetIface(){ QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli -f TYPE,DEVICE,STATE device > " + localPath; Utils::m_system(cmd.toUtf8().data()); -// int status = system(cmd.toUtf8().data()); -// if (status != 0){ syslog(LOG_ERR, "execute 'nmcli device' in function 'execGetIface' failed");} + // int status = system(cmd.toUtf8().data()); + // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli device' in function 'execGetIface' failed");} QFile file(localPath); - if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - syslog(LOG_ERR, "Can't open the file /tmp/kylin-nm-iface!"); - qDebug()<<"Can't open the file /tmp/kylin-nm-iface!"<lstate = 2; iface->wstate = 2; - for(int i = 1; i < txtList.size(); i ++){ + for (int i = 1; i < txtList.size(); i ++) { QString line = txtList.at(i); - if(line != ""){ + if (line != "") { int index1 = line.indexOf(" "); QString type = line.left(index1); QString lastStr = line.mid(index1).trimmed(); @@ -76,30 +80,32 @@ IFace* BackThread::execGetIface(){ QString iname = lastStr.left(index2); QString istateStr = lastStr.mid(index2).trimmed(); - if(type == "ethernet"){ + if (type == "ethernet") { + // if type is wired network iface->lname = iname; - if(istateStr == "unmanaged"){ - iface->lstate = 2; + if (istateStr == "unmanaged") { + iface->lstate = 2; //switch of wired device is off } - if(istateStr == "disconnected" || istateStr == "unavailable"){ - iface->lstate = 1; + if (istateStr == "disconnected" || istateStr == "unavailable") { + iface->lstate = 1; //wired network is disconnected } - if(istateStr == "connected"){ - iface->lstate = 0; + if (istateStr == "connected") { + iface->lstate = 0; //wired network is connected } } - if(type == "wifi"){ + if (type == "wifi") { + // if type is wireless network iface->wname = iname; - if(istateStr == "unmanaged" || istateStr == "unavailable"){ - iface->wstate = 2; + if (istateStr == "unmanaged" || istateStr == "unavailable") { + iface->wstate = 2; //switch of wireless device is off } - if(istateStr == "disconnected"){ - iface->wstate = 1; + if (istateStr == "disconnected") { + iface->wstate = 1; //wireless network is disconnected } - if(istateStr == "connected"){ - iface->wstate = 0; + if (istateStr == "connected") { + iface->wstate = 0; //wireless network is connected } } } @@ -108,14 +114,16 @@ IFace* BackThread::execGetIface(){ return iface; } -void BackThread::execEnNet(){ +//turn on the switch of network +void BackThread::execEnNet() +{ char *chr = "nmcli networking on"; Utils::m_system(chr); -// int status = system("nmcli networking on"); -// if (status != 0){ syslog(LOG_ERR, "execute 'nmcli networking on' in function 'execEnNet' failed");} - while(1){ - if (execGetIface()->lstate != 2){ + // int status = system("nmcli networking on"); + // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli networking on' in function 'execEnNet' failed");} + while (1) { + if (execGetIface()->lstate != 2) { sleep(3); emit enNetDone(); emit btFinish(); @@ -125,15 +133,17 @@ void BackThread::execEnNet(){ } } -void BackThread::execDisNet(){ - if (execGetIface()->wstate != 2){ +//turn off the switch of wireless network first, then turn off the switch of network +void BackThread::execDisNet() +{ + if (execGetIface()->wstate != 2) { char *chr = "nmcli radio wifi off"; Utils::m_system(chr); -// int status = system("nmcli radio wifi off"); -// if (status != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi off' in function 'execDisNet' failed");} - while(1){ - if (execGetIface()->wstate == 2){ + // int status = system("nmcli radio wifi off"); + // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi off' in function 'execDisNet' failed");} + while (1) { + if (execGetIface()->wstate == 2) { emit disWifiDone(); emit btFinish(); break; @@ -144,10 +154,10 @@ void BackThread::execDisNet(){ char *chr1 = "nmcli networking off"; Utils::m_system(chr1); -// int status1 = system("nmcli networking off"); -// if (status1 != 0){ syslog(LOG_ERR, "execute 'nmcli networking off' in function 'execDisNet' failed");} - while(1){ - if (execGetIface()->lstate == 2){ + // int status1 = system("nmcli networking off"); + // if (status1 != 0){ syslog(LOG_ERR, "execute 'nmcli networking off' in function 'execDisNet' failed");} + while (1) { + if (execGetIface()->lstate == 2) { emit disNetDone(); emit btFinish(); break; @@ -156,30 +166,33 @@ void BackThread::execDisNet(){ } } -void BackThread::execEnWifi(){ -// if (execGetIface()->lstate == 2){ -// char *chr = "nmcli networking on"; -// Utils::m_system(chr); -// //int status = system("nmcli networking on"); -// //if (status != 0){ syslog(LOG_ERR, "execute 'nmcli networking on' in function 'execEnWifi' failed");} -// while(1){ -// if (execGetIface()->lstate != 2){ -// emit launchLanDone(); -// break; -// } -// sleep(1); -// } -// } +//turn on the switch of wireless network +void BackThread::execEnWifi() +{ + //if (execGetIface()->lstate == 2){ + // char *chr = "nmcli networking on"; + // Utils::m_system(chr); + // //int status = system("nmcli networking on"); + // //if (status != 0){ syslog(LOG_ERR, "execute 'nmcli networking on' in function 'execEnWifi' failed");} + // while(1){ + // if (execGetIface()->lstate != 2){ + // emit launchLanDone(); + // break; + // } + // sleep(1); + // } + //} char *chr1 = "nmcli radio wifi on"; Utils::m_system(chr1); //int status1 = system("nmcli radio wifi on"); //if (status1 != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi on' in function 'execEnWifi' failed");} - while(1){ - if (execGetIface()->wstate != 2){ + while (1) { + if (execGetIface()->wstate != 2) { KylinDBus objKyDbus; - while(1){ - if (objKyDbus.getAccessPointsNumber() > 0){ + while (1) { + if (objKyDbus.getAccessPointsNumber() > 0) { + // objKyDbus.getAccessPointsNumber()>0 standard can get wireless accesspoints now emit enWifiDone(); emit btFinish(); break; @@ -192,13 +205,15 @@ void BackThread::execEnWifi(){ } } -void BackThread::execDisWifi(){ +//turn off the switch of wireless network +void BackThread::execDisWifi() +{ char *chr = "nmcli radio wifi off"; Utils::m_system(chr); -// int status = system("nmcli radio wifi off"); -// if (status != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi off' in function 'execDisWifi' failed");} - while(1){ - if (execGetIface()->wstate == 2){ + // int status = system("nmcli radio wifi off"); + // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi off' in function 'execDisWifi' failed");} + while (1) { + if (execGetIface()->wstate == 2) { emit disWifiDone(); emit btFinish(); break; @@ -207,15 +222,18 @@ void BackThread::execDisWifi(){ } } -void BackThread::execConnLan(QString connName){ +//to connect wired network +void BackThread::execConnLan(QString connName) +{ disConnLanOrWifi("ethernet"); KylinDBus objKyDbus; - if(objKyDbus.isWiredCableOn){ + if (objKyDbus.isWiredCableOn) { + // only if wired cable is plug in, can connect wired network QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection up '" + connName + "'"; Utils::m_system(cmd.toUtf8().data()); -// int status = system(cmd.toUtf8().data()); -// if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection up' in function 'execConnLan' failed");} + // int status = system(cmd.toUtf8().data()); + // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection up' in function 'execConnLan' failed");} qDebug()<<"debug: in function execConnLan, wired net state is: "<lstate); syslog(LOG_DEBUG, "In function execConnLan, wired net state is: %d", execGetIface()->lstate); emit connDone(0); @@ -226,7 +244,9 @@ void BackThread::execConnLan(QString connName){ emit btFinish(); } -void BackThread::execConnWifiPWD(QString connName, QString password){ +//to connected wireless network need a password +void BackThread::execConnWifiPWD(QString connName, QString password) +{ //disConnLanOrWifi("wifi"); QStringList homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation); @@ -234,29 +254,31 @@ void BackThread::execConnWifiPWD(QString connName, QString password){ QString cmdStr = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli device wifi connect '" + connName + "' password '" + password + "' > " + localPath; Utils::m_system(cmdStr.toUtf8().data()); -// int status = system(cmdStr.toUtf8().data()); -// if (status != 0){ syslog(LOG_ERR, "execute 'nmcli device wifi connect' in function 'execConnWifiPWD' failed");} + // int status = system(cmdStr.toUtf8().data()); + // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli device wifi connect' in function 'execConnWifiPWD' failed");} QFile file(localPath); - if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){ + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { syslog(LOG_DEBUG, "Can't open the file /tmp/kylin-nm-btoutput !"); qDebug()<<"Can't open the file /tmp/kylin-nm-btoutput !"<wstate); syslog(LOG_DEBUG, "In function execConnWifiPWD, wireless net state is: %d", execGetIface()->wstate); - }else{ + } else { emit connDone(1); } emit btFinish(); } -void BackThread::execConnWifi(QString connName){ +//to connected wireless network driectly do not need a password +void BackThread::execConnWifi(QString connName) +{ //disConnLanOrWifi("wifi"); QString cmdStr = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection up '" + connName + "'\n"; @@ -268,13 +290,13 @@ void BackThread::on_readoutput() QString str = cmdConnWifi->readAllStandardOutput(); cmdConnWifi->close(); qDebug()<<"on_readoutput: "<< str; - if(str.indexOf("successfully") != -1){ - emit connDone(0); + if (str.indexOf("successfully") != -1) { + emit connDone(0); //send this signal if connect net successfully qDebug()<<"debug: in function on_readoutput, wireless net state is: "<wstate); syslog(LOG_DEBUG, "In function on_readoutput, wireless net state is: %d", execGetIface()->wstate); - }else if(str.indexOf("unknown") != -1){ + } else if(str.indexOf("unknown") != -1) { emit connDone(2); - }else{ + } else { emit connDone(1); } @@ -285,28 +307,30 @@ void BackThread::on_readerror() QString str = cmdConnWifi->readAllStandardError(); cmdConnWifi->close(); qDebug()<<"on_readerror: "<< str; - if(str.indexOf("successfully") != -1){ + if (str.indexOf("successfully") != -1) { emit connDone(0); - }else if(str.indexOf("unknown") != -1 || str.indexOf("not exist") != -1){ - emit connDone(2); - }else{ - emit connDone(1); + } else if(str.indexOf("unknown") != -1 || str.indexOf("not exist") != -1) { + emit connDone(2); //send this signal if the network we want to connect has not a configuration file + } else { + emit connDone(1); //send this signal if connect net failed } emit btFinish(); } -QString BackThread::getConnProp(QString connName){ +//get property of connected network +QString BackThread::getConnProp(QString connName) +{ QStringList homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation); QString localPath = homePath.at(0) + "/.config/kylin-nm-connprop"; QString cmd = "nmcli connection show '" + connName + "' > " + localPath; Utils::m_system(cmd.toUtf8().data()); -// int status = system(cmd.toUtf8().data()); -// if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection show' in function 'getConnProp' failed");} + // int status = system(cmd.toUtf8().data()); + // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection show' in function 'getConnProp' failed");} QFile file(localPath); - if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){ + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { syslog(LOG_ERR, "Can't open the file /tmp/kylin-nm-connprop!"); qDebug()<<"Can't open the file /tmp/kylin-nm-connprop!"< " + localPath; - Utils::m_system(cmd.toUtf8().data()); -// int status = system(cmd.toUtf8().data()); -// if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection show' in function 'execChkWifiExist' failed");} - - QFile file(localPath); - if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) - { - syslog(LOG_ERR, "Can't open the file /tmp/kylin-nm-chkwifiexist!"); - qDebug()<<"Can't open the file /tmp/kylin-nm-chkwifiexist!"< " + localPath; Utils::m_system(cmd.toUtf8().data()); -// int status = system(cmd.toUtf8().data()); -// if (status != 0){ syslog(LOG_ERR, "execute 'ethtool' in function 'execChkLanWidth' failed");} + // int status = system(cmd.toUtf8().data()); + // if (status != 0){ syslog(LOG_ERR, "execute 'ethtool' in function 'execChkLanWidth' failed");} QFile file(localPath); - if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) - { + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { syslog(LOG_ERR, "Can't open the file /tmp/kylin-nm-bandwidth!"); qDebug()<<"Can't open the file /tmp/kylin-nm-bandwidth!"<button() == Qt::LeftButton){ +void ConfForm::mousePressEvent(QMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) { this->isPress = true; this->winPos = this->pos(); this->dragPos = event->globalPos(); event->accept(); } } -void ConfForm::mouseReleaseEvent(QMouseEvent *event){ +void ConfForm::mouseReleaseEvent(QMouseEvent *event) +{ this->isPress = false; } -void ConfForm::mouseMoveEvent(QMouseEvent *event){ - if(this->isPress){ +void ConfForm::mouseMoveEvent(QMouseEvent *event) +{ + if (this->isPress) { this->move(this->winPos - (this->dragPos - event->globalPos())); event->accept(); } } -void ConfForm::setProp(QString connName, QString v4method, QString addr, QString mask, QString gateway, QString dns, bool isActConf){ +//网络配置参数设置界面的显示内容 +void ConfForm::setProp(QString connName, QString v4method, QString addr, QString mask, QString gateway, QString dns, bool isActConf) +{ this->isActConf = isActConf; ui->leName->setText(connName); - if(v4method == "auto" || v4method == ""){ + if (v4method == "auto" || v4method == "") { ui->cbType->setCurrentIndex(0); cbTypeChanged(0); - }else{ + } else { ui->cbType->setCurrentIndex(1); cbTypeChanged(1); } @@ -175,30 +180,31 @@ void ConfForm::setProp(QString connName, QString v4method, QString addr, QString ui->leGateway->setText(gateway); // 配置中有多个DNS，只处理前两个 - if(dns.indexOf(",") != -1){ + if (dns.indexOf(",") != -1) { QStringList dnss = dns.split(","); ui->leDns->setText(dnss.at(0)); ui->leDns2->setText(dnss.at(1)); - }else{ + } else { ui->leDns->setText(dns); ui->leDns2->setText(""); } - if(mask == "24"){ + if (mask == "24") { ui->cbMask->setCurrentIndex(0); - }else if(mask == "23"){ + } else if(mask == "23") { ui->cbMask->setCurrentIndex(1); - }else if(mask == "22"){ + } else if(mask == "22") { ui->cbMask->setCurrentIndex(2); - }else if(mask == "16"){ + } else if(mask == "16") { ui->cbMask->setCurrentIndex(3); - }else if(mask == "8"){ + } else if(mask == "8") { ui->cbMask->setCurrentIndex(4); - }else{ + } else { ui->cbMask->setCurrentIndex(0); } } +//点击了创建新的网络的按钮 void ConfForm::on_btnCreate_clicked() { QString cmdStr = "nmcli connection add con-name '" + ui->leName->text() + "' type ethernet"; @@ -206,7 +212,7 @@ void ConfForm::on_btnCreate_clicked() //int status = system(cmdStr.toUtf8().data()); //if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection add con-name' in function 'on_btnCreate_clicked' failed");} - if(ui->cbType->currentIndex() == 1){ + if (ui->cbType->currentIndex() == 1) { //config the ipv4 and netmask and gateway if select Manual this->isCreateNewNet = true; this->on_btnOk_clicked(); @@ -219,28 +225,29 @@ void ConfForm::on_btnCreate_clicked() this->hide(); } +//点击了保存更改网络设置的按钮 void ConfForm::on_btnOk_clicked() { QString mask = ""; - if(ui->cbMask->currentIndex() == 0){ + if (ui->cbMask->currentIndex() == 0) { mask = "24"; - }else if(ui->cbMask->currentIndex() == 1){ + } else if(ui->cbMask->currentIndex() == 1) { mask = "23"; - }else if(ui->cbMask->currentIndex() == 2){ + } else if(ui->cbMask->currentIndex() == 2) { mask = "22"; - }else if(ui->cbMask->currentIndex() == 3){ + } else if(ui->cbMask->currentIndex() == 3) { mask = "16"; - }else if(ui->cbMask->currentIndex() == 4){ + } else if(ui->cbMask->currentIndex() == 4) { mask = "8"; - }else{ + } else { mask = "24"; } - if(ui->cbType->currentIndex() == 0){ + if (ui->cbType->currentIndex() == 0) { kylin_network_set_automethod(ui->leName->text().toUtf8().data()); - }else{ + } else { QString dnss = ui->leDns->text(); - if(ui->leDns2->text() != ""){ + if (ui->leDns2->text() != "") { dnss.append(","); dnss.append(ui->leDns2->text()); } @@ -255,7 +262,7 @@ void ConfForm::on_btnOk_clicked() kylindbus.showDesktopNotify(txt); if (!this->isCreateNewNet) { - if(this->isActConf == true){ + if (this->isActConf == true) { // 如果是修改当前连接的网络，则修改设置后简略重连网络 //QString cmd = "/usr/share/kylin-nm/shell/connup.sh '" + ui->leName->text() + "'"; kylindbus.connectWiredNet(ui->leName->text()); //reconnect this wired network @@ -271,20 +278,23 @@ void ConfForm::on_btnOk_clicked() this->isCreateNewNet = false; } +//点击取消按钮 void ConfForm::on_btnCancel_clicked() { this->hide(); } -void ConfForm::cbTypeChanged(int index){ - if (isShowSaveBtn){ +//根据需要设置的种类(自动或手动等)显示界面内容 +void ConfForm::cbTypeChanged(int index) +{ + if (isShowSaveBtn) { ui->leName->setEnabled(false); ui->btnOk->show(); ui->btnCreate->hide(); ui->lbLeftupTitle->setText(tr("Edit Network")); } - if(index == 0){ + if (index == 0) { ui->lineUp->hide(); ui->lineDown->hide(); ui->wgManual->hide(); @@ -295,7 +305,7 @@ void ConfForm::cbTypeChanged(int index){ this->resize(432, 230); } - if(index == 1){ + if (index == 1) { ui->lineUp->show(); ui->lineDown->show(); ui->wgManual->show(); @@ -306,7 +316,7 @@ void ConfForm::cbTypeChanged(int index){ this->resize(432, 510); } - if(index == 3){ + if (index == 3) { ui->btnOk->setStyleSheet(btnOffQss); ui->btnOk->setEnabled(false); @@ -328,50 +338,56 @@ void ConfForm::cbTypeChanged(int index){ } } +//编辑网络名称 void ConfForm::on_leName_textEdited(const QString &arg1) { this->setEnableOfBtn(); } +//编辑网络ip void ConfForm::on_leAddr_textEdited(const QString &arg1) { this->setEnableOfBtn(); } +//编辑网络网关 void ConfForm::on_leGateway_textEdited(const QString &arg1) { this->setEnableOfBtn(); } +//编辑网络DNS void ConfForm::on_leDns_textEdited(const QString &arg1) { this->setEnableOfBtn(); } +//编辑网络备用DNS void ConfForm::on_leDns2_textEdited(const QString &arg1) { // this->setEnableOfBtn(); } +//设置界面按钮是否可点击 void ConfForm::setEnableOfBtn() { - if (ui->leName->text().size() == 0 ){ + if (ui->leName->text().size() == 0 ) { this->setBtnEnableFalse(); return; } - if (ui->cbType->currentIndex() == 1){ - if (!this->getTextEditState(ui->leAddr->text()) ){ + if (ui->cbType->currentIndex() == 1) { + if (!this->getTextEditState(ui->leAddr->text()) ) { this->setBtnEnableFalse(); return; } - if (!this->getTextEditState(ui->leGateway->text()) ){ + if (!this->getTextEditState(ui->leGateway->text()) ) { this->setBtnEnableFalse(); return; } - if (!this->getTextEditState(ui->leDns->text()) ){ + if (!this->getTextEditState(ui->leDns->text()) ) { this->setBtnEnableFalse(); return; } @@ -384,6 +400,7 @@ void ConfForm::setEnableOfBtn() ui->btnCreate->setEnabled(true); } +//文本的输入要符合ip的格式要求 bool ConfForm::getTextEditState(QString text) { QRegExp rx("\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b"); @@ -395,6 +412,7 @@ bool ConfForm::getTextEditState(QString text) return match; } +//设置创建或保存按钮不可点击 void ConfForm::setBtnEnableFalse() { ui->btnOk->setStyleSheet(btnOffQss); diff --git a/src/confform.h b/src/confform.h index 511c4a37..64ebf116 100644 --- a/src/confform.h +++ b/src/confform.h @@ -19,8 +19,6 @@ #ifndef CONFFORM_H #define CONFFORM_H -#include "notifysend.h" - #include #include #include diff --git a/src/ksimplenm.cpp b/src/ksimplenm.cpp index f2a2362c..e82f7482 100644 --- a/src/ksimplenm.cpp +++ b/src/ksimplenm.cpp @@ -33,8 +33,10 @@ KSimpleNM::KSimpleNM(QObject *parent) : QObject(parent) connect(runShellProcess, SIGNAL(finished(int)), this, SLOT(finishedProcess(int))); } -void KSimpleNM::execGetLanList(){ - if (isExecutingGetWifiList){ +//获取有线网络列表数据 +void KSimpleNM::execGetLanList() +{ + if (isExecutingGetWifiList) { syslog(LOG_DEBUG, "It is running getting wifi list when getting lan list"); qDebug()<<"debug: it is running getting wifi list when getting lan list"; isUseOldLanSlist = true; @@ -45,24 +47,30 @@ void KSimpleNM::execGetLanList(){ runShellProcess->start("nmcli -f type,device,name connection show"); } -void KSimpleNM::execGetWifiList(){ +//获取无线网络列表数据 +void KSimpleNM::execGetWifiList() +{ isExecutingGetWifiList = true; shellOutput = ""; type = 1; runShellProcess->start("nmcli -f signal,security,ssid device wifi"); } -void KSimpleNM::readProcess(){ +//读取获取到的结果 +void KSimpleNM::readProcess() +{ QString output = runShellProcess->readAll(); shellOutput += output; } -void KSimpleNM::finishedProcess(int msg){ +//读取完所有列表数据后发信号，将数据发往mainwindow用于显示网络列表 +void KSimpleNM::finishedProcess(int msg) +{ QStringList slist = shellOutput.split("\n"); - if(type == 0){ + if (type == 0) { emit getLanListFinished(slist); isExecutingGetLanList = false; - }else{ + } else { emit getWifiListFinished(slist); isExecutingGetWifiList = false; } diff --git a/src/kylin-dbus-interface.cpp b/src/kylin-dbus-interface.cpp index fbf4272a..30150cf7 100644 --- a/src/kylin-dbus-interface.cpp +++ b/src/kylin-dbus-interface.cpp @@ -70,7 +70,7 @@ KylinDBus::KylinDBus(MainWindow *mainWindow, QObject *parent) :QObject(parent) qDebug()<<"Can not find wired device object path when using dbus."; } - if (wirelessPath.path() != ""){ + if (wirelessPath.path() != "") { QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"), QString(wirelessPath.path()), QString("org.freedesktop.NetworkManager.Device.Wireless"), @@ -110,7 +110,7 @@ void KylinDBus::getObjectPath() QList obj_paths = obj_reply.value(); - foreach (QDBusObjectPath obj_path, obj_paths){ + foreach (QDBusObjectPath obj_path, obj_paths) { QDBusInterface interface( "org.freedesktop.NetworkManager", obj_path.path(), "org.freedesktop.DBus.Introspectable", @@ -121,9 +121,9 @@ void KylinDBus::getObjectPath() qDebug()<<"execute dbus method 'Introspect' is invalid in func getObjectPath()"; } - if(reply.value().indexOf("org.freedesktop.NetworkManager.Device.Wired") != -1){ + if(reply.value().indexOf("org.freedesktop.NetworkManager.Device.Wired") != -1) { wiredPath = obj_path; - } else if (reply.value().indexOf("org.freedesktop.NetworkManager.Device.Wireless") != -1){ + } else if (reply.value().indexOf("org.freedesktop.NetworkManager.Device.Wireless") != -1) { wirelessPath = obj_path; isWirelessCardOn = true; } @@ -139,17 +139,17 @@ void KylinDBus::getPhysicalCarrierState(int n) QDBusReply reply = interface.call("Get", "org.freedesktop.NetworkManager.Device.Wired", "Carrier"); - try{ - if (reply.value().toString() == "true"){ + try { + if (reply.value().toString() == "true") { isWiredCableOn = true; if (n == 1){ this->mw->onPhysicalCarrierChanged(isWiredCableOn);} - } else if (reply.value().toString() == "false"){ + } else if (reply.value().toString() == "false") { isWiredCableOn = false; if (n == 1){ this->mw->onPhysicalCarrierChanged(isWiredCableOn);} } else { throw -1; } - }catch(...){ + } catch(...) { syslog(LOG_ERR, "Error occurred when get the property 'Carrier' of Wired"); qDebug()<<"Error occurred when get the property 'Carrier' of Wired"; } @@ -209,7 +209,7 @@ void KylinDBus::getLanIp(QString netName) QDBusReply> m_reply = m_interface.call("ListConnections"); QList m_objNets = m_reply.value(); - foreach (QDBusObjectPath objNet, m_objNets){ + foreach (QDBusObjectPath objNet, m_objNets) { QDBusInterface m_interface("org.freedesktop.NetworkManager", objNet.path(), "org.freedesktop.NetworkManager.Settings.Connection", @@ -221,26 +221,26 @@ void KylinDBus::getLanIp(QString netName) QMap> map; dbusArg1st >> map; - for(QString outside_key : map.keys() ){ + for (QString outside_key : map.keys() ) { QMap outsideMap = map.value(outside_key); if (outside_key == "connection") { - for (QString search_key : outsideMap.keys()){ - if (search_key == "id"){ + for (QString search_key : outsideMap.keys()) { + if (search_key == "id") { //const QDBusArgument &dbusArg2nd = innerMap.value(inner_key).value(); - if (netName == outsideMap.value(search_key).toString()){ + if (netName == outsideMap.value(search_key).toString()) { // qDebug()<<"aaaaaa"< innerMap = map.value(key); //qDebug() << "Key: " << key; if (key == "ipv4") { - for (QString inner_key : innerMap.keys()){ - if (inner_key == "address-data"){ + for (QString inner_key : innerMap.keys()) { + if (inner_key == "address-data") { const QDBusArgument &dbusArg2nd = innerMap.value(inner_key).value(); QMap m_map; dbusArg2nd.beginArray(); - while (!dbusArg2nd.atEnd()){ + while (!dbusArg2nd.atEnd()) { dbusArg2nd >> m_map;// append map to a vector here if you want to keep it } dbusArg2nd.endArray(); @@ -252,13 +252,13 @@ void KylinDBus::getLanIp(QString netName) } if (key == "ipv6") { - for (QString inner_key : innerMap.keys()){ + for (QString inner_key : innerMap.keys()) { if (inner_key == "address-data"){ const QDBusArgument &dbusArg2nd = innerMap.value(inner_key).value(); QMap m_map; dbusArg2nd.beginArray(); - while (!dbusArg2nd.atEnd()){ + while (!dbusArg2nd.atEnd()) { dbusArg2nd >> m_map;// append map to a vector here if you want to keep it } dbusArg2nd.endArray(); @@ -283,39 +283,6 @@ void KylinDBus::getWifiMac(QString netName) { dbusWifiMac = ""; -// //将wifi名转为utf-8 十进制形式 -// std::vector vec; -// int len_encoded; -// int len_netName = netName.size(); -// for (int i=0;ifromUnicode(netName.at(i)).toHex(); -// len_encoded = encoded.size(); -// qDebug()<<"debug: 11"<> reply = interface.call("GetAllAccessPoints"); QList objPaths = reply.value(); - foreach (QDBusObjectPath objPath, objPaths){ + foreach (QDBusObjectPath objPath, objPaths) { QDBusInterface ssid_interface( "org.freedesktop.NetworkManager", objPath.path(), "org.freedesktop.DBus.Properties", @@ -333,7 +300,7 @@ void KylinDBus::getWifiMac(QString netName) QDBusReply ssid_replys = ssid_interface.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "Ssid"); QString str_name = ssid_replys.value().toString(); - if (str_name == netName){ + if (str_name == netName) { QDBusInterface path_interface( "org.freedesktop.NetworkManager", objPath.path(), "org.freedesktop.DBus.Properties", @@ -382,7 +349,7 @@ void KylinDBus::onNewConnection(QDBusObjectPath objPath) QMap> map; dbusArg1st >> map; - for(QString key : map.keys() ){ + for(QString key : map.keys() ) { if (key == "802-3-ethernet") { emit this->updateWiredList(0); syslog(LOG_DEBUG, "A new wired network was created."); @@ -396,7 +363,7 @@ void KylinDBus::onConnectionRemoved(QDBusObjectPath objPath) syslog(LOG_DEBUG, "An old network was removed from configure directory."); qDebug()<<"An old network was removed from configure directory."; - if (mw->is_btnNetList_clicked == 1){ + if (mw->is_btnNetList_clicked == 1) { emit this->updateWiredList(0); } } @@ -709,7 +676,7 @@ bool KylinDBus::getSwitchStatus(QString key) { void KylinDBus::setWifiSwitchState(bool signal) { - if(!m_gsettings) { + if (!m_gsettings) { return ; } @@ -723,7 +690,7 @@ void KylinDBus::setWifiSwitchState(bool signal) void KylinDBus::setWifiCardState(bool signal) { - if(!m_gsettings) { + if (!m_gsettings) { return ; } diff --git a/src/loadingdiv.cpp b/src/loadingdiv.cpp index c4bbf870..1c4612a7 100644 --- a/src/loadingdiv.cpp +++ b/src/loadingdiv.cpp @@ -38,7 +38,8 @@ LoadingDiv::LoadingDiv(QWidget *parent) : QWidget(parent) this->hide(); } -void LoadingDiv::switchAnimStep(){ +void LoadingDiv::switchAnimStep() +{ QString qpmQss = "QLabel{background-image:url(':/res/s/conning-b/"; qpmQss.append(QString::number(this->currentPage)); qpmQss.append(".png');}"); @@ -46,24 +47,26 @@ void LoadingDiv::switchAnimStep(){ this->currentPage --; - if(this->currentPage < 1){ + if (this->currentPage < 1) { this->currentPage = 12; } this->countCurrentTime += FRAMESPEED; - if (this->countCurrentTime >= ALLTIME){ + if (this->countCurrentTime >= ALLTIME) { emit this->toStopLoading(); } } -void LoadingDiv::startLoading(){ +void LoadingDiv::startLoading() +{ this->currentPage = 12; this->countCurrentTime = 0; this->switchTimer->start(FRAMESPEED); this->show(); } -void LoadingDiv::stopLoading(){ +void LoadingDiv::stopLoading() +{ this->switchTimer->stop(); this->hide(); } diff --git a/src/main.cpp b/src/main.cpp index 1fb4e993..17f01552 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) // 国际化 QString locale = QLocale::system().name(); QTranslator trans_global; - if(locale == "zh_CN"){ + if (locale == "zh_CN") { trans_global.load(":/translations/kylin-nm_zh_CN.qm"); //trans_global.load(":/translations/kylin-nm_bo.qm"); a.installTranslator(&trans_global); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 911b1c4b..49bc1868 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -102,7 +102,6 @@ MainWindow::MainWindow(QWidget *parent) : getInitLanSlist(); //初始化有线网列表 initNetwork(); //初始化网络 initTimer(); //初始化定时器 - //changeTimerState();//停止所有定时器 connect(ui->btnNetList, &QPushButton::clicked, this, &MainWindow::onBtnNetListClicked); connect(ui->btnWifi, &QPushButton::clicked, this, &MainWindow::onBtnWifiClicked); @@ -120,13 +119,14 @@ MainWindow::MainWindow(QWidget *parent) : MainWindow::~MainWindow() { + trayIconMenu->deleteLater(); delete ui; } void MainWindow::checkSingle() { int fd = 0; - try{ + try { QStringList homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation); QString lockPath = homePath.at(0) + "/.config/kylin-nm-lock"; fd = open(lockPath.toUtf8().data(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); @@ -134,7 +134,7 @@ void MainWindow::checkSingle() if (fd < 0) { throw -1; } - }catch(...){ + } catch(...) { fd = open("/tmp/kylin-nm-lock", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); if (fd < 0) { exit(0); @@ -152,13 +152,13 @@ void MainWindow::checkSingle() bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *result) { Q_UNUSED(result); - if(eventType != "xcb_generic_event_t"){ + if (eventType != "xcb_generic_event_t") { return false; } xcb_generic_event_t *event = (xcb_generic_event_t*)message; - switch (event->response_type & ~0x80){ + switch (event->response_type & ~0x80) { case XCB_FOCUS_OUT: this->hide(); break; @@ -169,28 +169,28 @@ bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *r bool MainWindow::eventFilter(QObject *obj, QEvent *event) { - if (obj == ui->btnNetList){ - if(event->type() == QEvent::HoverEnter) { - if (!is_btnNetList_clicked){ + if (obj == ui->btnNetList) { + if (event->type() == QEvent::HoverEnter) { + if (!is_btnNetList_clicked) { ui->lbNetListBG->setStyleSheet(btnBgHoverQss); } return true; - } else if(event->type() == QEvent::HoverLeave){ - if (!is_btnNetList_clicked){ + } else if(event->type() == QEvent::HoverLeave) { + if (!is_btnNetList_clicked) { ui->lbNetListBG->setStyleSheet(btnBgLeaveQss); } return true; } } - if (obj == ui->btnWifiList){ - if(event->type() == QEvent::HoverEnter) { - if (!is_btnWifiList_clicked){ + if (obj == ui->btnWifiList) { + if (event->type() == QEvent::HoverEnter) { + if (!is_btnWifiList_clicked) { ui->lbWifiListBG->setStyleSheet(btnBgHoverQss); } return true; - } else if(event->type() == QEvent::HoverLeave){ - if (!is_btnWifiList_clicked){ + } else if(event->type() == QEvent::HoverLeave) { + if (!is_btnWifiList_clicked) { ui->lbWifiListBG->setStyleSheet(btnBgLeaveQss); } return true; @@ -405,10 +405,10 @@ void MainWindow::getInitLanSlist() QString strSlist = ""; QString line(buf); strSlist = line.trimmed(); - if(strSlist.indexOf("UUID") != -1 || strSlist.indexOf("NAME") != -1){ + if (strSlist.indexOf("UUID") != -1 || strSlist.indexOf("NAME") != -1) { oldLanSlist.append(strSlist); } - if(strSlist.indexOf("802-3-ethernet") != -1 || strSlist.indexOf("ethernet") != -1){ + if (strSlist.indexOf("802-3-ethernet") != -1 || strSlist.indexOf("ethernet") != -1) { oldLanSlist.append(strSlist); } } @@ -433,30 +433,25 @@ void MainWindow::initNetwork() qDebug()<<"state of network: '0' is connected, '1' is disconnected, '2' is net device switch off"; syslog(LOG_DEBUG, "state of network: '0' is connected, '1' is disconnected, '2' is net device switch off"); qDebug()<<"current network state: lan state ="<lstate<<", wifi state ="<wstate ; - syslog(LOG_DEBUG, "current network state: lan state =%d, wifi state =%d", iface->lstate, iface->wstate); + syslog(LOG_DEBUG, "current network state: wired state =%d, wifi state =%d", iface->lstate, iface->wstate); qDebug()<<"==="; ui->lbBtnNetBG->setStyleSheet(btnOnQss); - if(iface->wstate == 0 || iface->wstate == 1){ + if (iface->wstate == 0 || iface->wstate == 1) { ui->lbBtnWifiBG->setStyleSheet(btnBgOnQss); ui->lbBtnWifiBall->move(X_RIGHT_WIFI_BALL, Y_WIFI_BALL); - }else{ + } else { ui->lbBtnWifiBG->setStyleSheet(btnBgOffQss); ui->lbBtnWifiBall->move(X_LEFT_WIFI_BALL, Y_WIFI_BALL); } // 初始化网络列表 - if(iface->wstate != 2){ - if (iface->wstate == 0){ + if (iface->wstate != 2) { + if (iface->wstate == 0) { connWifiDone(3); - }else{ - if (iface->lstate == 0){ + } else { + if (iface->lstate == 0) { connLanDone(3); - }else{ - //syslog(LOG_DEBUG, "Launch kylin-nm, will check if Lan or Wifi connected circularly"); - //qDebug()<<"连接状态：启动kylin-nm, 即将循环检测 Lan或Wifi 是否连接"; - //changeTimerState(); - //checkIfNetworkOn->start(8000); } } on_btnWifiList_clicked(); @@ -465,21 +460,15 @@ void MainWindow::initNetwork() ui->btnWifiList->setStyleSheet("QPushButton{border:none;}"); } else { objKyDBus->setWifiSwitchState(false); //通知控制面板wifi未开启 - if(iface->lstate != 2){ + if (iface->lstate != 2) { if (iface->lstate == 0) { connLanDone(3); - } else{ - //syslog(LOG_DEBUG, "Launch kylin-nm, will check if Lan or Wifi connected circularly"); - //qDebug()<<"连接状态：启动kylin-nm, 即将循环检测 Lan或Wifi 是否连接"; - //changeTimerState(); - //checkIfNetworkOn->start(8000); } - onBtnNetListClicked(); ui->btnNetList->setStyleSheet("QPushButton{border:0px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);}"); ui->btnWifiList->setStyleSheet("QPushButton{border:none;}"); - }else { + } else { BackThread *m_bt = new BackThread(); IFace *m_iface = m_bt->execGetIface(); @@ -510,38 +499,27 @@ void MainWindow::initNetwork() // 初始化定时器 void MainWindow::initTimer() { -// checkIfLanConnect = new QTimer(this); -// checkIfLanConnect->setTimerType(Qt::PreciseTimer); -// QObject::connect(checkIfLanConnect, SIGNAL(timeout()), this, SLOT(on_isLanConnect())); -// checkIfLanConnect->start(2000); - -// checkIfWifiConnect = new QTimer(this); -// checkIfWifiConnect->setTimerType(Qt::PreciseTimer); -// QObject::connect(checkIfWifiConnect, SIGNAL(timeout()), this, SLOT(on_isWifiConnect())); -// checkIfWifiConnect->start(2000); - -// checkIfNetworkOn = new QTimer(this); -// checkIfNetworkOn->setTimerType(Qt::PreciseTimer); -// QObject::connect(checkIfNetworkOn, SIGNAL(timeout()), this, SLOT(on_isNetOn())); -// checkIfNetworkOn->start(2000); - //循环检测wifi列表的变化，可用于更新wifi列表 checkWifiListChanged = new QTimer(this); checkWifiListChanged->setTimerType(Qt::PreciseTimer); QObject::connect(checkWifiListChanged, SIGNAL(timeout()), this, SLOT(on_checkWifiListChanged())); checkWifiListChanged->start(7000); + //网线插入时定时执行 wiredCableUpTimer = new QTimer(this); wiredCableUpTimer->setTimerType(Qt::PreciseTimer); QObject::connect(wiredCableUpTimer, SIGNAL(timeout()), this, SLOT(onCarrierUpHandle())); + //网线拔出时定时执行 wiredCableDownTimer = new QTimer(this); wiredCableDownTimer->setTimerType(Qt::PreciseTimer); QObject::connect(wiredCableDownTimer, SIGNAL(timeout()), this, SLOT(onCarrierDownHandle())); + //定时处理异常网络，即当点击Lan列表按钮时，若lstate=2，但任然有有线网连接的情况 deleteLanTimer = new QTimer(this); deleteLanTimer->setTimerType(Qt::PreciseTimer); QObject::connect(deleteLanTimer, SIGNAL(timeout()), this, SLOT(onDeleteLan())); + //定时获取网速 setNetSpeed = new QTimer(this); setNetSpeed->setTimerType(Qt::PreciseTimer); @@ -549,21 +527,6 @@ void MainWindow::initTimer() setNetSpeed->start(3000); } -void MainWindow::changeTimerState() -{ - if (checkIfLanConnect->isActive()){ - checkIfLanConnect->stop(); - } - - if (checkIfNetworkOn->isActive()){ - checkIfNetworkOn->stop(); - } - - if (checkIfWifiConnect->isActive()){ - checkIfWifiConnect->stop(); - } -} - /////////////////////////////////////////////////////////////////////////////// // 任务栏托盘管理、托盘图标处理 @@ -573,17 +536,17 @@ void MainWindow::createTrayIcon() trayIcon = new QSystemTrayIcon(this); trayIcon->setToolTip(QString(tr("kylin-nm"))); - trayIconMenu = new QMenu(this); - //trayIconMenu->setAttribute(Qt::WA_TranslucentBackground);//设置窗口背景透明 + trayIconMenu = new QMenu(); mShowWindow = new QAction(tr("Show MainWindow"),this); mAdvConf = new QAction(tr("Advanced"),this); - //mAdvConf->setIcon(QIcon(":/res/x/setup.png")); mAdvConf->setIcon(QIcon::fromTheme("document-page-setup", QIcon(":/res/x/setup.png")) ); trayIconMenu->addAction(mShowWindow); //trayIconMenu->addSeparator(); trayIconMenu->addAction(mAdvConf); + //trayIconMenu->setAttribute(Qt::WA_TranslucentBackground);//设置窗口背景透明 + //trayIconMenu->setWindowOpacity(0.8); trayIcon->setContextMenu(trayIconMenu); // 初始化托盘所有Icon @@ -594,18 +557,18 @@ void MainWindow::createTrayIcon() iconWifiMedium = QIcon::fromTheme("network-wireless-signal-ok"); iconWifiLow = QIcon::fromTheme("network-wireless-signal-low"); - loadIcons.append(QIcon::fromTheme("network-1")); - loadIcons.append(QIcon::fromTheme("network-2")); - loadIcons.append(QIcon::fromTheme("network-3")); - loadIcons.append(QIcon::fromTheme("network-4")); - loadIcons.append(QIcon::fromTheme("network-5")); - loadIcons.append(QIcon::fromTheme("network-6")); - loadIcons.append(QIcon::fromTheme("network-7")); - loadIcons.append(QIcon::fromTheme("network-8")); - loadIcons.append(QIcon::fromTheme("network-9")); - loadIcons.append(QIcon::fromTheme("network-10")); - loadIcons.append(QIcon::fromTheme("network-11")); - loadIcons.append(QIcon::fromTheme("network-12")); + loadIcons.append(QIcon::fromTheme("kylin-network-1")); + loadIcons.append(QIcon::fromTheme("kylin-network-2")); + loadIcons.append(QIcon::fromTheme("kylin-network-3")); + loadIcons.append(QIcon::fromTheme("kylin-network-4")); + loadIcons.append(QIcon::fromTheme("kylin-network-5")); + loadIcons.append(QIcon::fromTheme("kylin-network-6")); + loadIcons.append(QIcon::fromTheme("kylin-network-7")); + loadIcons.append(QIcon::fromTheme("kylin-network-8")); + loadIcons.append(QIcon::fromTheme("kylin-network-9")); + loadIcons.append(QIcon::fromTheme("kylin-network-10")); + loadIcons.append(QIcon::fromTheme("kylin-network-11")); + loadIcons.append(QIcon::fromTheme("kylin-network-12")); iconTimer = new QTimer(this); connect(iconTimer, SIGNAL(timeout()), this, SLOT(iconStep())); @@ -615,7 +578,7 @@ void MainWindow::createTrayIcon() void MainWindow::iconStep() { - if(currentIconIndex < 0){ + if (currentIconIndex < 0) { currentIconIndex = 11; } setTrayIcon(loadIcons.at(currentIconIndex)); @@ -629,10 +592,10 @@ void MainWindow::setTrayIcon(QIcon icon) void MainWindow::setTrayLoading(bool isLoading) { - if(isLoading){ + if (isLoading) { currentIconIndex = 11; iconTimer->start(60); - }else{ + } else { iconTimer->stop(); } } @@ -646,13 +609,13 @@ void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason) // break; // } - switch(reason){ + switch (reason) { case QSystemTrayIcon::Trigger: case QSystemTrayIcon::MiddleClick: handleIconClicked(); - if(this->isHidden()){ + if (this->isHidden()) { this->showNormal(); - }else{ + } else { this->hide(); } break; @@ -679,52 +642,42 @@ void MainWindow::handleIconClicked() QRect deskDupRect = desktopWidget->availableGeometry(1);//获取可用桌面大小 QRect screenDupRect = desktopWidget->screenGeometry(1);//获取设备屏幕大小 -// qDebug()<<" "; -// qDebug()<<"trayIcon:"<geometry(); -// qDebug()<<"screenGeometry: "<getTaskBarPos("position"); int m = objKyDBus->getTaskBarHeight("height"); int d = 2; //窗口边沿到任务栏距离 - if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()){ - if(n == 0){ + if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()) { + if (n == 0) { //任务栏在下侧 this->move(availableGeometry.x() + availableGeometry.width() - this->width(), screenMainRect.y() + availableGeometry.height() - this->height() - m - d); - }else if(n == 1){ + } else if(n == 1) { //任务栏在上侧 this->move(availableGeometry.x() + availableGeometry.width() - this->width(), screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m + d); - } else if (n == 2){ + } else if (n == 2) { //任务栏在左侧 - if (screenGeometry.x() == 0){//主屏在左侧 + if (screenGeometry.x() == 0) {//主屏在左侧 this->move(m + d, screenMainRect.y() + screenMainRect.height() - this->height()); - }else{//主屏在右侧 + } else {//主屏在右侧 this->move(screenMainRect.x() + m + d, screenMainRect.y() + screenMainRect.height() - this->height()); } - } else if (n == 3){ + } else if (n == 3) { //任务栏在右侧 - if (screenGeometry.x() == 0){//主屏在左侧 + if (screenGeometry.x() == 0) {//主屏在左侧 this->move(screenMainRect.width() - this->width() - m - d, screenMainRect.y() + screenMainRect.height() - this->height()); - }else{//主屏在右侧 + } else {//主屏在右侧 this->move(screenMainRect.x() + screenMainRect.width() - this->width() - m - d, screenMainRect.y() + screenMainRect.height() - this->height()); } } - } else if(screenGeometry.width() == availableGeometry.width() ){ - if (trayIcon->geometry().y() > availableGeometry.height()/2){ + } else if(screenGeometry.width() == availableGeometry.width() ) { + if (trayIcon->geometry().y() > availableGeometry.height()/2) { //任务栏在下侧 this->move(availableGeometry.x() + availableGeometry.width() - this->width(), screenMainRect.y() + availableGeometry.height() - this->height() - d); - }else{ + } else { //任务栏在上侧 this->move(availableGeometry.x() + availableGeometry.width() - this->width(), screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + d); } - } else if (screenGeometry.height() == availableGeometry.height()){ - if (trayIcon->geometry().x() > availableGeometry.width()/2){ + } else if (screenGeometry.height() == availableGeometry.height()) { + if (trayIcon->geometry().x() > availableGeometry.width()/2) { //任务栏在右侧 this->move(availableGeometry.x() + availableGeometry.width() - this->width() - d, screenMainRect.y() + screenGeometry.height() - this->height()); } else { @@ -751,37 +704,37 @@ void MainWindow::showTrayIconMenu() int n = objKyDBus->getTaskBarPos("position"); int m = objKyDBus->getTaskBarHeight("height"); - int d = 4; //窗口边沿到任务栏距离 + int d = 0; //窗口边沿到任务栏距离 int s = 80; //窗口边沿到屏幕边沿距离 - if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()){ - if(n == 0){ //任务栏在下侧 + if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()) { + if (n == 0) { //任务栏在下侧 trayIconMenu->move(availableGeometry.x() + cursor_x - trayIconMenu->width()/2, screenMainRect.y() + availableGeometry.height() - trayIconMenu->height() - m - d); - }else if(n == 1){ //任务栏在上侧 + } else if(n == 1) { //任务栏在上侧 trayIconMenu->move(availableGeometry.x() + cursor_x - trayIconMenu->width()/2, screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m + d); - } else if (n == 2){ //任务栏在左侧 + } else if (n == 2) { //任务栏在左侧 trayIconMenu->move(m + d, cursor_y - trayIconMenu->height()/2); -// if (screenGeometry.x() == 0){//主屏在左侧 -// trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s); -// }else{//主屏在右侧 -// trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d,screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s); -// } - } else if (n == 3){ //任务栏在右侧 + //if (screenGeometry.x() == 0){//主屏在左侧 + // trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s); + //}else{//主屏在右侧 + // trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d,screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s); + //} + } else if (n == 3) { //任务栏在右侧 trayIconMenu->move(screenMainRect.width() - trayIconMenu->width() - m - d, cursor_y - trayIconMenu->height()/2); -// if (screenGeometry.x() == 0){//主屏在左侧 -// trayIconMenu->move(screenMainRect.width() + screenDupRect.width() - trayIconMenu->width() - m - d, screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s); -// }else{//主屏在右侧 -// trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width() - m - d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s); -// } + //if (screenGeometry.x() == 0){//主屏在左侧 + // trayIconMenu->move(screenMainRect.width() + screenDupRect.width() - trayIconMenu->width() - m - d, screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s); + //}else{//主屏在右侧 + // trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width() - m - d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s); + //} } - } else if(screenGeometry.width() == availableGeometry.width() ){ - if (trayIcon->geometry().y() > availableGeometry.height()/2){ //任务栏在下侧 + } else if(screenGeometry.width() == availableGeometry.width() ) { + if (trayIcon->geometry().y() > availableGeometry.height()/2) { //任务栏在下侧 trayIconMenu->move(availableGeometry.x() + cursor_x - trayIconMenu->width()/2, screenMainRect.y() + availableGeometry.height() - trayIconMenu->height() - d); - }else{ //任务栏在上侧 + } else { //任务栏在上侧 trayIconMenu->move(availableGeometry.x() + cursor_x - trayIconMenu->width()/2, screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + d); } - } else if (screenGeometry.height() == availableGeometry.height()){ - if (trayIcon->geometry().x() > availableGeometry.width()/2){ //任务栏在右侧 + } else if (screenGeometry.height() == availableGeometry.height()) { + if (trayIcon->geometry().x() > availableGeometry.width()/2) { //任务栏在右侧 trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width() - d, cursor_y - trayIconMenu->height()/2); } else { //任务栏在左侧 trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + d, cursor_y - trayIconMenu->height()/2); @@ -795,61 +748,6 @@ void MainWindow::on_showWindowAction() this->showNormal(); } -void MainWindow::init_widget_action(QWidget *wid, QString iconstr, QString textstr) -{ - QString style="QWidget{background:transparent;border:0px;border-radius: 4px;}\ - QWidget:hover{background-color:#34bed8ef;}\ - QWidget:pressed{background-color:#3abed8ef;}"; - - QHBoxLayout* layout=new QHBoxLayout(wid); - wid->setLayout(layout); - wid->setFixedSize(248, 36); - wid->setStyleSheet(style); - wid->setFocusPolicy(Qt::NoFocus); - - if(!iconstr.isEmpty()) { - QLabel* labelicon=new QLabel(wid); - labelicon->setFixedSize(16, 16); - labelicon->move(10, 12); - QPixmap *pixmap = new QPixmap(":/res/x/setup.png"); - pixmap->scaled(labelicon->size(), Qt::KeepAspectRatio); - labelicon->setScaledContents(true); - labelicon->setPixmap(*pixmap); - -// QLabel* labelicon=new QLabel(wid); -// QSvgRenderer* svg=new QSvgRenderer(wid); //#include -// svg->load(iconstr); -// QPixmap* pixmap=new QPixmap(22, 22); -// pixmap->fill(Qt::transparent); -// QPainter p(pixmap); -// svg->render(&p); -// labelicon->setPixmap(*pixmap); -// labelicon->setFixedSize(pixmap->size()); -// labelicon->move(10, 14); -// labelicon->setAlignment(Qt::AlignCenter); -// labelicon->setStyleSheet("QLabel{background:transparent;border:0px;}"); -// labelicon->setStyleSheet("QLabel{background-image:url(:/res/x/setup.png);}"); -// layout->addWidget(labelicon); - } - - QLabel* labeltext=new QLabel(wid); - labeltext->setStyleSheet("background:transparent;border:0px;color:rgba(255,255,255,0.91);font-size:14px;"); - QByteArray textbyte=textstr.toLocal8Bit(); - char* text=textbyte.data(); - labeltext->setText(tr(text)); - labeltext->adjustSize(); - layout->addWidget(labeltext); - - iconstr = ""; //用QSvgRenderer的话这句要注释掉 - if(!iconstr.isEmpty()) { - layout->setContentsMargins(10,0,wid->width()-16-labeltext->width()-20,0); - layout->setSpacing(5); - } - else { - layout->setContentsMargins(36,0,0,0); - } -} - /////////////////////////////////////////////////////////////////////////////// //加载动画,获取当前连接的网络和状态并设置图标 @@ -882,11 +780,11 @@ void MainWindow::getActiveInfo() activecon *act = kylin_network_get_activecon_info(lockPath.toUtf8().data()); int index = 0; - while(act[index].con_name != NULL){ - if(QString(act[index].type) == "ethernet" || QString(act[index].type) == "802-3-ethernet"){ + while (act[index].con_name != NULL) { + if (QString(act[index].type) == "ethernet" || QString(act[index].type) == "802-3-ethernet") { actLanName = QString(act[index].con_name); } - if(QString(act[index].type) == "wifi" || QString(act[index].type) == "802-11-wireless"){ + if (QString(act[index].type) == "wifi" || QString(act[index].type) == "802-11-wireless") { actWifiName = QString(act[index].con_name); } index ++; @@ -903,18 +801,18 @@ void MainWindow::getActiveInfo() //} //ukui3.0中获取currentActWifiSignalLv的值 - if(activeWifiSignalLv > 75){ + if (activeWifiSignalLv > 75) { currentActWifiSignalLv = 1; - }else if(activeWifiSignalLv > 55 && activeWifiSignalLv <= 75){ + } else if(activeWifiSignalLv > 55 && activeWifiSignalLv <= 75) { currentActWifiSignalLv = 2; - }else if(activeWifiSignalLv > 35 && activeWifiSignalLv <= 55){ + } else if(activeWifiSignalLv > 35 && activeWifiSignalLv <= 55) { currentActWifiSignalLv = 3; - }else if( activeWifiSignalLv <= 35){ + } else if( activeWifiSignalLv <= 35) { currentActWifiSignalLv = 4; } // 设置图标 - if(actWifiName != "--"){ + if (actWifiName != "--") { switch (currentActWifiSignalLv) { case 1: setTrayIcon(iconWifiFull); @@ -932,10 +830,10 @@ void MainWindow::getActiveInfo() setTrayIcon(iconWifiFull); break; } - }else{ - if(actLanName != "--"){ + } else { + if (actLanName != "--") { setTrayIcon(iconLanOnline); - }else{ + } else { setTrayIcon(iconLanOffline); } } @@ -950,10 +848,10 @@ void MainWindow::onPhysicalCarrierChanged(bool flag) { is_stop_check_net_state = 1; this->startLoading(); - if (flag){ + if (flag) { syslog(LOG_DEBUG,"wired physical cable is already plug in"); wiredCableUpTimer->start(2000); - } else{ + } else { syslog(LOG_DEBUG,"wired physical cable is already plug out"); wiredCableDownTimer->start(8000); } @@ -1006,7 +904,7 @@ void MainWindow::onNetworkDeviceAdded(QDBusObjectPath objPath) objKyDBus->isWirelessCardOn = false; objKyDBus->getObjectPath(); - if (objKyDBus->wirelessPath.path() == objPath.path()){ //证明添加的是无线网卡 + if (objKyDBus->wirelessPath.path() == objPath.path()) { //证明添加的是无线网卡 is_wireless_adapter_ready = 0; if (objKyDBus->isWirelessCardOn) { syslog(LOG_DEBUG,"wireless device is already plug in"); @@ -1020,7 +918,7 @@ void MainWindow::onNetworkDeviceAdded(QDBusObjectPath objPath) void MainWindow::onNetworkDeviceRemoved(QDBusObjectPath objPath) { //仅处理无线网卡拔出情况 - if (objKyDBus->wirelessPath.path() == objPath.path()){ + if (objKyDBus->wirelessPath.path() == objPath.path()) { objKyDBus->isWirelessCardOn = false; objKyDBus->getObjectPath(); //检查是不是还有无线网卡 if (!objKyDBus->isWirelessCardOn) { @@ -1038,7 +936,7 @@ void MainWindow::onNetworkDeviceRemoved(QDBusObjectPath objPath) void MainWindow::checkIsWirelessDeviceOn() { //启动时判断是否有无线网卡 -// KylinDBus kDBus3; + //KylinDBus kDBus3; if (objKyDBus->isWirelessCardOn) { is_wireless_adapter_ready = 1; } else { @@ -1062,9 +960,9 @@ bool MainWindow::checkLanOn() BackThread *bt = new BackThread(); IFace *iface = bt->execGetIface(); - if(iface->lstate == 2){ + if (iface->lstate == 2) { return false; - }else{ + } else { return true; } @@ -1077,9 +975,9 @@ bool MainWindow::checkWlOn() BackThread *bt = new BackThread(); IFace *iface = bt->execGetIface(); - if(iface->wstate == 2){ + if (iface->wstate == 2) { return false; - }else{ + } else { return true; } @@ -1093,7 +991,7 @@ bool MainWindow::checkWlOn() void MainWindow::on_btnNet_clicked() { - if(checkLanOn()){ + if (checkLanOn()) { QThread *t = new QThread(); BackThread *bt = new BackThread(); bt->moveToThread(t); @@ -1103,7 +1001,7 @@ void MainWindow::on_btnNet_clicked() connect(bt, SIGNAL(btFinish()), t, SLOT(quit())); t->start(); - }else{ + } else { is_stop_check_net_state = 1; QThread *t = new QThread(); BackThread *bt = new BackThread(); @@ -1211,7 +1109,6 @@ void MainWindow::onBtnWifiClicked(int flag) } QString txt(tr("please insert the wireless network adapter")); - //m_notify->execNotifySend(txt); //显示本应用自带的桌面通知 objKyDBus->showDesktopNotify(txt); //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800"; //int status = system(cmd.toUtf8().data()); @@ -1237,7 +1134,7 @@ void MainWindow::onBtnNetListClicked(int flag) lbLoadUp->show(); lbLoadDownImg->show(); lbLoadUpImg->show(); - if(iface->lstate != 0){ + if (iface->lstate != 0) { lbLoadDown->hide(); lbLoadUp->hide(); lbLoadDownImg->hide(); @@ -1252,7 +1149,7 @@ void MainWindow::onBtnNetListClicked(int flag) ui->lbBtnWifiBall->hide(); // 强行设置为打开 - if(flag == 1){ + if (flag == 1) { this->startLoading(); this->ksnm->execGetLanList(); this->scrollAreal->show(); @@ -1263,66 +1160,12 @@ void MainWindow::onBtnNetListClicked(int flag) return; } - if(iface->lstate != 2){ + if (iface->lstate != 2) { this->startLoading(); this->ksnm->execGetLanList(); } else { -// const int BUF_SIZE = 1024; -// char buf[BUF_SIZE]; - -// FILE * p_file = NULL; - -// p_file = popen("nmcli connection show -active", "r"); -// if (!p_file) { -// syslog(LOG_ERR, "Error occurred when popen cmd 'nmcli connection show'"); -// qDebug()<<"Error occurred when popen cmd 'nmcli connection show"; -// } - -// while (fgets(buf, BUF_SIZE, p_file) != NULL) { -// QString line(buf); -// if(line.indexOf("ethernet") != -1){ -// QString txt(tr("Abnormal connection exist, program will delete it"));//仍然有连接异常的有线网络，断开异常连接的网络 -// //m_notify->execNotifySend(txt);//显示本应用自带的桌面通知 -// //objKyDBus->showDesktopNotify(txt); -// //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800"; -// //int status = system(cmd.toUtf8().data()); -// //if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'onBtnNetListClicked' failed");} - -// is_stop_check_net_state = 1; -// this->startLoading(); -// deleteLanTimer->start(1000); -// pclose(p_file); -// return; -// } -// } -// pclose(p_file); - this->startLoading(); this->ksnm->execGetLanList(); - -// delete topLanListWidget; // 清空top列表 -// createTopLanUI(); //创建顶部有线网item -// lbTopLanList->hide(); -// btnCreateNet->hide(); - -// // 清空lan列表 -// lanListWidget = new QWidget(scrollAreal); -// lanListWidget->resize(W_LIST_WIDGET, H_NORMAL_ITEM + H_LAN_ITEM_EXTEND); -// scrollAreal->setWidget(lanListWidget); -// scrollAreal->move(W_LEFT_AREA, Y_SCROLL_AREA); - -// // 当前连接的lan -// OneLancForm *ccf = new OneLancForm(topLanListWidget, this, confForm, ksnm); -// ccf->setName(tr("Not connected"));//"当前未连接任何 以太网" -// ccf->setIcon(false); -// ccf->setConnedString(1, tr("Disconnected"));//"未连接" -// ccf->setAct(true); -// ccf->move(L_VERTICAL_LINE_TO_ITEM, 0); -// ccf->setTopItem(false); -// ccf->show(); - -// this->lanListWidget->show(); -// this->wifiListWidget->hide(); } this->scrollAreal->show(); @@ -1347,7 +1190,7 @@ void MainWindow::on_btnWifiList_clicked() lbLoadUp->show(); lbLoadDownImg->show(); lbLoadUpImg->show(); - if(iface->wstate != 0){ + if (iface->wstate != 0) { lbLoadDown->hide(); lbLoadUp->hide(); lbLoadDownImg->hide(); @@ -1364,15 +1207,15 @@ void MainWindow::on_btnWifiList_clicked() ui->lbBtnWifiBG->show(); ui->lbBtnWifiBall->show(); - if(iface->wstate == 0 || iface->wstate == 1){ + if (iface->wstate == 0 || iface->wstate == 1) { ui->lbBtnWifiBG->setStyleSheet(btnBgOnQss); ui->lbBtnWifiBall->move(X_RIGHT_WIFI_BALL, Y_WIFI_BALL); - }else{ + } else { ui->lbBtnWifiBG->setStyleSheet(btnBgOffQss); ui->lbBtnWifiBall->move(X_LEFT_WIFI_BALL, Y_WIFI_BALL); } - if(iface->wstate != 2){ + if (iface->wstate != 2) { //ui->lbBtnWifiBG->setStyleSheet(btnBgOnQss); //ui->lbBtnWifiBall->move(X_RIGHT_WIFI_BALL, Y_WIFI_BALL); @@ -1381,7 +1224,7 @@ void MainWindow::on_btnWifiList_clicked() this->startLoading(); this->ksnm->execGetWifiList(); - }else{ + } else { //ui->lbBtnWifiBG->setStyleSheet(btnBgOffQss); //ui->lbBtnWifiBall->move(X_LEFT_WIFI_BALL, Y_WIFI_BALL); @@ -1424,16 +1267,16 @@ void MainWindow::on_btnWifiList_clicked() void MainWindow::on_btnNetList_pressed() { -// ui->btnNetList->setStyleSheet("#btnNetList{font-size:12px;color:white;border:1px solid rgba(255,255,255,0.1);border:1px solid rgba(255,255,255,0.5);background:transparent;background-color:rgba(255,255,255,0.1);}"); -// ui->btnWifiList->setStyleSheet("#btnWifiList{font-size:12px;color:white;border:1px solid rgba(255,255,255,0.1);background:transparent;background-color:rgba(0,0,0,0.2);}" -// "#btnWifiList:Pressed{border:1px solid rgba(255,255,255,0.5);background:transparent;background-color:rgba(255,255,255,0.1);}"); + //ui->btnNetList->setStyleSheet("#btnNetList{font-size:12px;color:white;border:1px solid rgba(255,255,255,0.1);border:1px solid rgba(255,255,255,0.5);background:transparent;background-color:rgba(255,255,255,0.1);}"); + //ui->btnWifiList->setStyleSheet("#btnWifiList{font-size:12px;color:white;border:1px solid rgba(255,255,255,0.1);background:transparent;background-color:rgba(0,0,0,0.2);}" + // "#btnWifiList:Pressed{border:1px solid rgba(255,255,255,0.5);background:transparent;background-color:rgba(255,255,255,0.1);}"); } void MainWindow::on_btnWifiList_pressed() { -// ui->btnWifiList->setStyleSheet("#btnWifiList{font-size:12px;color:white;border:1px solid rgba(255,255,255,0.1);border:1px solid rgba(255,255,255,0.5);background:transparent;background-color:rgba(255,255,255,0.1);}"); -// ui->btnNetList->setStyleSheet("#btnNetList{font-size:12px;color:white;border:1px solid rgba(255,255,255,0.1);background:transparent;background-color:rgba(0,0,0,0.2);}" -// "#btnNetList:Pressed{border:1px solid rgba(255,255,255,0.5);background:transparent;background-color:rgba(255,255,255,0.1);}"); + //ui->btnWifiList->setStyleSheet("#btnWifiList{font-size:12px;color:white;border:1px solid rgba(255,255,255,0.1);border:1px solid rgba(255,255,255,0.5);background:transparent;background-color:rgba(255,255,255,0.1);}"); + //ui->btnNetList->setStyleSheet("#btnNetList{font-size:12px;color:white;border:1px solid rgba(255,255,255,0.1);background:transparent;background-color:rgba(0,0,0,0.2);}" + // "#btnNetList:Pressed{border:1px solid rgba(255,255,255,0.5);background:transparent;background-color:rgba(255,255,255,0.1);}"); } @@ -1443,7 +1286,7 @@ void MainWindow::on_btnWifiList_pressed() // 获取lan列表回调 void MainWindow::getLanListDone(QStringList slist) { - if (this->ksnm->isUseOldLanSlist){ + if (this->ksnm->isUseOldLanSlist) { slist = oldLanSlist; this->ksnm->isUseOldLanSlist = false; } @@ -1464,8 +1307,8 @@ void MainWindow::getLanListDone(QStringList slist) activecon *act = kylin_network_get_activecon_info(lockPath.toUtf8().data()); int index = 0; - while(act[index].con_name != NULL){ - if(QString(act[index].type) == "ethernet" || QString(act[index].type) == "802-3-ethernet"){ + while (act[index].con_name != NULL) { + if (QString(act[index].type) == "ethernet" || QString(act[index].type) == "802-3-ethernet") { actLanName = QString(act[index].con_name); break; } @@ -1474,7 +1317,7 @@ void MainWindow::getLanListDone(QStringList slist) // 若当前lan name为"--"，设置OneConnForm OneLancForm *ccf = new OneLancForm(topLanListWidget, this, confForm, ksnm); - if(actLanName == "--"){ + if (actLanName == "--") { ccf->setName(tr("Not connected"), "");//"当前未连接任何 以太网" ccf->setIcon(false); ccf->setConnedString(1, tr("Disconnected"));//"未连接" @@ -1510,10 +1353,10 @@ void MainWindow::getLanListDone(QStringList slist) QString ltype = line.mid(0, indexDevice).trimmed(); QString nname = line.mid(indexName).trimmed(); - if(ltype != "802-11-wireless" && ltype != "wifi" && ltype != "" && ltype != "--"){ + if (ltype != "802-11-wireless" && ltype != "wifi" && ltype != "" && ltype != "--") { // 当前连接的lan objKyDBus->getLanIp(nname); - if(nname == actLanName){ + if (nname == actLanName) { actLanName = "--"; if (mwBandWidth == "Unknown!") { getLanBandWidth(); } @@ -1532,7 +1375,7 @@ void MainWindow::getLanListDone(QStringList slist) ccf->setTopItem(false); currSelNetName = ""; syslog(LOG_DEBUG, "already insert an active lannet in the top of lan list"); - }else{ + } else { lanListWidget->resize(W_LIST_WIDGET, lanListWidget->height() + H_NORMAL_ITEM); OneLancForm *ocf = new OneLancForm(lanListWidget, this, confForm, ksnm); @@ -1554,16 +1397,16 @@ void MainWindow::getLanListDone(QStringList slist) QList itemList = lanListWidget->findChildren(); int n = itemList.size(); - if (n >= 1){ + if (n >= 1) { OneLancForm *lastItem = itemList.at(n-1); lastItem->setLine(false); lbNoItemTip->hide(); } else { - if (!ifLanConnected){ + if (!ifLanConnected) { lbNoItemTip->hide(); lbTopLanList->hide(); btnCreateNet->hide(); - } else{ + } else { lbNoItemTip->show(); lbNoItemTip->setText(tr("No Other Wired Network Scheme")); } @@ -1584,7 +1427,7 @@ void MainWindow::getWifiListDone(QStringList slist) { qDebug()<<"debug: oldWifiSlist.size()="<setName(tr("Not connected"));//"当前未连接任何 Wifi" ccf->setSignal("0", "--"); activeWifiSignalLv = 0; @@ -1657,7 +1500,7 @@ void MainWindow::loadWifiListDone(QStringList slist) QStringList wnames; int count = 0; - for(int i = 1, j = 0; i < slist.size(); i ++) { + for (int i = 1, j = 0; i < slist.size(); i ++) { QString line = slist.at(i); //QString wsignal = line.mid(0, indexRate).trimmed(); //QString wrate = line.mid(indexRate, indexSecu - indexRate).trimmed(); @@ -1672,9 +1515,9 @@ void MainWindow::loadWifiListDone(QStringList slist) } if(isContinue){ continue; } - if(wname != "" && wname != "--"){ + if (wname != "" && wname != "--") { // 当前连接的wifi - if(wname == actWifiName){ + if (wname == actWifiName) { connect(ccf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int))); connect(ccf, SIGNAL(disconnActiveWifi()), this, SLOT(activeWifiDisconn())); ccf->setName(wname); @@ -1694,7 +1537,7 @@ void MainWindow::loadWifiListDone(QStringList slist) currSelNetName = ""; syslog(LOG_DEBUG, "already insert an active wifi in the top of wifi list"); - }else{ + } else { wifiListWidget->resize(W_LIST_WIDGET, wifiListWidget->height() + H_NORMAL_ITEM); OneConnForm *ocf = new OneConnForm(wifiListWidget, this, confForm, ksnm); @@ -1720,12 +1563,12 @@ void MainWindow::loadWifiListDone(QStringList slist) QList itemList = wifiListWidget->findChildren(); int n = itemList.size(); - if (n >= 1){ + if (n >= 1) { OneConnForm *lastItem = itemList.at(n-1); lastItem->setLine(false); lbNoItemTip->hide(); - }else{ - if(ifWLanConnected){ + } else { + if (ifWLanConnected) { lbNoItemTip->show(); lbNoItemTip->setText(tr("No Other Wireless Network Scheme")); } else { @@ -1782,17 +1625,18 @@ void MainWindow::updateWifiListDone(QStringList slist) QString wname = line.mid(indexName).trimmed(); if (lastWname == wname){break;} //在slist最后之前找到了lastWname，则停止 - if (j == slist.size()-1){ + if (j == slist.size()-1) { syslog(LOG_DEBUG, "Will remove a Wi-Fi, it's name is: %s", lastWname.toUtf8().data()); qDebug()<<"Will remove a Wi-Fi, it's name is: "< wifiList = wifiListWidget->findChildren(); - for(int pos = 0; pos < wifiList.size(); pos ++){ + for (int pos = 0; pos < wifiList.size(); pos ++) { OneConnForm *ocf = wifiList.at(pos); - if (ocf->getName() == lastWname){ + if (ocf->getName() == lastWname) { if (ocf->isActive == true){break; - } else { delete ocf; + } else { + delete ocf; //删除元素下面的的所有元素上移 - for(int after_pos = pos+1; after_pos < wifiList.size(); after_pos ++){ + for (int after_pos = pos+1; after_pos < wifiList.size(); after_pos ++) { OneConnForm *after_ocf = wifiList.at(after_pos); if (lastWname == currSelNetName) {after_ocf->move(L_VERTICAL_LINE_TO_ITEM, after_ocf->y() - H_NORMAL_ITEM - H_WIFI_ITEM_BIG_EXTEND);} else {after_ocf->move(L_VERTICAL_LINE_TO_ITEM, after_ocf->y() - H_NORMAL_ITEM);} @@ -1826,18 +1670,18 @@ void MainWindow::updateWifiListDone(QStringList slist) if(isContinue){continue;} wnames.append(wname); - for (int j=1; j < oldWifiSlist.size(); j++){ + for (int j=1; j < oldWifiSlist.size(); j++) { QString line = oldWifiSlist.at(j); QString lastWname = line.mid(lastIndexName).trimmed(); if (lastWname == wname){break;} //上一次的wifi列表已经有名为wname的wifi，则停止 - if (j == oldWifiSlist.size()-1){ //到lastSlist最后一个都没找到，执行下面流程 + if (j == oldWifiSlist.size()-1) { //到lastSlist最后一个都没找到，执行下面流程 syslog(LOG_DEBUG, "Will add a Wi-Fi, it's name is: %s", wname.toUtf8().data()); qDebug()<<"Will add a Wi-Fi, it's name is: "< wifiList = wifiListWidget->findChildren(); int n = wifiList.size(); int posY = 0; - if (n >= 1){ + if (n >= 1) { OneConnForm *lastOcf = wifiList.at(n-1); lastOcf->setLine(true); if (lastOcf->wifiName == currSelNetName) { @@ -1881,8 +1725,8 @@ void MainWindow::on_btnAdvConf_clicked() { QProcess *qprocess = new QProcess(this); qprocess->start("nm-connection-editor &"); -// int status = system("nm-connection-editor &"); -// if (status != 0){ syslog(LOG_ERR, "execute 'nm-connection-editor &' in function 'on_btnAdvConf_clicked' failed");} + // int status = system("nm-connection-editor &"); + // if (status != 0){ syslog(LOG_ERR, "execute 'nm-connection-editor &' in function 'on_btnAdvConf_clicked' failed");} } void MainWindow::on_btnAdvConf_pressed() @@ -1897,7 +1741,7 @@ void MainWindow::on_btnAdvConf_released() void MainWindow::on_btnFlyMode_clicked() { - if(is_fly_mode_on == 0){ + if (is_fly_mode_on == 0) { ui->lbFlyImg->setStyleSheet("QLabel{background-image:url(:/res/x/fly-mode-on.svg);}"); ui->lbFlyBG->setStyleSheet(btnOnQss); is_fly_mode_on = 1; @@ -1913,8 +1757,8 @@ void MainWindow::on_btnFlyMode_clicked() void MainWindow::on_btnHotspot_clicked() { - if (is_wireless_adapter_ready == 1){ - if(is_hot_sopt_on == 0){ + if (is_wireless_adapter_ready == 1) { + if (is_hot_sopt_on == 0) { ui->lbHotImg->setStyleSheet("QLabel{background-image:url(:/res/x/hot-spot-on.svg);}"); ui->lbHotBG->setStyleSheet(btnOnQss); is_hot_sopt_on = 1; @@ -1976,25 +1820,25 @@ void MainWindow::oneLanFormSelected(QString lanName, QString uniqueName) //**********************先处理下方列表********************// // 下方所有元素回到原位 - for(int i = 0, j = 0;i < lanList.size(); i ++){ + for (int i = 0, j = 0;i < lanList.size(); i ++) { OneLancForm *ocf = lanList.at(i); - if(ocf->isActive == true){ + if (ocf->isActive == true) { ocf->move(L_VERTICAL_LINE_TO_ITEM, 0); } - if(ocf->isActive == false){ + if (ocf->isActive == false) { ocf->move(L_VERTICAL_LINE_TO_ITEM, j * H_NORMAL_ITEM); j ++; } } //是否与上一次选中同一个网络框 - if (currSelNetName == uniqueName){ + if (currSelNetName == uniqueName) { // 缩小所有选项卡 - for(int i = 0;i < lanList.size(); i ++){ + for (int i = 0;i < lanList.size(); i ++) { OneLancForm *ocf = lanList.at(i); - if(ocf->uniqueName == uniqueName){ + if (ocf->uniqueName == uniqueName) { ocf->setSelected(false, true); - }else{ + } else { ocf->setSelected(false, false); } } @@ -2002,28 +1846,28 @@ void MainWindow::oneLanFormSelected(QString lanName, QString uniqueName) currSelNetName = ""; } else { int selectY = 0; - for(int i = 0;i < lanList.size(); i ++){ + for (int i = 0;i < lanList.size(); i ++) { OneLancForm *ocf = lanList.at(i); - if(ocf->uniqueName == uniqueName){ + if (ocf->uniqueName == uniqueName) { selectY = ocf->y(); //获取选中item的y坐标 break; } } // 选中元素下面的所有元素下移 H_LAN_ITEM_EXTEND - for(int i = 0;i < lanList.size(); i ++){ + for (int i = 0;i < lanList.size(); i ++) { OneLancForm *ocf = lanList.at(i); - if(ocf->y() > selectY){ + if (ocf->y() > selectY) { ocf->move(L_VERTICAL_LINE_TO_ITEM, ocf->y() + H_LAN_ITEM_EXTEND); } } - for(int i = 0;i < lanList.size(); i ++){ + for (int i = 0;i < lanList.size(); i ++) { OneLancForm *ocf = lanList.at(i); - if(ocf->uniqueName == uniqueName){ + if (ocf->uniqueName == uniqueName) { ocf->setSelected(true, false); selectY = ocf->y(); - }else{ + } else { ocf->setSelected(false, false); } } @@ -2033,7 +1877,7 @@ void MainWindow::oneLanFormSelected(QString lanName, QString uniqueName) QList itemList = lanListWidget->findChildren(); int n = itemList.size(); - if(n >= 1){ + if (n >= 1) { OneLancForm *lastItem = itemList.at(n-1); lastItem->setLine(false); } @@ -2053,7 +1897,7 @@ void MainWindow::oneTopLanFormSelected(QString lanName, QString uniqueName) QList topLanList = topLanListWidget->findChildren(); QList lanList = lanListWidget->findChildren(); - if (currSelNetName == uniqueName){ + if (currSelNetName == uniqueName) { // 与上一次选中同一个网络框，缩小当前选项卡 topLanListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM + H_GAP_UP + X_ITEM); lbTopLanList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_GAP_UP); @@ -2068,7 +1912,7 @@ void MainWindow::oneTopLanFormSelected(QString lanName, QString uniqueName) } else { // 没有与上一次选中同一个网络框，放大当前选项卡 - for(int i = 0; i < lanList.size(); i ++){ + for (int i = 0; i < lanList.size(); i ++) { // 所有元素缩小并回到原位 OneLancForm *ocf = lanList.at(i); ocf->setSelected(false, false); @@ -2095,32 +1939,32 @@ void MainWindow::oneWifiFormSelected(QString wifiName, int extendLength) //******************先处理下方列表****************// // 下方所有元素回到原位 - for(int i = 0, j = 0;i < wifiList.size(); i ++){ + for (int i = 0, j = 0;i < wifiList.size(); i ++) { OneConnForm *ocf = wifiList.at(i); - if(ocf->isActive == true){ + if (ocf->isActive == true) { ocf->move(L_VERTICAL_LINE_TO_ITEM, 0); } - if(ocf->isActive == false){ + if (ocf->isActive == false) { ocf->move(L_VERTICAL_LINE_TO_ITEM, j * H_NORMAL_ITEM); j ++; } } //是否与上一次选中同一个网络框 - if (currSelNetName == wifiName){ + if (currSelNetName == wifiName) { // 缩小所有选项卡 - for(int i = 0;i < wifiList.size(); i ++){ + for (int i = 0;i < wifiList.size(); i ++) { OneConnForm *ocf = wifiList.at(i); - if(ocf->wifiName == wifiName){ - if (ocf->wifiName == hideWiFiConn){ + if (ocf->wifiName == wifiName) { + if (ocf->wifiName == hideWiFiConn) { ocf->setHideItem(true, true); - }else{ + } else { ocf->setSelected(false, true); } - } else{ - if (ocf->wifiName == hideWiFiConn){ + } else { + if (ocf->wifiName == hideWiFiConn) { ocf->setHideItem(true, true); - }else{ + } else { ocf->setSelected(false, false); } } @@ -2129,34 +1973,34 @@ void MainWindow::oneWifiFormSelected(QString wifiName, int extendLength) currSelNetName = ""; } else { int selectY = 0; - for(int i = 0;i < wifiList.size(); i ++){ + for (int i = 0;i < wifiList.size(); i ++) { OneConnForm *ocf = wifiList.at(i); - if(ocf->wifiName == wifiName){ + if (ocf->wifiName == wifiName) { selectY = ocf->y(); //获取选中item的y坐标 break; } } // 选中元素下面的所有元素下移 H_WIFI_ITEM_BIG_EXTEND - for(int i = 0;i < wifiList.size(); i ++){ + for (int i = 0;i < wifiList.size(); i ++) { OneConnForm *ocf = wifiList.at(i); - if(ocf->y() > selectY){ + if (ocf->y() > selectY) { ocf->move(L_VERTICAL_LINE_TO_ITEM, ocf->y() + extendLength); } } - for(int i = 0;i < wifiList.size(); i ++){ + for (int i = 0;i < wifiList.size(); i ++) { OneConnForm *ocf = wifiList.at(i); - if(ocf->wifiName == wifiName){ - if (ocf->wifiName == hideWiFiConn){ + if (ocf->wifiName == wifiName) { + if (ocf->wifiName == hideWiFiConn) { ocf->setHideItem(true, true); - }else{ + } else { ocf->setSelected(true, false); } - }else{ - if (ocf->wifiName == hideWiFiConn){ + } else { + if (ocf->wifiName == hideWiFiConn) { ocf->setHideItem(true, true); - }else{ + } else { ocf->setSelected(false, false); } } @@ -2168,7 +2012,7 @@ void MainWindow::oneWifiFormSelected(QString wifiName, int extendLength) //最后一个item没有下划线 QList itemList = wifiListWidget->findChildren(); int n = itemList.size(); - if (n >= 1){ + if (n >= 1) { OneConnForm *lastItem = itemList.at(n-1); lastItem->setLine(false); } @@ -2189,7 +2033,7 @@ void MainWindow::oneTopWifiFormSelected(QString wifiName, int extendLength) QListtopWifiList = topWifiListWidget->findChildren(); QList wifiList = wifiListWidget->findChildren(); - if (currSelNetName == wifiName){ + if (currSelNetName == wifiName) { // 与上一次选中同一个网络框，缩小当前选项卡 topWifiListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM + H_GAP_UP + X_ITEM); lbTopWifiList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_GAP_UP); @@ -2204,7 +2048,7 @@ void MainWindow::oneTopWifiFormSelected(QString wifiName, int extendLength) } else { // 没有与上一次选中同一个网络框，放大当前选项卡 - for(int i = 0;i < wifiList.size(); i ++){ + for(int i = 0;i < wifiList.size(); i ++) { // 所有元素回到原位 OneConnForm *ocf = wifiList.at(i); ocf->setSelected(false, false); @@ -2230,7 +2074,6 @@ void MainWindow::activeLanDisconn() syslog(LOG_DEBUG, "Wired net is disconnected"); QString txt(tr("Wired net is disconnected")); - //m_notify->execNotifySend(txt); objKyDBus->showDesktopNotify(txt); //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800"; //int status1 = system(cmd.toUtf8().data()); @@ -2259,7 +2102,6 @@ void MainWindow::activeStartLoading() syslog(LOG_DEBUG, "Wi-Fi is disconnected"); QString txt(tr("Wi-Fi is disconnected")); - //m_notify->execNotifySend(txt); objKyDBus->showDesktopNotify(txt); //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800"; //int status1 = system(cmd.toUtf8().data()); @@ -2284,7 +2126,7 @@ void MainWindow::enNetDone() ui->lbBtnNetBG->setStyleSheet(btnOnQss); // 打开网络开关时如果Wifi开关是打开的，设置其样式 - if(checkWlOn()){ + if (checkWlOn()) { ui->lbBtnWifiBG->setStyleSheet(btnBgOnQss); ui->lbBtnWifiBall->move(X_RIGHT_WIFI_BALL, Y_WIFI_BALL); } @@ -2400,9 +2242,9 @@ void MainWindow::disWifiDoneChangeUI() topWifiListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM + H_GAP_UP + X_ITEM); QList wifiList = topWifiListWidget->findChildren(); - for(int i = 0; i < wifiList.size(); i ++){ + for (int i = 0; i < wifiList.size(); i ++) { OneConnForm *ocf = wifiList.at(i); - if(ocf->isActive == true){ + if (ocf->isActive == true) { ocf->setSelected(false, false); ocf->setName(tr("Not connected"));//"当前未连接任何 Wifi" ocf->setSignal("0", "--"); @@ -2414,7 +2256,7 @@ void MainWindow::disWifiDoneChangeUI() ocf->isConnected = false; ocf->setTopItem(false); disconnect(ocf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int))); - }else{ + } else { ocf->deleteLater(); } } @@ -2466,11 +2308,11 @@ void MainWindow::onExternalWifiChange() void MainWindow::on_checkWifiListChanged() { - if (is_stop_check_net_state==0 && this->is_btnWifiList_clicked==1 && this->isVisible()){ + if (is_stop_check_net_state==0 && this->is_btnWifiList_clicked==1 && this->isVisible()) { BackThread *loop_bt = new BackThread(); IFace *loop_iface = loop_bt->execGetIface(); - if (loop_iface->wstate != 2){ + if (loop_iface->wstate != 2) { is_update_wifi_list = 1; this->ksnm->execGetWifiList(); //更新wifi列表 } @@ -2482,13 +2324,13 @@ void MainWindow::on_checkWifiListChanged() void MainWindow::on_setNetSpeed() { - if (this->isVisible() && is_stop_check_net_state==0){ - if (is_btnWifiList_clicked == 1){ - if ( objNetSpeed->getCurrentDownloadRates(objKyDBus->dbusWiFiCardName.toUtf8().data(), &start_rcv_rates, &start_tx_rates) == -1){ + if (this->isVisible() && is_stop_check_net_state==0) { + if (is_btnWifiList_clicked == 1) { + if ( objNetSpeed->getCurrentDownloadRates(objKyDBus->dbusWiFiCardName.toUtf8().data(), &start_rcv_rates, &start_tx_rates) == -1) { start_rcv_rates = end_rcv_rates; } - }else if(is_btnNetList_clicked == 1){ - if ( objNetSpeed->getCurrentDownloadRates(objKyDBus->dbusLanCardName.toUtf8().data(), &start_rcv_rates, &start_tx_rates) == -1){ + } else if(is_btnNetList_clicked == 1) { + if ( objNetSpeed->getCurrentDownloadRates(objKyDBus->dbusLanCardName.toUtf8().data(), &start_rcv_rates, &start_tx_rates) == -1) { start_tx_rates = end_tx_rates; } } @@ -2504,25 +2346,25 @@ void MainWindow::on_setNetSpeed() QString str_rcv; QString str_tx; - if (rcv_num < 1000){ + if (rcv_num < 1000) { str_rcv = QString::number(rcv_num) + "KB/s."; } else { int remainder; if (rcv_num%1000 < 100) { remainder = 0; - }else{ + } else { remainder = (rcv_num%1000)/100; } str_rcv = QString::number(rcv_num/1000) + "." + QString::number(remainder) + "MB/s."; } - if (tx_num < 1000){ + if (tx_num < 1000) { str_tx = QString::number(tx_num) + "KB/s"; } else { int remainder; if (tx_num%1000 < 100) { remainder = 0; - }else{ + } else { remainder = (tx_num%1000)/100; } str_tx = QString::number(tx_num/1000) + "." + QString::number(remainder) + "MB/s"; @@ -2558,217 +2400,61 @@ void MainWindow::connLanDone(int connFlag) emit this->waitLanStop(); //停止加载动画 // Lan连接结果，0点击连接成功 1失败 3开机启动网络工具时已经连接 - if(connFlag == 0){ + if (connFlag == 0) { syslog(LOG_DEBUG, "Wired net already connected by clicking button"); - //syslog(LOG_DEBUG, "Wired net already connected by clicking button, will check if Lan disconnected again circularly"); - //qDebug()<<"连接状态：有线网络已经点击连接，即将重新检测 Lan 是否断开"; this->is_wired_line_ready = 1; this->is_by_click_connect = 1; this->ksnm->execGetLanList(); QString txt(tr("Conn Ethernet Success")); - //m_notify->execNotifySend(txt); objKyDBus->showDesktopNotify(txt); //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800"; //int status = system(cmd.toUtf8().data()); //if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'connLanDone' failed");} - - //changeTimerState(); - //checkIfLanConnect->start(8000); } - if(connFlag == 1){ + if (connFlag == 1) { qDebug()<<"without net line connect to computer"; this->is_wired_line_ready = 0; //without net line connect to computer is_stop_check_net_state = 0; QString txt(tr("Conn Ethernet Fail")); - //m_notify->execNotifySend(txt); objKyDBus->showDesktopNotify(txt); //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800"; //int status = system(cmd.toUtf8().data()); //if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'connLanDone' failed");} } - if(connFlag == 3){ + if (connFlag == 3) { syslog(LOG_DEBUG, "Launch kylin-nm, Lan already connected"); - //syslog(LOG_DEBUG, "Launch kylin-nm, Lan already connected, will check if Lan disconnected circularly"); - //qDebug()<<"连接状态：启动kylin-nm,Lan已经开启，即将循环检测是否断开"; this->is_wired_line_ready = 1; - //changeTimerState(); - //checkIfLanConnect->start(8000); } this->stopLoading(); } -void MainWindow::on_isLanConnect() -{ - BackThread *loop_bt = new BackThread(); - IFace *loop_iface = loop_bt->execGetIface(); - - if (is_stop_check_net_state == 0){ - if (loop_iface->lstate == 1){ - syslog(LOG_DEBUG, "Wired net is disconnected"); - qDebug()<<"连接状态：有线网络连接已经断开"; - if(this->is_btnNetList_clicked == 1) { - this->ksnm->execGetLanList(); - } - if(this->is_btnWifiList_clicked== 1) { - this->ksnm->execGetWifiList(); - } - this->is_by_click_connect = 0; - checkIfLanConnect->stop(); - - if (loop_iface->wstate != 0){ - syslog(LOG_DEBUG, "Will check if LAN or Wi-Fi connected again circularly"); - qDebug()<<"连接状态：即将循环检测是否重新连接 Lan或Wifi"; - //changeTimerState(); - //checkIfNetworkOn->start(8000); - } - } else if (loop_iface->wstate != 2) { - count_loop = 1; - if (count_loop==1 && this->is_btnWifiList_clicked == 1){ - if (this->isVisible() ){ - is_update_wifi_list = 1; - this->ksnm->execGetWifiList(); //更新wifi列表 - } - } - if (count_loop >= 2){ count_loop = 1;} - } - } - - delete loop_iface; - delete loop_bt; -} - -void MainWindow::on_isNetOn() -{ - BackThread *loop_bt = new BackThread(); - IFace *loop_iface = loop_bt->execGetIface(); - - if (is_stop_check_net_state == 0){ - if (loop_iface->lstate == 0 && this->is_by_click_connect == 0 && this->is_wired_line_ready == 1){ - syslog(LOG_DEBUG, "Lan already connected again, will check if Wi-Fi disconnected circularly"); - qDebug()<<"连接状态：有线网络已经重新连接，即将循环检测 Lan 是否断开"; - if(this->is_btnNetList_clicked == 1) { - this->ksnm->execGetLanList(); - } - if(this->is_btnWifiList_clicked== 1) { - this->ksnm->execGetWifiList(); - } - checkIfNetworkOn->stop(); - - //changeTimerState(); - //checkIfLanConnect->start(8000); - } else if (loop_iface->lstate == 0 && this->is_by_click_connect == 1){ - qDebug()<<"连接状态：有线网络已经点击连接，即将重新循环检测 Lan 是否断开"; - checkIfNetworkOn->stop(); - } else if (loop_iface->wstate == 0 && this->is_by_click_connect == 0){ - syslog(LOG_DEBUG, "Wi-Fi already connected again, will check if Wi-Fi disconnected circularly"); - qDebug()<<"连接状态：Wifi网络已经重新连接，即将循环检测 Wifi 是否断开"; - if(this->is_btnNetList_clicked == 1) { - this->ksnm->execGetLanList(); - } - if(this->is_btnWifiList_clicked== 1) { - this->ksnm->execGetWifiList(); - } - checkIfNetworkOn->stop(); - - //changeTimerState(); - //checkIfWifiConnect->start(8000); - } else if (loop_iface->wstate == 0 && this->is_by_click_connect == 1){ - qDebug()<<"连接状态：Wifi网络已经点击连接，即将重新循环检测 Wifi 是否断开"; - checkIfNetworkOn->stop(); - } else if (loop_iface->wstate != 2) { - count_loop = 1; - if (count_loop==1 && this->is_btnWifiList_clicked == 1){ - if (this->isVisible() ){ - is_update_wifi_list = 1; - this->ksnm->execGetWifiList(); //更新wifi列表 - } - } - if (count_loop >= 2){ count_loop = 1;} - } - } - - delete loop_iface; - delete loop_bt; -} - void MainWindow::connWifiDone(int connFlag) { // Wifi连接结果，0点击连接成功 1失败 2没有配置文件 3开机启动网络工具时已经连接 - if(connFlag == 0){ + if (connFlag == 0) { syslog(LOG_DEBUG, "Wi-Fi already connected by clicking button"); - //syslog(LOG_DEBUG, "Wi-Fi already connected by clicking button, will check if Wi-Fi disconnected again circularly"); - //qDebug()<<"连接状态：Wifi网络已经点击连接，即将重新循环检测 Wifi 是否断开"; this->is_by_click_connect = 1; this->ksnm->execGetWifiList(); QString txt(tr("Conn Wifi Success")); - //m_notify->execNotifySend(txt); objKyDBus->showDesktopNotify(txt); //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800"; //int status = system(cmd.toUtf8().data()); //if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'connWifiDone' failed");} - - //changeTimerState(); - //checkIfWifiConnect->start(8000); } else if (connFlag == 1) { is_stop_check_net_state = 0; QString txt(tr("Confirm your Wi-Fi password or usable of wireless card")); - //m_notify->execNotifySend(txt); objKyDBus->showDesktopNotify(txt); //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800"; //int status1 = system(cmd.toUtf8().data()); //if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");} } else if (connFlag == 3) { syslog(LOG_DEBUG, "Launch kylin-nm, Wi-Fi already connected"); - //syslog(LOG_DEBUG, "Launch kylin-nm, Wi-Fi already connected, will check if Wi-Fi disconnected circularly"); - //qDebug()<<"连接状态：启动kylin-nm, Wifi已经连接，即将循环检测是否断开"; - //changeTimerState(); - //checkIfWifiConnect->start(8000); } } - -void MainWindow::on_isWifiConnect() -{ - BackThread *loop_bt = new BackThread(); - IFace *loop_iface = loop_bt->execGetIface(); - - if (is_stop_check_net_state == 0){ - if (loop_iface->wstate == 1){ - syslog(LOG_DEBUG, "Wi-Fi is disconnected"); - qDebug()<<"连接状态：Wifi 网络连接已经断开"; - if(this->is_btnNetList_clicked == 1) { - this->ksnm->execGetLanList(); - } - if(this->is_btnWifiList_clicked== 1) { - this->ksnm->execGetWifiList(); - } - this->is_by_click_connect = 0; - checkIfWifiConnect->stop(); - - if (loop_iface->lstate != 0){ - syslog(LOG_DEBUG, "Will check if LAN or Wi-Fi connected again circularly"); - qDebug()<<"连接状态：即将循环检测是否重新开启 Lan或Wifi"; - //changeTimerState(); - //checkIfNetworkOn->start(8000); - } - } else if (loop_iface->wstate != 2){ - count_loop = 1; - if (count_loop==1 && this->is_btnWifiList_clicked == 1){ - if (this->isVisible() ){ - is_update_wifi_list = 1; - this->ksnm->execGetWifiList(); //更新wifi列表 - } - } - if (count_loop >= 2){ count_loop = 1;} - } - } - - delete loop_iface; - delete loop_bt; -} diff --git a/src/mainwindow.h b/src/mainwindow.h index 43107f40..438d757c 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -25,7 +25,6 @@ #include "kylin-dbus-interface.h" #include "kylin-network-interface.h" #include "utils.h" -#include "notifysend.h" #include #include @@ -130,11 +129,8 @@ public: void getActiveInfo(); void initTimer(); - void changeTimerState(); void checkIsWirelessDeviceOn(); - void init_widget_action(QWidget *wid, QString iconstr, QString textstr); - QIcon iconLanOnline, iconLanOffline; QIcon iconWifiFull, iconWifiHigh, iconWifiMedium, iconWifiLow; QIcon iconConnecting; @@ -142,7 +138,6 @@ public: QString mwBandWidth; KylinDBus *objKyDBus = nullptr; NetworkSpeed *objNetSpeed = nullptr; - NotifySend *m_notify = nullptr; //状态设置,0为假，1为真 int is_update_wifi_list = 0; //是否是update wifi列表，而不是load wifi列表 @@ -292,9 +287,6 @@ private slots: void on_checkWifiListChanged(); void on_setNetSpeed(); void on_checkOverTime(); - void on_isLanConnect(); - void on_isWifiConnect(); - void on_isNetOn(); // 后台回调 void enNetDone(); diff --git a/src/notifysend.cpp b/src/notifysend.cpp deleted file mode 100644 index 3066f660..00000000 --- a/src/notifysend.cpp +++ /dev/null @@ -1,54 +0,0 @@ -#include "notifysend.h" -#include "ui_notifysend.h" - -NotifySend::NotifySend(QWidget *parent) : - QWidget(parent), - ui(new Ui::NotifySend) -{ - ui->setupUi(this); - - this->setWindowFlags(Qt::FramelessWindowHint | Qt::Popup); - this->setAttribute(Qt::WA_TranslucentBackground); - - QPainterPath path; - auto rect = this->rect(); - rect.adjust(1, 1, -1, -1); - path.addRoundedRect(rect, 4, 4); - setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon())); - - this->setStyleSheet("QWidget{border:none;border-radius:4px;}"); - ui->backwidget->setStyleSheet("QWidget{border:1px solid rgba(255, 255, 255, 0.05);border-radius:4px;background:rgba(19,19,20,0.7);}"); - ui->lbColor->setStyleSheet("QLabel{border:none;background:rgba(61,107,229,1);}"); - ui->leText->setStyleSheet("QLineEdit{border:none;background:transparent;font-size:14px;color:white;font-size:14px;}"); - ui->btnClose->setStyleSheet("QPushButton{background-image:url(:/res/g/close_white.png);background-color:transparent;border:none;}"); - ui->btnClose->setFocusPolicy(Qt::NoFocus); - - QRect availableGeometry = qApp->primaryScreen()->availableGeometry(); - int d = 10; //窗口上边沿到屏幕边沿距离 - int s = 10; //窗口右边沿到屏幕边沿距离 - - this->move(availableGeometry.x() + availableGeometry.width() - this->width() - s, availableGeometry.y() + d); -} - -NotifySend::~NotifySend() -{ - delete ui; -} - -void NotifySend::execNotifySend(QString text) -{ - ui->leText->setText(text); - this->show(); - - QTimer::singleShot(4000, this, SLOT(closeNotifyDialog() )); -} - -void NotifySend::closeNotifyDialog(){ - ui->leText->setText(""); - this->hide(); -} - -void NotifySend::on_btnClose_clicked() -{ - this->hide(); -} diff --git a/src/notifysend.h b/src/notifysend.h deleted file mode 100644 index 8a103135..00000000 --- a/src/notifysend.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef NOTIFYSEND_H -#define NOTIFYSEND_H - -#include -#include -#include - -namespace Ui { -class NotifySend; -} - -class NotifySend : public QWidget -{ - Q_OBJECT - -public: - explicit NotifySend(QWidget *parent = nullptr); - ~NotifySend(); - - void execNotifySend(QString text); - -private: - Ui::NotifySend *ui; - -private slots: - void closeNotifyDialog(); - - void on_btnClose_clicked(); - -signals: - void timeout(); -}; - -#endif // NOTIFYSEND_H diff --git a/src/notifysend.ui b/src/notifysend.ui deleted file mode 100644 index 4c23ef41..00000000 --- a/src/notifysend.ui +++ /dev/null @@ -1,69 +0,0 @@ - - - NotifySend - - - - 0 - 0 - 400 - 70 - - - - Form - - - - - 0 - 0 - 60 - 70 - - - - - - - - - - 360 - 20 - 30 - 30 - - - - - - - - - - 80 - 20 - 260 - 27 - - - - - - - 0 - 0 - 400 - 70 - - - - backwidget - lbColor - btnClose - leText - - - - diff --git a/src/oneconnform.cpp b/src/oneconnform.cpp index 6364d681..ea30d73f 100644 --- a/src/oneconnform.cpp +++ b/src/oneconnform.cpp @@ -144,11 +144,11 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf OneConnForm::~OneConnForm() { - m_notify->deleteLater(); delete ui; } -void OneConnForm::mousePressEvent(QMouseEvent *){ +void OneConnForm::mousePressEvent(QMouseEvent *) +{ emit selectedOneWifiForm(wifiName, H_WIFI_ITEM_BIG_EXTEND); } @@ -197,11 +197,12 @@ bool OneConnForm::eventFilter(QObject *obj, QEvent *event) } // 是否当前连接的网络，字体设置不同 -void OneConnForm::setAct(bool isAct){ - if(isAct){ +void OneConnForm::setAct(bool isAct) +{ + if (isAct) { ui->lbName->setStyleSheet("QLabel{font-size:14px;color:#ffffff;}"); ui->lbConned->show(); - }else{ + } else { ui->lbName->setStyleSheet("QLabel{font-size:14px;color:#ffffff;}"); ui->lbConned->hide(); } @@ -210,7 +211,7 @@ void OneConnForm::setAct(bool isAct){ void OneConnForm::setLePassword() { - if(ui->lePassword->text() == "Input Password..." || ui->lePassword->text() == "输入密码..."){ + if (ui->lePassword->text() == "Input Password..." || ui->lePassword->text() == "输入密码...") { ui->lePassword->setText(tr("")); ui->lePassword->setEchoMode(QLineEdit::Password); ui->checkBoxPwd->setChecked(false); @@ -218,8 +219,9 @@ void OneConnForm::setLePassword() } //点击窗口最上面的item时 -void OneConnForm::setTopItem(bool isSelected){ - if(isSelected){ +void OneConnForm::setTopItem(bool isSelected) +{ + if (isSelected) { resize(W_ITEM, H_ITEM_BIG); ui->wbg_3->show(); ui->leInfo_1->show(); @@ -227,7 +229,7 @@ void OneConnForm::setTopItem(bool isSelected){ ui->leInfo_3->show(); this->isSelected = true; - }else{ + } else { resize(W_ITEM, H_ITEM); ui->lePassword->setText(""); ui->wbg_3->hide(); @@ -250,21 +252,22 @@ void OneConnForm::setTopItem(bool isSelected){ ui->btnHideConn->hide(); ui->btnInfo->show(); - if (isConnected){ - if (this->isWaiting){ + if (isConnected) { + if (this->isWaiting) { ui->btnDisConn->hide(); - }else{ + } else { ui->btnDisConn->show(); } - }else{ + } else { ui->btnDisConn->hide(); } this->isTopItem = true; } // 点击窗口下面的item时 -void OneConnForm::setSelected(bool isSelected, bool isCurrName){ - if(isSelected){ +void OneConnForm::setSelected(bool isSelected, bool isCurrName) +{ + if (isSelected) { resize(W_ITEM, H_ITEM_BIG); ui->line->move(X_LINE_BIG_EXTEND, Y_LINE_BIG_EXTEND); ui->wbg->hide(); @@ -277,7 +280,7 @@ void OneConnForm::setSelected(bool isSelected, bool isCurrName){ ui->btnConnSub->show(); this->isSelected = true; - }else{ + } else { resize(W_ITEM, H_ITEM); ui->lePassword->setText(tr("Input Password..."));//"输入密码..." ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);border-radius:4px;" @@ -293,9 +296,9 @@ void OneConnForm::setSelected(bool isSelected, bool isCurrName){ ui->leInfo_2->hide(); ui->leInfo_3->hide(); - if (isCurrName){ + if (isCurrName) { ui->btnConn->show(); - }else{ + } else { ui->btnConn->hide(); } ui->btnConnSub->hide(); @@ -314,8 +317,9 @@ void OneConnForm::setSelected(bool isSelected, bool isCurrName){ this->isTopItem = false; } // 点击连接隐藏wifi的item时 -void OneConnForm::setHideItem(bool isHideItem, bool isShowHideBtn){ - if (isHideItem){ +void OneConnForm::setHideItem(bool isHideItem, bool isShowHideBtn) +{ + if (isHideItem) { ui->lbName->move(14, 20); ui->wbg->hide(); ui->btnConn->hide(); @@ -325,24 +329,26 @@ void OneConnForm::setHideItem(bool isHideItem, bool isShowHideBtn){ ui->btnConn->show(); } - if (isShowHideBtn){ + if (isShowHideBtn) { ui->btnHideConn->show(); } else{ ui->btnHideConn->hide(); } } -void OneConnForm::setConnedString(bool showLable, QString str, QString str1){ - if (!showLable){ +void OneConnForm::setConnedString(bool showLable, QString str, QString str1) +{ + if (!showLable) { ui->lbConned->setText(str1); ui->lbConned->hide(); ui->lbName->move(63, 18); - }else{ + } else { ui->lbConned->setText(str); } } -void OneConnForm::setName(QString name){ +void OneConnForm::setName(QString name) +{ ui->lbName->setText(name); wifiName = name; } @@ -357,7 +363,8 @@ QString OneConnForm::getName() return ui->lbName->text(); } -void OneConnForm::setRate(QString rate){ +void OneConnForm::setRate(QString rate) +{ QString txt(tr("Rate"));//"速率" this->setToolTip("  " + txt + ": " + rate + "  "); this->setToolTip(txt + ":" + rate); @@ -365,57 +372,58 @@ void OneConnForm::setRate(QString rate){ void OneConnForm::setLine(bool isShow) { - if(isShow){ + if (isShow) { ui->line->show(); - }else{ + } else { ui->line->hide(); } } -void OneConnForm::setSignal(QString lv, QString secu){ +void OneConnForm::setSignal(QString lv, QString secu) +{ int signal = lv.toInt(); - if (secu == "--" || secu == ""){ + if (secu == "--" || secu == "") { hasPwd = false; - }else{ + } else { hasPwd = true; } - if(signal > 75){ - if(hasPwd){ + if (signal > 75) { + if (hasPwd) { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-full-pwd.png);}"); - }else{ + } else { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-full.png);}"); } signalLv = 1; } - if(signal > 55 && signal <= 75){ - if(hasPwd){ + if (signal > 55 && signal <= 75) { + if (hasPwd) { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-high-pwd.png);}"); - }else{ + } else { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-high.png);}"); } signalLv = 2; } - if(signal > 35 && signal <= 55){ - if(hasPwd){ + if (signal > 35 && signal <= 55) { + if (hasPwd) { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-medium-pwd.png);}"); - }else{ + } else { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-medium.png);}"); } signalLv = 3; } - if(signal > 15 && signal <= 35){ - if(hasPwd){ + if (signal > 15 && signal <= 35) { + if (hasPwd) { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-low-pwd.png);}"); - }else{ + } else { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-low.png);}"); } signalLv = 4; } - if(signal <= 15){ - if(hasPwd){ + if (signal <= 15) { + if (hasPwd) { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-none-pwd.png);}"); - }else{ + } else { ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-none.png);}"); } signalLv = 4; @@ -437,12 +445,13 @@ void OneConnForm::setWifiInfo(QString str1, QString str2, QString str3) void OneConnForm::slotConnWifi() { -// mw->startLoading(); + //mw->startLoading(); this->startWaiting(true); emit sigConnWifi(ui->lbName->text()); } -void OneConnForm::slotConnWifiPWD(){ -// mw->startLoading(); +void OneConnForm::slotConnWifiPWD() +{ + //mw->startLoading(); this->startWaiting(true); emit sigConnWifiPWD(ui->lbName->text(), ui->lePassword->text()); } @@ -640,19 +649,19 @@ void OneConnForm::on_btnInfo_clicked() QStringList propList = connProp.split("|"); QString v4method, addr, mask, gateway, dns; foreach (QString line, propList) { - if(line.startsWith("method:")){ + if (line.startsWith("method:")) { v4method = line.split(":").at(1); } - if(line.startsWith("addr:")){ + if (line.startsWith("addr:")) { addr = line.split(":").at(1); } - if(line.startsWith("mask:")){ + if (line.startsWith("mask:")) { mask = line.split(":").at(1); } - if(line.startsWith("gateway:")){ + if (line.startsWith("gateway:")) { gateway= line.split(":").at(1); } - if(line.startsWith("dns:")){ + if (line.startsWith("dns:")) { dns = line.split(":").at(1); } } @@ -666,10 +675,11 @@ void OneConnForm::on_btnInfo_clicked() } // Wifi连接结果，0成功 1失败 2没有配置文件 -void OneConnForm::slotConnWifiResult(int connFlag){ +void OneConnForm::slotConnWifiResult(int connFlag) +{ qDebug()<<"Function slotConnWifiResult receives a number: "<currSelNetName = ""; emit selectedOneWifiForm(ui->lbName->text(), H_WIFI_ITEM_SMALL_EXTEND); @@ -693,12 +703,11 @@ void OneConnForm::slotConnWifiResult(int connFlag){ this->isSelected = true; } - if(connFlag == 1){ + if (connFlag == 1) { // 使用配置文件连接失败，需要删除该配置文件 QString txt(tr("Conn Wifi Failed"));//"连接 Wifi 失败" syslog(LOG_DEBUG, "Try to connect wifi named %s, but failed, will delete it's configuration file", ui->lbName->text().toUtf8().data()); - //m_notify->execNotifySend(txt); KylinDBus kylindbus; kylindbus.showDesktopNotify(txt); //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection delete '" + ui->lbName->text() + "';notify-send '" + txt + "...' -t 3800"; @@ -713,12 +722,13 @@ void OneConnForm::slotConnWifiResult(int connFlag){ currentActWifiSignalLv = signalLv; this->stopWaiting(); -// if (connFlag != 0){ -// mw->stopLoading(); -// } + //if (connFlag != 0){ + // mw->stopLoading(); + //} } -void OneConnForm::waitAnimStep(){ +void OneConnForm::waitAnimStep() +{ QString qpmQss = "QLabel{background-image:url(':/res/s/conning-a/"; qpmQss.append(QString::number(this->waitPage)); qpmQss.append(".png');}"); @@ -726,20 +736,21 @@ void OneConnForm::waitAnimStep(){ this->waitPage --; - if(this->waitPage < 1){ + if (this->waitPage < 1) { this->waitPage = TOTAL_PAGE; } this->countCurrentTime += FRAME_SPEED; - if (this->countCurrentTime >= LIMIT_TIME){ + if (this->countCurrentTime >= LIMIT_TIME) { this->stopWaiting(); } } -void OneConnForm::startWaiting(bool isConn){ +void OneConnForm::startWaiting(bool isConn) +{ this->isWaiting = true; - if (isConn){ + if (isConn) { ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);}"); - }else{ + } else { ui->btnDisConn->hide(); ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);}"); } @@ -752,7 +763,8 @@ void OneConnForm::startWaiting(bool isConn){ mw->setTrayLoading(true); } -void OneConnForm::stopWaiting(){ +void OneConnForm::stopWaiting() +{ this->isWaiting = false; this->waitTimer->stop(); ui->lbWaiting->hide(); diff --git a/src/oneconnform.h b/src/oneconnform.h index a247a810..c9a2021c 100644 --- a/src/oneconnform.h +++ b/src/oneconnform.h @@ -30,7 +30,6 @@ #include "confform.h" #include "backthread.h" #include "ksimplenm.h" -#include "notifysend.h" #define FRAME_SPEED 150 #define LIMIT_TIME 20*1000 @@ -82,7 +81,6 @@ public: bool isWifiConfExist(QString netName); - NotifySend *m_notify = nullptr; QString wifiName; bool isSelected; bool isActive; diff --git a/src/onelancform.cpp b/src/onelancform.cpp index 22be9925..790988e7 100644 --- a/src/onelancform.cpp +++ b/src/onelancform.cpp @@ -99,7 +99,8 @@ OneLancForm::~OneLancForm() delete ui; } -void OneLancForm::mousePressEvent(QMouseEvent *){ +void OneLancForm::mousePressEvent(QMouseEvent *) +{ //emit selectedOneLanForm(lanName); emit selectedOneLanForm(lanName, uniqueName);//避免重名情况 } @@ -107,31 +108,31 @@ void OneLancForm::mousePressEvent(QMouseEvent *){ //事件过滤器 bool OneLancForm::eventFilter(QObject *obj, QEvent *event) { - if (obj == ui->btnInfo){ + if (obj == ui->btnInfo) { if(event->type() == QEvent::HoverEnter) { ui->leInfo_1->setStyleSheet(leQssHigh); ui->leInfo_2->setStyleSheet(leQssHigh); ui->leInfo_3->setStyleSheet(leQssHigh); ui->leInfo_4->setStyleSheet(leQssHigh); return true; - } else if(event->type() == QEvent::HoverLeave){ + } else if(event->type() == QEvent::HoverLeave) { ui->leInfo_1->setStyleSheet(leQssLow); ui->leInfo_2->setStyleSheet(leQssLow); ui->leInfo_3->setStyleSheet(leQssLow); ui->leInfo_4->setStyleSheet(leQssLow); return true; } - }else if (obj == this){ - if(event->type() == QEvent::HoverEnter) { - if (!this->isTopItem){ - if (!this->isSelected){ + } else if (obj == this) { + if (event->type() == QEvent::HoverEnter) { + if (!this->isTopItem) { + if (!this->isSelected) { ui->btnConn->show(); ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(255,255,255,0.1);}"); ui->wbg_2->show(); } } return true; - } else if(event->type() == QEvent::HoverLeave){ + } else if(event->type() == QEvent::HoverLeave) { ui->btnConn->hide(); ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(255,255,255,0);}"); ui->wbg_2->hide(); @@ -143,12 +144,13 @@ bool OneLancForm::eventFilter(QObject *obj, QEvent *event) } // 是否当前连接的网络，字体设置不同 -void OneLancForm::setAct(bool isAct){ - if(isAct){ +void OneLancForm::setAct(bool isAct) +{ + if (isAct) { ui->lbName->setStyleSheet("QLabel{font-size:14px;color:#ffffff;}"); ui->lbConned->show(); ui->btnConnSub->hide(); - }else{ + } else { ui->lbName->setStyleSheet("QLabel{font-size:14px;color:#ffffff;}"); ui->lbConned->hide(); ui->btnConnSub->hide(); @@ -159,7 +161,7 @@ void OneLancForm::setAct(bool isAct){ // 是否选中 void OneLancForm::setSelected(bool isSelected, bool isCurrName) { - if(isSelected){ + if (isSelected) { resize(W_ITEM, H_ITEM_EXTEND); ui->wbg->show(); ui->wbg_2->hide(); @@ -168,7 +170,7 @@ void OneLancForm::setSelected(bool isSelected, bool isCurrName) ui->btnConnSub->show(); this->isSelected = true; - }else{ + } else { resize(W_ITEM, H_ITEM); ui->wbg->hide(); ui->wbg_2->show(); @@ -190,18 +192,18 @@ void OneLancForm::setSelected(bool isSelected, bool isCurrName) void OneLancForm::setTopItem(bool isSelected) { - if(isSelected){ + if (isSelected) { resize(W_ITEM, H_ITEM_EXTEND); ui->wbg->show(); ui->btnConnSub->hide(); this->isSelected = true; - }else{ + } else { resize(W_ITEM, H_ITEM); ui->wbg->hide(); ui->btnConnSub->hide(); this->isSelected = false; } - if (isConnected){ + if (isConnected) { ui->btnDisConn->show(); } else { ui->btnDisConn->hide(); @@ -214,28 +216,30 @@ void OneLancForm::setTopItem(bool isSelected) this->isTopItem = true; } -void OneLancForm::setName(QString name, QString uniName){ +void OneLancForm::setName(QString name, QString uniName) +{ ui->lbName->setText(name); lanName = name; uniqueName = uniName; } -void OneLancForm::setConnedString(bool showLable, QString str){ - if (!showLable){ +void OneLancForm::setConnedString(bool showLable, QString str) +{ + if (!showLable) { ui->lbConned->hide(); ui->lbName->move(63, 18); - }else{ + } else { ui->lbConned->setText(str); } } void OneLancForm::setLanInfo(QString str1, QString str2, QString str3, QString str4) { - if (str1 == "" || str1 == "auto"){ + if (str1 == "" || str1 == "auto") { str1 = tr("No Configuration"); } - if (str2 == "" || str2 == "auto"){ + if (str2 == "" || str2 == "auto") { str2 = tr("No Configuration"); } @@ -250,24 +254,26 @@ void OneLancForm::setLanInfo(QString str1, QString str2, QString str3, QString s ui->leInfo_4->setText(strMAC + str4); } -void OneLancForm::setIcon(bool isOn){ - if(isOn){ +void OneLancForm::setIcon(bool isOn) +{ + if (isOn) { ui->lbIcon->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/l/network-online.png);}"); - }else{ + } else { ui->lbIcon->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/l/network-offline.png);}"); } } void OneLancForm::setLine(bool isShow) { - if(isShow){ + if (isShow) { ui->line->show(); - }else{ + } else { ui->line->hide(); } } -void OneLancForm::slotConnLan(){ +void OneLancForm::slotConnLan() +{ //mw->startLoading(); this->startWaiting(true); emit sigConnLan(ui->lbName->text()); @@ -341,19 +347,19 @@ void OneLancForm::on_btnInfo_clicked() QStringList propList = connProp.split("|"); QString v4method, addr, mask, gateway, dns; foreach (QString line, propList) { - if(line.startsWith("method:")){ + if (line.startsWith("method:")) { v4method = line.split(":").at(1); } - if(line.startsWith("addr:")){ + if (line.startsWith("addr:")) { addr = line.split(":").at(1); } - if(line.startsWith("mask:")){ + if (line.startsWith("mask:")) { mask = line.split(":").at(1); } - if(line.startsWith("gateway:")){ + if (line.startsWith("gateway:")) { gateway= line.split(":").at(1); } - if(line.startsWith("dns:")){ + if (line.startsWith("dns:")) { dns = line.split(":").at(1); } } @@ -367,7 +373,8 @@ void OneLancForm::on_btnInfo_clicked() cf->raise(); } -void OneLancForm::waitAnimStep(){ +void OneLancForm::waitAnimStep() +{ QString qpmQss = "QLabel{background-image:url(':/res/s/conning-a/"; qpmQss.append(QString::number(this->waitPage)); qpmQss.append(".png');}"); @@ -375,20 +382,21 @@ void OneLancForm::waitAnimStep(){ this->waitPage --; - if(this->waitPage < 1){ + if (this->waitPage < 1) { this->waitPage = TOTAL_PAGE; } this->countCurrentTime += FRAME_SPEED; - if (this->countCurrentTime >= LIMIT_TIME){ + if (this->countCurrentTime >= LIMIT_TIME) { this->stopWaiting(); } } -void OneLancForm::startWaiting(bool isConn){ - if (isConn){ +void OneLancForm::startWaiting(bool isConn) +{ + if (isConn) { ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);}"); - }else{ + } else { ui->btnDisConn->hide(); ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);}"); } @@ -401,7 +409,8 @@ void OneLancForm::startWaiting(bool isConn){ mw->setTrayLoading(true); } -void OneLancForm::stopWaiting(){ +void OneLancForm::stopWaiting() +{ this->waitTimer->stop(); ui->lbWaiting->hide(); ui->lbWaitingIcon->hide(); diff --git a/src/utils.cpp b/src/utils.cpp index c5eceac2..e0da8b7c 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -33,7 +33,7 @@ int Utils::m_system(char *cmd) int status = 0; pid_t pid; - if ((pid = vfork()) <0){ + if ((pid = vfork()) <0) { qDebug()<<"failed to create a subprocess by using vfork"; syslog(LOG_ERR, "failed to create a subprocess by using vfork"); status = -1; @@ -84,36 +84,36 @@ int NetworkSpeed::getCurrentDownloadRates(char *netname, long *save_rate, long * //int i = 0; char tmp_value[128]; - if((NULL == netname)||(NULL == save_rate)||(NULL == tx_rate)){ + if((NULL == netname)||(NULL == save_rate)||(NULL == tx_rate)) { qDebug()<<"parameter pass to function getCurrentDownloadRates() error"; syslog(LOG_ERR, "parameter pass to function getCurrentDownloadRates() error"); return -1; } - if ( (net_dev_file=fopen("/proc/net/dev", "r")) == NULL ){ //打开文件/pro/net/dev/，从中读取流量数据 + if ( (net_dev_file=fopen("/proc/net/dev", "r")) == NULL ) { //打开文件/pro/net/dev/，从中读取流量数据 qDebug()<<"error occurred when try to open file /proc/net/dev/"; syslog(LOG_ERR, "error occurred when try to open file /proc/net/dev/"); return -1; } memset(buffer,0,sizeof(buffer)); - while(fgets(buffer,sizeof(buffer),net_dev_file) != NULL){ + while (fgets(buffer,sizeof(buffer),net_dev_file) != NULL) { match = strstr(buffer,netname); - if(NULL == match){ + if (NULL == match) { // qDebug()<<"No eth0 keyword to find!"; continue; - }else{ + } else { match = match + strlen(netname) + strlen(":"); //地址偏移到冒号 sscanf(match,"%ld ",save_rate); memset(tmp_value,0,sizeof(tmp_value)); sscanf(match,"%s ",tmp_value); match = match + strlen(tmp_value); - for(size_t i=0;iinherits("QTipLabel")){ -// widget->setAttribute(Qt::WA_TranslucentBackground); - -// QPainterPath path; -// auto rect = widget->rect(); -// rect.adjust(0, 0, -0, -0); -// path.addRoundedRect(rect, 3, 3); - -// widget->setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon())); -// } -// } - return QProxyStyle::polish(widget); }