From 4c8504df858a9fea1cc0fb1307846560ea3083e5 Mon Sep 17 00:00:00 2001
From: Jinxujie <jinxujie@kylinos.cn>
Date: Mon, 20 Dec 2021 09:24:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Bug#97419=20=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9ip=E5=9B=9E=E8=BD=A6pushbutton=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E9=BB=91=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/netdetails/netdetail.cpp | 20 ++++++++++++++++----
 src/frontend/netdetails/netdetail.h   |  2 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp
index 9f50a64f..18da89c2 100644
--- a/src/frontend/netdetails/netdetail.cpp
+++ b/src/frontend/netdetails/netdetail.cpp
@@ -45,6 +45,18 @@ void NetDetail::showDesktopNotify(const QString &message)
     iface.callWithArgumentList(QDBus::AutoDetect,"Notify",args);
 }
 
+void NetDetail::setNetdetailSomeEnable(bool on)
+{
+        detailPage->setEnabled(on);
+        ipv4Page->setEnabled(on);
+        ipv6Page->setEnabled(on);
+        securityPage->setEnabled(on);
+        createNetPage->setEnabled(on);
+        cancelBtn->setEnabled(on);
+        forgetBtn->setEnabled(on);
+        confimBtn->setEnabled(on);
+}
+
 NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActive, bool isWlan, bool isCreateNet, QWidget *parent)
     :m_deviceName(interface),
      m_name(name),
@@ -593,20 +605,20 @@ void NetDetail::initTtlsInfo(ConInfo &conInfo)
 void NetDetail::on_btnConfirm_clicked()
 {
     qDebug() << "on_btnConfirm_clicked";
-    setEnabled(false);
+    setNetdetailSomeEnable(false);
     if (m_isCreateNet) {
         if (!isWlan) {
             //新建有线连接
             qDebug() << "Confirm create wired connect";
             if (!createWiredConnect()) {
-                setEnabled(true);
+                setNetdetailSomeEnable(true);
                 return;
             }
         } else {
             //新建无线连接
             qDebug() << "Confirm create wireless connect";
             if (!createWirelessConnect()) {
-                setEnabled(true);
+                setNetdetailSomeEnable(true);
                 return;
             }
         }
@@ -614,7 +626,7 @@ void NetDetail::on_btnConfirm_clicked()
         //更新连接
         qDebug() << "Confirm update connect";
         if (!updateConnect()) {
-            setEnabled(true);
+            setNetdetailSomeEnable(true);
             return;
         }
     }
diff --git a/src/frontend/netdetails/netdetail.h b/src/frontend/netdetails/netdetail.h
index 710e5ed3..8942341a 100644
--- a/src/frontend/netdetails/netdetail.h
+++ b/src/frontend/netdetails/netdetail.h
@@ -77,6 +77,8 @@ private:
 
     void showDesktopNotify(const QString &message);
 
+    void setNetdetailSomeEnable(bool on);
+
     QPalette lightPalette() const;
 private:
     KyNetworkDeviceResourse *m_netDeviceResource = nullptr;

From e4da02822610e5216eae1a95b41f6077579b290d Mon Sep 17 00:00:00 2001
From: Jinxujie <jinxujie@kylinos.cn>
Date: Mon, 20 Dec 2021 14:36:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Bug#97419=20=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9ip=E5=9B=9E=E8=BD=A6pushbutton=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E9=BB=91=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/netdetails/netdetail.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp
index 18da89c2..99f5fe37 100644
--- a/src/frontend/netdetails/netdetail.cpp
+++ b/src/frontend/netdetails/netdetail.cpp
@@ -47,14 +47,14 @@ void NetDetail::showDesktopNotify(const QString &message)
 
 void NetDetail::setNetdetailSomeEnable(bool on)
 {
-        detailPage->setEnabled(on);
-        ipv4Page->setEnabled(on);
-        ipv6Page->setEnabled(on);
-        securityPage->setEnabled(on);
-        createNetPage->setEnabled(on);
-        cancelBtn->setEnabled(on);
-        forgetBtn->setEnabled(on);
-        confimBtn->setEnabled(on);
+    detailPage->setEnabled(on);
+    ipv4Page->setEnabled(on);
+    ipv6Page->setEnabled(on);
+    securityPage->setEnabled(on);
+    createNetPage->setEnabled(on);
+    cancelBtn->setEnabled(on);
+    forgetBtn->setEnabled(on);
+    confimBtn->setEnabled(on);
 }
 
 NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActive, bool isWlan, bool isCreateNet, QWidget *parent)