Merge branch '1027-cc' into 'dbus-interface'

update changelog && control

See merge request kylin-desktop/kylin-nm!370

debian/changelog

@@ -1,3 +1,27 @@
+kylin-nm (3.1.1-2021+1029.2) v101; urgency=medium
+
+  * BUG号：无
+  * 需求号：无
+  * 其他改动：增加libsecret-1 libgtk-3-dev依赖
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Fri, 29 Oct 2021 10:28:03 +0800
+
+kylin-nm (3.1.1-2021+1029.1) v101; urgency=medium
+
+  * BUG号：无
+  * 需求号：无
+  * 其他改动：增加libnma-dev依赖
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Fri, 29 Oct 2021 09:59:49 +0800
+
+kylin-nm (3.1.1-2021+1029) v101; urgency=medium
+
+  * BUG号：无
+  * 其他改动：全新基于3.1设计的重构版本
+  * 影响域：任务栏网络+控制面板网络插件全部功能 
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Fri, 29 Oct 2021 08:59:01 +0800
+
 kylin-nm (3.0.1-1kylin54) v101; urgency=medium
 
   * BUG号：#57502 #61141 #61356

debian/control

@@ -18,6 +18,9 @@ Build-Depends: debhelper (>=9),
                libkf5networkmanagerqt-dev (>= 5.36.0),
                libnm-dev,
                libcap-dev,
+	       libnma-dev,
+	       libsecret-1-dev,
+	       libgtk-3-dev,
 	       libukcc-dev,
 Standards-Version: 4.5.0
 Rules-Requires-Root: no

src/frontend/netdetails/detailpage.cpp

@@ -3,7 +3,7 @@
 #include <QListWidget>
 
 #define MAX_NAME_LENGTH 32
-#define MAX_LABEL_WIDTH 276
+#define MAX_LABEL_WIDTH 250
 extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
 
 DetailPage::DetailPage(bool isWlan, bool isCreate, QWidget *parent)
@@ -160,7 +160,9 @@ void DetailPage::initUI() {
     m_ipv4DnsWidget = new DetailWidget(qobject_cast<QWidget *>(mIPV4Dns), m_listWidget);
     m_ipv4DnsWidget->setKey(tr("IPV4 Dns:"));
 
-    mIPV6 = new QLabel(this);
+    mIPV6 = new FixLabel(this);
+    mIPV6->setFixedWidth(MAX_LABEL_WIDTH);
+    mIPV6->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
     m_ipv6Widget = new DetailWidget(qobject_cast<QWidget *>(mIPV6), m_listWidget);
     m_ipv6Widget->setKey(tr("IPV6:"));
 

src/frontend/netdetails/detailpage.h

@@ -61,7 +61,7 @@ public:
     QLabel *mBandWidth;
     QLabel *mIPV4;
     QLabel *mIPV4Dns;
-    QLabel *mIPV6;
+    FixLabel *mIPV6;
     QLabel *mMac;
     QLabel *autoConnect;
 

src/frontend/netdetails/detailwidget.cpp

@@ -5,6 +5,8 @@
 #define ITEM_HEIGHT 36
 #define ITEM_MARGINS 18,0,16,0
 
+#define MAX_LABEL_WIDTH 138
+
 FixLabel::FixLabel(QWidget *parent):
     QLabel(parent)
 {
@@ -56,7 +58,9 @@ void DetailWidget::initUI()
     m_mainLayout = new QHBoxLayout(this);
     m_mainLayout->setContentsMargins(ITEM_MARGINS);
 
-    m_keyLabel = new QLabel(this);
+    m_keyLabel = new FixLabel(this);
+    m_keyLabel->setMaximumWidth(MAX_LABEL_WIDTH);
+    m_keyLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     m_mainLayout->addWidget(m_keyLabel);
     m_mainLayout->addStretch();
     m_mainLayout->addWidget(m_valueWidget);

src/frontend/netdetails/detailwidget.h

@@ -32,7 +32,7 @@ public:
 
 private:
     QHBoxLayout * m_mainLayout = nullptr;
-    QLabel * m_keyLabel = nullptr;
+    FixLabel * m_keyLabel = nullptr;
     QWidget * m_valueWidget = nullptr;
 
     void initUI();

src/frontend/netdetails/netdetail.cpp

@@ -429,6 +429,9 @@ void NetDetail::getBaseInfo(ConInfo &conInfo)
                     conInfo.strChan = QString::number(item.m_channel);
                     //无线特有
                     conInfo.strSecType = item.m_secuType;
+                    if (conInfo.strSecType.isEmpty()) {
+                        conInfo.strSecType = "None";
+                    }
             }
         } else {
             uint iHz,iChan;
@@ -536,14 +539,21 @@ void NetDetail::getStaticIpInfo(ConInfo &conInfo, bool bActived)
 
 void NetDetail::initSecuData()
 {
-    QString password;
+    QString password("");
     int type = m_info.secType;
     switch (type) {
     case NONE:
         break;
     case WPA_AND_WPA2_PERSONAL:
     case WPA3_PERSONAL:
-        password = m_wirelessConnOpration->getPsk(m_uuid);
+        if (!m_uuid.isEmpty()) {
+            NetworkManager::Setting::SecretFlags flag;
+            if (m_wirelessConnOpration->getConnSecretFlags(m_uuid, flag)) {
+                if (!flag) {
+                    password = m_wirelessConnOpration->getPsk(m_uuid);
+                }
+            }
+        }
         m_info.strPassword = password;
         securityPage->setPsk(password);
         break;