the distance between upload icon and download icon can adjust self-adaption

confform.cpp

@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <KWindowEffects>
 
 extern QString llname, lwname;
 
@@ -46,7 +47,7 @@ ConfForm::ConfForm(QWidget *parent) :
     setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
 
     this->setStyleSheet("QWidget{border-radius:6px;border:none;}");
-    ui->centralWidget->setStyleSheet("#centralWidget{border:1px solid rgba(255,255,255,0.05);border-radius:6px;background:rgba(19,19,20,0.9);}");
+    ui->centralWidget->setStyleSheet("#centralWidget{border:1px solid rgba(255,255,255,0.05);border-radius:6px;background:rgba(19,19,20,0.7);}");
 
     ui->lbName->setText(tr("Network name: "));//"网络名称："
     ui->lbTxt1->setText(tr("Method: "));//"编辑IP设置："
@@ -130,6 +131,8 @@ ConfForm::ConfForm(QWidget *parent) :
     ui->leGateway->setValidator(new QRegExpValidator(rx, this));
     ui->leDns->setValidator(new QRegExpValidator(rx, this));
     ui->leDns2->setValidator(new QRegExpValidator(rx, this));
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 ConfForm::~ConfForm()

kylin-nm.pro

@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui x11extras dbus
+QT       += core gui x11extras dbus KWindowSystem
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 

main.cpp

@@ -31,10 +31,10 @@
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
-
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
+    QApplication a(argc, argv);
+
     openlog(LOG_IDENT, LOG_NDELAY | LOG_NOWAIT | LOG_PID, LOG_USER);
 
     syslog(LOG_DEBUG, "Kylin Network Manager Is Already Launched");

mainwindow.cpp

@@ -23,6 +23,8 @@
 #include "hot-spot/dlghotspotcreate.h"
 #include "wireless-security/dlgconnhidwifi.h"
 
+#include <KWindowEffects>
+
 QString llname, lwname, hideWiFiConn;
 int currentActWifiSignalLv, count_loop;
 
@@ -32,11 +34,11 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
 
+    checkSingle();
+
     syslog(LOG_DEBUG, "Using the icon theme named 'ukui-icon-theme-default'");
     QIcon::setThemeName("ukui-icon-theme-default");
 
-    checkSingle();
-
     // 如果使用Qt::Popup 任务栏不显示且保留X事件如XCB_FOCUS_OUT, 但如果indicator点击鼠标右键触发，XCB_FOCUS_OUT事件依然会失效
     // 如果使用Qt::ToolTip, Qt::Tool + Qt::WindowStaysOnTopHint, Qt::X11BypassWindowManagerHint等flag则会导致X事件失效
     // this->setWindowFlags(Qt::FramelessWindowHint | Qt::Tool | Qt::WindowStaysOnTopHint);
@@ -47,14 +49,14 @@ MainWindow::MainWindow(QWidget *parent) :
 
     QPainterPath path;
     auto rect = this->rect();
-    rect.adjust(0, 0, -0, -0);
+    rect.adjust(1, 1, -1, -1);
     path.addRoundedRect(rect, 6, 6);
     setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
 
     this->setStyleSheet("QWidget{border:none;border-radius:6px;}");
 
     ui->centralWidget->setStyleSheet("#centralWidget{border:1px solid rgba(255,255,255,0.05);"
-                                     "border-radius:6px;background:rgba(19,19,20,0.9);}");
+                                     "border-radius:6px;background:rgba(19,19,20,0.7);}");
 
     editQssString(); //编辑部分控件QSS
     createTopLanUI(); //创建顶部有线网item
@@ -101,6 +103,8 @@ MainWindow::MainWindow(QWidget *parent) :
 
     auto app = static_cast<QApplication*>(QCoreApplication::instance());
     app->setStyle(new CustomStyle());
+
+    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
 }
 
 MainWindow::~MainWindow()
@@ -211,17 +215,17 @@ void MainWindow::createTopWifiUI()
 void MainWindow::createOtherUI()
 {
     lbLoadDown = new QLabel(ui->centralWidget);
-    lbLoadDown->move(X_ITEM + 132, Y_TOP_ITEM + 32);
+    lbLoadDown->move(X_ITEM + 129, Y_TOP_ITEM + 32);
     lbLoadDown->resize(65, 20);
     lbLoadDownImg = new QLabel(ui->centralWidget);
-    lbLoadDownImg->move(X_ITEM + 115, Y_TOP_ITEM + 35);
+    lbLoadDownImg->move(X_ITEM + 112, Y_TOP_ITEM + 35);
     lbLoadDownImg->resize(16, 16);
 
     lbLoadUp = new QLabel(ui->centralWidget);
-    lbLoadUp->move(X_ITEM + 207, Y_TOP_ITEM + 32);
+    lbLoadUp->move(X_ITEM + 187, Y_TOP_ITEM + 32);
     lbLoadUp->resize(65, 20);
     lbLoadUpImg = new QLabel(ui->centralWidget);
-    lbLoadUpImg->move(X_ITEM + 190, Y_TOP_ITEM + 35);
+    lbLoadUpImg->move(X_ITEM + 170, Y_TOP_ITEM + 35);
     lbLoadUpImg->resize(16, 16);
 
     lbLoadDownImg->setStyleSheet("QLabel{background-image:url(:/res/x/load-down.png);}");
@@ -267,7 +271,8 @@ void MainWindow::createListAreaUI()
     lbLoadUp->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);}");
     lbLoadDown->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);}");
     lbLoadUp->setText("0KB/s");
-    lbLoadDown->setText("0KB/s");
+    lbLoadDown->setText("0KB/s.");
+    this->on_setNetSpeed();
 
     scrollAreal->setStyleSheet("QScrollArea{border:none;}");
     scrollAreal->viewport()->setStyleSheet("background-color:transparent;");
@@ -2228,7 +2233,7 @@ void MainWindow::on_setNetSpeed()
         QString str_tx;
 
         if (rcv_num < 1000){
-            str_rcv = QString::number(rcv_num) + "KB/s";
+            str_rcv = QString::number(rcv_num) + "KB/s.";
         } else {
             int remainder;
             if (rcv_num%1000 < 100) {
@@ -2236,7 +2241,7 @@ void MainWindow::on_setNetSpeed()
             }else{
                 remainder = (rcv_num%1000)/100;
             }
-            str_rcv = QString::number(rcv_num/1000) + "."  + QString::number(remainder) + "MB/s";
+            str_rcv = QString::number(rcv_num/1000) + "."  + QString::number(remainder) + "MB/s.";
         }
 
         if (tx_num < 1000){
@@ -2254,6 +2259,23 @@ void MainWindow::on_setNetSpeed()
         lbLoadDown->setText(str_rcv);
         lbLoadUp->setText(str_tx);
 
+        switch (str_rcv.size()) {
+        case 6:
+            lbLoadUp->move(X_ITEM + 187, Y_TOP_ITEM + 32);
+            lbLoadUpImg->move(X_ITEM + 170, Y_TOP_ITEM + 35);
+            break;
+        case 7:
+            lbLoadUp->move(X_ITEM + 194, Y_TOP_ITEM + 32);
+            lbLoadUpImg->move(X_ITEM + 176, Y_TOP_ITEM + 35);
+            break;
+        case 8:
+            lbLoadUp->move(X_ITEM + 199, Y_TOP_ITEM + 32);
+            lbLoadUpImg->move(X_ITEM + 186, Y_TOP_ITEM + 35);
+            break;
+        default:
+            break;
+        }
+
         end_rcv_rates = start_rcv_rates;
         end_tx_rates = start_tx_rates;
     }

oneconnform.cpp

@@ -346,41 +346,41 @@ void OneConnForm::setSignal(QString lv, QString secu){
 
     if(signal > 75){
         if(hasPwd){
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-full-pwd.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-full-pwd.png);}");
         }else{
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-full.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-full.png);}");
         }
         signalLv = 1;
     }
     if(signal > 55 && signal <= 75){
         if(hasPwd){
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-high-pwd.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-high-pwd.png);}");
         }else{
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-high.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-high.png);}");
         }
         signalLv = 2;
     }
     if(signal > 35 && signal <= 55){
         if(hasPwd){
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-medium-pwd.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-medium-pwd.png);}");
         }else{
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-medium.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-medium.png);}");
         }
         signalLv = 3;
     }
     if(signal > 15 && signal <= 35){
         if(hasPwd){
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-low-pwd.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-low-pwd.png);}");
         }else{
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-low.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-low.png);}");
         }
         signalLv = 4;
     }
     if(signal <= 15){
         if(hasPwd){
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-none-pwd.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-none-pwd.png);}");
         }else{
-            ui->lbSignal->setStyleSheet("QLabel{background:url(:/res/w/wifi-none.png);}");
+            ui->lbSignal->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/w/wifi-none.png);}");
         }
         signalLv = 4;
     }

onelancform.cpp

@@ -231,9 +231,9 @@ void OneLancForm::setLanInfo(QString str1, QString str2, QString str3, QString s
 
 void OneLancForm::setIcon(bool isOn){
     if(isOn){
-        ui->lbIcon->setStyleSheet("QLabel{background:url(:/res/l/network-online.png);}");
+        ui->lbIcon->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/l/network-online.png);}");
     }else{
-        ui->lbIcon->setStyleSheet("QLabel{background:url(:/res/l/network-offline.png);}");
+        ui->lbIcon->setStyleSheet("QLabel{border-radius:0px;background:url(:/res/l/network-offline.png);}");
     }
 }
 

qss/style.qss

@@ -8,14 +8,13 @@ QToolTip{
     outline:none;
 }
 
-
-QScrollBar:vertical{width:10px;background:rgba(48,48,51,1);border-radius:6px;}
+QScrollBar:vertical{margin:0px 2px 0px 2px;width:10px;background:rgba(48,48,51,0);border-radius:6px;}
 QScrollBar::up-arrow:vertical{height:0px;}
 QScrollBar::sub-line:vertical{border:0px solid;height:0px}
 QScrollBar::sub-page:vertical{background:transparent;}
-QScrollBar::handle:vertical{width:4px;background:rgba(72,72,76,1);border-radius:3px;}
-QScrollBar::handle:vertical:hover{width:4px;background:rgba(97,97,102,1);border-radius:3px;}
-QScrollBar::handle:vertical:pressed{width:4px;background:rgba(133,133,140,1);border-radius:3px;}
+QScrollBar::handle:vertical{width:6px;background:rgba(72,72,76,1);border-radius:3px;}
+QScrollBar::handle:vertical:hover{width:6px;background:rgba(97,97,102,1);border-radius:3px;}
+QScrollBar::handle:vertical:pressed{width:6px;background:rgba(133,133,140,1);border-radius:3px;}
 QScrollBar::add-page:vertical{background:transparent;}
 QScrollBar::add-line:vertical{border:0px solid;height:0px}
 QScrollBar::down-arrow:vertical{height:0px;}

translations/kylin-nm_zh_CN.ts

@@ -1358,7 +1358,7 @@
         <location filename="../mainwindow.cpp" line="1006"/>
         <location filename="../mainwindow.cpp" line="1157"/>
         <source>Connected</source>
-        <translation>已连接</translation>
+        <translation>已连接，</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="102"/>

wireless-security/dlgconnhidwifi.cpp

@@ -44,7 +44,7 @@ DlgConnHidWifi::DlgConnHidWifi(int type, MainWindow *mainWindow, QWidget *parent
     path.addRoundedRect(rect, 6, 6);
     setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
 
-    this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.9);border:1px solid rgba(255, 255, 255, 0.05);}");
+    this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
 
     MyQss objQss;
 
@@ -117,6 +117,8 @@ DlgConnHidWifi::DlgConnHidWifi(int type, MainWindow *mainWindow, QWidget *parent
     this->setFixedSize(432,358);
 
     this->mw = mainWindow;
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifi::~DlgConnHidWifi()

wireless-security/dlgconnhidwifileap.cpp

@@ -105,6 +105,8 @@ DlgConnHidWifiLeap::DlgConnHidWifiLeap(QWidget *parent) :
     ui->btnConnect->setEnabled(false);
 
     this->setFixedSize(432,434);
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifiLeap::~DlgConnHidWifiLeap()

wireless-security/dlgconnhidwifisecfast.cpp

@@ -154,6 +154,8 @@ DlgConnHidWifiSecFast::DlgConnHidWifiSecFast(int type, QWidget *parent) :
     ui->btnConnect->setEnabled(false);
 
     this->setFixedSize(432,673);
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifiSecFast::~DlgConnHidWifiSecFast()

wireless-security/dlgconnhidwifisecleap.cpp

@@ -124,6 +124,8 @@ DlgConnHidWifiSecLeap::DlgConnHidWifiSecLeap(int type, QWidget *parent) :
     ui->btnConnect->setEnabled(false);
 
     this->setFixedSize(432,487);
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifiSecLeap::~DlgConnHidWifiSecLeap()

wireless-security/dlgconnhidwifisecpeap.cpp

@@ -163,6 +163,8 @@ DlgConnHidWifiSecPeap::DlgConnHidWifiSecPeap(int type, QWidget *parent) :
     ui->btnConnect->setEnabled(false);
 
     this->setFixedSize(432,700);
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifiSecPeap::~DlgConnHidWifiSecPeap()

wireless-security/dlgconnhidwifisecpwd.cpp

@@ -125,6 +125,8 @@ DlgConnHidWifiSecPwd::DlgConnHidWifiSecPwd(int type, QWidget *parent) :
     ui->btnConnect->setEnabled(false);
 
     this->setFixedSize(432,487);
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifiSecPwd::~DlgConnHidWifiSecPwd()

wireless-security/dlgconnhidwifisectls.cpp

@@ -172,6 +172,8 @@ DlgConnHidWifiSecTls::DlgConnHidWifiSecTls(int type, QWidget *parent) :
     ui->leUserKeyPwd->setEnabled(false);
 
     this->setFixedSize(432,705);
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifiSecTls::~DlgConnHidWifiSecTls()

wireless-security/dlgconnhidwifisectunneltls.cpp

@@ -159,6 +159,8 @@ DlgConnHidWifiSecTunnelTLS::DlgConnHidWifiSecTunnelTLS(int type, QWidget *parent
     ui->btnConnect->setEnabled(false);
 
     this->setFixedSize(432,665);
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifiSecTunnelTLS::~DlgConnHidWifiSecTunnelTLS()

wireless-security/dlgconnhidwifiwep.cpp

@@ -125,6 +125,8 @@ DlgConnHidWifiWep::DlgConnHidWifiWep(int type, QWidget *parent) :
     ui->btnConnect->setEnabled(false);
 
     this->setFixedSize(432,493);
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifiWep::~DlgConnHidWifiWep()

wireless-security/dlgconnhidwifiwpa.cpp

@@ -127,6 +127,8 @@ DlgConnHidWifiWpa::DlgConnHidWifiWpa(int type, MainWindow *mainWindow, QWidget *
     this->setFixedSize(432,397);
 
     this->mw = mainWindow;
+
+    KWindowEffects::enableBlurBehind(this->winId(), true);
 }
 
 DlgConnHidWifiWpa::~DlgConnHidWifiWpa()

wireless-security/kylinheadfile.h

@@ -17,6 +17,7 @@
 #include <QPainter>
 #include <QListView>
 #include <QString>
+#include <KWindowEffects>
 
 class MyQss
 {