openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #139 from myshowtogo/master 

有线网络名称可以支持空格
This commit is contained in:
chenlelin 2021-05-19 19:13:53 +08:00 committed by GitHub
parent 0eaed37d46 304f623917
commit 136352ad5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/confform.cpp
View File

@ -261,7 +261,7 @@ void ConfForm::on_btnCreate_clicked()
} }
} }
} }
QString name = ui->leName->text().trimmed(); QString name = ui->leName->text();
QString cmdStr; QString cmdStr;
if(ui->cbType->currentIndex() == 0){ if(ui->cbType->currentIndex() == 0){
cmdStr = "nmcli connection add con-name '" + name + "' ifname '" + mIfname + "' type ethernet"; cmdStr = "nmcli connection add con-name '" + name + "' ifname '" + mIfname + "' type ethernet";
@ -350,7 +350,7 @@ void ConfForm::on_btnSave_clicked()
} }
//如果网络的名称已经修改，则删掉当前网络，新建一个网络 //如果网络的名称已经修改，则删掉当前网络，新建一个网络
QString name = ui->leName->text().trimmed(); QString name = ui->leName->text();
if (name != lastConnName) { if (name != lastConnName) {
QString cmd = "nmcli connection delete '" + netUuid + "'"; QString cmd = "nmcli connection delete '" + netUuid + "'";
int status = system(cmd.toUtf8().data()); int status = system(cmd.toUtf8().data());
@ -428,7 +428,7 @@ void ConfForm::saveNetworkConfiguration()
mask = "24"; mask = "24";
} }
QString name = ui->leName->text().trimmed(); QString name = ui->leName->text();
QString dnss = ui->leDns->text(); QString dnss = ui->leDns->text();
if (ui->leDns2->text() != "") { if (ui->leDns2->text() != "") {
dnss.append(","); dnss.append(",");
@ -717,7 +717,7 @@ void ConfForm::setEnableOfBtn()
// this->setBtnEnableFalse(); // this->setBtnEnableFalse();
// return; // return;
// } // }
if (ui->leName->text().trimmed().size() == 0 ) { if (ui->leName->text().size() == 0 ) {
this->setBtnEnableFalse(); this->setBtnEnableFalse();
return; return;
} }