From d716d019949920c7a2a5492cdcdf43cbaf3e548f Mon Sep 17 00:00:00 2001 From: zhangjiaping Date: Mon, 25 Jan 2021 20:40:16 +0800 Subject: [PATCH] fix(confform): Ipv6 address can not be edit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description: 修复ipv6地址设置项缺失的问题 Log: 修复ipv6地址设置项缺失的问题 Bug: http://172.17.66.192/biz/bug-view-19885.html --- src/confform.cpp | 34 +++++++++++++++++ src/confform.h | 3 ++ src/confform.ui | 68 ++++++++++++++++++++++++--------- translations/kylin-nm_zh_CN.qm | Bin 22082 -> 22153 bytes translations/kylin-nm_zh_CN.ts | 7 +++- 5 files changed, 94 insertions(+), 18 deletions(-) diff --git a/src/confform.cpp b/src/confform.cpp index 88bcdedb..a63da4f8 100644 --- a/src/confform.cpp +++ b/src/confform.cpp @@ -87,6 +87,7 @@ ConfForm::ConfForm(QWidget *parent) : ui->lbTxt4->setText(tr("Gateway: "));//"默认网关：" ui->lbTxt5->setText(tr("DNS 1: "));//"首选DNS：" ui->lbTxt6->setText(tr("DNS 2: "));//"备选DNS：" + ui->lbTxt_ipv6->setText(tr("Ipv6 Address: ")); ui->lbLeftupTitle->setText(tr("Edit Conn"));//"网络设置" ui->cbType->addItem(tr("Auto(DHCP)"));//"自动(DHCP)" @@ -110,10 +111,12 @@ ConfForm::ConfForm(QWidget *parent) : // IP的正则格式限制 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"); + QRegExp ipv6_rx("^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*$"); ui->leAddr->setValidator(new QRegExpValidator(rx, this)); ui->leGateway->setValidator(new QRegExpValidator(rx, this)); ui->leDns->setValidator(new QRegExpValidator(rx, this)); ui->leDns2->setValidator(new QRegExpValidator(rx, this)); + ui->leAddr_ipv6->setValidator(new QRegExpValidator(ipv6_rx, this)); KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon())); } @@ -234,6 +237,11 @@ void ConfForm::on_btnCreate_clicked() kylindbus.showDesktopNotify(txt); } + if (!ui->leAddr_ipv6->text().isEmpty()) { + QString cmdStr = "nmcli connection modify " + ui->leName->text() + " ipv6.addresses " + ui->leAddr_ipv6->text(); + Utils::m_system(cmdStr.toUtf8().data()); + } + this->hide(); } @@ -307,6 +315,11 @@ void ConfForm::on_btnSave_clicked() this->saveNetworkConfiguration(); } + if (!ui->leAddr_ipv6->text().isEmpty()) { + QString cmdStr = "nmcli connection modify " + ui->leName->text() + " ipv6.addresses " + ui->leAddr_ipv6->text(); + Utils::m_system(cmdStr.toUtf8().data()); + } + QString txt(tr("New network settings already finished")); kylindbus.showDesktopNotify(txt); } @@ -480,6 +493,12 @@ void ConfForm::on_leAddr_textEdited(const QString &arg1) this->setEnableOfBtn(); } +//编辑ipv6地址 +void ConfForm::on_leAddr_ipv6_textChanged(const QString &arg1) +{ + this->setEnableOfBtn(); +} + //编辑网络网关 void ConfForm::on_leGateway_textEdited(const QString &arg1) { @@ -521,6 +540,11 @@ void ConfForm::setEnableOfBtn() this->setBtnEnableFalse(); return; } + + if (!ui->leAddr_ipv6->text().isEmpty() && ! this->getIpv6EditState(ui->leAddr_ipv6->text())) { + this->setBtnEnableFalse(); + return; + } } ui->btnSave->setEnabled(true); @@ -538,6 +562,16 @@ bool ConfForm::getTextEditState(QString text) return match; } +bool ConfForm::getIpv6EditState(QString text) +{ + QRegExp rx("^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*$"); + + bool match = false; + match = rx.exactMatch(text); + + return match; +} + //设置创建或保存按钮不可点击 void ConfForm::setBtnEnableFalse() { diff --git a/src/confform.h b/src/confform.h index 292cdef9..436cc48f 100644 --- a/src/confform.h +++ b/src/confform.h @@ -67,9 +67,12 @@ private slots: void setEnableOfBtn(); bool getTextEditState(QString text); + bool getIpv6EditState(QString text); void setBtnEnableFalse(); void saveNetworkConfiguration(); + void on_leAddr_ipv6_textChanged(const QString &arg1); + private: Ui::ConfForm *ui; diff --git a/src/confform.ui b/src/confform.ui index cf838c3c..b4526a40 100644 --- a/src/confform.ui +++ b/src/confform.ui @@ -29,16 +29,16 @@ 1 - 180 + 169 430 - 260 + 271 175 - 15 + 10 182 32 @@ -53,7 +53,7 @@ 175 - 60 + 95 182 32 @@ -68,7 +68,7 @@ 175 - 105 + 140 182 32 @@ -83,7 +83,7 @@ 175 - 150 + 185 182 32 @@ -98,7 +98,7 @@ 76 - 20 + 15 80 20 @@ -117,7 +117,7 @@ 76 - 65 + 100 80 20 @@ -136,7 +136,7 @@ 76 - 110 + 145 80 20 @@ -155,7 +155,7 @@ 76 - 155 + 190 80 20 @@ -174,7 +174,7 @@ 175 - 195 + 230 182 32 @@ -189,7 +189,7 @@ 76 - 200 + 235 80 20 @@ -204,6 +204,40 @@ + + + + 76 + 57 + 91 + 20 + + + + + Noto Sans CJK SC + 11 + + + + + + + + + + 175 + 52 + 182 + 32 + + + + + 10 + + + @@ -296,7 +330,7 @@ 315 - 15 + 20 90 30 @@ -314,7 +348,7 @@ 215 - 15 + 20 90 30 @@ -332,7 +366,7 @@ 315 - 15 + 20 90 30 @@ -359,7 +393,7 @@ 10 - 175 + 170 412 1 @@ -372,7 +406,7 @@ 10 - 430 + 440 412 1 diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm index 3505f5069787535116747100ccd856c7588ef560..ba45c83eb331f5039e2c75feab046c8f3c133d72 100644 GIT binary patch delta 2532 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 diff --git a/translations/kylin-nm_zh_CN.ts b/translations/kylin-nm_zh_CN.ts index 5bd15398..e2e3cc1a 100644 --- a/translations/kylin-nm_zh_CN.ts +++ b/translations/kylin-nm_zh_CN.ts @@ -25,10 +25,15 @@ Method: 编辑IP设置: + + + Ipv6 Address: + IPV6地址: + Address: - IP地址: + IPV4地址: