Merge branch 'y2209bug' into 'dbus-interface'

Fix bug 141204 网络项间距

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

src/frontend/list-items/listitem.cpp

@@ -22,7 +22,8 @@
 
 #define MAIN_LAYOUT_MARGINS 0,0,0,0
 #define MAIN_LAYOUT_SPACING 0
-#define ITEM_FRAME_MARGINS 12,6,16,6
+#define ITEM_FRAME_MARGINS 12,4,16,4
+
 #define ITEM_FRAME_SPACING 8
 #define FRAME_WIDTH 404
 #define INFO_ICON_WIDTH 16
@@ -156,6 +157,7 @@ void ListItem::initUI()
     m_hItemLayout = new QHBoxLayout(m_itemFrame);
     m_hItemLayout->setContentsMargins(ITEM_FRAME_MARGINS);
     m_hItemLayout->setSpacing(ITEM_FRAME_SPACING);
+    m_hItemLayout->setAlignment(Qt::AlignHCenter);
 
     m_netButton = new RadioItemButton(m_itemFrame);
     m_nameLabel = new FixLabel(m_itemFrame);

src/frontend/list-items/wlanlistitem.cpp

@@ -311,6 +311,7 @@ void WlanListItem::initWlanUI()
 
     m_mainLayout->addWidget(m_pwdFrame);
     m_mainLayout->addWidget(m_autoConnectFrame);
+    m_mainLayout->addStretch();
 
     m_pwdFrame->hide();
     m_autoConnectFrame->hide();

src/frontend/tab-pages/tabpage.cpp

@@ -81,6 +81,7 @@ void TabPage::initUI()
 //    m_activatedNetLayout->setSpacing(NET_LAYOUT_SPACING);
     m_activatedNetLabel = new QLabel(m_activatedNetFrame);
     m_activatedNetLabel->setContentsMargins(TEXT_MARGINS);
+    m_activatedNetLabel->setFixedHeight(TEXT_HEIGHT);
     m_activatedNetLayout->addWidget(m_activatedNetLabel);
     m_activatedNetDivider = new Divider(this);
 
@@ -93,6 +94,7 @@ void TabPage::initUI()
 
     m_inactivatedNetLabel = new QLabel(m_inactivatedNetFrame);
     m_inactivatedNetLabel->setContentsMargins(TEXT_MARGINS);
+    m_inactivatedNetLabel->setFixedHeight(TEXT_HEIGHT);
 
 //    m_inactivatedNetListArea = new QScrollArea(m_inactivatedNetFrame);
 //    m_inactivatedNetListArea->setFrameShape(QFrame::Shape::NoFrame);

src/frontend/tab-pages/tabpage.h

@@ -57,6 +57,7 @@ enum network_mode {
 #define NET_LAYOUT_SPACING 8
 #define NET_LIST_SPACING 0
 #define TEXT_MARGINS 16,0,0,0
+#define TEXT_HEIGHT 20
 //#define SCROLL_AREA_HEIGHT 200
 #define SETTINGS_LAYOUT_MARGINS 23,0,24,0
 #define TRANSPARENT_COLOR QColor(0,0,0,0)

src/frontend/tools/infobutton.cpp

@@ -30,9 +30,9 @@
 //#define FOREGROUND_COLOR_PRESS QColor(36,109,212,255)
 #define FOREGROUND_COLOR_BRIGHTTEXT qApp->palette().brightText().color()
 #define FOREGROUND_COLOR_HIGHLIGHT qApp->palette().highlight().color()
-#define OUTER_PATH 8,8,16,16
-#define INNER_PATH 9,9,14,14
-#define TEXT_POS 14,5,16,16,0
+#define OUTER_PATH 8,10,16,16
+#define INNER_PATH 9,11,14,14
+#define TEXT_POS 14,7,16,16,0
 
 #define BUTTON_SIZE 36,36