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

Fix bug two wired network be created after click create button

This commit is contained in:
chenlelin 2020-11-28 16:23:35 +08:00
parent e031158306
commit 6c9d383e7e
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/confform.cpp
View File

@ -243,7 +243,7 @@ void ConfForm::on_btnCreate_clicked()
if (ui->cbType->currentIndex() == 1) {
//config the ipv4 and netmask and gateway if select Manual
this->isCreateNewNet = true;
this->on_btnSave_clicked();
this->saveNetworkConfiguration();
} else {
QString txt(tr("New network already created"));
kylindbus.showDesktopNotify(txt);
@ -288,31 +288,7 @@ void ConfForm::on_btnSave_clicked()
}
}
QString mask = "";
if (ui->cbMask->currentIndex() == 0) {
mask = "24";
} else if(ui->cbMask->currentIndex() == 1) {
mask = "23";
} else if(ui->cbMask->currentIndex() == 2) {
mask = "22";
} else if(ui->cbMask->currentIndex() == 3) {
mask = "16";
} else if(ui->cbMask->currentIndex() == 4) {
mask = "8";
} else {
mask = "24";
}
if (ui->cbType->currentIndex() == 0) {
kylin_network_set_automethod(ui->leName->text().toUtf8().data());
} else {
QString dnss = ui->leDns->text();
if (ui->leDns2->text() != "") {
dnss.append(",");
dnss.append(ui->leDns2->text());
}
kylin_network_set_manualall(ui->leName->text().toUtf8().data(), ui->leAddr->text().toUtf8().data(), mask.toUtf8().data(), ui->leGateway->text().toUtf8().data(), dnss.toUtf8().data());
}
this->saveNetworkConfiguration();
//this->close();
this->hide();
@ -340,6 +316,35 @@ void ConfForm::on_btnSave_clicked()
this->isCreateNewNet = false;
}
void ConfForm::saveNetworkConfiguration()
{
QString mask = "";
if (ui->cbMask->currentIndex() == 0) {
mask = "24";
} else if(ui->cbMask->currentIndex() == 1) {
mask = "23";
} else if(ui->cbMask->currentIndex() == 2) {
mask = "22";
} else if(ui->cbMask->currentIndex() == 3) {
mask = "16";
} else if(ui->cbMask->currentIndex() == 4) {
mask = "8";
} else {
mask = "24";
}
if (ui->cbType->currentIndex() == 0) {
kylin_network_set_automethod(ui->leName->text().toUtf8().data());
} else {
QString dnss = ui->leDns->text();
if (ui->leDns2->text() != "") {
dnss.append(",");
dnss.append(ui->leDns2->text());
}
kylin_network_set_manualall(ui->leName->text().toUtf8().data(), ui->leAddr->text().toUtf8().data(), mask.toUtf8().data(), ui->leGateway->text().toUtf8().data(), dnss.toUtf8().data());
}
}
bool ConfForm::check_ip_conflict(QString ifname)
{
//即将检测Ip地址冲突

1
src/confform.h
View File

@ -68,6 +68,7 @@ private slots:
void setEnableOfBtn();
bool getTextEditState(QString text);
void setBtnEnableFalse();
void saveNetworkConfiguration();
private:
Ui::ConfForm *ui;