adjust ui

src/frontend/list-items/lanlistitem.cpp

@@ -15,6 +15,7 @@ LanListItem::LanListItem(KyConnectItem *data, QString deviceName, QWidget *paren
     m_nameLabel->setText(m_data->m_connectName);
 
     if (m_data != nullptr) {
+        m_netButton->setButtonIcon(QIcon::fromTheme("network-wired-connected-symbolic"));
         if (m_data->m_connectState == NetworkManager::ActiveConnection::State::Activated) {
             setIcon(true);
             m_isActive = true;
@@ -41,10 +42,10 @@ LanListItem::LanListItem(QWidget *parent) : ListItem(parent)
 void LanListItem::setIcon(bool isOn)
 {
     if (isOn) {
-        m_netButton->setButtonIcon(QIcon::fromTheme("network-wired-connected-symbolic"));
+//        m_netButton->setButtonIcon(QIcon::fromTheme("network-wired-connected-symbolic"));
         m_netButton->setActive(true);               //设置图标显示不同颜色
     } else {
-        m_netButton->setButtonIcon(QIcon::fromTheme("network-wired-disconnected-symbolic"));
+//        m_netButton->setButtonIcon(QIcon::fromTheme("network-wired-connected-symbolic"));
         m_netButton->setActive(false);
     }
 }

src/frontend/mainwindow.cpp

@@ -11,7 +11,8 @@
 #include "../backend/dbus-interface/kylinagentinterface.h"
 
 #define MAINWINDOW_WIDTH 420
-#define MAINWINDOW_HEIGHT 456
+#define MAINWINDOW_HEIGHT 476
+#define LAYOUT_MARGINS 0,0,0,0
 #define THEME_SCHAME "org.ukui.style"
 #define COLOR_THEME "styleName"
 
@@ -138,6 +139,7 @@ void MainWindow::initUI()
     m_centralWidget->addTab(m_lanWidget, tr(""));
     m_centralWidget->addTab(m_wlanWidget,tr(""));
     m_tabBarLayout = new QHBoxLayout(this);
+    m_tabBarLayout->setContentsMargins(LAYOUT_MARGINS);
     m_lanLabel = new QLabel(tr("LAN"));
     m_lanLabel->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
     m_wlanLabel = new QLabel(tr("WLAN"));

src/frontend/tab-pages/lanpage.cpp

@@ -5,7 +5,7 @@
 #define MAIN_LAYOUT_SPACING 0
 #define TITLE_FRAME_HEIGHT 52
 #define TITLE_LAYOUT_MARGINS 24,0,24,0
-#define LAN_LIST_SPACING 2
+#define LAN_LIST_SPACING 0
 #define TEXT_MARGINS 16,0,0,0
 #define SETTINGS_LAYOUT_MARGINS 24,16,24,16
 #define TRANSPARENT_COLOR QColor(0,0,0,0)
@@ -692,7 +692,7 @@ void LanPage::initUI()
     m_activatedNetLabel->setText(tr("Activated LAN"));
     m_activatedLanListWidget = new QListWidget(m_activatedNetFrame);
     m_activatedLanListWidget->setFrameShape(QFrame::Shape::NoFrame);
-    m_activatedLanListWidget->setSpacing(LAN_LIST_SPACING);
+//    m_activatedLanListWidget->setSpacing(LAN_LIST_SPACING);
     m_activatedLanListWidget->setFixedHeight(ITEM_HEIGHT);              //active区域固定高度,只显示一个条目
     m_activatedLanListWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     m_activatedNetLayout->addWidget(m_activatedLanListWidget);

src/frontend/tab-pages/tabpage.cpp

@@ -27,6 +27,7 @@ void TabPage::initUI()
     m_titleLayout = new QHBoxLayout(m_titleFrame);
     m_titleLayout->setContentsMargins(TITLE_LAYOUT_MARGINS);
     m_titleLabel = new QLabel(m_titleFrame);
+    m_titleLabel->setFixedHeight(LABEL_HEIGHT);
     m_netSwitch = new SwitchButton(m_titleFrame);
     m_titleLayout->addWidget(m_titleLabel);
     m_titleLayout->addStretch();
@@ -40,6 +41,7 @@ void TabPage::initUI()
     m_deviceLayout->setContentsMargins(DEVICE_LAYOUT_MARGINS);
     m_deviceFrame->setLayout(m_deviceLayout);
     m_deviceLabel = new QLabel(m_deviceFrame);
+    m_deviceLabel->setFixedHeight(LABEL_HEIGHT);
     m_deviceLabel->setText(tr("Current Device"));
     m_deviceComboBox = new QComboBox(m_deviceFrame);
     m_deviceComboBox->setFixedWidth(DEVICE_COMBOBOX_WIDTH);
@@ -55,9 +57,10 @@ void TabPage::initUI()
     m_activatedNetFrame->setMaximumHeight(ACTIVE_AREA_MAX_HEIGHT);
     m_activatedNetLayout = new QVBoxLayout(m_activatedNetFrame);
     m_activatedNetLayout->setContentsMargins(ACTIVE_NET_LAYOUT_MARGINS);
-    m_activatedNetLayout->setSpacing(NET_LAYOUT_SPACING);
+//    m_activatedNetLayout->setSpacing(NET_LAYOUT_SPACING);
     m_activatedNetLabel = new QLabel(m_activatedNetFrame);
     m_activatedNetLabel->setContentsMargins(TEXT_MARGINS);
+    m_activatedNetLabel->setFixedHeight(LABEL_HEIGHT);
     m_activatedNetLayout->addWidget(m_activatedNetLabel);
     m_activatedNetDivider = new Divider(this);
 
@@ -65,10 +68,11 @@ void TabPage::initUI()
     m_inactivatedNetFrame->setMinimumHeight(INACTIVE_AREA_MIN_HEIGHT);
     m_inactivatedNetLayout = new QVBoxLayout(m_inactivatedNetFrame);
     m_inactivatedNetLayout->setContentsMargins(NET_LAYOUT_MARGINS);
-    m_inactivatedNetLayout->setSpacing(NET_LAYOUT_SPACING);
+//    m_inactivatedNetLayout->setSpacing(NET_LAYOUT_SPACING);
     m_inactivatedNetFrame->setLayout(m_inactivatedNetLayout);
     m_inactivatedNetLabel = new QLabel(m_inactivatedNetFrame);
     m_inactivatedNetLabel->setContentsMargins(TEXT_MARGINS);
+    m_inactivatedNetLabel->setFixedHeight(LABEL_HEIGHT);
     m_inactivatedNetListArea = new QScrollArea(m_inactivatedNetFrame);
     m_inactivatedNetListArea->setFrameShape(QFrame::Shape::NoFrame);
     m_inactivatedNetListArea->setWidgetResizable(true);

src/frontend/tab-pages/tabpage.h

@@ -22,15 +22,16 @@
 #define DEVICE_LAYOUT_MARGINS 24,0,24,8
 #define DEVICE_COMBOBOX_WIDTH 150
 #define ACTIVE_NET_LAYOUT_MARGINS 8,8,8,8
-#define NET_LAYOUT_MARGINS 8,8,0,8
+#define NET_LAYOUT_MARGINS 8,8,0,3
 #define NET_LAYOUT_SPACING 8
-#define NET_LIST_SPACING 2
+#define NET_LIST_SPACING 0
 #define TEXT_MARGINS 16,0,0,0
 //#define SCROLL_AREA_HEIGHT 200
 #define SETTINGS_LAYOUT_MARGINS 24,16,24,16
 #define TRANSPARENT_COLOR QColor(0,0,0,0)
-#define INACTIVE_AREA_MIN_HEIGHT 150
-#define ACTIVE_AREA_MAX_HEIGHT 100
+#define INACTIVE_AREA_MIN_HEIGHT 170
+#define ACTIVE_AREA_MAX_HEIGHT 92
+#define LABEL_HEIGHT 20
 
 enum KyDeviceType
 {