diff --git a/src/backend/backend.pri b/src/backend/backend.pri
index 3be0c4ab..feb4853f 100644
--- a/src/backend/backend.pri
+++ b/src/backend/backend.pri
@@ -3,11 +3,7 @@ include(hotspot/hotspot.pri)
 include(dbus-interface/dbus-interface.pri)
 
 HEADERS += \
-    $$PWD/backthread.h \
     $$PWD/dbusadaptor.h \
-    $$PWD/ksimplenm.h \
-    $$PWD/kylin-dbus-interface.h \
-    $$PWD/kylin-network-interface.h \
     $$PWD/kylinarping.h \
     $$PWD/kylinipv4arping.h \
     $$PWD/kylinipv6arping.h \
@@ -16,11 +12,7 @@ HEADERS += \
     $$PWD/wifi-auth-thread.h
 
 SOURCES += \
-    $$PWD/backthread.cpp \
     $$PWD/dbusadaptor.cpp \
-    $$PWD/ksimplenm.cpp \
-    $$PWD/kylin-dbus-interface.cpp \
-    $$PWD/kylin-network-interface.c \
     $$PWD/kylinipv4arping.cpp \
     $$PWD/kylinipv6arping.cpp \
     $$PWD/sysdbusregister.cpp \
diff --git a/src/backend/backthread.cpp b/src/backend/backthread.cpp
deleted file mode 100644
index 9bc7f969..00000000
--- a/src/backend/backthread.cpp
+++ /dev/null
@@ -1,673 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#include "backthread.h"
-#include "utils.h"
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <QFile>
-#include <QRegExp>
-#include <QDir>
-
-BackThread::BackThread(QObject *parent) : QObject(parent)
-{
-    cmdProcessWifi = new QProcess(this);
-    connect(cmdProcessWifi , SIGNAL(readyReadStandardOutput()) , this , SLOT(onReadOutputWifi()));
-    connect(cmdProcessWifi , SIGNAL(readyReadStandardError()) , this , SLOT(onReadErrorWifi()));
-
-    cmdProcessLan = new QProcess(this);
-    connect(cmdProcessLan , SIGNAL(readyReadStandardOutput()) , this , SLOT(onReadOutputLan()));
-    connect(cmdProcessLan , SIGNAL(readyReadStandardError()) , this , SLOT(onReadErrorLan()));
-}
-
-BackThread::~BackThread()
-{
-    cmdProcessWifi->close();
-    cmdProcessLan->close();
-}
-
-//get the connection state of wired and wireles network
-IFace* BackThread::execGetIface()
-{
-    IFace *iface = new IFace();
-
-    QString tmpPath = "/tmp/kylin-nm-iface-" + QDir::home().dirName();
-    QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli -f TYPE,DEVICE,STATE device > " + tmpPath;
-    Utils::m_system(cmd.toUtf8().data());
-
-    QFile file(tmpPath);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qDebug()<<"Can't open the file ~/.config/kylin-nm-iface!";
-    }
-    QString txt = file.readAll();
-    QStringList txtList = txt.split("\n");
-    file.close();
-
-    iface->lstate = 2;
-    iface->wstate = 2;
-
-    for (int i = 1; i < txtList.size(); i ++) {
-        QString line = txtList.at(i);
-        if (line != "") {
-            int index1 = line.indexOf(" ");
-            QString type = line.left(index1);
-            QString lastStr = line.mid(index1).trimmed();
-            int index2 = lastStr.indexOf(" ");
-            QString iname = lastStr.left(index2);
-            QString istateStr = lastStr.mid(index2).trimmed();
-
-            //只要存在一个有线设备已连接，就不再扫描其他有线设备状态，避免有线被误断开
-            if (type == "ethernet" && iface->lstate != 0) {
-                // if type is wired network
-                iface->lname = iname;
-
-                if (istateStr == "unmanaged") {
-                    iface->lstate = 2; //switch of wired device is off
-                } else if (istateStr == "unavailable") {
-                    iface->lstate = 4;
-                } else if (istateStr == "disconnected") {
-                    iface->lstate = 1; //wired network is disconnected
-                } else if (istateStr == "connected" || istateStr == "connecting (getting IP configuration)") {
-                    iface->lstate = 0; //wired network is connected
-                } else {
-                    //连接中，正在配置
-                    iface->lstate = 3;
-                }
-            }
-            if (type == "wifi" && iface->wname.isEmpty()) { //仅统计第一个无线网卡，后续无线网卡状态必然等于或差与第一个获取到的无线网卡
-                // if type is wireless network
-                iface->wname = iname;
-
-                if (istateStr == "unmanaged" || istateStr == "unavailable") {
-                    iface->wstate = 2; //switch of wireless device is off
-                } else if (istateStr == "disconnected") {
-                    iface->wstate = 1; //wireless network is disconnected
-                } else if (istateStr == "connected") {
-                    iface->wstate = 0; //wireless network is connected
-                } else {
-                    //连接中，正在配置
-                    iface->wstate = 3;
-                }
-            }
-        }
-    }
-
-    return iface;
-}
-
-void BackThread::saveSwitchButtonState(const QString &key, const QVariant &value)
-{
-    QSettings * m_settings = new QSettings(CONFIG_FILE_PATH, QSettings::IniFormat);
-    m_settings->setValue(key, value);
-    m_settings->sync();
-    delete m_settings;
-    return;
-}
-
-QVariant BackThread::getSwitchState(const QString &key)
-{
-    QSettings * m_settings = new QSettings(CONFIG_FILE_PATH, QSettings::IniFormat);
-    QVariant value = m_settings->value(key);
-    delete m_settings;
-    if (!value.isValid())
-        return QVariant();
-    return value;
-}
-
-//turn on the switch of network
-void BackThread::execEnNet()
-{
-    char *chr = "nmcli networking on";
-    Utils::m_system(chr);
-
-    while (1) {
-        if (execGetIface()->lstate != 2) {
-            sleep(3);
-            emit enNetDone();
-            emit btFinish();
-            break;
-        }
-        sleep(1);
-    }
-}
-
-//turn off the switch of wireless network first, then turn off the switch of network
-void BackThread::execDisNet()
-{
-    if (execGetIface()->wstate != 2) {
-        char *chr = "nmcli radio wifi off";
-        Utils::m_system(chr);
-
-        while (1) {
-            if (execGetIface()->wstate == 2) {
-                emit disWifiDone();
-                emit btFinish();
-                break;
-            }
-            sleep(1);
-        }
-    }
-
-    char *chr1 = "nmcli networking off";
-    Utils::m_system(chr1);
-
-    while (1) {
-        if (execGetIface()->lstate == 2) {
-            emit disNetDone();
-            emit btFinish();
-            break;
-        }
-        sleep(1);
-    }
-}
-
-//turn on the switch of wireless network
-void BackThread::execEnWifi()
-{
-    char *chr1 = "nmcli radio wifi on";
-    Utils::m_system(chr1);
-    emit btFinish();
-    KylinDBus objBackThreadDBus;
-
-    while (1) {
-        if (execGetIface()->wstate != 2) {
-            while (1) {
-                if (objBackThreadDBus.getAccessPointsNumber() > 0) {
-                    // objBackThreadDBus.getAccessPointsNumber()>0 standard can get wireless accesspoints now
-                    emit enWifiDone();
-                    emit btFinish();
-                    break;
-                }
-                sleep(2);
-            }
-            break;
-        }
-        sleep(1);
-    }
-}
-
-void BackThread::rfKillexecEnWifi()
-{
-    char *chr1 = "nmcli radio wifi on";
-    Utils::m_system(chr1);
-
-    if (execGetIface()->wstate != 2) {
-        emit enWifiDoneByRfkill();
-        emit btFinishByRfkill();
-    } else {
-        usleep(500*1000);
-        emit enWifiDoneByRfkill();
-        emit btFinishByRfkill();
-    }
-
-}
-
-//turn off the switch of wireless network
-void BackThread::execDisWifi()
-{
-    char *chr = "nmcli radio wifi off";
-    Utils::m_system(chr);
-    while (1) {
-        if (execGetIface()->wstate == 2) {
-            emit disWifiDone();
-            emit btFinish();
-            break;
-        }
-        sleep(1);
-    }
-}
-
-void BackThread::rfkillExecDisWifi()
-{
-    char *chr = "nmcli radio wifi off";
-    Utils::m_system(chr);
-    while (1) {
-        if (execGetIface()->wstate == 2) {
-            emit disWifiDoneByRfkill();
-            emit btFinishByRfkill();
-            break;
-        }
-        sleep(1);
-    }
-}
-
-//to connect wired network
-void BackThread::execConnLan(QString connName, QString ifname, QString connectType)
-{
-    currConnLanUuid = connName;
-    currConnLanType = connectType;
-    QString mycmd; //连接命令
-    KylinDBus objBackThreadDBus;
-
-    bool isWiredCableAlready = objBackThreadDBus.getWiredCableStateByIfname(ifname);
-
-    if (connectType == "bluetooth" || connectType == "vpn"|| ifname == "") {
-        isWiredCableAlready = true; //对于蓝牙类型的网络不需要接入网线就可以连接
-        mycmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection up '" + connName + "'";
-    } else {
-        mycmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection up '" + connName + "' ifname '" + ifname + "'";
-    }
-    qDebug()<<"Trying to connect wifi. ssid="<<connName;
-
-    if (isWiredCableAlready) {
-        QStringList options;
-        options << "-c" << mycmd;
-        cmdProcessLan->start("/bin/bash",options);
-        cmdProcessLan->waitForStarted();
-        cmdProcessLan->waitForFinished();
-    } else {
-        qDebug()<<"connect wired network failed for without wired cable plug in.";
-        emit connDone(1);
-    }
-
-    emit btFinish();
-}
-
-void BackThread::onReadOutputLan()
-{
-    QByteArray cmdout = cmdProcessLan->readAllStandardOutput();
-    QString strResult = QString::fromLocal8Bit(cmdout);
-    qDebug()<<"on_readoutput_lan:  "<< strResult;
-    dellConnectLanResult(strResult);
-}
-void BackThread::onReadErrorLan()
-{
-    QByteArray cmdout = cmdProcessLan->readAllStandardError();
-    QString strResult = QString::fromLocal8Bit(cmdout);
-    qDebug()<<"on_readerror_lan:  "<< strResult;
-    dellConnectLanResult(strResult);
-}
-
-void BackThread::dellConnectLanResult(QString info)
-{
-    if (info.indexOf("successfully") != -1) {
-        qDebug()<<"debug: in function execConnLan, wired net state is: "<<QString::number(execGetIface()->lstate);
-
-        if (currConnLanType == "bluetooth") {
-            emit connDone(2);
-        } else {
-            emit connDone(0);
-        }
-    } else {
-        QString cmd = "nmcli connection down '" + currConnLanUuid + "'";
-        Utils::m_system(cmd.toUtf8().data());
-        if (info.indexOf("IP configuration could not be reserved") != -1) {
-            emit connDone(4);
-        } else if(info.indexOf("MACs") != -1 || info.indexOf("Mac") != -1 || info.indexOf("MAC") != -1) {
-            emit connDone(5);
-        } else if(info.indexOf("Killed") != -1 || info.indexOf("killed") != -1) {
-            emit connDone(6);
-        } else if(info.indexOf("The Bluetooth connection failed") != -1) {
-            emit connDone(7);
-        } else if(info.indexOf("Carrier/link changed") != -1) {
-            emit connDone(8);
-        } else {
-            if (currConnLanType == "vpn"){
-                emit connDone(10);
-            }
-            else{
-                emit connDone(9);
-            }
-        }
-    }
-}
-
-//to connected wireless network need a password
-void BackThread::execConnWifiPWD(QString connName, QString password, QString connType, QString security, QString ifname)
-{
-    //disConnLanOrWifi("wifi");
-    if (!connType.isEmpty()) {
-        QString strConntype = "nmcli connection modify '" + connName + "' wifi-sec.psk-flags 0";
-        Utils::m_system(strConntype.toUtf8().data());
-    }
-
-    QString tmpPath = "/tmp/kylin-nm-btoutput-" + QDir::home().dirName();
-    if (security.contains("WPA3")) {
-        QString create_cmd = QString("nmcli connection add con-name %1 type wifi 802-11-wireless-security.key-mgmt sae ssid %2 802-11-wireless-security.psk %3").arg(connName).arg(connName).arg(password);
-        Utils::m_system(create_cmd.toUtf8().data());
-        QString connect_cmdStr = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection up '" + connName + "' ifname " + ifname +" > " + tmpPath;
-        Utils::m_system(connect_cmdStr.toUtf8().data());
-    } else {
-        QString cmdStr = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli device wifi connect '" + connName + "' password '" + password + "' > " + tmpPath;
-        Utils::m_system(cmdStr.toUtf8().data());
-    }
-
-    QFile file(tmpPath);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qDebug()<<"Can't open the file /tmp/kylin-nm-btoutput !"<<endl;
-    }
-    QString line = file.readLine();
-    file.close();
-    qDebug()<<"connect_wifi_result: "<< line;
-
-    if (line.indexOf("successfully") != -1) {
-        emit connDone(0);
-        qDebug()<<"debug: in function execConnWifiPWD, wireless net state is: "<<QString::number(execGetIface()->wstate);
-    } else if(line.indexOf("Secrets were required") != -1){
-        //emit connDone(4);//发出信号4是之前添加每次连接输入密码的功能时需要的
-        emit connDone(1);
-    } else {
-        emit connDone(1);
-    }
-
-    emit btFinish();
-}
-
-void BackThread::execConnHiddenWifiWPA(QString wifiName, QString wifiPassword)
-{
-    int x(1), n(0);
-    do {
-        n += 1;
-        if (n >= 4) {
-            qDebug()<<"connection attempt of hidden wifi"<<wifiName<<" failed for 3 times, no more attempt";
-            x = 0;
-            emit connDone(1);
-            emit btFinish();
-            return ;
-        }
-
-        QString tmpPath = "/tmp/kylin-nm-btoutput-" + QDir::home().dirName();
-        QString cmd = "nmcli device wifi connect '" + wifiName + "' password '" + wifiPassword + "' hidden yes > " + tmpPath + " 2>&1";
-
-        int status = Utils::m_system(cmd.toUtf8().data());
-        qDebug() << Q_FUNC_INFO << cmd << tmpPath << "res=" << status;
-
-        QFile file(tmpPath);
-        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            qDebug()<<"Can't open the file!"<<endl;
-        }
-        QString text = file.readAll();
-        file.close();
-        if(text.indexOf("Scanning not allowed") != -1
-           || text.isEmpty()
-           || text.indexOf("No network with SSID") != -1){
-            x = 1;
-            sleep(10);//nm扫描冷却为10s
-        } else {
-            emit connDone(6);
-            x = 0;
-        }
-    } while (x == 1);
-
-    emit btFinish();
-}
-
-void BackThread::execConnRememberedHiddenWifi(QString wifiName)
-{
-    QProcess shellProcess;
-    shellProcess.start("nmcli -f ssid device wifi");
-    shellProcess.waitForFinished(3000); // 等待最多3s
-    if (shellProcess.exitCode() == 0) {
-        QString shellOutput = shellProcess.readAllStandardOutput();
-        QStringList wlist = shellOutput.split("\n");
-        bool is_hidden  = true;
-        foreach (QString wifi, wlist) {
-            if (wifi.trimmed() == wifiName) {
-                is_hidden = false;
-            }
-        }
-        if (! is_hidden) {
-            QString cmd = "nmcli connection up '" + wifiName + "'";
-            qDebug()<<"Trying to connect wifi. ssid="<<wifiName;
-            int res = Utils::m_system(cmd.toUtf8().data());
-            if (res == 0) {
-                emit connDone(6);
-            } else {
-                emit connDone(res);
-            }
-        } else {
-            //已保存的wifi没有在wifi列表找到（隐藏wifi保存后也会出现在wifi列表），则当前区域无法连接此wifi
-            qDebug() << "Choosen wifi can not be sacnned, wifiName=" << wifiName;
-            emit connDone(5);
-        }
-    }
-    emit btFinish();
-}
-void BackThread::execConnWifiPsk(QString cmd)
-{
-    int res = Utils::m_system(cmd.toUtf8().data());
-    emit connDone(res);
-}
-
-//to connected wireless network driectly do not need a password
-void BackThread::execConnWifi(QString connName, QString connIfName)
-{
-    qDebug() << "Will to connect wifi " << connName << " with wifi card named " << connIfName;
-
-    QString cmdStr;
-    KylinDBus objBackThreadDBus;
-    QString wifiUuid = objBackThreadDBus.checkHasWifiConfigFile(connName);
-    if (!wifiUuid.isEmpty()) {
-        //有配置文件
-        cmdStr = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection up '" + wifiUuid + "' ifname '" + connIfName + "'\n";
-    } else {
-        //没有配置文件
-        cmdStr = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection up '" + connName + "' ifname '" + connIfName + "'\n";
-    }
-    qDebug() << "Trying to connect wifi. cmd=" << cmdStr;
-
-    QStringList options;
-    options << "-c" << cmdStr;
-    cmdProcessWifi->start("/bin/bash",options);
-    cmdProcessWifi->waitForStarted();
-    cmdProcessWifi->waitForFinished();
-}
-
-void BackThread::execReconnWIfi(QString uuid)
-{
-    QString cmd = "nmcli connection down " + uuid;
-    Utils::m_system(cmd.toUtf8().data());
-    cmd = "nmcli connection up " + uuid;
-    Utils::m_system(cmd.toUtf8().data());
-    qDebug()<<"Trying to connect wifi. uuid="<<uuid;
-}
-
-void BackThread::onReadOutputWifi()
-{
-    QString str = cmdProcessWifi->readAllStandardOutput();
-    qDebug()<<"on_readoutput_wifi:  "<< str;
-    dellConnectWifiResult(str);
-}
-void BackThread::onReadErrorWifi()
-{
-    QString str = cmdProcessWifi->readAllStandardError();
-    qDebug()<<"on_readerror_wifi: "<< str;
-    dellConnectWifiResult(str);
-}
-
-void BackThread::dellConnectWifiResult(QString info)
-{
-    if (info.indexOf("successfully") != -1) {
-        emit connDone(0);
-    } else if(info.indexOf("unknown") != -1 || info.indexOf("not exist") != -1) {
-        //qDebug() << "send this signal if the network we want to connect has not a configuration file";
-        emit connDone(2);
-    } else if (info.indexOf("The connection was not a Wi-Fi connection..") != -1) {
-        emit connDone(2);
-    } else if(info.indexOf("not given") != -1 || info.indexOf("Secrets were required") != -1) {
-        //nothing need to do
-    } else if(info.indexOf("Passwords or encryption keys are required") != -1){
-        //qDebug() << "password for '802-11-wireless-security.psk' not given in 'passwd-file'";
-        emit connDone(4);
-    } else {
-        //qDebug() << "send this signal if connect net failed";
-        emit connDone(1);
-    }
-
-    emit btFinish();
-}
-
-
-//get property of connected network
-QString BackThread::getConnProp(QString connName)
-{
-    QString tmpPath = "/tmp/kylin-nm-connprop-" + QDir::home().dirName();
-    QString cmd = "nmcli connection show '" + connName + "' > " + tmpPath;
-    Utils::m_system(cmd.toUtf8().data());
-
-    QFile file(tmpPath);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qDebug() << "Can't open the file /tmp/kylin-nm-connprop!";
-    }
-
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-
-    QString rtn = "";
-    foreach (QString line, txtLine) {
-        if (line.startsWith("ipv4.method:")) {
-            QString v4method = line.mid(12).trimmed();
-            rtn += "method:" + v4method + "|";
-        }
-
-        if (line.startsWith("ipv4.addresses:")) {
-            QString value = line.mid(15).trimmed();
-            if (value == "--" || value == "") {
-                rtn += "v4addr:|mask:|";
-            } else {
-                QString addr = value.split("/").at(0);
-                QString mask = value.trimmed().split("/").at(1);
-                rtn += "v4addr:" + addr + "|";
-                rtn += "mask:" + mask + "|";
-            }
-        }
-
-        if (line.startsWith("ipv6.method:")) {
-            QString value = line.mid(12).trimmed();
-            if (value == "auto") {
-                rtn += "v6method:auto|v6addr:|";
-            } else {
-                rtn += "v6method:manual|";
-            }
-        }
-
-        if (line.startsWith("ipv6.addresses:")) {
-            QString value = line.mid(15).trimmed();
-            if (value == "--" || value == "") {
-                rtn += "v6addr:|";
-            } else {
-                QString addr = value.split("/").at(0);
-                rtn += "v6addr:" + addr + "|";
-            }
-        }
-
-
-        if (line.startsWith("ipv4.gateway:")) {
-            QString value = line.mid(13).trimmed();
-            if (value == "--" || value == "") {
-                rtn += "gateway:|";
-            } else {
-                rtn += "gateway:" + value + "|";
-            }
-        }
-
-        if (line.startsWith("ipv4.dns:")) {
-            QString value = line.mid(9).trimmed();
-            if (value == "--" || value == "") {
-                rtn += "dns:|";
-            } else {
-                rtn += "dns:" + value + "|";
-            }
-        }
-    }
-
-    return rtn.left(rtn.length() - 1);
-}
-
-//get band width of wired network
-QString BackThread::execChkLanWidth(QString ethName)
-{
-    QString tmpPath = "/tmp/kylin-nm-bandwidth-" + QDir::home().dirName();
-    QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';ethtool '" + ethName + "' | grep Speed > " + tmpPath;
-    int res = Utils::m_system(cmd.toUtf8().data());
-    qDebug() << "executed cmd=" << cmd << ".res="<<res;
-
-    QFile file(tmpPath);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qDebug() << "Can't open the file /tmp/kylin-nm-bandwidth!";
-    }
-    QString line = file.readLine();
-    file.close();
-
-    QStringList params = line.split(":");
-    if (params.size() < 2) {
-        return "";
-    }
-
-    QString rtn = params.at(1);
-    return rtn.trimmed();
-}
-
-//disconnected spare ethernet or wifi
-void BackThread::disConnSparedNetSlot(QString type)
-{
-    if (type == "wifi") {
-        //disConnLanOrWifi("wifi");
-    } else if(type == "ethernet") {
-        sleep(1);
-        disConnLanOrWifi("ethernet");
-    }
-}
-
-//disconnected ethernet or wifi according to network type
-void BackThread::disConnLanOrWifi(QString type)
-{
-    QString strSlist;
-    const int BUF_SIZE = 1024;
-    char buf[BUF_SIZE];
-
-    FILE * p_file = NULL;
-
-    p_file = popen("nmcli connection show -active", "r");
-    if (!p_file) {
-        qDebug() << "Error occurred when popen cmd 'nmcli connection show";
-    }
-
-    while (fgets(buf, BUF_SIZE, p_file) != NULL) {
-        QString line(buf);
-
-        if (line.indexOf("802-11-wireless") != -1) {
-            if (type == "wifi") {
-                type = "802-11-wireless";
-            }
-        }
-
-        if (line.indexOf("802-3-ethernet") != -1) {
-            if (type == "ethernet") {
-                type = "802-3-ethernet";
-            }
-        }
-
-        if (line.indexOf(type) != -1) {
-            QStringList subLine = line.split(" ");
-            if (subLine[1].size() == 1) {
-                strSlist =  subLine[0]+ " " + subLine[1];
-            } else {
-                strSlist =  subLine[0];
-            }
-            kylin_network_set_con_down(strSlist.toUtf8().data());
-        }
-    }
-    emit btFinish();
-    pclose(p_file);
-}
diff --git a/src/backend/backthread.h b/src/backend/backthread.h
deleted file mode 100644
index 101674a0..00000000
--- a/src/backend/backthread.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef BACKTHREAD_H
-#define BACKTHREAD_H
-
-#include "kylin-dbus-interface.h"
-#include "kylin-network-interface.h"
-
-#include <QObject>
-#include <QDebug>
-#include <QDir>
-#include <QTimer>
-#include <QProcess>
-#include <QDBusInterface>
-#include <QDBusMessage>
-#include <QDBusArgument>
-#include <QSettings>
-#include "tab-pages/tabpage.h"
-
-//#define CONFIG_FILE_PATH QDir::homePath() + "/.config/ukui/kylin-nm.conf"
-#define WIFI_SWITCH_OPENED "wifi_switch_opened"
-#define LAN_SWITCH_OPENED "lan_switch_opened"
-
-class IFace{
-public:
-    QString lname;
-    QString wname;
-    int lstate; // 0已连接 1未连接 2已关闭
-    int wstate; // 0已连接 1未连接 2已关闭
-};
-
-class BackThread : public QObject
-{
-    Q_OBJECT
-public:
-    explicit BackThread(QObject *parent = nullptr);
-    ~BackThread();
-
-    static IFace* execGetIface();
-    static void saveSwitchButtonState(const QString &key, const QVariant &value);
-    static QVariant getSwitchState(const QString &key);
-    QString getConnProp(QString connName);
-    QString execChkLanWidth(QString ethName);
-    QProcess *cmdProcessWifi = nullptr;
-    QProcess *cmdProcessLan;
-    QString currConnLanUuid;
-    QString currConnLanType;
-
-public slots:
-    void execEnNet();
-    void execDisNet();
-    void execEnWifi();
-    void rfKillexecEnWifi();
-    void execDisWifi();
-    void rfkillExecDisWifi();
-    void execConnLan(QString connName, QString ifname, QString connectType);
-    void execConnWifi(QString connName, QString connIfName);
-    void execReconnWIfi(QString uuid);
-    void execConnWifiPWD(QString connName, QString password, QString connType, QString security, QString ifname);
-    void execConnWifiPsk(QString cmd);
-    void execConnHiddenWifiWPA(QString connName, QString password);
-    void execConnRememberedHiddenWifi(QString connName);
-
-    void disConnSparedNetSlot(QString type);
-    void disConnLanOrWifi(QString type);
-
-    void onReadOutputWifi();
-    void onReadErrorWifi();
-    void dellConnectWifiResult(QString info);
-
-    void onReadOutputLan();
-    void onReadErrorLan();
-    void dellConnectLanResult(QString info);
-
-signals:
-    void enNetDone();
-    void disNetDone();
-    void enWifiDone();
-    void enWifiDoneByRfkill();
-    void disWifiDone();
-    void disWifiDoneByRfkill();
-
-    void connDone(int connFlag);
-
-    void btFinish();
-    void btFinishByRfkill();
-};
-
-#endif // BACKTHREAD_H
diff --git a/src/backend/dbusadaptor.h b/src/backend/dbusadaptor.h
index 0c290333..bfbb471a 100644
--- a/src/backend/dbusadaptor.h
+++ b/src/backend/dbusadaptor.h
@@ -32,7 +32,7 @@ QT_END_NAMESPACE
  * Adaptor class for interface com.kylin.weather
  */
 
-#include "new-mainwindow.h"
+#include "mainwindow.h"
 
 class DbusAdaptor: public QDBusAbstractAdaptor
 {
diff --git a/src/backend/ksimplenm.cpp b/src/backend/ksimplenm.cpp
deleted file mode 100644
index f2f18a12..00000000
--- a/src/backend/ksimplenm.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#include "ksimplenm.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <QThread>
-
-#define MAX_LEN 2048
-#define MAX_PATH 1024
-
-KSimpleNM::KSimpleNM(QObject *parent) : QObject(parent)
-{
-    runProcessLan = new QProcess(this);
-    connect(runProcessLan, &QProcess::readyRead, this, &KSimpleNM::readProcessLan);
-    connect(runProcessLan, SIGNAL(finished(int)), this, SLOT(finishedProcessLan(int)));
-
-    runProcessWifi = new QProcess(this);
-    connect(runProcessWifi, &QProcess::readyRead, this, &KSimpleNM::readProcessWifi);
-    connect(runProcessWifi, SIGNAL(finished(int)), this, SLOT(finishedProcessWifi(int)));
-
-    runProcessConn = new QProcess(this);
-    connect(runProcessConn, &QProcess::readyRead, this, &KSimpleNM::readProcessConn);
-    connect(runProcessConn, SIGNAL(finished(int)), this, SLOT(finishedProcessConn(int)));
-}
-
-KSimpleNM::~KSimpleNM()
-{
-    delete runProcessLan;
-    delete runProcessWifi;
-}
-
-//获取有线网络列表数据
-void KSimpleNM::execGetLanList()
-{
-    if (isExecutingGetLanList) {
-        qDebug()<<"debug: it is running getting lan list when getting lan list";
-        isUseOldLanSlist = true;
-        QStringList slistmEmpty;
-        slistmEmpty.append("Empty");
-        emit getLanListFinished(slistmEmpty);
-        return;
-    }
-    isExecutingGetLanList = true;
-
-    shellOutputLan = "";
-    QString getCmd = "export LANG='zh_CN.UTF-8';export LANGUAGE='zh_CN:zh';nmcli -f type,uuid,name connection show";
-    QStringList options;
-    options << "-c" << getCmd;
-    runProcessLan->start("/bin/bash",options);
-
-    //runProcessLan->start("nmcli -f type,uuid,name connection show");
-}
-
-//获取无线网络列表数据
-void KSimpleNM::execGetWifiList(const QString& wname, const bool &isHuaweiPc)
-{
-    if (isExecutingGetWifiList) {
-        qDebug() << "It is running getting wifi list when getting wifi list";
-        isUseOldWifiSlist = true;
-        QStringList slistmEmpty;
-        slistmEmpty.append("Empty");
-        emit requestRevalueUpdateWifi();
-        emit getWifiListFinished(slistmEmpty);
-        return;
-    }
-    isExecutingGetWifiList = true;
-    shellOutputWifi = "";
-    QString cmd;
-    //将ssid放置在最后一列以防ssid存在中文或特殊字符导致其后面的列不对齐
-    if (wname.isEmpty() || wname == "") {
-        if (isHuaweiPc)
-            cmd = "nmcli -f in-use,signal,security,freq,bssid,dbus-path,category,ssid device wifi";
-        else
-            cmd = "nmcli -f in-use,signal,security,freq,bssid,dbus-path,ssid device wifi";
-    } else {
-        if (isHuaweiPc)
-            cmd = "nmcli -f in-use,signal,security,freq,bssid,dbus-path,category,ssid device wifi list ifname " + wname;
-        else
-            cmd = "nmcli -f in-use,signal,security,freq,bssid,dbus-path,ssid device wifi list ifname " + wname;
-    }
-    runProcessWifi->start(cmd);
-}
-
-//获取保存的网络列表数据
-void KSimpleNM::execGetConnList()
-{
-    shellOutputConn = "";
-    runProcessConn->start("nmcli -f name connection show");
-}
-
-//读取获取到的结果
-void KSimpleNM::readProcessLan()
-{
-    QString output = runProcessLan->readAll();
-    shellOutputLan += output;
-}
-void KSimpleNM::readProcessWifi()
-{
-    QString output = runProcessWifi->readAll();
-    shellOutputWifi += output;
-}
-void KSimpleNM::readProcessConn()
-{
-    QString output = runProcessConn->readAll();
-    shellOutputConn += output;
-}
-
-//读取完所有列表数据后发信号，将数据发往mainwindow用于显示网络列表
-void KSimpleNM::finishedProcessLan(int msg)
-{
-    QStringList slist = shellOutputLan.split("\n");
-    emit getLanListFinished(slist);
-    isExecutingGetLanList = false;
-}
-void KSimpleNM::finishedProcessWifi(int msg)
-{
-    QStringList slist = shellOutputWifi.split("\n");
-    emit getWifiListFinished(slist);
-    isExecutingGetWifiList = false;
-}
-void KSimpleNM::finishedProcessConn(int msg)
-{
-    QStringList slist = shellOutputConn.split("\n");
-    emit getConnListFinished(slist);
-}
diff --git a/src/backend/ksimplenm.h b/src/backend/ksimplenm.h
deleted file mode 100644
index 54d8c488..00000000
--- a/src/backend/ksimplenm.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef KSIMPLENM_H
-#define KSIMPLENM_H
-
-#include <QObject>
-#include <QProcess>
-#include <QDebug>
-
-class KSimpleNM : public QObject
-{
-    Q_OBJECT
-public:
-    explicit KSimpleNM(QObject *parent = nullptr);
-    ~KSimpleNM();
-
-    QProcess *runProcessLan;
-    QProcess *runProcessWifi;
-    QProcess *runProcessConn;
-    QString shellOutputLan;
-    QString shellOutputWifi;
-    QString shellOutputConn;
-
-    bool isExecutingGetLanList = false; //是否正在执行获取有线网列表
-    bool isExecutingGetWifiList = false; //是否正在执行获取无线网列表
-    bool isUseOldLanSlist = false; //是否应该要用上一次获取的有线列表
-    bool isUseOldWifiSlist = false; //是否应该要用上一次获取的有线列表
-
-    void execGetLanList();
-    void execGetWifiList(const QString& wname, const bool& isHuaweiPc = false);
-    void execGetConnList();
-
-signals:
-    void getLanListFinished(QStringList slist);
-    void getWifiListFinished(QStringList slist);
-    void getConnListFinished(QStringList slist);
-    void requestRevalueUpdateWifi();
-
-public slots:
-    void readProcessLan();
-    void readProcessWifi();
-    void readProcessConn();
-    void finishedProcessLan(int msg);
-    void finishedProcessWifi(int msg);
-    void finishedProcessConn(int msg);
-};
-
-#endif // KSIMPLENM_H
diff --git a/src/backend/kylin-dbus-interface.cpp b/src/backend/kylin-dbus-interface.cpp
deleted file mode 100644
index 1779dd03..00000000
--- a/src/backend/kylin-dbus-interface.cpp
+++ /dev/null
@@ -1,2130 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#include "kylin-dbus-interface.h"
-#include "mainwindow.h"
-#include "utils.h"
-#include "wificonfigdialog.h"
-
-#include <vector>
-
-#include <QTextCodec>
-#include <QByteArray>
-#include <QMetaType>
-#include <QDBusMetaType>
-
-namespace {
-
-void quitThread(QThread *thread)
-{
-    Q_ASSERT(thread);
-    if (thread) {
-        thread->quit();
-        if (!thread->wait(2000)) {
-            thread->terminate();
-            thread->wait();
-        }
-    }
-}
-
-} // namespace
-
-KylinDBus::KylinDBus(OldMainWindow *mainWindow, QObject *parent) :QObject(parent)
-{
-    this->mw = mainWindow;
-
-    getObjectPath(); //获取dbus中 lan 与 WiFi 的device路径
-    getPhysicalCarrierState(0); //初始化获取网线插入状态
-    getLanHwAddressState(); //获取有线网Mac地址
-    getWiredCardName(); //获取有线网卡名称
-    //initTaskbarGsetting(); //初始化taskbar的GSetting方法
-    getWifiSwitchState(); //初始化wifi开关GSetting通信方法
-    initTransparentState(); //初始化窗口透明度的GSetting方法
-    getLanIpChanged();
-
-    QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
-                                         QString("/org/freedesktop/NetworkManager"),
-                                         QString("org.freedesktop.NetworkManager"),
-                                         QString("PropertiesChanged"), this, SLOT(onPropertiesChanged(QVariantMap) ) );
-
-    QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
-                                         QString("/org/freedesktop/NetworkManager"),
-                                         QString("org.freedesktop.NetworkManager"),
-                                         QString("AutoConnect"), this, SLOT(onAutoConnect() ) );
-
-    QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
-                                         QString("/org/freedesktop/NetworkManager"),
-                                         QString("org.freedesktop.NetworkManager"),
-                                         QString("DeviceAdded"), mw, SLOT(onNetworkDeviceAdded(QDBusObjectPath) ) );
-
-    QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
-                                         QString("/org/freedesktop/NetworkManager"),
-                                         QString("org.freedesktop.NetworkManager"),
-                                         QString("DeviceRemoved"), mw, SLOT(onNetworkDeviceRemoved(QDBusObjectPath) ) );
-
-    QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
-                                         QString("/org/freedesktop/NetworkManager/Settings"),
-                                         QString("org.freedesktop.NetworkManager.Settings"),
-                                         QString("NewConnection"), this, SLOT(onNewConnection(QDBusObjectPath) ) );
-
-    QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
-                                         QString("/org/freedesktop/NetworkManager/Settings"),
-                                         QString("org.freedesktop.NetworkManager.Settings"),
-                                         QString("ConnectionRemoved"), this, SLOT(onConnectionRemoved(QDBusObjectPath) ) );
-
-    if (multiWiredPaths.size() > 0) {
-        foreach (QDBusObjectPath mWiredPath, multiWiredPaths) {
-            QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
-                                                 QString(mWiredPath.path()),
-                                                 QString("org.freedesktop.NetworkManager.Device.Wired"),
-                                                 QString("PropertiesChanged"), this, SLOT(onLanPropertyChanged(QVariantMap) ) );
-        }
-    } else {
-        qDebug()<<"Can not find wired device object path when using dbus.";
-    }
-
-    if (!multiWirelessPaths.isEmpty()) {
-        getWirelessCardName();//获取无线网卡名称
-    } else {
-        qDebug()<<"Can not find wireless device object path when using dbus.";
-    }
-
-    time = new QTimer(this);
-    time->setTimerType(Qt::PreciseTimer);
-    QObject::connect(time, SIGNAL(timeout()), this, SLOT(slot_timeout()));
-
-    if (mw) {
-        QObject::connect(this, SIGNAL(updateWiredList(int)), mw, SLOT(onBtnNetListClicked(int)));
-        QObject::connect(this, SIGNAL(newConnAdded(int)), mw, SLOT(onNewConnAdded(int)));
-        QObject::connect(this, SIGNAL(updateWirelessList()), mw, SLOT(on_wifi_changed()));
-    }
-
-    mUtils = new Utils();
-    mUtilsThread = new QThread(this);
-    mUtils->moveToThread(mUtilsThread);
-    connect(mUtilsThread, &QThread::finished, mUtils, &Utils::deleteLater);
-    connect(this, SIGNAL(requestSendDesktopNotify(QString)), mUtils, SLOT(onRequestSendDesktopNotify(QString)), Qt::QueuedConnection);
-    QTimer::singleShot(1, this, [=] {
-        mUtilsThread->start();
-    });
-}
-
-KylinDBus::~KylinDBus()
-{
-    quitThread(mUtilsThread);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-//下方使用Dbus 进程通信方法
-
-//获取dbus中 lan 与 WiFi 的device路径
-void KylinDBus::getObjectPath()
-{
-    foreach (QDBusObjectPath mPath, multiWiredPaths) {
-        QDBusConnection::systemBus().disconnect(QString("org.freedesktop.NetworkManager"),
-                                             QString(mPath.path()),
-                                             QString("org.freedesktop.NetworkManager.Device.Wired"),
-                                             QString("PropertiesChanged"), this, SLOT(onLanPropertyChanged(QVariantMap) ) );
-        multiWiredPaths.removeOne(mPath);
-    }
-
-    QDBusInterface m_interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.NetworkManager",
-                              QDBusConnection::systemBus() );
-
-   //先获取所有的网络设备的设备路径
-   QDBusReply<QList<QDBusObjectPath>> obj_reply = m_interface.call("GetAllDevices");
-   if (!obj_reply.isValid()) {
-       qDebug()<<"execute dbus method 'GetAllDevices' is invalid in func getObjectPath()";
-   }
-
-   QList<QDBusObjectPath> obj_paths = obj_reply.value();
-
-   //再判断有无有线设备和无线设备的路径
-   foreach (QDBusObjectPath obj_path, obj_paths) {
-       QDBusInterface interface( "org.freedesktop.NetworkManager",
-                                 obj_path.path(),
-                                 "org.freedesktop.DBus.Introspectable",
-                                 QDBusConnection::systemBus() );
-
-       QDBusReply<QString> reply = interface.call("Introspect");
-       if (!reply.isValid()) {
-           qDebug()<<"execute dbus method 'Introspect' is invalid in func getObjectPath()";
-       }
-
-       if(reply.value().indexOf("org.freedesktop.NetworkManager.Device.Wired") != -1) {
-           //表明有有线网设备
-           multiWiredPaths.append(obj_path);
-       } else if (reply.value().indexOf("org.freedesktop.NetworkManager.Device.Wireless") != -1) {
-           //表明有wifi设备
-           multiWirelessPaths.append(obj_path);
-           wirelessPath = obj_path;
-           isWirelessCardOn = true;
-       }
-   }
-}
-
-//获取是否连接有线网网线
-void KylinDBus::getPhysicalCarrierState(int n)
-{
-    foreach (QString mStr, multiWiredCableState) {
-        multiWiredCableState.removeOne(mStr);
-    }
-
-    foreach (QDBusObjectPath localPath, multiWiredPaths) {
-        QDBusInterface interface( "org.freedesktop.NetworkManager",
-                                  localPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        //Carrier值为true，插了网线；为false，未插网线
-        QDBusReply<QVariant> reply = interface.call("Get", "org.freedesktop.NetworkManager.Device.Wired", "Carrier");
-
-        try {
-            if (reply.value().toString() == "true") {
-                multiWiredCableState.append("true");
-            } else if (reply.value().toString() == "false") {
-                multiWiredCableState.append("false");
-            } else {
-                throw -1; //出现异常
-            }
-        } catch(...) {
-            qDebug()<<"Error occurred when get the property 'Carrier' of Wired";
-        }
-    }
-
-    isWiredCableOn = false;
-    foreach (QString state, multiWiredCableState) {
-        if (state == "true") {
-            isWiredCableOn = true;
-        }
-    }
-
-    if (n == 1) { this->mw->onPhysicalCarrierChanged(isWiredCableOn);}
-}
-
-//获取有线网Mac地址
-void KylinDBus::getLanHwAddressState()
-{
-    foreach (QString mStr, multiWiredMac) {
-        multiWiredMac.removeOne(mStr);
-    }
-
-    foreach (QDBusObjectPath mPath, multiWiredPaths) {
-        QDBusInterface lanInterface( "org.freedesktop.NetworkManager",
-                                  mPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        QDBusReply<QVariant> lanReply = lanInterface.call("Get", "org.freedesktop.NetworkManager.Device.Wired", "HwAddress");
-        if (!lanReply.isValid()) {
-            qDebug()<<"can not get the attribute 'HwAddress' in func getLanHwAddressState()";
-        } else {
-            QString dbusLanMac = lanReply.value().toString();
-            multiWiredMac.append(dbusLanMac);
-        }
-    }
-
-    if (multiWiredMac.size() > 0) {
-        dbusMacDefault = multiWiredMac.at(0);
-    } else {
-        dbusMacDefault = "--";
-    }
-}
-
-//获取有线网卡名称
-void KylinDBus::getWiredCardName()
-{
-    foreach (QString mStr, multiWiredIfName) {
-        multiWiredIfName.removeOne(mStr);
-    }
-
-    foreach (QDBusObjectPath mPath, multiWiredPaths) {
-        QDBusInterface lanInterface( "org.freedesktop.NetworkManager",
-                                     mPath.path(),
-                                     "org.freedesktop.DBus.Properties",
-                                     QDBusConnection::systemBus() );
-
-        QDBusReply<QVariant> lanReply = lanInterface.call("Get", "org.freedesktop.NetworkManager.Device", "Interface");
-        if (!lanReply.isValid()) {
-            qDebug()<<"can not get the attribute 'Interface' in func getWiredCardName()";
-        } else {
-            QString dbusLanCardName = lanReply.value().toString();
-            multiWiredIfName.append(dbusLanCardName);
-        }
-    }
-}
-
-//获取无线网卡名称
-void KylinDBus::getWirelessCardName()
-{
-    if (multiWirelessPaths.size() == 0) {
-        dbusWiFiCardName = "";
-        return;
-    }
-
-    QDBusInterface lanInterface( "org.freedesktop.NetworkManager",
-                              multiWirelessPaths.at(0).path(),
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    QDBusReply<QVariant> lanReply = lanInterface.call("Get", "org.freedesktop.NetworkManager.Device", "Interface");
-    if (!lanReply.isValid()) {
-        qDebug()<<"can not get the attribute 'Interface' in func getWirelessCardName()";
-    } else {
-        dbusWiFiCardName = lanReply.value().toString();
-    }
-}
-
-//获取普通的有线网ip、DNS、ifname
-void KylinDBus::getLanIpDNS(QString uuidName, bool isActNet)
-{
-    dbusIfName = "--";
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> m_reply = m_interface.call("ListConnections");
-
-    QList<QDBusObjectPath> m_objNets = m_reply.value();
-    foreach (QDBusObjectPath objNet, m_objNets) {
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objNet.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage result = m_interface.call("GetSettings"); //get information of this network
-
-        const QDBusArgument &dbusArg1st = result.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg1st >> map;
-
-        for (QString outside_key : map.keys() ) {
-            QMap<QString,QVariant> outsideMap = map.value(outside_key);
-            if (outside_key == "connection") {
-                for (QString search_key : outsideMap.keys()) {
-                    if (search_key == "uuid") {
-                        if (uuidName == outsideMap.value(search_key).toString()) {
-                            for (QString search_key : outsideMap.keys()) {
-                                if (search_key == "interface-name") {
-                                    dbusIfName = outsideMap.value("interface-name").toString();
-                                }
-                            }
-
-                            for (QString key : map.keys() ) {
-                                QMap<QString,QVariant> innerMap = map.value(key);
-                                if (key == "ipv4") {
-                                    for (QString inner_key : innerMap.keys()) {
-                                        //获取ipv4
-                                        if (inner_key == "address-data") {
-                                            const QDBusArgument &dbusArg2nd = innerMap.value(inner_key).value<QDBusArgument>();
-                                            QMap<QString,QVariant> m_map;
-
-                                            dbusArg2nd.beginArray();
-                                            while (!dbusArg2nd.atEnd()) {
-                                                dbusArg2nd >> m_map;// append map to a vector here if you want to keep it
-                                                break;
-                                            }
-                                            dbusArg2nd.endArray();
-
-                                            dbusLanIpv4 = m_map.value("address").toString();
-                                        }
-
-                                        if (isActNet && inner_key == "dns") {
-                                            const QDBusArgument &dbusArg2nd = innerMap.value(inner_key).value<QDBusArgument>();
-                                            int strDns = 0;
-                                            dbusArg2nd.beginArray();
-                                            while (!dbusArg2nd.atEnd()) {
-                                                dbusArg2nd >> strDns;// append map to a vector here if you want to keep it
-                                                if (strDns == 0) {
-                                                    //dbusArg2nd为空时，strDns没有从dbusArg2nd获取到结果
-                                                    dbusArg2nd.endArray();
-                                                }
-                                            }
-                                            dbusArg2nd.endArray();
-                                            dbusActLanDNS = strDns;
-                                        }
-                                    }
-                                }
-
-                                if (key == "ipv6") {
-                                    for (QString inner_key : innerMap.keys()) {
-                                        if (inner_key == "address-data"){
-                                            const QDBusArgument &dbusArg2nd = innerMap.value(inner_key).value<QDBusArgument>();
-                                            QMap<QString,QVariant> m_map;
-
-                                            dbusArg2nd.beginArray();
-                                            while (!dbusArg2nd.atEnd()) {
-                                                dbusArg2nd >> m_map;// append map to a vector here if you want to keep it
-                                                break;
-                                            }
-                                            dbusArg2nd.endArray();
-
-                                            dbusLanIpv6 = m_map.value("address").toString();
-                                        } else if (inner_key == "method") {
-                                            dbusLanIpv6Method = innerMap.value(inner_key).toString();
-                                        }
-                                    }
-                                }
-                            } //end for(QString key : map.keys() )
-
-                        }
-                    }
-                } //end for (QString search_key : outsideMap.keys())
-            }
-        } // end for(QString outside_key : map.keys() )
-
-    } //end foreach (QDBusObjectPath objNet, m_objNets)
-}
-
-void KylinDBus::getWifiIp(QString uuid)
-{
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> m_reply = m_interface.call("ListConnections");
-
-    QList<QDBusObjectPath> m_objNets = m_reply.value();
-    foreach (QDBusObjectPath objNet, m_objNets) {
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objNet.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage result = m_interface.call("GetSettings");
-
-        const QDBusArgument &dbusArg1st = result.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg1st >> map;
-
-        for (QString outside_key : map.keys() ) {
-            QMap<QString,QVariant> outsideMap = map.value(outside_key);
-            if (outside_key == "connection") {
-                for (QString search_key : outsideMap.keys()) {
-                    if (search_key == "uuid") {
-                        if (uuid == outsideMap.value(search_key).toString()) {
-                            for (QString key : map.keys() ) {
-                                QMap<QString,QVariant> innerMap = map.value(key);
-                                if (key == "ipv4") {
-                                    for (QString inner_key : innerMap.keys()) {
-                                        if (inner_key == "address-data") {
-                                            const QDBusArgument &dbusArg2nd = innerMap.value(inner_key).value<QDBusArgument>();
-                                            QMap<QString,QVariant> m_map;
-                                            dbusArg2nd.beginArray();
-                                            while (!dbusArg2nd.atEnd()) {
-                                                dbusArg2nd >> m_map;
-                                            }
-                                            dbusArg2nd.endArray();
-                                            dbusWifiIpv4 = m_map.value("address").toString();
-                                        } else if (inner_key == "method") {
-                                            dbusWifiIpv4Method = innerMap.value(inner_key).toString();
-                                        }
-                                    }
-                                }
-                                if (key == "ipv6") {
-                                    for (QString inner_key : innerMap.keys()) {
-                                        if (inner_key == "address-data"){
-                                            const QDBusArgument &dbusArg2nd = innerMap.value(inner_key).value<QDBusArgument>();
-                                            QMap<QString,QVariant> m_map;
-
-                                            dbusArg2nd.beginArray();
-                                            while (!dbusArg2nd.atEnd()) {
-                                                dbusArg2nd >> m_map;// append map to a vector here if you want to keep it
-                                            }
-                                            dbusArg2nd.endArray();
-
-                                            dbusWifiIpv6 = m_map.value("address").toString();
-                                        } else if (inner_key == "method") {
-                                            dbusWifiIpv6Method = innerMap.value(inner_key).toString();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        continue;
-                    }
-                }
-            }
-        }
-    }
-}
-
-//获取有线网络的MAC
-QString KylinDBus::getLanMAC(QString ifname)
-{
-    QString macAddress = "--";
-
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "AllDevices");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath; //保存设备的路径
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-
-        QDBusInterface interfacePro( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        QDBusReply<QVariant> reply = interfacePro.call("Get", "org.freedesktop.NetworkManager.Device", "Interface");
-        if (ifname == reply.value().toString()) {
-            //先获取已连接有线网络对应的设备路径
-            QDBusInterface interfaceMac( "org.freedesktop.NetworkManager",
-                                          objPath.path(),
-                                          "org.freedesktop.DBus.Properties",
-                                          QDBusConnection::systemBus() );
-
-            QDBusReply<QVariant> reply = interfaceMac.call("Get", "org.freedesktop.NetworkManager.Device.Wired", "HwAddress");
-            macAddress = reply.value().toString();
-        }
-    }
-    dbusArgs.endArray();
-
-    return macAddress;
-}
-
-//获取已经连接的有线网ip
-void KylinDBus::getConnectNetIp(QString netUuid)
-{
-    dbusWifiIpv4 = "";
-    dbusActiveWifiIpv4 = "";
-    dbusWifiIpv4Method = "";
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    //获取已经连接了那些网络，及这些网络对应的网络类型(ethernet or wifi)
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-
-        QDBusInterface interfacePro( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        QDBusReply<QVariant> replyType = interfacePro.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-        QDBusReply<QVariant> replyUuid = interfacePro.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Uuid");
-        if (replyType.value().toString() == "ethernet" || replyType.value().toString() == "802-3-ethernet" || replyType.value().toString() == "bluetooth") { //有线网或蓝牙共享网络
-            if (replyUuid.value().toString() == netUuid) {
-                //ipv4的路径信息和ip信息
-                QDBusInterface interfaceIp4( "org.freedesktop.NetworkManager",
-                                          objPath.path(),
-                                          "org.freedesktop.DBus.Properties",
-                                          QDBusConnection::systemBus() );
-                QDBusMessage replyIp4 = interfaceIp4.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip4Config");
-                QList<QVariant> outArgsIp4 = replyIp4.arguments();
-                if(false == outArgsIp4.isEmpty())
-                {
-                    QVariant firstIp4 = outArgsIp4.at(0);
-                    QDBusVariant dbvFirstIp4 = firstIp4.value<QDBusVariant>();
-                    QVariant vFirstIp4 = dbvFirstIp4.variant();
-                    QDBusObjectPath dbusPathIp4 = vFirstIp4.value<QDBusObjectPath>();
-
-                    QDBusInterface interfaceIpv4( "org.freedesktop.NetworkManager",
-                                                dbusPathIp4.path(),
-                                                "org.freedesktop.DBus.Properties",
-                                                QDBusConnection::systemBus() );
-                    QDBusMessage replyIpv4 = interfaceIpv4.call("Get", "org.freedesktop.NetworkManager.IP4Config", "AddressData");
-
-                    QList<QVariant> outArgsIpv4 = replyIpv4.arguments();
-                    if(false == outArgsIpv4.isEmpty())
-                    {
-                        QVariant firstIpv4 = outArgsIpv4.at(0);
-                        QDBusVariant dbvFirstIpv4 = firstIpv4.value<QDBusVariant>();
-                        QVariant vFirstIpv4 = dbvFirstIpv4.variant();
-
-                        const QDBusArgument &dbusArgIpv4 = vFirstIpv4.value<QDBusArgument>();
-                        QList<QVariantMap> mDatasIpv4;
-                        dbusArgIpv4 >> mDatasIpv4;
-                        if(false == mDatasIpv4.isEmpty())
-                        {
-                            foreach (QVariantMap mDataIpv4, mDatasIpv4) {
-                                dbusActiveLanIpv4 = mDataIpv4.value("address").toString();
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                //ipv6的路径信息和ip信息
-                QDBusInterface interfaceIp6( "org.freedesktop.NetworkManager",
-                                          objPath.path(),
-                                          "org.freedesktop.DBus.Properties",
-                                          QDBusConnection::systemBus() );
-                QDBusMessage replyIp6 = interfaceIp6.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip6Config");
-                QList<QVariant> outArgsIp6 = replyIp6.arguments();
-                if(outArgsIp6.isEmpty())
-                    continue;
-
-                QVariant firstIp6 = outArgsIp6.at(0);
-                QDBusVariant dbvFirstIp6 = firstIp6.value<QDBusVariant>();
-                QVariant vFirstIp6 = dbvFirstIp6.variant();
-                QDBusObjectPath dbusPathIp6 = vFirstIp6.value<QDBusObjectPath>();
-
-                QDBusInterface interfaceIpv6( "org.freedesktop.NetworkManager",
-                                              dbusPathIp6.path(),
-                                              "org.freedesktop.DBus.Properties",
-                                              QDBusConnection::systemBus() );
-                QDBusMessage replyIpv6 = interfaceIpv6.call("Get", "org.freedesktop.NetworkManager.IP6Config", "AddressData");
-
-                QList<QVariant> outArgsIpv6 = replyIpv6.arguments();
-                if(outArgsIpv6.isEmpty())
-                    continue;
-
-                QVariant firstIpv6 = outArgsIpv6.at(0);
-                QDBusVariant dbvFirstIpv6 = firstIpv6.value<QDBusVariant>();
-                QVariant vFirstIpv6 = dbvFirstIpv6.variant();
-
-                const QDBusArgument &dbusArgIpv6 = vFirstIpv6.value<QDBusArgument>();
-                QList<QVariantMap> mDatasIpv6;
-                dbusArgIpv6 >> mDatasIpv6;
-                if(mDatasIpv6.isEmpty())
-                    continue;
-
-                foreach (QVariantMap mDataIpv6, mDatasIpv6) {
-                    dbusActiveLanIpv6 = mDataIpv6.value("address").toString();
-                    break;
-                }
-            }
-
-        } else { //无线网
-            if (replyUuid.value().toString() == netUuid) {
-                //ipv4的路径信息和ip信息
-                QDBusInterface interfaceIp4( "org.freedesktop.NetworkManager",
-                                          objPath.path(),
-                                          "org.freedesktop.DBus.Properties",
-                                          QDBusConnection::systemBus() );
-                QDBusMessage replyIp4 = interfaceIp4.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip4Config");
-                QList<QVariant> outArgsIp4 = replyIp4.arguments();
-                if(false == outArgsIp4.isEmpty())
-                {
-                    QVariant firstIp4 = outArgsIp4.at(0);
-                    QDBusVariant dbvFirstIp4 = firstIp4.value<QDBusVariant>();
-                    QVariant vFirstIp4 = dbvFirstIp4.variant();
-                    QDBusObjectPath dbusPathIp4 = vFirstIp4.value<QDBusObjectPath>();
-
-                    QDBusInterface interfaceIpv4( "org.freedesktop.NetworkManager",
-                                                dbusPathIp4.path(),
-                                                "org.freedesktop.DBus.Properties",
-                                                QDBusConnection::systemBus() );
-                    QDBusMessage replyIpv4 = interfaceIpv4.call("Get", "org.freedesktop.NetworkManager.IP4Config", "AddressData");
-
-                    QList<QVariant> outArgsIpv4 = replyIpv4.arguments();
-                    if(false == outArgsIpv4.isEmpty())
-                    {
-                        QVariant firstIpv4 = outArgsIpv4.at(0);
-                        QDBusVariant dbvFirstIpv4 = firstIpv4.value<QDBusVariant>();
-                        QVariant vFirstIpv4 = dbvFirstIpv4.variant();
-
-                        const QDBusArgument &dbusArgIpv4 = vFirstIpv4.value<QDBusArgument>();
-                        QList<QVariantMap> mDatasIpv4;
-                        dbusArgIpv4 >> mDatasIpv4;
-                        if(false == mDatasIpv4.isEmpty())
-                        {
-                            foreach (QVariantMap mDataIpv4, mDatasIpv4) {
-                                dbusActiveWifiIpv4 = mDataIpv4.value("address").toString();
-                            }
-                        }
-                    }
-                }
-
-                //ipv6的路径信息和ip信息
-                QDBusInterface interfaceIp6( "org.freedesktop.NetworkManager",
-                                          objPath.path(),
-                                          "org.freedesktop.DBus.Properties",
-                                          QDBusConnection::systemBus() );
-                QDBusMessage replyIp6 = interfaceIp6.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip6Config");
-                QList<QVariant> outArgsIp6 = replyIp6.arguments();
-                if(outArgsIp6.isEmpty())
-                    continue;
-                QVariant firstIp6 = outArgsIp6.at(0);
-                QDBusVariant dbvFirstIp6 = firstIp6.value<QDBusVariant>();
-                QVariant vFirstIp6 = dbvFirstIp6.variant();
-                QDBusObjectPath dbusPathIp6 = vFirstIp6.value<QDBusObjectPath>();
-
-                QDBusInterface interfaceIpv6( "org.freedesktop.NetworkManager",
-                                              dbusPathIp6.path(),
-                                              "org.freedesktop.DBus.Properties",
-                                              QDBusConnection::systemBus() );
-                QDBusMessage replyIpv6 = interfaceIpv6.call("Get", "org.freedesktop.NetworkManager.IP6Config", "AddressData");
-
-                QList<QVariant> outArgsIpv6 = replyIpv6.arguments();
-                if(outArgsIpv6.isEmpty())
-                    continue;
-                QVariant firstIpv6 = outArgsIpv6.at(0);
-                QDBusVariant dbvFirstIpv6 = firstIpv6.value<QDBusVariant>();
-                QVariant vFirstIpv6 = dbvFirstIpv6.variant();
-
-                const QDBusArgument &dbusArgIpv6 = vFirstIpv6.value<QDBusArgument>();
-                QList<QVariantMap> mDatasIpv6;
-                dbusArgIpv6 >> mDatasIpv6;
-                if(mDatasIpv6.isEmpty())
-                    continue;
-                foreach (QVariantMap mDataIpv6, mDatasIpv6) {
-                    dbusActiveWifiIpv6 = mDataIpv6.value("address").toString();
-                }
-            }
-        }
-    }
-    dbusArgs.endArray();
-}
-
- //监听有线网络ip变化
-void KylinDBus::getLanIpChanged()
-{
-    m_lanPathList.clear();
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> m_reply = m_interface.call("ListConnections");
-
-    QList<QDBusObjectPath> m_objNets = m_reply.value();
-    foreach (QDBusObjectPath objNet, m_objNets) {
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objNet.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage result = m_interface.call("GetSettings");
-
-        const QDBusArgument &dbusArg1st = result.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg1st >> map;
-
-        for(QString key : map.keys() ) {
-            if (key == "802-3-ethernet") {
-                oldSettingPaths.append(objNet);
-                QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
-                                                     objNet.path(),
-                                                     QString("org.freedesktop.NetworkManager.Settings.Connection"),
-                                                     QString("Updated"), this, SLOT(onLanIpPropertiesChanged() ) );
-                m_lanPathList.append(objNet.path());
-            } else if (key == "802-11-wireless") {
-                QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
-                                                     objNet.path(),
-                                                     QString("org.freedesktop.NetworkManager.Settings.Connection"),
-                                                     QString("Updated"), this, SLOT(onWifiIpPropertiesChanged() ) );
-            }
-        }
-    }
-}
-
-//获取wifi的mac地址
-void KylinDBus::getWifiMac(QString netName)
-{
-    dbusWifiMac = "";
-
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              multiWirelessPaths.at(0).path(),
-                              "org.freedesktop.NetworkManager.Device.Wireless",
-                              QDBusConnection::systemBus() );
-
-    QDBusReply<QList<QDBusObjectPath>> reply = interface.call("GetAllAccessPoints"); //get accesspoint for each wifi
-    QList<QDBusObjectPath> objPaths = reply.value();
-
-    foreach (QDBusObjectPath objPath, objPaths) {
-        QDBusInterface ssid_interface( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        QDBusReply<QVariant> ssid_replys = ssid_interface.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "Ssid");
-        QString str_name = ssid_replys.value().toString();
-
-        if (str_name == netName) {
-            //if the ssid of the accesspoint is just the netName, we can get this hardware address
-            QDBusInterface path_interface( "org.freedesktop.NetworkManager",
-                                      objPath.path(),
-                                      "org.freedesktop.DBus.Properties",
-                                      QDBusConnection::systemBus() );
-
-            QDBusReply<QVariant> path_reply = path_interface.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "HwAddress");
-            dbusWifiMac = path_reply.value().toString();
-        }
-    }
-}
-
-//获取当前能获取到的wifi的数量， 每个accesspoint 代表一个wifi
-int KylinDBus::getAccessPointsNumber()
-{
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              multiWirelessPaths.at(0).path(),
-                              "org.freedesktop.NetworkManager.Device.Wireless",
-                              QDBusConnection::systemBus() );
-
-    QDBusReply<QList<QDBusObjectPath>> reply = interface.call("GetAllAccessPoints");
-    QList<QDBusObjectPath> objPaths = reply.value();
-
-    return objPaths.size();
-}
-
-//返回当前已创建有线的个数
-int KylinDBus::getWiredNetworkNumber()
-{
-    QDBusInterface interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> reply = interface.call("ListConnections");
-    QList<QDBusObjectPath> objNetPaths = reply.value();
-
-    int wiredNetworkNumber = 0;
-    foreach (QDBusObjectPath objNetPath, objNetPaths) {
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objNetPath.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage result = m_interface.call("GetSettings");
-
-        const QDBusArgument &dbusArg1st = result.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg1st >> map;
-
-        for(QString key : map.keys() ) {
-            if (key == "802-3-ethernet") {
-                wiredNetworkNumber += 1;
-            }
-        }
-    }
-
-    return wiredNetworkNumber;
-}
-
-QStringList KylinDBus::getWifiSsidList()
-{
-    QStringList wifiSsidList;
-
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> m_reply = m_interface.call("ListConnections");
-
-    QDBusObjectPath specific_connection;
-    specific_connection.setPath("/");
-
-    QList<QDBusObjectPath> m_objSettingPaths = m_reply.value();
-    foreach (QDBusObjectPath objSettingPath, m_objSettingPaths) {
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objSettingPath.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage result = m_interface.call("GetSettings");
-
-        const QDBusArgument &dbusArg1st = result.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg1st >> map;
-
-        if (map.value("802-11-wireless").value("mode").toString() == "infrastructure") {
-            wifiSsidList.append(map.value("connection").value("id").toString());
-        }
-    }
-
-    return wifiSsidList;
-}
-
-QString KylinDBus::checkHasWifiConfigFile(QString wifiName)
-{
-    QString wifiUuid = "";
-
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> m_reply = m_interface.call("ListConnections");
-
-    QDBusObjectPath specific_connection;
-    specific_connection.setPath("/");
-
-    QList<QDBusObjectPath> m_objSettingPaths = m_reply.value();
-    foreach (QDBusObjectPath objSettingPath, m_objSettingPaths) {
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objSettingPath.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage result = m_interface.call("GetSettings");
-
-        const QDBusArgument &dbusArg1st = result.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg1st >> map;
-
-        if (map.value("connection").value("type").toString() == "802-11-wireless") {
-            if (map.value("802-11-wireless").value("ssid").toString() == wifiName) {
-                //qDebug() << "-------------------------> wifi ssid : " <<map.value("802-11-wireless").value("ssid").toString();
-                //qDebug() << "-------------------------> wifi id : " <<map.value("connection").value("id").toString();
-                wifiUuid = map.value("connection").value("uuid").toString();
-            }
-        }
-    }
-
-    return wifiUuid;
-}
-
-void KylinDBus::toCreateNewLan()
-{
-    int i = 1;
-    if (multiWiredIfName.size() != 0) {
-        foreach (QString strIfName, multiWiredIfName) {
-            //QString cmdStr = "nmcli connection add con-name '有线连接 " + QString::number(i,10) + "' ifname '" + strIfName + "' type ethernet";
-            QString cmdStr = "nmcli connection add con-name '"+tr("Wired connection")+" "+ QString::number(i,10) + "' ifname '" + strIfName + "' type ethernet";
-            Utils::m_system(cmdStr.toUtf8().data());
-            i += 1;
-        }
-    }
-}
-
-//根据网卡接口的名称获取接口对应网线是否接入
-bool KylinDBus::getWiredCableStateByIfname(QString ifname)
-{
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "AllDevices");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-        QDBusInterface interfaceInterface( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        QDBusReply<QVariant> replyInterface = interfaceInterface.call("Get", "org.freedesktop.NetworkManager.Device", "Interface");
-        if (replyInterface.value().toString() == ifname) {
-            QDBusInterface interfaceCarrier( "org.freedesktop.NetworkManager",
-                                      objPath.path(),
-                                      "org.freedesktop.DBus.Properties",
-                                      QDBusConnection::systemBus() );
-
-            QDBusReply<QVariant> replyCarrier = interfaceCarrier.call("Get", "org.freedesktop.NetworkManager.Device.Wired", "Carrier");
-
-            if (replyCarrier.value().toBool()) {
-               return true;
-            }
-        }
-    }
-    dbusArgs.endArray();
-
-    return false;
-}
-
-//根据网卡接口的名称获取uuid
-QString KylinDBus::getConnLanNameByIfname(QString ifname)
-{
-    QString uuidName = "--";
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-
-        QDBusInterface interfaceDevice( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        QDBusMessage replyDevices = interfaceDevice.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Devices");
-        QList<QVariant> outArgsDevices = replyDevices.arguments();
-        QVariant firstDevices = outArgsDevices.at(0);
-        QDBusVariant dbvFirstDevices = firstDevices.value<QDBusVariant>();
-        QVariant vFirstDevices = dbvFirstDevices.variant();
-        QDBusArgument dbusArgsDevices = vFirstDevices.value<QDBusArgument>();
-
-        QDBusObjectPath objPathDevices;
-        dbusArgsDevices.beginArray();
-        while (!dbusArgsDevices.atEnd()) {
-            dbusArgsDevices >> objPathDevices;
-            QDBusInterface interfaceInterface( "org.freedesktop.NetworkManager",
-                                      objPathDevices.path(),
-                                      "org.freedesktop.DBus.Properties",
-                                      QDBusConnection::systemBus() );
-
-            QDBusReply<QVariant> replyInterface = interfaceInterface.call("Get", "org.freedesktop.NetworkManager.Device", "Interface");
-            if (replyInterface.value().toString() == ifname) {
-                QDBusInterface interfaceUuid( "org.freedesktop.NetworkManager",
-                                          objPath.path(),
-                                          "org.freedesktop.DBus.Properties",
-                                          QDBusConnection::systemBus() );
-
-                QDBusReply<QVariant> replyDevices = interfaceUuid.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Uuid");
-                uuidName = replyDevices.value().toString();
-            }
-        }
-        dbusArgsDevices.endArray();
-    }
-    dbusArgs.endArray();
-
-    return uuidName;
-}
-
-//新增了一个网络，伴随着多了一个网络配置文件
-void KylinDBus::onNewConnection(QDBusObjectPath objPath)
-{
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                              objPath.path(),
-                              "org.freedesktop.NetworkManager.Settings.Connection",
-                              QDBusConnection::systemBus());
-    QDBusMessage result = m_interface.call("GetSettings");
-
-    const QDBusArgument &dbusArg1st = result.arguments().at( 0 ).value<QDBusArgument>();
-    QMap<QString,QMap<QString,QVariant>> map;
-    dbusArg1st >> map;
-
-    for(QString key : map.keys() ) {
-        if (key == "802-3-ethernet") {
-            emit this->updateWiredList(0); //send this signal to update wired network list
-            emit this->newConnAdded(0);
-            m_lanPathList.append(objPath.path());
-            emit mw->wiredConnectionAdded();
-            qDebug()<<"A new wired network was created.";
-            break;
-        } else if (key == "802-11-wireless") {
-            qDebug()<<"A new wireless network was created.";
-            sleep(1);
-            bool has_wpa_psk = false;
-            bool has_psk_flags = false;
-            QDBusInterface interfaceSet("org.freedesktop.NetworkManager",
-                                      objPath.path(),
-                                      "org.freedesktop.NetworkManager.Settings.Connection",
-                                      QDBusConnection::systemBus());
-            QDBusMessage resultSet = interfaceSet.call("GetSettings");
-            const QDBusArgument &dbusArg1stSet = resultSet.arguments().at( 0 ).value<QDBusArgument>();
-            QMap<QString,QMap<QString,QVariant>> mapSet;
-            dbusArg1stSet >> mapSet;
-            for (QString setKey : mapSet.keys() ) {
-                QMap<QString,QVariant> subSetMap = mapSet.value(setKey);
-                if (setKey == "802-11-wireless-security") {
-                    for (QString searchKey : subSetMap.keys()) {
-                        if (searchKey == "key-mgmt") {
-                            qDebug() << "key-mgmt : "<<subSetMap.value(searchKey).toString();
-                            has_wpa_psk = true;
-                        }
-                        if (searchKey == "psk-flags") {
-                            qDebug() << "psk-flags : "<<subSetMap.value(searchKey).toInt();
-                            has_psk_flags = true;
-                        }
-                    }
-                }
-            }
-
-            if (has_wpa_psk && has_psk_flags) {
-                QPoint pos = QCursor::pos();
-                QRect primaryGeometry;
-                for (QScreen *screen : qApp->screens()) {
-                    if (screen->geometry().contains(pos)) {
-                        primaryGeometry = screen->geometry();
-                    }
-                }
-                if (primaryGeometry.isEmpty()) {
-                    primaryGeometry = qApp->primaryScreen()->geometry();
-                }
-
-                QApplication::setQuitOnLastWindowClosed(false);
-                WiFiConfigDialog *wifiConfigDialog = new WiFiConfigDialog();
-                wifiConfigDialog->move(primaryGeometry.width() / 2 - wifiConfigDialog->width() / 2, primaryGeometry.height() / 2 - wifiConfigDialog->height() / 2);
-                wifiConfigDialog->show();
-                wifiConfigDialog->raise();
-            } else {
-                emit this->newConnAdded(1);
-            }
-
-            break;
-        }
-    }
-
-    onWiredSettingNumChanged();
-}
-
-//减少了一个网络，伴随着减少了一个网络配置文件
-void KylinDBus::onConnectionRemoved(QDBusObjectPath objPath)
-{
-    if (m_lanPathList.contains(objPath.path())) {
-        m_lanPathList.removeOne(objPath.path());
-        qDebug()<<"An old network was removed from configure directory.";
-        if (mw->is_btnLanList_clicked == 1) {
-            emit this->updateWiredList(0); //send this signal to update wired network list
-        }
-        emit mw->wiredConnectionRemoved();
-    }
-
-    onWiredSettingNumChanged();
-}
-
-//有线网的个数，也即有线网配置的个数变化
-void KylinDBus::onWiredSettingNumChanged()
-{
-    //先取消之前建立的信号槽连接
-    foreach (QDBusObjectPath objSettingPath, oldSettingPaths) {
-        QDBusConnection::systemBus().disconnect(QString("org.freedesktop.NetworkManager"),
-                                             objSettingPath.path(),
-                                             QString("org.freedesktop.NetworkManager.Settings.Connection"),
-                                             QString("Updated"), this, SLOT(onLanIpPropertiesChanged() ) );
-    }
-
-    //再建立新的信号槽连接
-    getLanIpChanged();
-}
-
-//应用启动时，获取已经连接的网络信息，包括该网络的路径和类型
-void KylinDBus::initConnectionInfo()
-{
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    //获取已经连接了那些网络，及这些网络对应的网络类型(ethernet or wifi)
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-        oldPaths.append(objPath);
-
-        QDBusInterface interface( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        QDBusReply<QVariant> reply = interface.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-        oldPathInfo.append(reply.value().toString());
-    }
-    dbusArgs.endArray();
-
-    //获取当前wifi的开关状态
-    QDBusReply<QVariant> m_result = interface.call("Get", "org.freedesktop.NetworkManager", "WirelessEnabled");
-    qDebug()<<"debug: *****初始的无线网络开关状态是: "<<m_result.value().toBool();
-    oldWifiSwitchState = m_result.value().toBool();
-}
-
-//获取已经连接有线网络的ssid和uuid和state
-QList<QString> KylinDBus::getAtiveLanSsidUuidState()
-{
-    QList<QString> strSsidUuidState;
-
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-    //获取已经连接了那些网络，及这些网络对应的网络类型(ethernet or wifi)
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-
-        QDBusInterface interfaceType( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-        QDBusReply<QVariant> reply = interfaceType.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-
-        if (reply.value().toString() == "ethernet" || reply.value().toString() == "802-3-ethernet" || reply.value().toString() == "bluetooth") {
-            QDBusInterface interfaceInfo( "org.freedesktop.NetworkManager",
-                                      objPath.path(),
-                                      "org.freedesktop.DBus.Properties",
-                                      QDBusConnection::systemBus() );
-            QDBusReply<QVariant> replyId = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Id");
-            QDBusReply<QVariant> replyUuid = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Uuid");
-            QDBusReply<QVariant> replyState = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "State");
-            strSsidUuidState.append(replyId.value().toString());
-            strSsidUuidState.append(replyUuid.value().toString());
-            if (replyState.value().toUInt() == 1) {
-                strSsidUuidState.append("connecting");
-            }
-            if (replyState.value().toUInt() == 2) {
-                strSsidUuidState.append("connected");
-            }
-        }
-    }
-    dbusArgs.endArray();
-
-    return strSsidUuidState;
-}
-
-//获取已连接wifi的uuid
-QString KylinDBus::getActiveWifiUuid()
-{
-    QString ssid;
-
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-    //获取已经连接了那些网络，及这些网络对应的网络类型(ethernet or wifi)
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-
-        QDBusInterface interfaceType( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-        QDBusReply<QVariant> reply = interfaceType.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-
-        if (reply.value().toString() == "wifi" || reply.value().toString() == "802-11-wireless") {
-            QDBusInterface interfaceInfo( "org.freedesktop.NetworkManager",
-                                      objPath.path(),
-                                      "org.freedesktop.DBus.Properties",
-                                      QDBusConnection::systemBus() );
-            QDBusReply<QVariant> replyUuid = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Uuid");
-            ssid = replyUuid.value().toString();
-        }
-    }
-    dbusArgs.endArray();
-
-    return ssid;
-}
-
-//获取已连接wifi的信息
-int KylinDBus::getActiveWifiSignal()
-{
-    int wifistrength = 0;
-
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-    //获取已经连接了那些网络，及这些网络对应的网络类型(ethernet or wifi)
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-
-        QDBusInterface interfaceType( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-        QDBusReply<QVariant> reply = interfaceType.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-
-        if (reply.value().toString() == "wifi" || reply.value().toString() == "802-11-wireless") {
-            QDBusInterface interfaceSpecificObject( "org.freedesktop.NetworkManager",
-                                      objPath.path(),
-                                      "org.freedesktop.DBus.Properties",
-                                      QDBusConnection::systemBus() );
-
-            QDBusMessage resultSpecificObject = interfaceSpecificObject.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "SpecificObject");
-            QList<QVariant> outArgsSpecificObject = resultSpecificObject.arguments();
-            QVariant firstSpecificObject = outArgsSpecificObject.at(0);
-            QDBusVariant dbvFirstSpecificObject = firstSpecificObject.value<QDBusVariant>();
-            QVariant vFirstSpecificObject = dbvFirstSpecificObject.variant();
-            QDBusObjectPath objPathSpecificObject = vFirstSpecificObject.value<QDBusObjectPath>();
-
-            QDBusInterface interfaceAP( "org.freedesktop.NetworkManager",
-                                      objPathSpecificObject.path(),
-                                      "org.freedesktop.DBus.Properties",
-                                      QDBusConnection::systemBus() );
-
-            QDBusReply<QVariant> replyStrength = interfaceAP.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "Strength"); //signal
-
-            //QString strStrength;
-            QByteArray sesultStrength = replyStrength.value().toByteArray();
-            int wifiSignal = sesultStrength[0] & 0x000000FF;
-            wifiSignal |= ((sesultStrength[1] << 8) & 0x0000FF00);
-            wifiSignal |= ((sesultStrength[2] << 16) & 0x00FF0000);
-            wifiSignal |= ((sesultStrength[3] << 24) & 0xFF000000);
-            //strStrength = QString::number(addr);
-            wifistrength = wifiSignal;
-        }
-    }
-    dbusArgs.endArray();
-
-    return wifistrength;
-}
-
-//根据Dbus路径获取wifi的ssid（排除空格干扰）
-QString KylinDBus::getWifiSsid(QString accessPointPath)
-{
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              accessPointPath,
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "Ssid");
-    if (result.arguments().isEmpty()) return "";
-    return result.arguments().at(0).value<QDBusVariant>().variant().toString();
-}
-
-//检查wifi连接状态
-int KylinDBus::checkWifiConnectivity()
-{
-    int wifiState = WIFI_DISCONNECTED;
-
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-
-        QDBusInterface interfaceType( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-        QDBusReply<QVariant> replyType = interfaceType.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-
-        if (replyType.value().toString() == "wifi" || replyType.value().toString() == "802-11-wireless") {
-            QDBusReply<QVariant> replyState = interfaceType.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "State");
-            wifiState = replyState.value().toUInt(); //正在连接的状态是1，连接上的状态是2
-        }
-    }
-    dbusArgs.endArray();
-
-    return wifiState;
-}
-
-bool KylinDBus::checkNetworkConnectivity()
-{
-    bool hasNetworkConnecting = false;
-
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-
-        QDBusInterface interfaceType( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-        QDBusReply<QVariant> replyType = interfaceType.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-
-        if (replyType.value().toString() == "802-3-ethernet" || replyType.value().toString() == "802-11-wireless") {
-            QDBusReply<QVariant> replyState = interfaceType.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "State");
-            if (replyState.value().toUInt() == 1) {
-                hasNetworkConnecting = true;
-            }
-        }
-    }
-    dbusArgs.endArray();
-
-    return hasNetworkConnecting;
-}
-
-//获取已经连接无线网络的ssid和uuid
-QList<QString> KylinDBus::getAtiveWifiBSsidUuid(QStringList wifilist)
-{
-    QList<QString> strBSsidUuid;
-
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-    //获取已经连接了那些网络，及这些网络对应的网络类型(ethernet or wifi)
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath objPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> objPath;
-
-        QDBusInterface interfaceType( "org.freedesktop.NetworkManager",
-                                  objPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-        QDBusReply<QVariant> reply = interfaceType.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-
-        if (reply.value().toString() == "wifi" || reply.value().toString() == "802-11-wireless") {
-            QDBusInterface interfaceInfo( "org.freedesktop.NetworkManager",
-                                      objPath.path(),
-                                      "org.freedesktop.DBus.Properties",
-                                      QDBusConnection::systemBus() );
-
-            //获取已经连接wifi的uuid
-            QDBusReply<QVariant> replyUuid = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Uuid");
-            //qDebug() << "wifi uuid : "<< replyUuid.value().toString();
-            strBSsidUuid.append(replyUuid.value().toString());
-
-
-            //再获取bssid
-            QDBusMessage resultConnection = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Connection");
-
-            QList<QVariant> outArgsConnection = resultConnection.arguments();
-            if(outArgsConnection.isEmpty())
-                continue;
-            QVariant firstConnection = outArgsConnection.at(0);
-            QDBusVariant dbvFirstConnection = firstConnection.value<QDBusVariant>();
-            QVariant vFirstConnection = dbvFirstConnection.variant();
-            QDBusObjectPath dbusArgsConnection = vFirstConnection.value<QDBusObjectPath>();
-
-            QDBusInterface interfaceSet("org.freedesktop.NetworkManager",
-                                      dbusArgsConnection.path(),
-                                      "org.freedesktop.NetworkManager.Settings.Connection",
-                                      QDBusConnection::systemBus());
-            QDBusMessage resultSet = interfaceSet.call("GetSettings");
-            if(resultSet.arguments().isEmpty())
-                continue;
-            const QDBusArgument &dbusArg1stSet = resultSet.arguments().at( 0 ).value<QDBusArgument>();
-            QMap<QString,QMap<QString,QVariant>> mapSet;
-            dbusArg1stSet >> mapSet;
-
-            for (QString setKey : mapSet.keys() ) {
-                QMap<QString,QVariant> subSetMap = mapSet.value(setKey);
-                if (setKey == "802-11-wireless") {
-                    for (QString searchKey : subSetMap.keys()) {
-                        if (searchKey == "seen-bssids") {
-                            //qDebug() << "wifi bssid : "<<subSetMap.value(searchKey).toStringList();
-                            QStringList strBssidList = subSetMap.value(searchKey).toStringList();
-                            foreach (QString strBssid, strBssidList) {
-                                strBSsidUuid.append(strBssid);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    dbusArgs.endArray();
-
-//    //获取已经连接wifi的bssid
-//    if (wifilist.size() != 0) {
-//        // 填充可用网络列表
-//        QString headLine = wifilist.at(0);
-//        int indexSignal,indexSecu, indexFreq, indexBSsid, indexName;
-//        headLine = headLine.trimmed();
-
-//        bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-//        if (isChineseExist) {
-//            indexSignal = headLine.indexOf("SIGNAL");
-//            indexSecu = headLine.indexOf("安全性");
-//            indexFreq = headLine.indexOf("频率") + 4;
-//            indexBSsid = headLine.indexOf("BSSID") + 6;
-//            indexName = indexBSsid + 19;
-//        } else {
-//            indexSignal = headLine.indexOf("SIGNAL");
-//            indexSecu = headLine.indexOf("SECURITY");
-//            indexFreq = headLine.indexOf("FREQ");
-//            indexBSsid = headLine.indexOf("BSSID");
-//            indexName = indexBSsid + 19;
-//        }
-
-//        for (int i = 1, j = 0; i < wifilist.size(); i ++) {
-//            QString line = wifilist.at(i);
-//            QString winuse = line.mid(0, indexSignal).trimmed();
-//            QString wbssid = line.mid(indexBSsid, 17).trimmed();
-//            if (winuse == "*") {
-//                strBSsidUuid.append(wbssid);
-//            }
-//        }
-//    }
-
-    return strBSsidUuid;
-}
-
-
-//使用dbus的方法获取wifi的信息，形成包含每个wifi信息的列表
-void KylinDBus::toGetWifiList()
-{
-    QStringList slist;
-
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    QDBusMessage resultAllDevices = interface.call("Get", "org.freedesktop.NetworkManager", "AllDevices");
-    QList<QVariant> outArgsAllDevices = resultAllDevices.arguments();
-    QVariant firstAllDevices = outArgsAllDevices.at(0);
-    QDBusVariant dbvFirstAllDevices = firstAllDevices.value<QDBusVariant>();
-    QVariant vFirstAllDevices = dbvFirstAllDevices.variant();
-    QDBusArgument dbusArgsAllDevices = vFirstAllDevices.value<QDBusArgument>();
-
-    QDBusObjectPath objPathDevice;
-    dbusArgsAllDevices.beginArray();
-    while (!dbusArgsAllDevices.atEnd()) {
-        dbusArgsAllDevices >> objPathDevice;
-
-        QDBusInterface interfacePro( "org.freedesktop.NetworkManager",
-                                  objPathDevice.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        QDBusMessage resultAccessPoints = interfacePro.call("Get", "org.freedesktop.NetworkManager.Device.Wireless", "AccessPoints");
-        QList<QVariant> outArgsAccessPoints = resultAccessPoints.arguments();
-        QVariant firstAccessPoints = outArgsAccessPoints.at(0);
-        QDBusVariant dbvFirstAccessPoints = firstAccessPoints.value<QDBusVariant>();
-        QVariant vFirstAccessPoints = dbvFirstAccessPoints.variant();
-        QDBusArgument dbusArgsAccessPoints = vFirstAccessPoints.value<QDBusArgument>();
-
-        QDBusObjectPath objPathAccessPoint;
-        dbusArgsAccessPoints.beginArray();
-        while (!dbusArgsAccessPoints.atEnd()) {
-            dbusArgsAccessPoints >> objPathAccessPoint;
-
-            QDBusInterface interfaceAP( "org.freedesktop.NetworkManager",
-                                      objPathAccessPoint.path(),
-                                      "org.freedesktop.DBus.Properties",
-                                      QDBusConnection::systemBus() );
-
-            QDBusReply<QVariant> replyFlags = interfaceAP.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "Flags"); //in-use
-            QDBusReply<QVariant> replyStrength = interfaceAP.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "Strength"); //signal
-            QDBusReply<QVariant> replyWpaFlags = interfaceAP.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "WpaFlags"); //security
-            QDBusReply<QVariant> replyFrequency = interfaceAP.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "Frequency"); //freq
-            QDBusReply<QVariant> replyHwAddress = interfaceAP.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "HwAddress"); //bssid
-            QDBusReply<QVariant> replySsid = interfaceAP.call("Get", "org.freedesktop.NetworkManager.AccessPoint", "Ssid"); //ssid
-
-            QString strFlags = replyFlags.value().toString();
-
-            QString strStrength;
-            QByteArray sesultStrength = replyStrength.value().toByteArray();
-            int addr = sesultStrength[0] & 0x000000FF;
-            addr |= ((sesultStrength[1] << 8) & 0x0000FF00);
-            addr |= ((sesultStrength[2] << 16) & 0x00FF0000);
-            addr |= ((sesultStrength[3] << 24) & 0xFF000000);
-            strStrength = QString::number(addr);
-
-            QString strWpaFlags = replyWpaFlags.value().toString();
-
-            QString strFrequency = replyFrequency.value().toString();
-
-            QString strHwAddress = replyHwAddress.value().toString();
-
-            QString strSsid = replySsid.value().toString();
-
-            slist.append(strFlags);
-            slist.append(strStrength);
-            slist.append(strWpaFlags);
-            slist.append(strFrequency);
-            slist.append(strHwAddress);
-            slist.append(strSsid);
-        }
-        dbusArgsAccessPoints.endArray();
-
-    }
-    dbusArgsAllDevices.endArray();
-
-    emit toGetWifiListFinished(slist);
-}
-
-//网络连接变化时，如有新增或减少的网络，发信号通知更新主界面
-void KylinDBus::onPropertiesChanged(QVariantMap qvm)
-{
-    if (mw->is_stop_check_net_state) {
-        return;
-    }
-    for(QString keyStr : qvm.keys()) {
-        //有关已连接网络变化的信号
-        if (keyStr == "ActiveConnections") {
-            // 第一步 获取当前已连接网络的对象路径和对应的网络类型(ethernet or wifi)
-            const QDBusArgument &dbusArg = qvm.value(keyStr).value<QDBusArgument>();
-            QList<QDBusObjectPath> newPaths;
-            newPaths.clear();
-            dbusArg >> newPaths;
-            QStringList newPathInfo;
-            qDebug()<<"             ";
-            foreach (QDBusObjectPath objPath, newPaths) {
-                QDBusInterface interface( "org.freedesktop.NetworkManager",
-                                          objPath.path(),
-                                          "org.freedesktop.DBus.Properties",
-                                          QDBusConnection::systemBus() );
-
-                QDBusReply<QVariant> reply = interface.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-                newPathInfo.append(reply.value().toString());
-            }
-            // 第二步 同上一次获取的已连接网络相比较，处理相比于上次减少的网络连接
-            for (int i=0; i<oldPaths.size(); i++) {
-                QDBusObjectPath old_path = oldPaths.at(i);
-                if (newPaths.size() == 0) {
-                    if (oldPathInfo.size() == oldPaths.size()) {
-                        qDebug()<<"debug: 已连接网络个数由1减少到0";
-                        mw->onExternalConnectionChange(oldPathInfo.at(i), false);
-                    }
-                } else {
-                    for (int j=0; j<newPaths.size(); j++) {
-                        QDBusObjectPath new_path = newPaths.at(j);
-                        if (new_path == old_path) {
-                            break; //stop if new_path also in oldPaths
-                        }
-
-                        if (j == newPaths.size()-1) {
-                            if (oldPathInfo.size() == oldPaths.size()) {
-                                qDebug()<<"debug: 已连接网络个数由3减少到2，或由2减少到1";
-                                mw->onExternalConnectionChange(oldPathInfo.at(i), false);
-                            }
-                        }
-                    }
-                }
-            }
-
-            // 第三步 同上一次获取的已连接网络相比较，处理相比于上次增加的网络连接
-            for (int i=0; i<newPaths.size(); i++) {
-                QDBusObjectPath new_path = newPaths.at(i);
-                if (oldPaths.size() == 0) {
-                    qDebug()<<"debug: 已连接网络个数由0增加到1";
-                    mw->onExternalConnectionChange(newPathInfo.at(i), true);
-                } else {
-                    for (int j=0; j<oldPaths.size(); j++) {
-                        QDBusObjectPath old_path = oldPaths.at(j);
-                        if (new_path == old_path) {
-                            break; //stop if new_path also in oldPaths
-                        }
-
-                        if (j == oldPaths.size()-1) {
-                            qDebug()<<"debug: 已连接网络个数由1增加到2，或2增加到3";
-                            mw->onExternalConnectionChange(newPathInfo.at(i), true);
-                        }
-                    }
-                }
-            }
-
-            bool isChangeOldPathInfo = true;
-            for (int k=0; k<newPathInfo.size(); k++) {
-                if (newPathInfo.at(k) == "") {
-                    isChangeOldPathInfo = false;
-                }
-            }
-            if (isChangeOldPathInfo) {
-                oldPathInfo = newPathInfo;
-            }
-            oldPaths = newPaths;
-        }
-
-        //收到wifi开关打开或关闭的信号后，进行处理
-//        if (keyStr == "WirelessEnabled") {
-//            bool newWifiSwitchState = qvm.value("WirelessEnabled").toBool();
-//            if (oldWifiSwitchState == false && newWifiSwitchState == true) {
-//                qDebug()<<"debug: wifi开关已经打开";
-//                mw->onExternalWifiSwitchChange(true);
-//            }
-//            if (oldWifiSwitchState == true && newWifiSwitchState == false) {
-//                qDebug()<<"debug: wifi开关已经关闭";
-//                mw->onExternalWifiSwitchChange(false);
-//            }
-
-//            oldWifiSwitchState = newWifiSwitchState; //更新状态用于下一次
-//        }
-    }
-}
-
-//接收到自动连接的信号过后执行自动连接wifi
-void KylinDBus::onAutoConnect()
-{
-    //syslog(LOG_DEBUG, "Receive a auto-connect signal to reconnect wifi");
-    qDebug() << "Receive a auto-connect signal to reconnect wifi";
-    if (mw->isRadioWifiTurningOn) {
-        qDebug() << "But it is turning wifi switch on now, stop to reconnect wifi";
-    } else {
-        mw->toReconnectWifi();
-    }
-}
-
-//有线网属性变化时，执行该函数。由于可能在短时间收到几条相同属性变化信息，所以在短时间内，执行一次
-void KylinDBus::onLanPropertyChanged(QVariantMap qvm)
-{
-    if (!isRunningFunction) {
-        qDebug()<<"kylin-nm receive a signal 'Device.Wired PropertiesChanged' about interface.";
-        isRunningFunction = true;  //function onLanPropertyChanged is running
-        time->start(3000);
-        QString str = qvm.value("Carrier").toString();
-        if (str == "false" || str == "true") {
-            getPhysicalCarrierState(1);
-        }
-    } else { a = 0; }
-}
-void KylinDBus::slot_timeout()
-{
-    isRunningFunction = false;
-    time->stop();
-}
-
-//有线网的Ip属性变化时的响应函数
-void KylinDBus::onLanIpPropertiesChanged()
-{
-    if (!mw->isHandlingWiredCableOn) {
-        emit this->updateWiredList(0);
-    }
-}
-
-//无线网的Ip属性变化时的响应函数
-void KylinDBus::onWifiIpPropertiesChanged() {
-    if (mw->is_stop_check_net_state) {
-        return;
-    }
-    emit this->updateWirelessList();
-}
-
-//利用dbus的方法对已经连接的有线网进行再次连接
-void KylinDBus::reConnectWiredNet(QString netUuid)
-{
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> m_reply = m_interface.call("ListConnections");
-
-    QDBusObjectPath specific_connection;
-    specific_connection.setPath("/");
-
-    QList<QDBusObjectPath> m_objSettingPaths = m_reply.value();
-    foreach (QDBusObjectPath objSettingPath, m_objSettingPaths) {
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objSettingPath.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage result = m_interface.call("GetSettings");
-
-        const QDBusArgument &dbusArg1st = result.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg1st >> map;
-
-        for (QString outside_key : map.keys() ) {
-            QMap<QString,QVariant> outsideMap = map.value(outside_key);
-            if (outside_key == "connection") {
-                for (QString search_key : outsideMap.keys()) {
-                    if (search_key == "uuid") {
-                        if (netUuid == outsideMap.value(search_key).toString()) {
-
-                            QDBusInterface conn_interface("org.freedesktop.NetworkManager",
-                                                       "/org/freedesktop/NetworkManager",
-                                                       "org.freedesktop.NetworkManager",
-                                                       QDBusConnection::systemBus() );
-
-                            QDBusInterface interface( "org.freedesktop.NetworkManager",
-                                                      "/org/freedesktop/NetworkManager",
-                                                      "org.freedesktop.DBus.Properties",
-                                                      QDBusConnection::systemBus() );
-
-                            //获取已经连接了那些网络，及这些网络对应的网络类型(ethernet or wifi)
-                            QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-                            QList<QVariant> outArgs = result.arguments();
-                            QVariant first = outArgs.at(0);
-                            QDBusVariant dbvFirst = first.value<QDBusVariant>();
-                            QVariant vFirst = dbvFirst.variant();
-                            QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-                            QDBusObjectPath connWiredDivicePath; //已经连接的有线网对应的device路径
-                            QDBusObjectPath objPath;
-                            dbusArgs.beginArray();
-                            while (!dbusArgs.atEnd()) {
-                                dbusArgs >> objPath;
-
-                                QDBusInterface interfacePro( "org.freedesktop.NetworkManager",
-                                                          objPath.path(),
-                                                          "org.freedesktop.DBus.Properties",
-                                                          QDBusConnection::systemBus() );
-
-                                QDBusReply<QVariant> reply = interfacePro.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
-                                if (reply.value().toString() == "ethernet" || reply.value().toString() == "802-3-ethernet") {
-                                    //先获取已连接有线网络对应的设备路径
-                                    QDBusInterface interfaceConn( "org.freedesktop.NetworkManager",
-                                                              objPath.path(),
-                                                              "org.freedesktop.DBus.Properties",
-                                                              QDBusConnection::systemBus() );
-                                    QDBusMessage replyConn = interfaceConn.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Devices");
-                                    QList<QVariant> outArgsIp4 = replyConn.arguments();
-                                    QVariant firstIp4 = outArgsIp4.at(0);
-                                    QDBusVariant dbvFirstIp4 = firstIp4.value<QDBusVariant>();
-                                    QVariant vFirstIp4 = dbvFirstIp4.variant();
-                                    const QDBusArgument &dbusArgIpv4 = vFirstIp4.value<QDBusArgument>();
-                                    QList<QDBusObjectPath> mDatasIpv4;
-                                    dbusArgIpv4 >> mDatasIpv4;
-                                    connWiredDivicePath = mDatasIpv4.at(0);
-                                    //qDebug() << "xxxxxxxxxxxxxxxxxxxxxxxxxx" << mDatasIpv4.at(0).path();
-                                }
-                            }
-                            dbusArgs.endArray();
-
-                            /*
-                             * 获取到所需的信息后，接下来进行连接
-                             * conn_interface.call("ActivateConnection" 用到的参数
-                             * 1. QVariant::fromValue(objSettingPath)  有线网络对应的Setting Path
-                             * 2. QVariant::fromValue(connWiredDivicePath) 有线网络对应的Devices Path
-                             * 3. QVariant::fromValue(specific_connection) 其他选项路径，可设置为"/"
-                             */
-                            QDBusReply<QDBusObjectPath> connectionReply = conn_interface.call("ActivateConnection",
-                                                                                           QVariant::fromValue(objSettingPath),
-                                                                                           QVariant::fromValue(connWiredDivicePath),
-                                                                                           QVariant::fromValue(specific_connection));
-                        }
-                    }
-                }
-            }
-        } // end for(QString outside_key : map.keys() )
-
-    } //end foreach (QDBusObjectPath objSettingPath, m_objSettingPaths)
-}
-
-//利用dbus的方法连接有线网
-bool KylinDBus::toConnectWiredNet(QString netUuid, QString netIfName)
-{
-    bool isConnectUp = false; //是否连接上
-
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> m_reply = m_interface.call("ListConnections");
-
-    QDBusObjectPath specific_connection;
-    specific_connection.setPath("/");
-
-    QList<QDBusObjectPath> m_objSettingPaths = m_reply.value();
-    foreach (QDBusObjectPath objSettingPath, m_objSettingPaths) {
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objSettingPath.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage result = m_interface.call("GetSettings");
-
-        const QDBusArgument &dbusArg1st = result.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg1st >> map;
-
-        for (QString outside_key : map.keys() ) {
-            QMap<QString,QVariant> outsideMap = map.value(outside_key);
-            if (outside_key == "connection") {
-                for (QString search_key : outsideMap.keys()) {
-                    if (search_key == "uuid") {
-                        if (netUuid == outsideMap.value(search_key).toString()) {
-                            QDBusInterface connInterface("org.freedesktop.NetworkManager",
-                                                       "/org/freedesktop/NetworkManager",
-                                                       "org.freedesktop.NetworkManager",
-                                                       QDBusConnection::systemBus() );
-
-                            //获取对应的设备路径
-                            QDBusObjectPath connWiredDivicePath;
-                            connWiredDivicePath.setPath("/");
-                            QDBusInterface interfaceDevice( "org.freedesktop.NetworkManager",
-                                                      "/org/freedesktop/NetworkManager",
-                                                      "org.freedesktop.DBus.Properties",
-                                                      QDBusConnection::systemBus() );
-
-                            QDBusMessage resultDevice = interfaceDevice.call("Get", "org.freedesktop.NetworkManager", "AllDevices");
-                            QList<QVariant> outArgsDevice = resultDevice.arguments();
-                            QVariant firstDevice = outArgsDevice.at(0);
-                            QDBusVariant dbvFirstDevice = firstDevice.value<QDBusVariant>();
-                            QVariant vFirstDevice = dbvFirstDevice.variant();
-                            QDBusArgument dbusArgsDevice = vFirstDevice.value<QDBusArgument>();
-
-                            QDBusObjectPath objPathDevice;
-                            dbusArgsDevice.beginArray();
-                            while (!dbusArgsDevice.atEnd()) {
-                                dbusArgsDevice >> objPathDevice;
-                                QDBusInterface interfaceInterfaceDevice( "org.freedesktop.NetworkManager",
-                                                          objPathDevice.path(),
-                                                          "org.freedesktop.DBus.Properties",
-                                                          QDBusConnection::systemBus() );
-
-                                QDBusReply<QVariant> replyInterfaceDevice = interfaceInterfaceDevice.call("Get", "org.freedesktop.NetworkManager.Device", "Interface");
-                                if (replyInterfaceDevice.value().toString() == netIfName) {
-                                    connWiredDivicePath = objPathDevice;
-                                }
-                            }
-                            dbusArgsDevice.endArray();
-
-                            //下面执行连接网络
-                            QDBusReply<QDBusObjectPath> connectionReply = connInterface.call("ActivateConnection",
-                                                                                           QVariant::fromValue(objSettingPath),
-                                                                                           QVariant::fromValue(connWiredDivicePath),
-                                                                                           QVariant::fromValue(specific_connection));
-                            if (!connectionReply.value().path().isEmpty()) {
-                                isConnectUp = true;
-                            }
-                        }
-                    }
-                }
-            }
-        } // end for(QString outside_key : map.keys() )
-
-    } //end foreach (QDBusObjectPath objSettingPath, m_objSettingPaths)
-
-    return isConnectUp;
-}
-
-//要求底层的驱动进行扫描AP
-void KylinDBus::requestScanWifi()
-{
-    if (multiWirelessPaths.size() == 0)  return;
-
-    qRegisterMetaType<QMap<QString, QVariant>>("QMap<QString, QVariant>");
-    qDBusRegisterMetaType<QMap<QString, QVariant>>();
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              multiWirelessPaths.at(0).path(),
-                              "org.freedesktop.NetworkManager.Device.Wireless",
-                              QDBusConnection::systemBus() );
-    QMap<QString, QVariant> my_map;
-    my_map = {};
-    interface.call("RequestScan", my_map);
-}
-
-//显示桌面通知
-void KylinDBus::showDesktopNotify(QString message)
-{
-    emit requestSendDesktopNotify(message);
-}
-
-//获取任务栏位置，上下左右
-int KylinDBus::getTaskBarPos(QString str)
-{
-    QDBusInterface interface( "com.ukui.panel.desktop",
-                              "/",
-                              "com.ukui.panel.desktop",
-                              QDBusConnection::sessionBus() );
-
-    QDBusReply<int> reply = interface.call("GetPanelPosition", str);
-    if (reply.isValid()) {
-        return reply;
-    } else {
-        return 0; //如果没有成功获取，返回一个默认值
-    }
-}
-
-//获取任务栏高度
-int KylinDBus::getTaskBarHeight(QString str)
-{
-    QDBusInterface interface( "com.ukui.panel.desktop",
-                              "/",
-                              "com.ukui.panel.desktop",
-                              QDBusConnection::sessionBus() );
-
-    QDBusReply<int> reply = interface.call("GetPanelSize", str);
-    if (reply.isValid()) {
-        return reply;
-    } else {
-        return 46; //如果没有成功获取，返回一个默认值
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//下方使用Gsetting 进程通信方法
-
-//创建获取任务栏信息的GSetting对象
-void KylinDBus::initTaskbarGsetting()
-{
-    if (QGSettings::isSchemaInstalled("org.ukui.panel.settings")) {
-        m_tastbar_gsettings = new QGSettings("org.ukui.panel.settings");
-    }
-}
-
-//使用GSetting方法获取任务栏高度
-int KylinDBus::getTaskbarHeight()
-{
-    if (!m_tastbar_gsettings) {
-        return 46;
-    }
-
-    QStringList keys = m_tastbar_gsettings->keys();
-    if (keys.contains("panelsize")) {
-        int hh = m_tastbar_gsettings->get("panelsize").toInt();
-        return hh;
-    } else {
-        return 46;
-    }
-}
-
-//使用GSetting方法获取任务栏位置，上下左右
-int KylinDBus::getTaskbarPos()
-{
-    if (!m_tastbar_gsettings) {
-        return 0;
-    }
-
-    QStringList keys = m_tastbar_gsettings->keys();
-    if (keys.contains("panelposition")) {
-        int pp = m_tastbar_gsettings->get("panelposition").toInt();
-        return pp;
-    } else {
-        return 0;
-    }
-}
-
-//创建监听wifi打开或关闭信息的GSetting对象
-void KylinDBus::getWifiSwitchState()
-{
-    if (QGSettings::isSchemaInstalled("org.ukui.control-center.wifi.switch")) {
-
-        m_gsettings = new QGSettings("org.ukui.control-center.wifi.switch");
-
-        // 监听key的value是否发生了变化
-        connect(m_gsettings, &QGSettings::changed, this, [=] (const QString &key) {
-
-            if (key == "switch") {
-                if (isWirelessCardOn) {
-                    bool judge = getSwitchStatus(key);
-                    if (judge) {
-                        mw->onBtnWifiClicked(2); //打开wifi开关
-                        qDebug()<<"receive a signal to turn on wifi switch from control-center";
-                    } else {
-                        mw->onBtnWifiClicked(3); //关闭wifi开关
-                        qDebug()<<"receive a signal to turn off wifi switch from control-center";
-                    }
-                }
-            }
-        });
-    }
-}
-
-//收到控制面板发来的消息后，获取wifi开关信息
-bool KylinDBus::getSwitchStatus(QString key) {
-    if (!m_gsettings) {
-        return true;
-    }
-    const QStringList list = m_gsettings->keys();
-    if (!list.contains(key)) {
-        return true;
-    }
-    bool res = m_gsettings->get(key).toBool();
-    return res;
-}
-
-//通知控制面板wifi开关的信息
-void KylinDBus::setWifiSwitchState(bool signal)
-{
-    if (!m_gsettings) {
-        return ;
-    }
-
-    const QStringList list = m_gsettings->keys();
-
-    if (!list.contains("switchor")) {
-        return ;
-    }
-    m_gsettings->set("switchor",signal);
-}
-
-//通知控制面板无线网卡的状态信息
-void KylinDBus::setWifiCardState(bool signal)
-{
-    if (!m_gsettings) {
-        return ;
-    }
-
-    const QStringList list = m_gsettings->keys();
-
-    if (!list.contains("wificard")) {
-        return ;
-    }
-    m_gsettings->set("wificard",signal);
-}
-
-//创建获取窗口透明度信息的GSetting的对象
-void KylinDBus::initTransparentState()
-{
-    if (QGSettings::isSchemaInstalled("org.ukui.control-center.personalise")) {
-        m_transparency_gsettings = new QGSettings("org.ukui.control-center.personalise");
-    }
-}
-
-//使用GSetting获取当前窗口应该使用的透明度
-double KylinDBus::getTransparentData()
-{
-    if (!m_transparency_gsettings) {
-        return 0.7;
-    }
-
-    QStringList keys = m_transparency_gsettings->keys();
-    if (keys.contains("transparency")) {
-        double tp = m_transparency_gsettings->get("transparency").toDouble();
-        return tp;
-    } else {
-        return 0.7;
-    }
-}
diff --git a/src/backend/kylin-dbus-interface.h b/src/backend/kylin-dbus-interface.h
deleted file mode 100644
index ebc8dbaa..00000000
--- a/src/backend/kylin-dbus-interface.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef KYLINDBUSINTERFACE_H
-#define KYLINDBUSINTERFACE_H
-
-#include <QObject>
-#include <QDebug>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusObjectPath>
-#include <QDBusReply>
-#include <QDBusObjectPath>
-#include <QVariant>
-#include <QVariantMap>
-#include <QGSettings/QGSettings>
-#include <QTimer>
-#include <QThread>
-
-#define WIFI_CONNECTING 1
-#define WIFI_CONNECTED 2
-#define WIFI_DISCONNECTED 3
-
-class OldMainWindow;
-class Utils;
-
-class KylinDBus : public QObject
-{
-    Q_OBJECT
-public:
-    explicit KylinDBus(OldMainWindow *mw = 0, QObject *parent = nullptr);
-    ~KylinDBus();
-
-    void getObjectPath();
-    int getAccessPointsNumber();
-    int getWiredNetworkNumber();
-    QStringList getWifiSsidList();
-    QString checkHasWifiConfigFile(QString wifiName);
-    void showDesktopNotify(QString message);
-    void initConnectionInfo();
-    QList<QString> getAtiveLanSsidUuidState();
-    QString getActiveWifiUuid();
-    QList<QString> getAtiveWifiBSsidUuid(QStringList wifilist);
-    void reConnectWiredNet(QString netUuid);
-    bool toConnectWiredNet(QString netUuid, QString netIfName);
-    void getConnectNetIp(QString netUuid);
-    void getLanIpChanged();
-    void onWiredSettingNumChanged();
-
-    int getTaskBarPos(QString str);
-    int getTaskBarHeight(QString str);
-    void initTaskbarGsetting();
-    int getTaskbarHeight();
-    int getTaskbarPos();
-
-    void getWifiSwitchState();
-    bool getSwitchStatus(QString key);
-    void setWifiSwitchState(bool signal);
-    void setWifiCardState(bool signal);
-
-    void initTransparentState();
-    double getTransparentData();
-    int checkWifiConnectivity();
-    bool checkNetworkConnectivity();
-    int getActiveWifiSignal();
-    QString getWifiSsid(QString accessPointPath);
-
-    void toGetWifiList();
-
-    QDBusObjectPath wirelessPath; //无线设备的路径
-    QList<QDBusObjectPath> multiWirelessPaths; //Wireless Device的对象路径列表
-    QList<QDBusObjectPath> multiWiredPaths; //Wired Device的对象路径列表
-    QList<QString> multiWiredCableState;//多有线网卡的情况，判断有线网卡对应网线是否插入
-    QList<QString> multiWiredMac; //对应有线网卡的Mac地址
-    QList<QString> multiWiredIfName; //对应有线网的接口
-
-    bool isWiredCableOn = false; //是否插入了网线
-    bool isWirelessCardOn = false; //是否插入了无线网卡
-
-    QString dbusLanIpv4 = "";
-    QString dbusLanIpv6 = "";
-    QString dbusLanIpv6Method = "";
-    QString dbusWifiIpv4Method = "";
-    QString dbusWifiIpv6Method = "";
-    QString dbusActiveLanIpv4 = "";
-    QString dbusActiveLanIpv6 = "";
-    QString dbusActiveWifiIpv4 = "";
-    QString dbusActiveWifiIpv6 = "";
-    QString dbusWifiIpv4 = "";
-    QString dbusWifiIpv6 = "";
-    QString dbusLanGateway = "";
-    QString dbusWiFiCardName = "";
-    QString dbusWifiMac = "";
-    QString dbusIfName;
-    QString dbusMacDefault;
-    int dbusActLanDNS;
-
-public slots:
-    void onNewConnection(QDBusObjectPath objPath);
-    void onConnectionRemoved(QDBusObjectPath objPath);
-    void toCreateNewLan();
-    bool getWiredCableStateByIfname(QString ifname);
-    QString getConnLanNameByIfname(QString ifname);
-    void onPropertiesChanged(QVariantMap qvm);
-    void onAutoConnect();
-    void onLanPropertyChanged(QVariantMap qvm);
-    void onLanIpPropertiesChanged();
-    void onWifiIpPropertiesChanged();
-    void getPhysicalCarrierState(int n);
-    void getLanHwAddressState();
-    void getWiredCardName();
-    void getWirelessCardName();
-    void getLanIpDNS(QString uuidName, bool isActNet);
-    void getWifiIp(QString uuid);
-    QString getLanMAC(QString ifname);
-    void getWifiMac(QString netName);
-    void slot_timeout();
-    void requestScanWifi();
-
-private:
-    OldMainWindow *mw;
-    Utils *mUtils;
-    QThread *mUtilsThread;
-
-    int a = 0;
-    bool isRunningFunction = false;
-    QTimer *time = nullptr;
-    QList<QDBusObjectPath> oldPaths; //已连接网络的对象路径列表
-    QList<QDBusObjectPath> oldSettingPaths; //保存之前的路径
-    QStringList oldPathInfo; //某个已连接网络对象路径对应的网络类型(ethernet or wifi)
-    bool oldWifiSwitchState; //上一次获取到的wifi开关状态
-
-    QGSettings *m_tastbar_gsettings = nullptr;
-    QGSettings *m_gsettings = nullptr;
-    QGSettings *m_transparency_gsettings = nullptr;
-    QStringList m_lanPathList;//有线网dbuspath列表
-
-signals:
-    void updateWiredList(int n);
-    void updateWirelessList();
-    void requestSendDesktopNotify(QString message);
-    void newConnAdded(int type);
-    void toGetWifiListFinished(QStringList slist);
-};
-
-#endif // KYLINDBUSINTERFACE_H
diff --git a/src/backend/kylin-network-interface.c b/src/backend/kylin-network-interface.c
deleted file mode 100644
index 231d3c52..00000000
--- a/src/backend/kylin-network-interface.c
+++ /dev/null
@@ -1,1015 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-#include "kylin-network-interface.h"
-
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <arpa/inet.h>
-#include <linux/route.h>
-#include <netinet/ether.h>
-#include <net/ethernet.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/syslog.h>
-#include <pwd.h>
-
-//获取网络接口名
-ifname *kylin_network_get_ifacename()
-{
-    int i = 0;
-    int sockfd;
-    struct ifconf ifconf;
-    struct ifreq *ifreq;
-    unsigned char buf[1024];
-
-    //初始化ifconf
-    ifconf.ifc_len = 1024;
-    //字符串指针ifconf.ifc_buf指向buf
-    ifconf.ifc_buf = buf;
-
-    if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-    {
-        perror("socket error");
-        return 0;
-    }
-
-    //获取所有接口信息
-    ioctl(sockfd, SIOCGIFCONF, &ifconf);
-    //    printf("%s\n",ifconf.ifc_buf);
-
-    //逐个获取Ip地址
-    //结构体指针ifreq指向buf，即ifconf.ifc_buf
-    ifreq = (struct ifreq*)buf;
-    int number=ifconf.ifc_len/sizeof(struct ifreq);
-    // printf("%d\n",number);
-
-    ifname *ifn=(ifname *)malloc(sizeof(ifname)*(number+1));
-
-    for(i = number; i>0; i--)
-    {
-        // printf("name = [%s] \n",ifreq->ifr_name);
-
-        int j=number-i;
-        ifn[j].if_name=(char *)malloc(sizeof(char)*10);
-        strcpy(ifn[j].if_name,ifreq->ifr_name);
-        // ifn[j].if_name=ifreq->ifr_name;
-        // printf("if_name[%d]:%s\n",j,if_name[j]);
-
-        ifreq++;
-    }
-    ifn[number].if_name=NULL;
-
-
-    return ifn;
-}
-
-//获取所有网络连接
-conlist *kylin_network_get_conlist_info()
-{
-    int status = system("nmcli connection show > /tmp/conlist.txt");
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection show' in function 'kylin_network_get_conlist_info' failed");}
-    char *filename="/tmp/conlist.txt";
-
-    FILE *confp;
-    int connum=0;
-    char ConStrLine[1024];
-    if((confp=fopen(filename,"r"))==NULL)
-    {
-        printf("error!");
-
-    }
-    fgets(ConStrLine,1024,confp);
-    while(!feof(confp))
-    {
-        fgets(ConStrLine,1024,confp);
-        connum++;
-    }
-    // printf("%d\n",connum);
-    fclose(confp);
-    conlist *clist=(conlist *)malloc(sizeof(conlist)*connum);
-
-    int count=0;
-    FILE *fp;
-    char StrLine[1024];
-    if((fp=fopen(filename,"r"))==NULL)
-    {
-        printf("error!");
-
-    }
-    fgets(StrLine,1024,fp);
-    while(!feof(fp))
-    {
-        if(count==connum-1)break;
-
-        fgets(StrLine,1024,fp);
-
-        char *index=StrLine;
-        char conname[256];
-
-        //截取连接名称
-        int num=0;
-        for(index;*index!='\n';index++)
-        {
-            if(*index==' ')
-            {
-                if(*(index+1)==' ')
-                    break;
-            }
-            num++;
-        }
-
-        // printf("连接名称长度：%d\n",num);
-        clist[count].con_name=(char *)malloc(sizeof(char)*(num+1));
-        strncpy(conname,StrLine,num+1);
-        conname[num]='\0';
-        strncpy(clist[count].con_name,conname,num+1);
-        // printf("%s\n",clist[count].con_name);
-
-        //截取连接类型
-        char type[256];
-        for(index;*index!='\n';index++)
-        {
-            if(*index==' ')
-            {
-                if(*(index+1)=' ')
-                    if(*(index+2)!=' ')
-                        break;
-
-            }
-        }
-        char *index1=index+2;
-        for(index1;*index1!='\n';index1++)
-        {
-            if(*index1==' ')
-            {
-                if(*(index1+1)==' ')
-                    break;
-            }
-        }
-        int num1=0;
-        char *index2=index1+2;
-        for(index2;*index2!='\n';index2++)
-        {
-            if(*index2==' ')break;
-            num1++;
-        }
-        clist[count].type=(char *)malloc(sizeof(char)*(num1+1));
-        strncpy(type,index1+2,num1+1);
-        type[num1]='\0';
-        strncpy(clist[count].type,type,num1+1);
-        // printf("%s\n",clist[count].type);
-        count++;
-    }
-    fclose(fp);
-
-    clist[count].con_name=NULL;
-    clist[count].type=NULL;
-
-    return clist;
-}
-
-//获取当前活动网络连接
-activecon *kylin_network_get_activecon_info()
-{
-    struct passwd *pwd;
-    pwd = getpwuid(getuid());
-    char *name = pwd->pw_name;
-    char *tmpPrefix = "/tmp/kylin-nm-activecon-";
-    char *chr = "nmcli connection show -active > ";
-
-    char *cmd;
-    asprintf(&cmd, "%s%s%s", chr, tmpPrefix, name);
-    char *path;
-    asprintf(&path, "%s%s", tmpPrefix, name);
-    int status = system(cmd);
-    if (status != 0)
-        syslog(LOG_ERR, "execute 'nmcli connection show -active' in function 'kylin_network_get_activecon_info' failed");
-    free(cmd);
-
-    char *filename = path;
-
-    FILE *activefp;
-    int activenum=0;
-    char activeStrLine[1024];
-    if((activefp=fopen(filename,"r"))==NULL)
-    {
-        printf("error!");
-    }
-    fgets(activeStrLine,1024,activefp);
-    while(!feof(activefp))
-    {
-        fgets(activeStrLine,1024,activefp);
-        activenum++;
-    }
-    // printf("%d\n",activenum);
-    fclose(activefp);
-    activecon *activelist=(activecon *)malloc(sizeof(activecon)*activenum);
-
-    int count=0;
-    FILE *fp;
-    char StrLine[1024];
-    if((fp=fopen(filename,"r"))==NULL)
-    {
-        printf("error!");
-
-    }
-    free(path);
-
-    fgets(StrLine,1024,fp);
-    while(!feof(fp))
-    {
-        if(count==activenum-1)break;
-
-        fgets(StrLine,1024,fp);
-
-        char *index=StrLine;
-        char conname[256];
-
-        //截取连接名称
-        int num=0;
-        for(index;*index!='\n';index++)
-        {
-            if(*index==' ')
-            {
-                if(*(index+1)==' ')
-                    break;
-            }
-            num++;
-        }
-
-        // printf("连接名称长度：%d\n",num);
-        activelist[count].con_name=(char *)malloc(sizeof(char)*(num+1));
-        strncpy(conname,StrLine,num+1);
-        conname[num]='\0';
-        strncpy(activelist[count].con_name,conname,num+1);
-        // printf("%s\n",activelist[count].con_name);
-
-        //截取连接类型
-        char type[256];
-        for(index;*index!='\n';index++)
-        {
-            if(*index==' ')
-            {
-                if(*(index+1)=' ')
-                    if(*(index+2)!=' ')
-                        break;
-
-            }
-        }
-        char *index1=index+2;
-        for(index1;*index1!='\n';index1++)
-        {
-            if(*index1==' ')
-            {
-                if(*(index1+1)==' ')
-                    break;
-            }
-        }
-        int num1=0;
-        char *index2=index1+2;
-        for(index2;*index2!='\n';index2++)
-        {
-            if(*index2==' ')break;
-            num1++;
-        }
-        activelist[count].type=(char *)malloc(sizeof(char)*(num1+1));
-        strncpy(type,index1+2,num1+1);
-        type[num1]='\0';
-        strncpy(activelist[count].type,type,num1+1);
-        // printf("%s\n",activelist[count].type);
-
-        //截取连接所属设备
-        char *index3=index2;
-        char dev[256];
-        for(index3;*index3!='\n';index3++)
-        {
-            if(*index3==' ')
-            {
-                if(*(index3+1)!=' ')
-                    break;
-            }
-        }
-        int num2=0;
-        char *index4=index3+1;
-        for(index4;*index4!='\n';index4++)
-        {
-            if(*index4==' ')break;
-            num2++;
-        }
-        activelist[count].dev=(char *)malloc(sizeof(char)*(num2+1));
-        strncpy(dev,index3+1,num2+1);
-        dev[num2]='\0';
-        strncpy(activelist[count].dev,dev,num2+1);
-        // printf("%s\n",activelist[count].dev);
-        count++;
-    }
-    fclose(fp);
-
-    activelist[count].con_name=NULL;
-    activelist[count].type=NULL;
-    activelist[count].dev=NULL;
-
-    return activelist;
-}
-
-//创建新的以太网连接
-void kylin_network_create_new_ethernet(char *con_name,char *if_name)
-{
-    char str[256];
-    char *net_type="ethernet";
-    sprintf(str,"nmcli connection add con-name '%s' ifname '%s' type %s",con_name,if_name,net_type);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection add con-name' in function 'kylin_network_create_new_ethernet' failed");}
-}
-
-// 创建新的wifi连接配置
-void kylin_network_create_new_wifi(char *con_name, char *if_name)
-{
-    char str[200];
-    sprintf(str, "nmcli connection add con-name '%s' ifname '%s' type wifi ssid '%s'",
-            con_name, if_name, con_name);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection add con-name' in function 'kylin_network_create_new_wifi' failed");}
-}
-
-//删除以太网连接
-void kylin_network_del_ethernet_con(char *con_name)
-{
-    char str[256];
-    sprintf(str,"nmcli connection delete '%s'",con_name);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection delete' in function 'kylin_network_del_ethernet_con' failed");}
-}
-
-//设置动态分配ip
-void kylin_network_set_automethod(char *con_name)
-{
-    char str[256];
-    char *automethod="auto";
-    sprintf(str,"nmcli connection modify '%s' ipv4.method %s ipv4.address '' ipv4.gateway ''",con_name,automethod);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection modify' in function 'kylin_network_set_automethod' failed");}
-}
-
-//设置动态分配ipv6地址
-void kylin_network_set_ipv6_automethod(char *con_name)
-{
-    char str[256];
-    char *automethod="auto";
-    sprintf(str,"nmcli connection modify '%s' ipv6.method %s ipv6.address ''",con_name,automethod);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection modify' in function 'kylin_network_set_ipv6_automethod' failed");}
-}
-
-//设置手动分配ip
-void kylin_network_set_manualmethod(char *con_name,char *ip)
-{
-    char str[256];
-    char *method="manual";
-    sprintf(str,"nmcli connection modify '%s' ipv4.method %s ipv4.address '%s'",con_name,method,ip);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection modify' in function 'kylin_network_set_manualmethod' failed");}
-}
-
-//设置手动分配ipv6地址
-void kylin_network_set_ipv6_manualmethod(char *con_name,char *ip)
-{
-    char str[256];
-    char *method="manual";
-    sprintf(str,"nmcli connection modify '%s' ipv6.method %s ipv6.address '%s'",con_name,method,ip);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection modify' in function 'kylin_network_set_ipv6_manualmethod' failed");}
-}
-
-// 设置手动分配all
-void kylin_network_set_manualall(char *con_name, char *addr, char *mask, char *gateway, char *dns)
-{
-    char str[200];
-    sprintf(str, "nmcli connection modify '%s' ipv4.method manual ipv4.address %s/%s ipv4.gateway '%s' ipv4.dns '%s'",
-            con_name, addr, mask, gateway, dns);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection modify' in function 'kylin_network_set_manualall' failed");}
-}
-
-//设置是否自动连接
-void kylin_network_set_autoconnect(char *con_name,bool autocon)
-{
-    char str[256];
-    if(autocon==false)
-    {
-        char *ac="no";
-        sprintf(str,"nmcli connection modify '%s' connection.autoconnect %s",con_name,ac);
-    }
-    else{
-        char *ac="yes";
-        sprintf(str,"nmcli connection modify '%s' connection.autoconnect %s",con_name,ac);
-    }
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection modify' in function 'kylin_network_set_autoconnect' failed");}
-}
-
-//修改ip
-void kylin_network_mod_ip(char *con_name,char *ip)
-{
-    char str[256];
-    sprintf(str,"nmcli connection modify '%s' ipv4.address %s",con_name,ip);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection modify' in function 'kylin_network_mod_ip' failed");}
-}
-
-//修改网关
-void kylin_network_mod_gateway(char *con_name,char *gw)
-{
-    char str[256];
-    sprintf(str,"nmcli connection modify '%s' ipv4.gateway %s",con_name,gw);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection modify' in function 'kylin_network_mod_gateway' failed");}
-}
-
-//修改dns
-void kylin_network_mod_dns(char *con_name,char *dns)
-{
-    char str[256];
-    sprintf(str,"nmcli connection modify '%s' ipv4.dns %s",con_name,dns);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection modify' in function 'kylin_network_mod_dns' failed");}
-}
-
-//连接以太网
-void kylin_network_set_con_up(char *con_name)
-{
-    char str[256];
-    sprintf(str,"nmcli connection up '%s'",con_name);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection up' in function 'kylin_network_set_con_up' failed");}
-}
-
-//断开以太网
-void kylin_network_set_con_down(char *con_name)
-{
-    char str[256];
-    sprintf(str,"nmcli connection down '%s'",con_name);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection down' in function 'kylin_network_set_con_down' failed");}
-}
-
-//连接wifi
-void kylin_network_set_wifi_up(char *con_name,char *passwd)
-{
-    char str[256];
-    sprintf(str,"export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli device wifi connect '%s' password '%s'", con_name,passwd);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli device wifi connect' in function 'kylin_network_set_wifi_up' failed");}
-}
-
-//断开wifi连接
-void kylin_network_set_wifi_down(char *if_name)
-{
-    char str[256];
-    snprintf(str,sizeof(str),"nmcli device disconnect '%s'",if_name);
-    int status = system(str);
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli device disconnect' in function 'kylin_network_set_wifi_down' failed");}
-}
-
-//获取wifi列表信息
-wifilist *kylin_network_get_wifilist_info()
-{
-    int status = system("nmcli device wifi > /tmp/wflist.txt");
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli device wifi' in function 'kylin_network_get_wifilist_info' failed");}
-    char *filename="/tmp/wflist.txt";
-
-    FILE *wffp;
-    int wfnum=0;
-    char WfStrLine[1024];
-    if((wffp=fopen(filename,"r"))==NULL)
-    {
-        printf("error!");
-
-    }
-    fgets(WfStrLine,1024,wffp);
-    while(!feof(wffp))
-    {
-        fgets(WfStrLine,1024,wffp);
-        wfnum++;
-    }
-    // printf("wifi数量：%d\n",wfnum);
-    fclose(wffp);
-    //wifi实际数量是wfnum-1
-    wifilist *wflist=(wifilist *)malloc(sizeof(wifilist)*wfnum);
-
-    int count=0;
-    FILE *fp;
-    char StrLine[1024];
-    if((fp=fopen(filename,"r"))==NULL)
-    {
-        printf("error!");
-
-    }
-    fgets(StrLine,1024,fp);
-    while(!feof(fp))
-    {
-        if(count==wfnum-1)break;
-
-        fgets(StrLine,1024,fp);
-
-        // printf("%s\n",StrLine+3);
-        char *index=StrLine+3;
-
-        //截取ssid
-        char *str1="Infra";
-        int num=0;
-        for(index;strcmp(index+5,"\n")!=0;index++)
-        {
-            int result=strncmp(index,str1,5);
-            if(result==0)
-            {
-                // printf("%s\n",index);
-                break;
-
-            }
-            num++;
-
-        }
-        char ssid[256];
-        char *ssidindex=index-1;
-        int ssidnum=0;
-        for(ssidindex;*ssidindex==' ';ssidindex--)ssidnum++;
-        // printf("空格数量：%d\n",ssidnum);
-        // if(ssidnum==1)
-        strncpy(ssid,StrLine+3,num-1);
-        ssid[num-ssidnum]='\0';
-        // printf("-6666--%s---\n",ssid);
-
-        wflist[count].ssid=(char *)malloc(sizeof(char)*(num-ssidnum));
-        strncpy(wflist[count].ssid,ssid,num-ssidnum+1);
-        // printf("第%d个：%s ",count,wflist[count].ssid);
-
-
-        //截取信号强度
-        char *str2="Mbit/s";
-        for(index;strcmp(index+6,"\n")!=0;index++)
-        {
-            int result=strncmp(index,str2,6);
-            if(result==0)
-            {
-                // printf("%s\n",index);
-                break;
-            }
-        }
-
-        char signal[10];
-        char *signalindex=index+8;
-        int signalnum=0;
-        for(signalindex;*signalindex!=' ';signalindex++)signalnum++;
-        strncpy(signal,index+8,signalnum);
-        signal[signalnum]='\0';
-        // printf("-7777--%s---\n",signal);
-
-        wflist[count].signal=atoi(signal);
-        // printf("%d ",wflist[count].signal);
-
-         //截取安全性
-        char *str3="WPA";
-        for(index;strcmp(index+3,"\n")!=0;index++)
-        {
-            int result=strncmp(index,str3,3);
-            if(result==0)
-            {
-                // printf("%s\n",index);
-                break;
-            }
-        }
-
-        char safety[20];
-        char *safetyindex=index;
-        int safetynum=0;
-        for(safetyindex;strcmp(safetyindex+2,"\n")!=0;safetyindex++)
-        {
-            int result=strncmp(safetyindex,"  ",2);
-            if(result==0)break;
-            safetynum++;
-        }
-        strncpy(safety,index,safetynum+1);
-        safety[safetynum+1]='\0';
-        // printf("-8888--%s---\n",safety);
-
-        wflist[count].safety=(char *)malloc(sizeof(char)*(safetynum+1));
-        strncpy(wflist[count].safety,safety,safetynum+2);
-        // printf("%s\n",wflist[count].safety);
-
-        count++;
-
-    }
-
-    fclose(fp);
-
-    wflist[count].ssid=NULL;
-    wflist[count].signal=0;
-    wflist[count].safety=NULL;
-
-    return wflist;
-}
-
-//启用联网
-void kylin_network_enable_networking()
-{
-    int status = system("nmcli networking on");
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli networking on' in function 'kylin_network_enable_networking' failed");}
-}
-
-//禁用联网
-void kylin_network_disable_networking()
-{
-    int status = system("nmcli networking off");
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli networking off' in function 'kylin_network_disable_networking' failed");}
-}
-
-//启用wifi
-void kylin_network_enable_wifi()
-{
-    int status = system("nmcli radio wifi on;sleep 3");
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi on' in function 'kylin_network_enable_wifi' failed");}
-}
-
-//禁用wifi
-void kylin_network_disable_wifi()
-{
-    int status = system("nmcli radio wifi off;sleep 2");
-    if (status != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi off' in function 'kylin_network_disable_wifi' failed");}
-}
-
-//获取ip地址
-int kylin_network_get_ipaddr(char *if_name,char *ipaddr)
-{
-    int sock_ip;
-    struct sockaddr_in sin_ip;
-    struct ifreq ifr_ip;
-    if((sock_ip=socket(AF_INET,SOCK_STREAM,0))<0)
-    {
-        perror("sockket error");
-        return -1;
-    }
-
-    strcpy(ifr_ip.ifr_name,if_name);
-
-    if(ioctl(sock_ip,SIOCGIFADDR,&ifr_ip)<0)//直接获取ip地址
-    {
-        perror("Not setup interface\n");
-        return -1;
-    }
-
-    memcpy(&sin_ip,&ifr_ip.ifr_addr,sizeof(sin_ip));
-    strcpy(ipaddr,inet_ntoa(sin_ip.sin_addr));//#include <arpa/inet.h>
-    close(sock_ip);
-    return 0;
-
-}
-
-//获取广播地址
-int kylin_network_get_brdaddr(char *if_name,char *brdaddr)
-{
-    int sock_brdaddr;
-    struct sockaddr_in sin_brd;
-    struct ifreq ifr_brd;
-    if((sock_brdaddr=socket(AF_INET,SOCK_STREAM,0))<0)
-    {
-        perror("sockket error");
-        return -1;
-    }
-
-    strcpy(ifr_brd.ifr_name,if_name);
-
-    if(ioctl(sock_brdaddr,SIOCGIFBRDADDR,&ifr_brd)<0)//直接获取广播地址
-    {
-        perror("Not setup interface\n");
-        return -1;
-    }
-
-    memcpy(&sin_brd,&ifr_brd.ifr_broadaddr,sizeof(sin_brd));
-    strcpy(brdaddr,inet_ntoa(sin_brd.sin_addr));
-    close(sock_brdaddr);
-    return 0;
-
-}
-
-//获取子网掩码
-int kylin_network_get_netmask(char *if_name,char *netmask)
-{
-    int sock_mask;
-    struct sockaddr_in sin_netmask;
-    struct ifreq ifr_mask;
-    if((sock_mask=socket(AF_INET,SOCK_STREAM,0))<0)
-    {
-        perror("sockket error");
-        return -1;
-    }
-
-    strcpy(ifr_mask.ifr_name,if_name);
-
-    if(ioctl(sock_mask,SIOCGIFNETMASK,&ifr_mask)<0)//直接获取子网掩码
-    {
-        perror("Not setup interface\n");
-        return -1;
-    }
-
-    memcpy(&sin_netmask,&ifr_mask.ifr_netmask,sizeof(sin_netmask));
-    strcpy(netmask,inet_ntoa(sin_netmask.sin_addr));
-    close(sock_mask);
-    return 0;
-
-}
-
-//获取MAC
-int kylin_network_get_mac(char *if_name,char *macaddr)
-{
-    int sock_mac;
-    struct ifreq ifr_mac;
-    struct sockaddr_in sin_mac;
-    struct ether_addr ethaddr;//#include <net/ethernet.h>
-
-    sock_mac=socket(AF_INET,SOCK_STREAM,0);
-
-    strcpy(ifr_mac.ifr_name,if_name);
-
-    if(-1==ioctl(sock_mac,SIOCGIFHWADDR,&ifr_mac))
-    {
-        perror("Not setup interface\n");
-        return -1;
-    }
-    memcpy(&ethaddr,&ifr_mac.ifr_hwaddr.sa_data,sizeof(ethaddr));
-    strcpy(macaddr,ether_ntoa(&ethaddr));//#include <netinet/ether.h>
-
-    // strcpy(macaddr,ether_ntoa((struct ether_addr*)ifr_mac.ifr_hwaddr.sa_data));
-
-    close(sock_mac);
-    return 0;
-
-}
-
-//获取MTU
-int kylin_network_get_mtu(char *if_name)
-{
-    int sock_mtu;
-//    struct sockaddr_in sin_ip;
-    struct ifreq ifr_MTU;
-    if((sock_mtu=socket(AF_INET,SOCK_STREAM,0))<0)
-    {
-        perror("sockket error");
-        return -1;
-    }
-
-    strcpy(ifr_MTU.ifr_name,if_name);
-
-    if(ioctl(sock_mtu,SIOCGIFMTU,&ifr_MTU))
-    {
-        perror("Not setup interface\n");
-        return -1;
-    }
-
-    int mtu=ifr_MTU.ifr_mtu;
-    // printf("%d\n",ifr_MTU.ifr_mtu);
-    // printf("%d\n",mtu);
-
-    close(sock_mtu);
-    return mtu;
-
-}
-
-static void getBuf(char *bufstr)
-{
-    //O_RDONLY以只读方式打开文件
-    int fd=open("/proc/net/dev", O_RDONLY);
-    if(-1==fd)
-    {
-        printf("/proc/net/dev not exists!\n");
-    }
-
-    char buf[1024*2];
-    //将读写位置移到文件开头
-    lseek(fd,0,SEEK_SET);
-    int nBytes=read(fd,buf,sizeof(buf)-1);
-    if(-1==nBytes)
-    {
-        perror("read error");
-        close(fd);
-    }
-
-    buf[nBytes]='\0';
-    strcpy(bufstr,buf);
-}
-
-//总计上传下载数据量
-long *kylin_network_get_bytes(char *if_name)
-{
-    char buf[1024*2];
-    getBuf(buf);
-
-    //返回第一次指向if_name位置的指针
-    char *pDev=strstr(buf,if_name);
-    if(NULL==pDev)
-    {
-        printf("don't find dev %s\n",if_name);
-        return NULL;
-    }
-
-    char *p;
-    char *value;
-    int i=0;
-    static long rtbyt[2];
-    /*去除空格，制表符，换行符等不需要的字段*/
-    for (p = strtok(pDev, " \t\r\n"); p; p = strtok(NULL, " \t\r\n"))
-    {
-        i++;
-        value = (char*)malloc(20);
-        strcpy(value, p);
-        /*得到的字符串中的第二个字段是接收流量*/
-        if(i == 2)
-        {
-            rtbyt[0] = atol(value);
-        }
-        /*得到的字符串中的第十个字段是发送流量*/
-        if(i == 10)
-        {
-            rtbyt[1] = atol(value);
-            break;
-        }
-        free(value);
-    }
-    return rtbyt;
-}
-
-//总计上传下载数据包
-long *kylin_network_get_packets(char *if_name)
-{
-    char buf[1024*2];
-    getBuf(buf);
-
-    //返回第一次指向if_name位置的指针
-    char *pDev=strstr(buf,if_name);
-    if(NULL==pDev)
-    {
-        printf("don't find dev %s\n",if_name);
-        return NULL;
-    }
-
-    char *p;
-    char *value;
-    int i=0;
-    static long rtpkt[2];
-    /*去除空格，制表符，换行符等不需要的字段*/
-    for (p = strtok(pDev, " \t\r\n"); p; p = strtok(NULL, " \t\r\n"))
-    {
-        i++;
-        value = (char*)malloc(20);
-        strcpy(value, p);
-        /*得到的字符串中的第三个字段是接收流量*/
-        if(i == 3)
-        {
-            rtpkt[0] = atol(value);
-        }
-        /*得到的字符串中的第十一个字段是发送流量*/
-        if(i == 11)
-        {
-            rtpkt[1] = atol(value);
-            break;
-        }
-        free(value);
-    }
-    return rtpkt;
-}
-
-//总计上传下载错误数据包数量
-long *kylin_network_get_errs(char *if_name)
-{
-    char buf[1024*2];
-    getBuf(buf);
-
-    //返回第一次指向if_name位置的指针
-    char *pDev=strstr(buf,if_name);
-    if(NULL==pDev)
-    {
-        printf("don't find dev %s\n",if_name);
-        return NULL;
-    }
-
-    char *p;
-    char *value;
-    int i=0;
-    static long rterrs[2];
-    /*去除空格，制表符，换行符等不需要的字段*/
-    for (p = strtok(pDev, " \t\r\n"); p; p = strtok(NULL, " \t\r\n"))
-    {
-        i++;
-        value = (char*)malloc(20);
-        strcpy(value, p);
-        /*得到的字符串中的第四个字段是接收流量*/
-        if(i == 4)
-        {
-            rterrs[0] = atol(value);
-        }
-        /*得到的字符串中的第十二个字段是发送流量*/
-        if(i == 12)
-        {
-            rterrs[1] = atol(value);
-            break;
-        }
-        free(value);
-    }
-    return rterrs;
-}
-
-//总计上传下载丢弃数据包数量
-long *kylin_network_get_drop(char *if_name)
-{
-    char buf[1024*2];
-    getBuf(buf);
-
-    //返回第一次指向if_name位置的指针
-    char *pDev=strstr(buf,if_name);
-    if(NULL==pDev)
-    {
-        printf("don't find dev %s\n",if_name);
-        return NULL;
-    }
-
-    char *p;
-    char *value;
-    int i=0;
-    static long rtdrop[2];
-    /*去除空格，制表符，换行符等不需要的字段*/
-    for (p = strtok(pDev, " \t\r\n"); p; p = strtok(NULL, " \t\r\n"))
-    {
-        i++;
-        value = (char*)malloc(20);
-        strcpy(value, p);
-        /*得到的字符串中的第五个字段是接收流量*/
-        if(i == 5)
-        {
-            rtdrop[0] = atol(value);
-        }
-        /*得到的字符串中的第十三个字段是发送流量*/
-        if(i == 13)
-        {
-            rtdrop[1] = atol(value);
-            break;
-        }
-        free(value);
-    }
-    return rtdrop;
-}
-
-//总计上传下载过载数据包数量
-long *kylin_network_get_fifo(char *if_name)
-{
-    char buf[1024*2];
-    getBuf(buf);
-
-    //返回第一次指向if_name位置的指针
-    char *pDev=strstr(buf,if_name);
-    if(NULL==pDev)
-    {
-        printf("don't find dev %s\n",if_name);
-        return NULL;
-    }
-
-    char *p;
-    char *value;
-    int i=0;
-    static long rtfifo[2];
-    /*去除空格，制表符，换行符等不需要的字段*/
-    for (p = strtok(pDev, " \t\r\n"); p; p = strtok(NULL, " \t\r\n"))
-    {
-        i++;
-        value = (char*)malloc(20);
-        strcpy(value, p);
-        /*得到的字符串中的第六个字段是接收流量*/
-        if(i == 6)
-        {
-            rtfifo[0] = atol(value);
-        }
-        /*得到的字符串中的第十四个字段是发送流量*/
-        if(i == 14)
-        {
-            rtfifo[1] = atol(value);
-            break;
-        }
-        free(value);
-    }
-    return rtfifo;
-}
diff --git a/src/backend/kylin-network-interface.h b/src/backend/kylin-network-interface.h
deleted file mode 100644
index 2a15931a..00000000
--- a/src/backend/kylin-network-interface.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef __KYLINNETWORKINTERFACE_H__
-#define __KYLINNETWORKINTERFACE_H__
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <malloc.h>
-#include <string.h>
-#include <unistd.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-typedef struct
-{
-    char *if_name;
-}ifname;
-
-typedef struct
-{
-    char *ssid;//wifi名称
-    int signal;//信号强度
-    char *safety;//安全性
-
-}wifilist;//存放wifi信息的结构体
-
-typedef struct
-{
-    char *con_name;//网络连接名称
-    char *type;//网络连接类型
-}conlist;//存放所有网络连接
-
-typedef struct
-{
-    char *con_name;//活动网络连接名称
-    char *type;//活动网络连接类型
-    char *dev;//活动网络所属设备
-}activecon;//存放当前活动网络连接
-
-/*
- * Get the network interface name.
- * return the struct pointer.
- */
-ifname *kylin_network_get_ifacename();
-
-/*
- * Get the all network connection.
- *  return the struct pointer.
- */
-conlist *kylin_network_get_conlist_info();
-
-/*
- * Get the active network connection.
- * return the struct pointer.
- */
-activecon *kylin_network_get_activecon_info();
-
-/*
- * Create a new Ethernet connection.
- * @con_name is the connection name.
- * @if_name is the interface name.
- */
-void kylin_network_create_new_ethernet(char *con_name,char *if_name);
-
-/*
- * Create a new Wifi connection.
- * @con_name is the connection name.
- * @if_name is the interface name.
- */
-void kylin_network_create_new_wifi(char *con_name, char *if_name);
-
-/*
- * Delete ethernet connection.
- * @con_name is the connection name.
- */
-void kylin_network_del_ethernet_con(char *con_name);
-
-/*
- * Set up dynamic IP allocation.
- * @con_name is the connection name.
- */
-void kylin_network_set_automethod(char *con_name);
-
-void kylin_network_set_ipv6_automethod(char *con_name);
-/*
- * Set up manual IP assignment.
- * @con_name is the connection name.
- * @ip is the ip address(for example,"192.168.68.160/16")
- */
-void kylin_network_set_manualmethod(char *con_name,char *ip);
-
-void kylin_network_set_ipv6_manualmethod(char *con_name,char *ip);
-
-/*
- * Set up manual all prop.
- */
-void kylin_network_set_manualall(char *con_name, char *addr, char *mask, char *gateway, char *dns);
-
-/*
- * Sets whether the connection is automatic.
- * @con_name is the connection name.
- * @autocon is the automatic connection option.
- */
-void kylin_network_set_autoconnect(char *con_name,bool autocon);
-
-/*
- * Modify the ip address.
- * @con_name is the connection name.
- * @ip is the ip address(for example,"192.168.68.160/16")
- */
-void kylin_network_mod_ip(char *con_name,char *ip);
-
-/*
- * Modify the gateway.
- * @con_name is the connection name.
- * @gw is the gateway address.
- */
-void kylin_network_mod_gateway(char *con_name,char *gw);
-
-/*
- * Modify the dns address.
- * @con_name is the connection name.
- * @dns is the dns address.
- */
-void kylin_network_mod_dns(char *con_name,char *dns);
-
-/*
- * Connect the ethernet.
- * @con_name is the connection name.
- */
-void kylin_network_set_con_up(char *con_name);
-
-/*
- * Disconnect the ethernet.
- * @con_name is the connection name.
- */
-void kylin_network_set_con_down(char *con_name);
-
-/*
- * Connect the wifi.
- * @con_name is the wifi name.
- * @passwd is the wifi password.
- */
-void kylin_network_set_wifi_up(char *con_name,char *passwd);
-
-/*
- * Disconnect the wifi.
- * @if_name is the network interface name.
- */
-void kylin_network_set_wifi_down(char *if_name);
-
-/*
- * Get wifi list information.
- * Return the struct pointer.
- */
-wifilist *kylin_network_get_wifilist_info();
-
-/*
- * Enable networking.
- */
-void kylin_network_enable_networking();
-
-/*
- * Disable networking.
- */
-void kylin_network_disable_networking();
-
-/*
- * Enable wifi.
- */
-void kylin_network_enable_wifi();
-
-/*
- * Disable wifi.
- */
-void kylin_network_disable_wifi();
-
-/* Get the ip address.
- * @if_name is the interface name.
- * @ipaddr is used to save the ip address.
- */
-int kylin_network_get_ipaddr(char *if_name,char *ipaddr);
-
-/*
- * Get the broadcast address.
- * @if_name is the interface name.
- * @brdaddr is used to save the broadcast address.
- */
-int kylin_network_get_brdaddr(char *if_name,char *brdaddr);
-
-/*
- * Get the subnet mask.
- * @if_name is the interface name.
- * @netmask is used to save the subnet mask.
- */
-int kylin_network_get_netmask(char *if_name,char *netmask);
-
-/*
- * Get MAC address.
- * @if_name is the interface name.
- * @macaddr is used to save the MAC address.
- */
-int kylin_network_get_mac(char *if_name,char *macaddr);
-
-/* Get the MTU.
- * @if_name is the interface name.
- * return the MTU value.
- */
-int kylin_network_get_mtu(char *if_name);
-
-/*
- * Total upload and download data volume.
- * @if_name is the network interface name.
- * return the address of the first element of a one-dimensional long integer array.
- */
-long *kylin_network_get_bytes(char *if_name);
-
-/*
- * Total upload and download data packets.
- * @if_name is the network interface name.
- * return the address of the first element of a one-dimensional long integer array.
- */
-long *kylin_network_get_packets(char *if_name);
-
-/*
- * Total wrong data packets number of uploading and downloading.
- * @if_name is the network interface name.
- * return the address of the first element of a one-dimensional long integer array.
- */
-long *kylin_network_get_errs(char *if_name);
-
-/*
- * Total discarded data packets number of uploading and downloading.
- * @if_name is the network interface name.
- * return the address of the first element of a one-dimensional long integer array.
- */
-long *kylin_network_get_drop(char *if_name);
-
-/*
- * Total overloaded data packets number of uploading and downloading.
- * @if_name is the network interface name.
- * return the address of the first element of a one-dimensional long integer array.
- */
-long *kylin_network_get_fifo(char *if_name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/frontend/confform.cpp b/src/frontend/confform.cpp
deleted file mode 100644
index 3513cb8b..00000000
--- a/src/frontend/confform.cpp
+++ /dev/null
@@ -1,765 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#include "confform.h"
-#include "ui_confform.h"
-#include "kylin-network-interface.h"
-#include "backthread.h"
-#include "utils.h"
-#include "wireless-security/kylinheadfile.h"
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <KWindowEffects>
-
-extern QString llname, lwname;
-
-ConfForm::ConfForm(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::ConfForm)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint); //Qt::WindowStaysOnTopHint
-    this->setWindowTitle(tr("edit network"));//"网络设置"
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    this->setWindowIcon(QIcon::fromTheme("kylin-network", QIcon(":/res/x/setup.png")) );
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-    //this->setWindowIcon(QIcon::fromTheme("indicator-china-weather", QIcon(":/res/x/setup.png")) );
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    MyQss objQss;
-
-//use uniform ui style instead
-//    labelQss = "QLabel{border:0px;color:rgba(255,255,255,0.97);background-color:transparent;}";
-//    cbxQss = "QComboBox{padding-left:20px;font-size:13px;color:rgba(255,255,255,0.91);"
-//                        "border:1px solid rgba(255, 255, 255, 0.05);border-radius:4px;background:rgba(255,255,255,0.08);}"
-//             "QComboBox::drop-down{border:0px;width:30px;}"
-//             "QComboBox::down-arrow{image:url(:/res/g/down_arrow.png);}"
-//             "QComboBox QAbstractItemView {margin:0px 0px 0px 0px;padding: 0px 0px;border-radius:0px;background-color:#48484C;outline:0px;}"
-//             "QComboBox QAbstractItemView::item{padding-left:17px;border-radius:0px;font-size:13px;color:rgba(255,255,255,0.91);height: 32px;background-color:#48484C;outline:0px;}"
-//             "QComboBox QAbstractItemView::item:hover{padding-left:17px;border-radius:0px;font-size:13px;color:rgba(255,255,255,0.91);background-color:#3D6BE5;outline:0px;}";
-//    leQss = "QLineEdit{padding-left:20px;color:rgba(255,255,255,0.97);background:rgba(255,255,255,0.08);}";
-//    btnOffQss = "QPushButton[on=false]{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.08);color:white;font-size:14px;}"
-//                   "QPushButton[on=false]:Hover{border:0px solid rgba(255,255,255,0.1);border-radius:4px;background-color:rgba(255,255,255,0.1);}"
-//                   "QPushButton[on=false]:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}"
-//                "QPushButton[on=true]{border:0px;border-radius:4px;background-color:rgba(244,244,244,0.12);color:white;font-size:14px;}"
-//                "QPushButton[on=true]:Hover{border:0px solid rgba(244,244,244,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-//                "QPushButton[on=true]:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}";
-//    btnOnQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
-//                "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-//                "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);";
-//    lineQss = "background:rgba(156,156,156,0.1);";
-
-    ui->wdHead->setStyleSheet("#wdHead{border:none}");
-    ui->wgManual->setStyleSheet("#wgManual{border:none}");
-    ui->wdBottom->setStyleSheet("#wdBottom{border:none}");
-    ui->lbLeftupTitle->setStyleSheet("QLabel{font-size:20px;}");
-    ui->leAddr->setContextMenuPolicy(Qt::NoContextMenu);
-    ui->leName->setContextMenuPolicy(Qt::NoContextMenu);
-    ui->leDns->setContextMenuPolicy(Qt::NoContextMenu);
-    ui->leDns2->setContextMenuPolicy(Qt::NoContextMenu);
-    ui->leGateway->setContextMenuPolicy(Qt::NoContextMenu);
-    ui->leAddr_ipv6->setContextMenuPolicy(Qt::NoContextMenu);
-
-    //设置网络名称的正则表达式
-//    ui->leName->setValidator(new QRegExpValidator(QRegExp("[^ \s]*"), ui->leName));
-
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-    ui->lineUp->hide();
-    ui->lineDown->hide();
-
-    ui->lbName->setText(tr("LAN name: "));//"网络名称："
-    ui->lbTxt1->setText(tr("Method: "));//"编辑IP设置："
-    ui->lbTxt2->setText(tr("Address: "));//"IP地址："
-    ui->lbTxt3->setText(tr("Netmask: "));//"子网掩码："
-    ui->lbTxt4->setText(tr("Gateway: "));//"默认网关："
-    ui->lbTxt5->setText(tr("DNS 1: "));//"首选DNS："
-    ui->lbTxt6->setText(tr("DNS 2: "));//"备选DNS："
-    ui->lbTxt_ipv6->setText(tr("Ipv6 Address: "));
-
-    ui->lbLeftupTitle->setText(tr("Edit Conn"));//"网络设置"
-    ui->cbType->addItem(tr("Auto(DHCP)"));//"自动(DHCP)"
-    ui->cbType->addItem(tr("Manual"));//"手动"
-
-    connect(ui->cbType, SIGNAL(currentIndexChanged(int)), this, SLOT(cbTypeChanged(int)));
-
-    ui->cbMask->addItem("255.255.255.0"); //24
-    ui->cbMask->addItem("255.255.254.0"); //23
-    ui->cbMask->addItem("255.255.252.0"); //22
-    ui->cbMask->addItem("255.255.0.0"); //16
-    ui->cbMask->addItem("255.0.0.0"); //8
-
-    connect(ui->cbMask, SIGNAL(currentIndexChanged(int)), this, SLOT(cbMaskChanged(int)));
-
-    ui->btnCancel->setText(tr("Cancel"));//"取消"
-    ui->btnSave->setText(tr("Save"));//"保存"
-    ui->btnCreate->setText(tr("Ok"));//"确定"
-
-    ui->btnCancel->setProperty("on",true);
-    ui->btnSave->setProperty("on",false);
-    ui->btnCreate->setProperty("on",false);
-
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnSave->setStyleSheet(objQss.btnOffQss);
-    ui->btnCreate->setStyleSheet(objQss.btnOffQss);
-
-    ui->btnCancel->setFocusPolicy(Qt::NoFocus);
-    ui->btnSave->setFocusPolicy(Qt::NoFocus);
-    ui->btnCreate->setFocusPolicy(Qt::NoFocus);
-
-    // IP的正则格式限制
-    QRegExp rx("\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b");
-    QRegExp ipv6_rx("^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*$");
-    ui->leAddr->setValidator(new QRegExpValidator(rx, this));
-    ui->leGateway->setValidator(new QRegExpValidator(rx, this));
-    ui->leDns->setValidator(new QRegExpValidator(rx, this));
-    ui->leDns2->setValidator(new QRegExpValidator(rx, this));
-    ui->leAddr_ipv6->setValidator(new QRegExpValidator(ipv6_rx, this));
-    setModal(false);
-    setEnableOfBtn();
-}
-
-ConfForm::~ConfForm()
-{
-    delete ui;
-}
-
-void ConfForm::mousePressEvent(QMouseEvent *event)
-{
-    if (event->button() == Qt::LeftButton) {
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-    return QDialog::mousePressEvent(event);
-}
-void ConfForm::mouseReleaseEvent(QMouseEvent *event)
-{
-    this->isPress = false;
-}
-void ConfForm::mouseMoveEvent(QMouseEvent *event)
-{
-    if (this->isPress) {
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-    return QDialog::mouseMoveEvent(event);
-}
-
-//网络配置参数设置界面的显示内容
-void ConfForm::setProp(QString connName, QString uuidName, QString v4method, QString v4addr, QString v6method, QString v6addr, QString mask, QString gateway, QString dns, bool isActConf, bool isWiFi)
-{
-    this->isActConf = isActConf;
-    ui->leName->setText(connName);
-    lastConnName = connName;
-    lastIpv4 = v4addr;
-    lastIpv6 = v6addr;
-    lastTypeIndex = ui->cbType->currentIndex();
-    netUuid = uuidName;
-    qDebug() << Q_FUNC_INFO << connName << uuidName;
-
-    isActWifi = false;
-    if (isWiFi) {
-        ui->leName->setEnabled(false);
-        isActWifi = isWiFi;
-    }
-
-    if ((v4method == "auto" || v4method == "") && (v6method == "auto" || v6method == "")) {
-        ui->cbType->setCurrentIndex(0);
-        cbTypeChanged(0);
-    } else {
-        ui->cbType->setCurrentIndex(1);
-        cbTypeChanged(1);
-    }
-    if (v6method == "manual") {
-        ui->leAddr_ipv6->setText(v6addr);
-    }
-
-    ui->leAddr->setText(v4addr);
-    ui->leGateway->setText(gateway);
-
-    // 配置中有多个DNS，只处理前两个
-    if (dns.indexOf(",") != -1) {
-        QStringList dnss = dns.split(",");
-        ui->leDns->setText(dnss.at(0));
-        ui->leDns2->setText(dnss.at(1));
-    } else {
-        ui->leDns->setText(dns);
-        ui->leDns2->setText("");
-    }
-
-    if (mask == "24") {
-        ui->cbMask->setCurrentIndex(0);
-    } else if(mask == "23") {
-        ui->cbMask->setCurrentIndex(1);
-    } else if(mask == "22") {
-        ui->cbMask->setCurrentIndex(2);
-    } else if(mask == "16") {
-        ui->cbMask->setCurrentIndex(3);
-    } else if(mask == "8") {
-        ui->cbMask->setCurrentIndex(4);
-    } else {
-        ui->cbMask->setCurrentIndex(0);
-    }
-
-    ui->btnSave->setEnabled(false);
-}
-
-void ConfForm::connectInfoConstruct(KyConnectSetting &connectInfo)
-{
-    QString connectName = ui->leName->text();
-
-    connectInfo.setConnectName(connectName);
-    connectInfo.setIfaceName(m_ifaceName);
-    if (MANUAL_IP == ui->cbType->currentIndex()) {
-        if (!ui->leAddr->text().isEmpty()) {
-            QString ipv4Address = ui->leAddr->text();
-            QString ipv4NetMask = ui->cbMask->currentText();
-            QString ipv4GateWay = ui->leGateway->text();
-
-            QStringList ipv4DnsList;
-            ipv4DnsList.clear();
-            ipv4DnsList<<ui->leDns->text();
-            if (ui->leDns2->text() != "") {
-                ipv4DnsList << ui->leDns2->text();
-            }
-
-            connectInfo.setIpConfigType(IPADDRESS_V4, CONFIG_IP_MANUAL);
-            connectInfo.ipv4AddressConstruct(ipv4Address, ipv4NetMask,
-                                         ipv4GateWay, ipv4DnsList);
-        }
-
-        if (!ui->leAddr_ipv6->text().isEmpty()) {
-            qWarning()<<"ipv6 function need todo";
-        }
-    }
-
-    return;
-}
-
-//点击了创建新的网络的按钮
-void ConfForm::on_btnCreate_clicked()
-{
-    KylinDBus kylindbus;
-    kylindbus.getWiredCardName();
-
-    if (kylindbus.multiWiredIfName.size() == 0) {
-        QString tip(tr("Can not create new wired network for without wired card"));
-        kylindbus.showDesktopNotify(tip);
-        onConfformHide();
-        return;
-    } else {
-        m_ifaceName = kylindbus.multiWiredIfName.at(0);
-    }
-
-    if (ui->cbType->currentIndex() == MANUAL_IP) {
-        //在手动配置网络的情况下以及当前的IP参数有更改的情况下，检测IP冲突
-        if (!ui->leAddr->text().isEmpty()|| !ui->leAddr_ipv6->text().isEmpty()) {
-            if (check_ip_conflict(m_ifaceName)) {
-                return;
-            }
-        }
-    }
-
-    KyConnectSetting newConnectInfo;
-    connectInfoConstruct(newConnectInfo);
-    m_networkConnect.createWiredConnect(newConnectInfo);
-
-    if (DHCP_IP == ui->cbType->currentIndex()) {
-        //选择自动，则配置完成并发出桌面通知
-        QString txt(tr("New network already created"));
-        kylindbus.showDesktopNotify(txt);
-    }
-
-    onConfformHide();
-}
-
-//点击了保存更改网络设置的按钮
-void ConfForm::on_btnSave_clicked()
-{
-    KylinDBus kylindbus;
-
-    if (isActWifi) {
-        kylindbus.getWirelessCardName();
-        m_ifaceName = kylindbus.dbusWiFiCardName;
-        this->isCreateNewNet = false;
-
-        if (m_ifaceName.isEmpty()) {
-            QString notifyTxt(tr("Wireless card not exist"));
-            kylindbus.showDesktopNotify(notifyTxt);
-            return;
-        }
-        if (ui->cbType->currentIndex() == 1) {
-            //在手动配置网络的情况下以及当前的IP参数有更改的情况下，检测IP冲突
-            if ((!ui->leAddr->text().isEmpty() && (ui->leAddr->text() != lastIpv4)) || (!ui->leAddr_ipv6->text().isEmpty() && (ui->leAddr_ipv6->text() != lastIpv6))) {
-                if (check_ip_conflict(m_ifaceName)) {
-                    return;
-                }
-            }
-        }
-
-        this->saveNetworkConfiguration();
-    } else {
-        kylindbus.getWiredCardName();
-        if (kylindbus.multiWiredIfName.size() == 0) {
-            QString tip(tr("Can not save wired network for without wired card"));
-            kylindbus.showDesktopNotify(tip);
-            //this->close();
-            onConfformHide();
-            return;
-        } else {
-            m_ifaceName = kylindbus.multiWiredIfName.at(0);
-        }
-
-        this->isCreateNewNet = false;
-
-        if (ui->cbType->currentIndex() == 1) {
-            //在手动配置网络的情况下以及当前的IP参数有更改的情况下，检测IP冲突
-            if ((!ui->leAddr->text().isEmpty() && (ui->leAddr->text() != lastIpv4)) || (!ui->leAddr_ipv6->text().isEmpty() && (ui->leAddr_ipv6->text() != lastIpv6))) {
-                if (check_ip_conflict(m_ifaceName)) {
-                    return;
-                }
-            }
-        }
-
-        this->saveNetworkConfiguration();
-
-    }
-    QString txt(tr("New network settings already finished"));
-    kylindbus.showDesktopNotify(txt);
-}
-
-void ConfForm::saveNetworkConfiguration()
-{
-    KylinDBus kylindbus;
-
-    KyConnectSetting newConnectInfo;
-    connectInfoConstruct(newConnectInfo);
-    m_networkConnect.updateWiredConnect(netUuid, newConnectInfo);
-
-    //是选择的自动还是手动配置网络  
-    if (ui->cbType->currentIndex() == DHCP_IP) {
-        if (this->isActConf && lastTypeIndex == 1 && ui->cbType->currentIndex() == 0) {
-            //对于已经连接的网络，若由手动改为自动，则进行重连以保证配置生效
-            kylindbus.reConnectWiredNet(netUuid.toUtf8().data());
-        }
-    }
-
-    onConfformHide();
-}
-
-void ConfForm::showNotify(QString message)
-{
-    QDBusInterface iface("org.freedesktop.Notifications",
-                         "/org/freedesktop/Notifications",
-                         "org.freedesktop.Notifications",
-                         QDBusConnection::sessionBus());
-    QList<QVariant> args;
-    args<<(tr("kylin-nm"))
-       <<((unsigned int) 0)
-      <<QString("/usr/share/icons/ukui-icon-theme-default/24x24/devices/gnome-dev-ethernet.png")
-     <<tr("kylin network applet desktop message") //显示的是什么类型的信息
-    <<message //显示的具体信息
-    <<QStringList()
-    <<QVariantMap()
-    <<(int)-1;
-    iface.callWithArgumentList(QDBus::AutoDetect,"Notify",args);
-}
-
-bool ConfForm::check_ip_conflict(QString ifname)
-{
-    if (canCheckIpConflict) {
-        canCheckIpConflict = false;
-        QTimer::singleShot(2*1000, this, SLOT(changeEnableCheckIp() ));
-    } else {
-        return true;
-    }
-    //即将检测Ip地址冲突
-    QString strIpCheck = tr("Will check the IP address conflict");
-    QString bufferIpCheck = "notify-send -i network-offline " + strIpCheck;
-    showNotify(strIpCheck);
-
-    FILE *fp;
-    char ret[10], arp_all[1024];
-
-    // if (!ui->leAddr_ipv6->text().isEmpty() && ui->leAddr_ipv6->text() != "") {
-    if (!ui->leAddr->text().isEmpty() && ui->leAddr->text() != "") {
-        //ipv4地址不为空，需要验证是否冲突
-        QString arp_all_cmd = "arping -c 3 -f -I " + ifname + " -D " + ui->leAddr->text();
-        fp = popen(arp_all_cmd.toUtf8().data(),"r");
-        if(!fp)
-            return false;
-        fread(arp_all, 1, sizeof(arp_all), fp);
-        pclose(fp);
-
-        if (strstr(arp_all, "Received") && strstr(arp_all, " response(s)")) {
-            QString arp_result = "arping -c 1 -f -I " + ifname + " -D " + ui->leAddr->text() + " | awk '{print $2}' | sed -n '3p'";
-
-            fp = popen(arp_result.toUtf8().data(),"r");
-            if(!fp)
-                return false;
-            fgets(ret,sizeof(ret),fp);
-            pclose(fp);
-
-            ret[strlen(ret)-1]=0;
-
-            if ( ret != NULL ) {
-    //            if (!strcmp(ret,"0")) {
-    //                //printf("正常连接");
-    //                return  false;
-    //            } else {
-                if (strcmp(ret,"0")) {
-                    //printf("ipv4地址冲突");
-                    QString strInfo = tr("IPV4 address conflict, Please change IP");
-    //                QString buffer = "notify-send -i network-offline " + strInfo;
-                    showNotify(strInfo);
-                    return  true;
-                }
-            }
-        }
-    }
-    if (ui->leAddr_ipv6->text().isEmpty() || ui->leAddr_ipv6->text() == "") {
-        //未配置ipv6地址，跳过ipv6地址冲突检测
-        return false;
-    }
-    isIpv6Conflict = false;
-    QProcess * process = new QProcess;
-    if (this->isActWifi) {
-        //指定无线网卡检测
-        process->start(QString("ping6 %1%%2").arg(ui->leAddr_ipv6->text()).arg(wcard));
-    } else {
-        //指定有线网卡检测
-        process->start(QString("ping6 %1%%2").arg(ui->leAddr_ipv6->text()).arg(lcard));
-    }
-    connect(process, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), this, [ = ]() {
-        process->deleteLater();
-    });
-    connect(process, &QProcess::readyReadStandardOutput, this, [ = ]() {
-        QString str = process->readAllStandardOutput();
-        if (!str.contains("PING")) {
-            if (str.contains("unreachable")) {
-                isIpv6Conflict = false;
-            } else {
-                //如果能ping通，需要看是不是当前本机连接的ipv6地址，如果是本机连接的，也不算冲突
-                if (this->isActWifi) {
-                    if (ui->leAddr_ipv6->text() == actWifiIpv6Addr) {
-                        //新地址与当前本机连接的wifi的ipv6地址一直，不算冲突
-                        isIpv6Conflict = false;
-                    } else {
-                        isIpv6Conflict = true;
-                    }
-                } else {
-                    if (ui->leAddr_ipv6->text() == actLanIpv6Addr) {
-                        //新地址与当前本机连接的有线的ipv6地址一直，不算冲突
-                        isIpv6Conflict = false;
-                    } else {
-                        isIpv6Conflict = true;
-                    }
-                }
-            }
-            process->close();
-        }
-    });
-    connect(process, &QProcess::readyReadStandardError, this, [ = ]() {
-        isIpv6Conflict = false;
-        process->close();
-    });
-    process->waitForFinished();
-    if (isIpv6Conflict) {
-        //printf("ipv6地址冲突");
-        QString strInfo = tr("IPV6 address conflict, Please change IP");
-        showNotify(strInfo);
-        return  true;
-    }
-    //printf("正常连接");
-    return false;
-}
-
-void ConfForm::changeEnableCheckIp()
-{
-    canCheckIpConflict = true;
-}
-
-//点击取消按钮
-void ConfForm::on_btnCancel_clicked()
-{
-    onConfformHide();
-}
-
-//根据需要设置的种类(自动或手动等)显示界面内容
-void ConfForm::cbTypeChanged(int index)
-{
-    if (isShowSaveBtn) {
-        if (!isActWifi) {
-            ui->leName->setEnabled(true);
-        }
-        ui->btnSave->show(); //显示保存按钮
-        ui->btnCreate->hide(); //隐藏创建按钮
-        ui->lbLeftupTitle->setText(tr("Edit Network"));
-    }
-
-    if (index == 0) {
-        ui->lineUp->hide();
-        ui->lineDown->hide();
-        ui->wgManual->hide();
-        //ui->centralWidget->resize(432, 230);
-        ui->centralWidget->setFixedSize(432, 230);
-        ui->wdBottom->move(1, 170);
-
-        this->setEnableOfBtn();
-
-        //this->resize(432, 230);
-        this->setFixedSize(432, 230);
-    }
-    if (index == 1) {
-        ui->lineUp->show();
-        ui->lineDown->show();
-        ui->wgManual->show();
-        //ui->centralWidget->resize(432, 510);
-        ui->centralWidget->setFixedSize(432, 510);
-        ui->wdBottom->move(1, 440);
-
-        this->setEnableOfBtn();
-
-        //this->resize(432, 510);
-        this->setFixedSize(432, 510);
-    }
-    if (index == 3) {
-        setBtnEnableFalse();
-
-        if (!isActWifi) {
-            ui->leName->setEnabled(true);
-        }
-        ui->btnSave->hide();
-        ui->btnCreate->show();
-        ui->lbLeftupTitle->setText(tr("Add Wired Network"));
-        isShowSaveBtn = false;
-
-        ui->lineUp->hide();
-        ui->lineDown->hide();
-        ui->wgManual->hide();
-        //ui->centralWidget->resize(432, 230);
-        ui->centralWidget->setFixedSize(432, 230);
-        ui->wdBottom->move(1, 170);
-        //this->resize(432, 230);
-        this->setFixedSize(432, 230);
-    }
-}
-
-void ConfForm::cbMaskChanged(int index)
-{
-    this->setEnableOfBtn();
-}
-
-//编辑网络名称
-void ConfForm::on_leName_textEdited(const QString &arg1)
-{
-    this->setEnableOfBtn();
-}
-
-//编辑网络ip
-void ConfForm::on_leAddr_textEdited(const QString &arg1)
-{
-    this->setEnableOfBtn();
-}
-
-//编辑ipv6地址
-void ConfForm::on_leAddr_ipv6_textChanged(const QString &arg1)
-{
-    this->setEnableOfBtn();
-}
-
-//编辑网络网关
-void ConfForm::on_leGateway_textEdited(const QString &arg1)
-{
-    this->setEnableOfBtn();
-}
-
-//编辑网络DNS
-void ConfForm::on_leDns_textEdited(const QString &arg1)
-{
-    this->setEnableOfBtn();
-}
-
-//编辑网络备用DNS
-void ConfForm::on_leDns2_textEdited(const QString &arg1)
-{
-     this->setEnableOfBtn();
-}
-
-//设置界面按钮是否可点击
-void ConfForm::setEnableOfBtn()
-{
-//    if(!isEditingAlready()){
-//        this->setBtnEnableFalse();
-//        return;
-//    }
-    if (ui->leName->text().size() == 0 ) {
-        this->setBtnEnableFalse();
-        return;
-    }
-
-    if (ui->cbType->currentIndex() == 1) {
-        if (ui->leAddr->text().isEmpty() && ui->leAddr_ipv6->text().isEmpty()) {
-            //当ipv4和ipv6地址均未设置时，禁止保存
-            this->setBtnEnableFalse();
-            return;
-        }
-
-        if (!ui->leAddr->text().isEmpty() && !this->getTextEditState(ui->leAddr->text()) ) {
-            this->setBtnEnableFalse();
-            return;
-        }
-
-        if (!ui->leGateway->text().isEmpty() && !this->getTextEditState(ui->leGateway->text()) ) {
-            this->setBtnEnableFalse();
-            return;
-        }
-
-        if (!ui->leDns->text().isEmpty() && !this->getTextEditState(ui->leDns->text()) ) {
-            this->setBtnEnableFalse();
-            return;
-        }
-
-        if (!ui->leAddr_ipv6->text().isEmpty() && ! this->getIpv6EditState(ui->leAddr_ipv6->text())) {
-            this->setBtnEnableFalse();
-            return;
-        }
-        if(ui->leDns2->text().isEmpty()){
-
-        }else{
-            if(!this->getTextEditState(ui->leDns2->text())){
-                this->setBtnEnableFalse();
-                return ;
-            }
-        }
-    }
-
-
-    ui->btnSave->setEnabled(true);
-    ui->btnCreate->setEnabled(true);
-    ui->btnSave->setProperty("on",true);
-    ui->btnSave->style()->unpolish(ui->btnSave);
-    ui->btnSave->style()->polish(ui->btnSave);
-
-    ui->btnCreate->setProperty("on",true);
-    ui->btnCreate->style()->unpolish(ui->btnCreate);
-    ui->btnCreate->style()->polish(ui->btnCreate);
-
-}
-
-bool ConfForm::isEditingAlready(){
-    if (ui->leName->text().size() == 0) return false;
-    if(ui->cbType->currentIndex() == 1){    //手动新建网络
-        //仅填写连接名和ipv4地址时可被按下
-        if(getTextEditState(ui->leAddr->text()) && ui->leAddr_ipv6->text().isEmpty()
-                && ui->leGateway->text().isEmpty() && ui->leDns->text().isEmpty() && ui->leDns2->text().isEmpty()){
-            return true;
-        }
-        //全部填写完成时可被按下
-        if(getTextEditState(ui->leAddr->text()) && ui->leAddr_ipv6->text().isEmpty()
-                && getTextEditState(ui->leGateway->text()) && getTextEditState(ui->leDns->text())){
-            if(getTextEditState(ui->leDns2->text()) || ui->leDns2->text().isEmpty()){
-                return true;
-            }
-        }
-    }
-    return false;
-}
-//文本的输入要符合ip的格式要求
-bool ConfForm::getTextEditState(QString text)
-{
-    QRegExp rx("\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b");
-
-    bool match = false;
-    match = rx.exactMatch(text);
-
-    return match;
-}
-
-bool ConfForm::getIpv6EditState(QString text)
-{
-    QRegExp rx("^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*$");
-
-    bool match = false;
-    match = rx.exactMatch(text);
-
-    return match;
-}
-
-void ConfForm::onConfformHide()
-{
-    clearFocus();
-    ui->leAddr->clearFocus();
-    ui->leAddr_ipv6->clearFocus();
-    ui->leGateway->clearFocus();
-    ui->leDns->clearFocus();
-    ui->leDns2->clearFocus();
-    this->hide();
-}
-
-//设置创建或保存按钮不可点击
-void ConfForm::setBtnEnableFalse()
-{
-    ui->btnSave->setEnabled(false);
-    ui->btnCreate->setEnabled(false);
-    ui->btnSave->setProperty("on",false);
-    ui->btnSave->style()->unpolish(ui->btnSave);
-    ui->btnSave->style()->polish(ui->btnSave);
-
-    ui->btnCreate->setProperty("on",false);
-    ui->btnCreate->style()->unpolish(ui->btnCreate);
-    ui->btnCreate->style()->polish(ui->btnCreate);
-}
-
-void ConfForm::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QString name = tr("Method: ");
-    ui->lbTxt1->setText(ui->lbTxt1->fontMetrics().elidedText(name, Qt::ElideRight, 95));
-    if (name != ui->lbTxt1->text()) {
-        ui->lbTxt1->setToolTip(tr("Method: "));
-    } else {
-        ui->lbTxt1->setToolTip("");
-    }
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/confform.h b/src/frontend/confform.h
deleted file mode 100644
index 92d8929a..00000000
--- a/src/frontend/confform.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef CONFFORM_H
-#define CONFFORM_H
-
-#include <QWidget>
-#include <QMouseEvent>
-#include <QDebug>
-#include <QPoint>
-#include <QPainter>
-#include <QPainterPath>
-#include <QDialog>
-#include <QListView>
-#include "kylin-dbus-interface.h"
-#include "backend/dbus-interface/kylinwiredconnectoperation.h"
-#include "backend/dbus-interface/kylinconnectsetting.h"
-
-namespace Ui {
-class ConfForm;
-}
-
-enum{
-    DHCP_IP = 0,
-    MANUAL_IP = 1,
-};
-
-class ConfForm : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit ConfForm(QWidget *parent = 0);
-    ~ConfForm();
-
-    void setProp(QString connName, QString uuidName, QString v4method, QString v4addr, QString v6method, QString v6addr, QString mask, QString gateway, QString dns, bool isActConf, bool isWiFi);
-    QString actLanIpv6Addr;
-    QString actWifiIpv6Addr;
-    QString lcard, wcard;
-
-public slots:
-    void cbTypeChanged(int index);
-    void cbMaskChanged(int index);
-    void changeEnableCheckIp();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-private slots:
-    void on_btnSave_clicked();
-
-    void on_btnCancel_clicked();
-
-    void on_btnCreate_clicked();
-
-    void on_leName_textEdited(const QString &arg1);
-
-    void on_leAddr_textEdited(const QString &arg1);
-
-    void on_leGateway_textEdited(const QString &arg1);
-
-    void on_leDns_textEdited(const QString &arg1);
-
-    void on_leDns2_textEdited(const QString &arg1);
-
-    void setEnableOfBtn();
-    bool getTextEditState(QString text);
-    bool getIpv6EditState(QString text);
-    void setBtnEnableFalse();
-    void saveNetworkConfiguration();
-
-    void on_leAddr_ipv6_textChanged(const QString &arg1);
-
-private:
-    Ui::ConfForm *ui;
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-    void showNotify(QString message);
-    bool check_ip_conflict(QString ifname);
-    void onConfformHide();
-    bool isEditingAlready();    //连接按钮是否可被按
-    void connectInfoConstruct(KyConnectSetting &connectInfo);
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-    bool isActConf; //是否对已经连接的网络进行的更改
-    bool isCreateNewNet = false; //是否是创建的新网络
-    bool isShowSaveBtn = true; //是否显示保存按钮，即是否是编辑网络界面
-    QString lastConnName, lastIpv4, netUuid, newUuid, lastIpv6;
-    int lastTypeIndex;
-    bool isActWifi; //是否是wifi网络
-    bool canCheckIpConflict = true; //当前是否可以执行IP冲突的检测
-    bool isIpv6Conflict = false; //ipv6地址是否冲突
-
-    QString labelQss, cbxQss, leQss, lineQss, btnOnQss, btnOffQss;
-
-    KyWiredConnectOperation m_networkConnect;
-    QString m_ifaceName;
-
-signals:
-    void requestRefreshLanList(int updateType);
-};
-
-#endif // CONFFORM_H
diff --git a/src/frontend/confform.ui b/src/frontend/confform.ui
deleted file mode 100644
index c3064079..00000000
--- a/src/frontend/confform.ui
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ConfForm</class>
- <widget class="QWidget" name="ConfForm">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>510</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <property name="toolTip">
-   <string/>
-  </property>
-  <widget class="QWidget" name="centralWidget" native="true">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>510</height>
-    </rect>
-   </property>
-   <widget class="QWidget" name="wgManual" native="true">
-    <property name="geometry">
-     <rect>
-      <x>1</x>
-      <y>169</y>
-      <width>430</width>
-      <height>271</height>
-     </rect>
-    </property>
-    <widget class="QLineEdit" name="leAddr">
-     <property name="geometry">
-      <rect>
-       <x>175</x>
-       <y>10</y>
-       <width>182</width>
-       <height>32</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-    </widget>
-    <widget class="QComboBox" name="cbMask">
-     <property name="geometry">
-      <rect>
-       <x>175</x>
-       <y>95</y>
-       <width>182</width>
-       <height>32</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="leGateway">
-     <property name="geometry">
-      <rect>
-       <x>175</x>
-       <y>140</y>
-       <width>182</width>
-       <height>32</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="leDns">
-     <property name="geometry">
-      <rect>
-       <x>175</x>
-       <y>185</y>
-       <width>182</width>
-       <height>32</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-    </widget>
-    <widget class="QLabel" name="lbTxt2">
-     <property name="geometry">
-      <rect>
-       <x>76</x>
-       <y>13</y>
-       <width>95</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <family>Noto Sans CJK SC</family>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLabel" name="lbTxt3">
-     <property name="geometry">
-      <rect>
-       <x>76</x>
-       <y>98</y>
-       <width>95</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <family>Noto Sans CJK SC</family>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLabel" name="lbTxt4">
-     <property name="geometry">
-      <rect>
-       <x>76</x>
-       <y>143</y>
-       <width>95</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <family>Noto Sans CJK SC</family>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLabel" name="lbTxt5">
-     <property name="geometry">
-      <rect>
-       <x>76</x>
-       <y>188</y>
-       <width>95</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <family>Noto Sans CJK SC</family>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="leDns2">
-     <property name="geometry">
-      <rect>
-       <x>175</x>
-       <y>230</y>
-       <width>182</width>
-       <height>32</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-    </widget>
-    <widget class="QLabel" name="lbTxt6">
-     <property name="geometry">
-      <rect>
-       <x>76</x>
-       <y>233</y>
-       <width>95</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <family>Noto Sans CJK SC</family>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLabel" name="lbTxt_ipv6">
-     <property name="geometry">
-      <rect>
-       <x>76</x>
-       <y>55</y>
-       <width>95</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <family>Noto Sans CJK SC</family>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="leAddr_ipv6">
-     <property name="geometry">
-      <rect>
-       <x>175</x>
-       <y>52</y>
-       <width>182</width>
-       <height>32</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-    </widget>
-   </widget>
-   <widget class="QWidget" name="wdHead" native="true">
-    <property name="geometry">
-     <rect>
-      <x>1</x>
-      <y>1</y>
-      <width>430</width>
-      <height>180</height>
-     </rect>
-    </property>
-    <widget class="QComboBox" name="cbType">
-     <property name="geometry">
-      <rect>
-       <x>175</x>
-       <y>120</y>
-       <width>182</width>
-       <height>32</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-    </widget>
-    <widget class="QLabel" name="lbTxt1">
-     <property name="geometry">
-      <rect>
-       <x>76</x>
-       <y>123</y>
-       <width>95</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <family>Noto Sans CJK SC</family>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLabel" name="lbName">
-     <property name="geometry">
-      <rect>
-       <x>76</x>
-       <y>78</y>
-       <width>95</width>
-       <height>24</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <family>Noto Sans CJK SC</family>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="leName">
-     <property name="geometry">
-      <rect>
-       <x>175</x>
-       <y>75</y>
-       <width>182</width>
-       <height>32</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="maxLength">
-      <number>20</number>
-     </property>
-    </widget>
-   </widget>
-   <widget class="QWidget" name="wdBottom" native="true">
-    <property name="geometry">
-     <rect>
-      <x>1</x>
-      <y>440</y>
-      <width>430</width>
-      <height>70</height>
-     </rect>
-    </property>
-    <widget class="QPushButton" name="btnSave">
-     <property name="geometry">
-      <rect>
-       <x>315</x>
-       <y>20</y>
-       <width>90</width>
-       <height>30</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="btnCancel">
-     <property name="geometry">
-      <rect>
-       <x>215</x>
-       <y>20</y>
-       <width>90</width>
-       <height>30</height>
-      </rect>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-    <widget class="QPushButton" name="btnCreate">
-     <property name="geometry">
-      <rect>
-       <x>315</x>
-       <y>20</y>
-       <width>90</width>
-       <height>30</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </widget>
-   <widget class="QLabel" name="lbLeftupTitle">
-    <property name="geometry">
-     <rect>
-      <x>30</x>
-      <y>30</y>
-      <width>240</width>
-      <height>22</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="Line" name="lineUp">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>170</y>
-      <width>412</width>
-      <height>1</height>
-     </rect>
-    </property>
-    <property name="orientation">
-     <enum>Qt::Horizontal</enum>
-    </property>
-   </widget>
-   <widget class="Line" name="lineDown">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>440</y>
-      <width>412</width>
-      <height>1</height>
-     </rect>
-    </property>
-    <property name="orientation">
-     <enum>Qt::Horizontal</enum>
-    </property>
-   </widget>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/frontend.pri b/src/frontend/frontend.pri
index 6b0c3d0e..f2d899d7 100644
--- a/src/frontend/frontend.pri
+++ b/src/frontend/frontend.pri
@@ -1,6 +1,5 @@
 INCLUDEPATH += $$PWD
 include(tools/tools.pri)
-include(wireless-security/wireless-security.pri)
 include(xatom/xatom.pri)
 include(tab-pages/tab-pages.pri)
 include(list-items/list-items.pri)
@@ -8,27 +7,18 @@ include(netdetails/netdetails.pri)
 include(enterprise-wlan/enterprise-wlan.pri)
 
 FORMS += \
-    $$PWD/confform.ui \
-    $$PWD/mainwindow.ui \
-    $$PWD/wificonfigdialog.ui \
-    $$PWD/wpawifidialog.ui
+    $$PWD/wificonfigdialog.ui
 
 HEADERS += \
-    $$PWD/confform.h \
     $$PWD/customstyle.h \
     $$PWD/kylinwiredwidget.h \
     $$PWD/mainwindow.h \
     $$PWD/nmdemo.h \
-    $$PWD/wificonfigdialog.h \
-    $$PWD/wpawifidialog.h \
-    $$PWD/new-mainwindow.h
+    $$PWD/wificonfigdialog.h
 
 SOURCES += \
-    $$PWD/confform.cpp \
     $$PWD/customstyle.cpp \
     $$PWD/kylinwiredwidget.cpp \
     $$PWD/mainwindow.cpp \
     $$PWD/nmdemo.cpp \
-    $$PWD/wificonfigdialog.cpp \
-    $$PWD/wpawifidialog.cpp \
-    $$PWD/new-mainwindow.cpp
+    $$PWD/wificonfigdialog.cpp
diff --git a/src/frontend/kylinwiredwidget.cpp b/src/frontend/kylinwiredwidget.cpp
index 70bc686a..3807d792 100644
--- a/src/frontend/kylinwiredwidget.cpp
+++ b/src/frontend/kylinwiredwidget.cpp
@@ -34,18 +34,18 @@ void KyWiredWidget::constructWiredActiveConnectList()
     m_activeConnectResource->getActiveConnectionList("enp2s0",
                                                      NetworkManager::ConnectionSettings::ConnectionType::Wired,
                                                      wiredActiveConnect);
-    if (wiredActiveConnect.isEmpty()) {
-        OneLancForm *activeWiredForm = new OneLancForm(this, nullptr);
-        activeWiredForm->constructActiveConnectionEmptyItem();
-        m_wiredActiveFormlist<<activeWiredForm;
-    } else {
-        for (int index = 0; index < wiredActiveConnect.size(); ++index) {
-            resize(width(), height() + H_NORMAL_ITEM * index);
-            OneLancForm *activeWiredForm = new OneLancForm(this, wiredActiveConnect.at(index));
-            activeWiredForm->constructActiveConnectionItem(index);
-            m_wiredActiveFormlist<<activeWiredForm;
-        }
-    }
+//    if (wiredActiveConnect.isEmpty()) {
+//        LanListItem *activeWiredForm = new LanListItem(this, nullptr);
+//        activeWiredForm->constructActiveConnectionEmptyItem();
+//        m_wiredActiveFormlist<<activeWiredForm;
+//    } else {
+//        for (int index = 0; index < wiredActiveConnect.size(); ++index) {
+//            resize(width(), height() + H_NORMAL_ITEM * index);
+//            LanListItem *activeWiredForm = new LanListItem(this, wiredActiveConnect.at(index));
+//            activeWiredForm->constructActiveConnectionItem(index);
+//            m_wiredActiveFormlist<<activeWiredForm;
+//        }
+//    }
 
     return;
 }
@@ -62,14 +62,14 @@ void KyWiredWidget::constructWiredConnectList()
     m_connectResource->getConnectionList("enp2s0",
                                          NetworkManager::ConnectionSettings::ConnectionType::Wired,
                                          wiredConnections);
-    if (!wiredConnections.isEmpty()) {
-        for (int index = 0; index < wiredConnections.size(); ++index) {
-            resize(W_LIST_WIDGET, height() + H_NORMAL_ITEM);
-            OneLancForm *wiredForm = new OneLancForm(this, wiredConnections.at(index));
-            wiredForm->constructConnectionItem(index);
-            m_wiredFormlist<<wiredForm;
-        }
-    }
+//    if (!wiredConnections.isEmpty()) {
+//        for (int index = 0; index < wiredConnections.size(); ++index) {
+//            resize(W_LIST_WIDGET, height() + H_NORMAL_ITEM);
+//            OneLancForm *wiredForm = new OneLancForm(this, wiredConnections.at(index));
+//            wiredForm->constructConnectionItem(index);
+//            m_wiredFormlist<<wiredForm;
+//        }
+//    }
 
     return;
 }
@@ -78,7 +78,7 @@ void KyWiredWidget::updateWiredActiveConnection()
 {
     qDebug()<<"updateWiredActiveConnection......";
     while (!m_wiredActiveFormlist.empty()) {
-        OneLancForm *wiredActiveForm = m_wiredActiveFormlist.at(0);
+        LanListItem *wiredActiveForm = m_wiredActiveFormlist.at(0);
         m_wiredActiveFormlist.removeAt(0);
         delete wiredActiveForm;
         wiredActiveForm = nullptr;
@@ -91,9 +91,8 @@ void KyWiredWidget::updateWiredConnection()
 {
     qDebug()<<"updateWiredConnection........";
     while (!m_wiredFormlist.empty()) {
-        OneLancForm *wiredForm = m_wiredFormlist.at(0);
+        LanListItem *wiredForm = m_wiredFormlist.at(0);
         m_wiredFormlist.removeAt(0);
-        qDebug()<<"delete item"<< wiredForm->uuidName;
         delete wiredForm;
         wiredForm = nullptr;
     }
diff --git a/src/frontend/kylinwiredwidget.h b/src/frontend/kylinwiredwidget.h
index 75879a15..360560bd 100644
--- a/src/frontend/kylinwiredwidget.h
+++ b/src/frontend/kylinwiredwidget.h
@@ -6,9 +6,11 @@
 #include "backend/dbus-interface/kylinconnectresource.h"
 #include "backend/dbus-interface/kylinnetworkdeviceresource.h"
 #include "backend/dbus-interface/kylinconnectitem.h"
-#include "onelancform.h"
+#include "lanlistitem.h"
 #include "mainwindow.h"
 
+class LanListItem;
+
 typedef enum{
     ACTIVECONNECTION,
     CONNECTION,
@@ -56,8 +58,8 @@ private:
     KyConnectResourse        *m_connectResource = nullptr;
     KyNetworkDeviceResourse  *m_deviceResource = nullptr;
 
-    QList<OneLancForm*> m_wiredActiveFormlist;
-    QList<OneLancForm*> m_wiredFormlist;
+    QList<LanListItem*> m_wiredActiveFormlist;
+    QList<LanListItem*> m_wiredFormlist;
 };
 
 #endif // KYLINWIREDWIDGET_H
diff --git a/src/frontend/list-items/list-items.pri b/src/frontend/list-items/list-items.pri
index 27443cf7..90ab1247 100644
--- a/src/frontend/list-items/list-items.pri
+++ b/src/frontend/list-items/list-items.pri
@@ -7,14 +7,10 @@ FORMS += \
 HEADERS += \
     $$PWD/lanlistitem.h \
     $$PWD/listitem.h \
-    $$PWD/oneconnform.h \
-    $$PWD/onelancform.h \
     $$PWD/wlanlistitem.h
 
 SOURCES += \
     $$PWD/lanlistitem.cpp \
     $$PWD/listitem.cpp \
-    $$PWD/oneconnform.cpp \
-    $$PWD/onelancform.cpp \
     $$PWD/wlanlistitem.cpp
 
diff --git a/src/frontend/list-items/oneconnform.cpp b/src/frontend/list-items/oneconnform.cpp
deleted file mode 100644
index b3f68089..00000000
--- a/src/frontend/list-items/oneconnform.cpp
+++ /dev/null
@@ -1,1218 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#include "oneconnform.h"
-#include "ui_oneconnform.h"
-#include "mainwindow.h"
-#include "kylin-dbus-interface.h"
-#include "kylin-network-interface.h"
-#include "wireless-security/dlghidewifi.h"
-#include "utils.h"
-#include "wificonfigdialog.h"
-#include "wpawifidialog.h"
-
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusObjectPath>
-#include <QDBusReply>
-#include <QDBusObjectPath>
-#include <QtConcurrent>
-
-OneConnForm::OneConnForm(QWidget *parent, OldMainWindow *mainWindow, ConfForm *confForm, KSimpleNM *ksnm) :
-    QWidget(parent),
-    ui(new Ui::OneConnForm)
-{
-    ui->setupUi(this);
-
-    ui->btnConnSub->setText(tr("Connect"));//"设置"
-    ui->btnConn->setText(tr("Connect"));//"连接"
-    ui->btnConnPWD->setText(tr("Connect"));//"连接"
-    ui->btnDisConn->setText(tr("Disconnect"));//"断开连接"
-    ui->btnHideConn->setText(tr("Connect"));//"连接"
-    ui->btnCancel->setText(tr("Cancel"));//取消连接
-
-    ui->lbConned->setAlignment(Qt::AlignLeft);
-    ui->lePassword->setEchoMode(QLineEdit::Normal);
-    ui->lePassword->setContextMenuPolicy(Qt::NoContextMenu);
-    ui->lePassword->setTextMargins(0,0,24,0);
-    ui->btnConnPWD->setEnabled(false);
-
-    leQssLow = "QLineEdit{border:none;background:transparent;font-size:14px;}";
-    leQssHigh = "QLineEdit{border:none;background:transparent;font-size:14px;}";
-    funcBtnQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0);color:rgba(107,142,235,0.97);font-size:14px;}"
-                 "QPushButton:Hover{border:0px;border-radius:4px;background-color:rgba(255,255,255,0);color:rgba(151,175,241,0.97);font-size:14px;}"
-                 "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0);color:rgba(61,107,229,0.97);font-size:14px;}";
-
-    ui->leInfo_1->setStyleSheet(leQssLow);
-    ui->leInfo_2->setStyleSheet(leQssLow);
-    ui->leInfo_3->setStyleSheet(leQssLow);
-    ui->leInfo_1->setEnabled(false);
-    ui->leInfo_2->setEnabled(false);
-    ui->leInfo_3->setEnabled(false);
-    ui->btnInfo->setStyleSheet("QPushButton{border:none;background:transparent;}");
-    ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(156,156,156,0);}");
-    ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(156,156,156,0.1);}");
-    ui->wbg_3->setStyleSheet("#wbg_3{border-radius:4px;background-color:rgba(156,156,156,0.1);}");
-    ui->lbName->setStyleSheet("QLabel{font-size:14px;}");
-    ui->lbConned->setStyleSheet("QLabel{font-size:14px;}");
-    ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);font-size:14px;}");
-    ui->checkBoxPwd->setStyleSheet("QCheckBox::indicator {width: 18px; height: 9px;}"
-                                   "QCheckBox::indicator:checked {image: url(:/res/h/show-pwd.png);}"
-                                   "QCheckBox::indicator:unchecked {image: url(:/res/h/hide-pwd.png);}");
-    ui->btnConnSub->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}"
-                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}");
-    ui->btnConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}"
-                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}");
-    ui->btnConnPWD->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
-                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}"
-                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}");
-    ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
-                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}");
-    ui->btnCancel->setStyleSheet("QPushButton{border:none;background:transparent;color:white;font-size:14px;}");
-    ui->btnHideConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}"
-                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}");
-    ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);}");
-    ui->lbWaitingIcon->setStyleSheet("QLabel{border:0px;background-color:transparent;}");
-
-    ui->btnInfo->setCursor(QCursor(Qt::PointingHandCursor));
-    ui->btnInfo->setFocusPolicy(Qt::NoFocus);
-    ui->checkBoxPwd->setFocusPolicy(Qt::NoFocus);
-    ui->btnConnSub->setFocusPolicy(Qt::NoFocus);
-    ui->btnConn->setFocusPolicy(Qt::NoFocus);
-    ui->btnConnPWD->setFocusPolicy(Qt::NoFocus);
-    ui->btnDisConn->setFocusPolicy(Qt::NoFocus);
-    ui->btnHideConn->setFocusPolicy(Qt::NoFocus);
-
-    ui->wbg->show();
-    ui->wbg_2->hide();
-    ui->wbg_3->hide();
-    ui->lbName->show();
-    ui->leInfo_1->hide();
-    ui->leInfo_2->hide();
-    ui->leInfo_3->hide();
-    ui->lePassword->hide();
-    ui->checkBoxPwd->hide();
-    ui->checkBoxPwd->setChecked(true);
-    ui->btnConnSub->hide();
-    ui->btnConn->hide();
-    ui->btnDisConn->hide();
-    ui->btnConnPWD->hide();
-    ui->btnCancel->hide();
-    ui->btnHideConn->hide();
-    ui->line->show();
-    ui->lbWaiting->hide();
-    ui->lbWaitingIcon->hide();
-    ui->btnInfo->hide();
-
-    btnProperty = new QPushButton(ui->wbg_3);
-    btnProperty->resize(60, 20);
-    btnProperty->move(335, 108);
-    btnProperty->setText(tr("Property"));//"属性"
-    btnProperty->setStyleSheet(funcBtnQss);
-    btnProperty->setFocusPolicy(Qt::NoFocus);
-    btnProperty->hide();
-    connect(btnProperty,SIGNAL(clicked()),this,SLOT(onBtnPropertyClicked()));
-
-    this->mw = mainWindow;
-    this->cf = confForm;
-    this->ks = ksnm;
-
-    this->isSelected = false;
-    this->isActive = false;
-
-    this->setAttribute(Qt::WA_Hover,true);
-    this->installEventFilter(this);
-    ui->lePassword->setAttribute(Qt::WA_Hover,true);
-    ui->lePassword->installEventFilter(this);
-    ui->btnInfo->setAttribute(Qt::WA_Hover,true);
-    ui->btnInfo->installEventFilter(this);
-
-//    connect(ui->lePassword, SIGNAL(returnPressed()), this, SLOT(on_btnConnPWD_clicked()));
-    ui->btnConn->setShortcut(Qt::Key_Return);//将字母区回车键与连接按钮绑定在一起
-    ui->btnConnSub->setShortcut(Qt::Key_Return);//点击连接按钮触发回车键
-
-    this->waitTimer = new QTimer(this);
-    connect(waitTimer, SIGNAL(timeout()), this, SLOT(waitAnimStep()));
-
-    connect(mw, &OldMainWindow::reConnectWifi, this, [ = ](const QString& uuid) {
-        if (isActive) {
-            QThread *t = new QThread();
-            BackThread *bt = new BackThread();
-            bt->moveToThread(t);
-            connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-            connect(t, &QThread::started, bt, [ = ]() {
-                mw->is_wifi_reconnected = 1;
-                bt->execReconnWIfi(uuid);
-            });
-            t->start();
-        }
-    });
-
-    connect(mw, &OldMainWindow::startReconnectWifi, this, [ = ](const QString &ssid) {
-        if (ssid == this->wifiName && !this->isWaiting) {
-            this->startWifiWaiting(true);
-        }
-    });
-    connect(mw, &OldMainWindow::stopReconnectWifi, this, [ = ](const QString &ssid, const int &result) {
-        if (ssid == this->wifiName) {
-            qDebug()<<"Reconnect "<<ssid<<" finished. result="<<result;
-            if (result != 0) {
-                lbPwdTip->show();
-            }
-            if (this->isWaiting)
-                this->stopWifiWaiting(true);
-        }
-    });
-
-    connect(mw, &OldMainWindow::wifiClicked, this, [ = ](QString name) {
-        if (QString::compare(name, this->wifiName) == 0 && !this->isActive) {
-            on_btnConn_clicked();
-        }
-    });
-
-    connType = "";
-    lbNameLyt = new QHBoxLayout(ui->lbName);
-    lbFreq = new QLabel(ui->lbName);
-    lbFreq->setAlignment(Qt::AlignCenter);
-    lbFreq->setEnabled(false);
-    lbFreq->setFixedHeight(14);
-    lbFreq->setStyleSheet("QLabel{border: 1px solid rgba(165, 165, 165, 1);"
-                          "background: transparent; color: rgba(0, 0, 0, 0.5);"
-                          "border-radius: 3px; font-size: 10px;"
-                          "color: rgba(165, 165, 165, 1)}");
-    lbFreq->setContentsMargins(2, 0, 2, 0);
-    lbFreq->hide();
-
-    lbPwdTip = new QLabel(ui->lbName);
-    lbPwdTip->setAlignment(Qt::AlignCenter);
-    lbPwdTip->setEnabled(false);
-    lbPwdTip->setFixedHeight(14);
-    lbPwdTip->setStyleSheet("QLabel{border: 1px solid rgba(165, 165, 165, 1);"
-                          "background: transparent; color: rgba(0, 0, 0, 0.5);"
-                          "border-radius: 3px; font-size: 10px;"
-                          "color: rgba(165, 165, 165, 1)}");
-    lbPwdTip->setContentsMargins(2, 0, 2, 0);
-    lbPwdTip->hide();
-    lbPwdTip->setText(tr("Password Incorrect"));
-
-    lbNameText = new QLabel(ui->lbName);
-    lbNameLyt->setContentsMargins(0, 0, 0, 0);
-    lbNameLyt->setSpacing(8);
-    lbNameLyt->addWidget(lbNameText);
-    lbNameLyt->addWidget(lbFreq);
-    lbNameLyt->addWidget(lbPwdTip);
-    lbNameLyt->addStretch();
-    ui->lbName->setLayout(lbNameLyt);
-
-    connect(this, SIGNAL(requestRefreshWifiList()), mw, SLOT(onRequestRefreshWifiList()));
-
-    m_menu = new QMenu();//右键菜单
-    connect(m_menu, &QMenu::triggered, this, &OneConnForm::onMenuTriggered);
-
-#if 0
-    m_networkConnect = new KyNetworkConnect();
-    connect(this, &OneConnForm::activateWirelessConnection, m_networkConnect, &KyNetworkConnect::onActivateWirelessConnection);
-    connect(this, &OneConnForm::activateWirelessConnectionWithPWD, m_networkConnect, &KyNetworkConnect::onActivateWirelessConnectionWithPWD);
-    connect(m_networkConnect, &KyNetworkConnect::noConnection, this, &OneConnForm::onNoConnetion);
-    connect(m_networkConnect, &KyNetworkConnect::notSavedConnection, this, &OneConnForm::onNotSavedConnection);
-    connect(m_networkConnect, &KyNetworkConnect::connResult, this ,&OneConnForm::slotConnWifiResult);
-    connect(m_networkConnect, &KyNetworkConnect::starWaiting, [=](){
-        this->startWifiWaiting(true);
-    });
-#endif
-
-    connect(this, SIGNAL(connDone(int)), mw, SLOT(connWifiDone(int)));
-}
-
-OneConnForm::~OneConnForm()
-{
-    delete ui;
-    delete m_networkConnect;
-    if (m_menu) {
-        delete m_menu;
-        m_menu = nullptr;
-    }
-}
-
-void OneConnForm::mousePressEvent(QMouseEvent *event)
-{
-    if (event->button() == Qt::RightButton && this->wifiBSsid != "--") {
-        m_menu->clear();
-        if (this->isTopItem) {
-            m_menu->addAction(new QAction(tr("Disconnect"), this));
-        } else {
-            m_menu->addAction(new QAction(tr("Connect"), this));
-        }
-        if (checkIsSaved())
-            m_menu->addAction(new QAction(tr("Forget"), this));
-        m_menu->move(cursor().pos());
-        m_menu->show();
-    }
-    qDebug() << "selectedOneWifiForm";
-    emit selectedOneWifiForm(wifiBSsid, H_WIFI_ITEM_BIG_EXTEND);
-}
-
-bool OneConnForm::checkIsSaved()
-{
-    QString uuid = getUuidByWifiName(wifiName);
-    if (uuid.isEmpty()){
-        qDebug()<<"There is no configuration for wifi "<<this->wifiName;
-        return false;
-    } else {
-        return true;
-    }
-}
-
-/**
- * @brief OneConnForm::onMenuTriggered 点击右键菜单选项的槽函数
- * @param action
- */
-bool OneConnForm::onMenuTriggered(QAction *action)
-{
-    if (action->text() == tr("Disconnect")) {
-        this->on_btnDisConn_clicked();
-        return true;
-    } else if (action->text() == tr("Connect")) {
-        this->on_btnConn_clicked();
-        return true;
-    } else if (action->text() == tr("Forget")) {
-        QString uuid = getUuidByWifiName(wifiName);
-        mw->m_networkResourceInstance->removeConnection(uuid);
-        hasPwd = false;
-        return true;
-    }
-}
-
-void OneConnForm::onBtnPropertyClicked()
-{
-    //WORKAROUND::ukui-control-center启动会出现rfkill僵尸进程
-    //添加sleep后可以正常打开
-    //此处sleep了10毫秒
-    QProcess::startDetached(QString("bash -c \"sleep 0.01; ukui-control-center --netconnect;\""));
-}
-
-//事件过滤器
-bool OneConnForm::eventFilter(QObject *obj, QEvent *event)
-{
-    if (obj == ui->btnInfo) {
-        if (event->type() == QEvent::HoverEnter) {
-            ui->leInfo_1->setStyleSheet(leQssHigh);
-            ui->leInfo_2->setStyleSheet(leQssHigh);
-            ui->leInfo_3->setStyleSheet(leQssHigh);
-            return true;
-        } else if(event->type() == QEvent::HoverLeave) {
-            ui->leInfo_1->setStyleSheet(leQssLow);
-            ui->leInfo_2->setStyleSheet(leQssLow);
-            ui->leInfo_3->setStyleSheet(leQssLow);
-            return true;
-        }
-    } else if (obj == this) {
-        if(event->type() == QEvent::HoverEnter) {
-            if (!this->isTopItem) {
-                if (!this->isSelected) {
-                    ui->btnConn->show();
-                    ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(156,156,156,0.1);}");
-                    ui->wbg->show();
-                }
-            }
-            return true;
-        } else if (event->type() == QEvent::HoverLeave) {
-            ui->btnConn->hide();
-            ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(156,156,156,0);}");
-            ui->wbg->hide();
-            return true;
-        }
-    }
-
-    if (obj == ui->lePassword) {
-        if (event->type() == QEvent::MouseButtonPress) {
-            this->setLePassword();
-        } else {
-            return false;
-        }
-    }
-
-    return QWidget::eventFilter(obj,event);
-}
-
-// 是否当前连接的网络，字体设置不同
-void OneConnForm::setAct(bool isAct)
-{
-    if (isAct) {
-        ui->lbConned->show();
-        btnProperty->show();
-    } else {
-        ui->lbConned->hide();
-        btnProperty->hide();
-    }
-    isActive = isAct;
-}
-
-void OneConnForm::setLePassword()
-{
-    if (ui->lePassword->text() == "Input Password..."  || ui->lePassword->text() == "输入密码...") {
-        ui->lePassword->setText(tr(""));
-        ui->lePassword->setEchoMode(QLineEdit::Password);
-        ui->checkBoxPwd->setChecked(false);
-    }
-}
-
-//点击窗口最上面的item时
-void OneConnForm::setTopItem(bool isSelected)
-{
-    if (isSelected) {
-        resize(W_ITEM, H_ITEM_BIG);
-        ui->wbg_3->show();
-        ui->leInfo_1->show();
-        ui->leInfo_2->show();
-        ui->leInfo_3->show();
-
-        this->isSelected = true;
-    } else {
-        resize(W_ITEM, H_ITEM);
-        ui->lePassword->setText("");
-        ui->wbg_3->hide();
-        ui->leInfo_1->hide();
-        ui->leInfo_2->hide();
-        ui->leInfo_3->hide();
-
-
-        this->isSelected = false;
-    }
-
-    ui->wbg->hide();
-    ui->wbg_2->hide();
-    ui->lbSignal->show();
-    ui->lePassword->hide();
-    ui->checkBoxPwd->hide();
-    ui->line->hide();
-    ui->btnConn->hide();
-    ui->btnConnPWD->hide();
-    ui->btnHideConn->hide();
-    ui->btnInfo->show();
-
-    if (isConnected) {
-        if (this->isWaiting) {
-            ui->btnDisConn->hide();
-        } else {
-            ui->btnDisConn->show();
-        }
-    } else {
-        ui->btnDisConn->hide();
-    }
-
-    this->isTopItem = true;
-}
-// 点击窗口下面的item时
-void OneConnForm::setSelected(bool isSelected, bool isCurrName)
-{
-    if (isSelected) {
-        resize(W_ITEM, H_ITEM_BIG);
-        ui->line->move(X_LINE_BIG_EXTEND, Y_LINE_BIG_EXTEND);
-        ui->wbg->hide();
-        ui->wbg_2->hide();
-        ui->wbg_3->show();
-        ui->leInfo_1->show();
-        ui->leInfo_2->show();
-        ui->leInfo_3->show();
-        ui->btnConn->hide();
-        ui->btnConnSub->show();
-
-        this->isSelected = true;
-    } else {
-        resize(W_ITEM, H_ITEM);
-        ui->lePassword->setText("");
-        ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);border-radius:4px;background:rgba(0,0,0,0.2);}");
-        ui->lePassword->setEchoMode(QLineEdit::Normal);
-        ui->checkBoxPwd->setChecked(true);
-
-        ui->line->move(X_LINE, Y_LINE);
-        ui->wbg->show();
-        ui->wbg_2->hide();
-        ui->wbg_3->hide();
-        ui->leInfo_1->hide();
-        ui->leInfo_2->hide();
-        ui->leInfo_3->hide();
-
-        if (isCurrName) {
-            ui->btnConn->show();
-        } else {
-            ui->btnConn->hide();
-        }
-        ui->btnConnSub->hide();
-
-        this->isSelected = false;
-    }
-
-    ui->lePassword->hide();
-    ui->checkBoxPwd->hide();
-    ui->btnConnPWD->hide();
-    ui->lbSignal->show();
-    ui->btnDisConn->hide();
-    ui->btnHideConn->hide();
-    ui->btnInfo->hide();
-
-    this->isTopItem = false;
-}
-// 点击连接隐藏wifi的item时
-void OneConnForm::setHideItem(bool isHideItem, bool isShowHideBtn)
-{
-    if (isHideItem) {
-        ui->lbName->move(14, 20);
-        ui->wbg->hide();
-        ui->btnConn->hide();
-    } else {
-        ui->lbName->move(62, 8);
-        ui->wbg->show();
-        ui->btnConn->show();
-    }
-
-    if (isShowHideBtn) {
-        ui->btnHideConn->show();
-    } else{
-        ui->btnHideConn->hide();
-    }
-}
-
-void OneConnForm::setConnedString(bool showLable, QString str, QString str1)
-{
-    if (!showLable) {
-        ui->lbConned->setText(str1);
-        ui->lbConned->hide();
-        ui->lbName->move(63, 18);
-    } else {
-        ui->lbConned->setText(str);
-    }
-}
-
-void OneConnForm::setWifiName(QString name, QString bssid, QString uuid, QString ifname, bool isHW, bool is9006C)
-{
-    QFontMetrics fontMetrics(lbNameText->font());
-    QString showname = fontMetrics.elidedText(name, Qt::ElideRight, 200);
-    lbNameText->setText(showname);
-    wifiName = name;
-    wifiBSsid = bssid;
-    wifiUuid = uuid;
-    wifiIfName = ifname;
-    isHuaweiPC = isHW;
-    isHuaWei9006C = is9006C;
-}
-
-QString OneConnForm::getName()
-{
-    return wifiName;
-}
-
-void OneConnForm::setRate(QString rate)
-{
-    QString txt(tr("Rate"));//"速率"
-    this->setToolTip("<span style=\"font-size:14px;border:none;background-color:#3593b5;color:white;\">&nbsp; " + txt + ": " + rate + " &nbsp;</span>");
-    this->setToolTip(txt + ":" + rate);
-}
-
-void OneConnForm::setLine(bool isShow)
-{
-    if (isShow) {
-        ui->line->show();
-    } else {
-        ui->line->hide();
-    }
-}
-
-void OneConnForm::setSignal(QString lv, QString secu, QString category, bool hasSignalStrength)
-{
-    this->m_signal = lv.toInt();
-    int signal = lv.toInt();
-
-    QString uuid = getUuidByWifiName(wifiName);
-    if (uuid.isEmpty())
-    {
-        hasPwd = false;
-        this->lbPwdTip->hide();
-    } else {
-        hasPwd = true;
-    }
-
-    QString signalStyle;
-    if (isHuaweiPC) {
-        signalStyle = "QLabel{border-radius:0px;background:url(:/res/hw/wifi";
-    } else {
-        signalStyle = "QLabel{border-radius:0px;background:url(:/res/w/wifi";
-    }
-
-    if (isHuaWei9006C) {
-        if ("1" == category) {
-            signalStyle += "6";
-        } else if ("2" == category) {
-            signalStyle += "6+";
-        }
-    }
-
-    if (signal > 75) {
-        if (hasPwd) {
-            signalStyle += "-full-pwd.png);}";
-        } else {
-            signalStyle += "-full.png);}";
-        }
-    }
-    if (signal > 55 && signal <= 75) {
-        if (hasPwd) {
-            signalStyle += "-high-pwd.png);}";
-        } else {
-            signalStyle += "-high.png);}";
-        }
-    }
-    if (signal > 35 && signal <= 55) {
-        if (hasPwd) {
-            signalStyle += "-medium-pwd.png);}";
-        } else {
-            signalStyle += "-medium.png);}";
-        }
-    }
-    if (signal <= 35) {
-        if (hasSignalStrength) {
-            if (hasPwd) {
-                signalStyle += "-low-pwd.png);}";
-            } else {
-                signalStyle += "-low.png);}";
-            }
-        } else {
-            signalStyle += "-none.png);}";
-        }
-    }
-
-    ui->lbSignal->setStyleSheet(signalStyle);
-}
-
-int OneConnForm::getSignal()
-{
-    return this->m_signal;
-}
-
-void OneConnForm::setWifiInfo(QString str1, QString str2, QString str3, int freq)
-{
-    //freq 0:含2.4G和5G， 1：只有2.4G， 2：只有5G
-    lbFreq->show();
-    if (freq == 1) {
-        //freq ~ 2.4G
-        lbFreq->setText("2.4G");
-    } else if (freq == 2) {
-        //freq ~ 5G
-        lbFreq->setText("5G");
-    } else {
-        //freq ~ 5G&2.4G
-        lbFreq->setText("2.4/5G");
-    }
-    if (str1 == "--" || str1 == ""){ str1 = tr("None"); };
-
-    QString strSecurity = QString(tr("WLAN Security："));
-    QString strSignal = QString(tr("Signal："));
-    QString strMAC = QString(tr("MAC："));
-    wifiSecu = str1;
-
-    ui->leInfo_1->setText(strSecurity + str1);
-    ui->leInfo_2->setText(strSignal + str2);
-    ui->leInfo_3->setText(strMAC + str3);
-}
-
-void OneConnForm::slotConnWifi()
-{
-    this->startWifiWaiting(true);
-    emit sigConnWifi(wifiName, wifiIfName);
-}
-void OneConnForm::slotConnWifiPWD()
-{
-    this->startWifiWaiting(true);
-    emit sigConnWifiPWD(wifiName, ui->lePassword->text(), connType, wifiSecu, wifiIfName);
-}
-
-//点击后断开wifi网络
-void OneConnForm::on_btnDisConn_clicked()
-{
-    qDebug()<<"on_btnDisConn_clicked";
-    if (mw->is_stop_check_net_state == 1) {
-        return;
-    }
-
-    qDebug()<<"DisConnect button about wifi net is clicked, current wifi name is "<<wifiName;
-    if (mw->canReconnectWifiList.contains(wifiName)) {
-        mw->canReconnectWifiList.removeOne(wifiName);
-    }
-
-    this->startWifiWaiting(false);
-
-    mw->is_stop_check_net_state = 1;
-
-    QString uuid = getUuidByWifiName(wifiName);
-    m_networkConnect->deactivateConnection(wifiName,uuid);
-    disconnect(this, SIGNAL(selectedOneWifiForm(QString,int)), mw, SLOT(oneTopWifiFormSelected(QString,int)));
-    emit requestHandleWifiDisconn();
-}
-
-//点击列表item扩展时会出现该按钮 用于连接网络
-void OneConnForm::on_btnConnSub_clicked()
-{
-    qDebug()<<"on_btnConnSub_clicked";
-    if (mw->is_stop_check_net_state == 1) {
-        return;
-    }
-
-    qDebug()<<"check lbPwdTip";
-    if (lbPwdTip->isVisible()) {
-        QString uuid = getUuidByWifiName(wifiName);
-        mw->m_networkResourceInstance->removeConnection(uuid);
-        hasPwd = false;
-        showLePassword();
-        lbPwdTip->hide();
-        return;
-    }
-
-    qDebug()<<"A button named on_btnConnSub about wifi net is clicked.";
-    toConnectWirelessNetwork();
-}
-
-//无需密码的wifi连接
-void OneConnForm::on_btnConn_clicked()
-{
-    qDebug()<<"on_btnConn_clicked";
-    if (mw->is_stop_check_net_state == 1) {
-        return;
-    }
-
-    qDebug()<<"check lbPwdTip";
-    if (lbPwdTip->isVisible()) {
-        QString uuid = getUuidByWifiName(wifiName);
-        mw->m_networkResourceInstance->removeConnection(uuid);
-        hasPwd = false;
-        showLePassword();
-        lbPwdTip->hide();
-        return;
-    }
-
-    qDebug()<<"A button named btnConn about wifi net is clicked.";
-    toConnectWirelessNetwork();
-}
-//无配置文件，认为是第一次连接的wifi，需要显示密码输入框
-void OneConnForm::onNoConnetion()
-{
-    qDebug()<<"onNoConnetion";
-    showLePassword();
-    mw->is_stop_check_net_state = 0;
-}
-
-void OneConnForm::onNotSavedConnection()
-{
-    qDebug()<<"onNotSavedConnection";
-    mw->is_stop_check_net_state = 0;
-    showLePassword();
-}
-
-//显示密码框
-void OneConnForm::showLePassword()
-{
-//    mw->currSelNetName = "";
-    emit selectedOneWifiForm(wifiBSsid, H_WIFI_ITEM_SMALL_EXTEND);
-
-    resize(W_ITEM, H_ITEM_MIDDLE);
-    ui->wbg->hide();
-    ui->wbg_2->show();
-    ui->wbg_3->hide();
-    ui->leInfo_1->hide();
-    ui->leInfo_2->hide();
-    ui->leInfo_3->hide();
-    ui->btnHideConn->hide();
-    ui->btnDisConn->hide();
-    ui->btnConn->hide();
-    ui->btnConnSub->hide();
-    ui->line->move(X_LINE_SMALL_EXTEND, Y_LINE_SMALL_EXTEND);
-
-    ui->lePassword->show();
-    ui->checkBoxPwd->show();
-    ui->btnConnPWD->show();
-
-    this->isSelected = true;
-
-    //设置输入密码框被选中
-    ui->lePassword->setFocus();
-    ui->lePassword->setEchoMode(QLineEdit::Password);
-    ui->checkBoxPwd->setChecked(false);
-}
-
-void OneConnForm::toConnectWirelessNetwork()
-{
-    qDebug() << "toConnectWirelessNetwork";
-    if (wifiSecu.contains("802.1x", Qt::CaseInsensitive)) {
-        //企业wifi
-        WifiConfig wc;
-        bool isConfiged = getWifiConfig(wc, this->wifiName);
-        if (isConfiged && wc.eap != "peap") {
-            mw->is_stop_check_net_state = 1;
-            QThread *t = new QThread();
-            BackThread *bt = new BackThread();
-            bt->moveToThread(t);
-            connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-            connect(t, SIGNAL(started()), this, SLOT(slotConnWifi()));
-            connect(this, SIGNAL(sigConnWifi(QString, QString)), bt, SLOT(execConnWifi(QString, QString)));
-            connect(bt, SIGNAL(connDone(int)), mw, SLOT(connWifiDone(int)));
-            connect(bt, SIGNAL(connDone(int)), this, SLOT(slotConnWifiResult(int)));
-            connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-            t->start();
-            return;
-        }
-
-        WpaWifiDialog * wpadlg = new WpaWifiDialog(mw, mw, this->wifiName);
-        QPoint pos = QCursor::pos();
-        QRect primaryGeometry;
-        for (QScreen *screen : qApp->screens()) {
-            if (screen->geometry().contains(pos)) {
-                primaryGeometry = screen->geometry();
-            }
-        }
-        if (primaryGeometry.isEmpty()) {
-            primaryGeometry = qApp->primaryScreen()->geometry();
-        }
-        wpadlg->move(primaryGeometry.width() / 2 - wpadlg->width() / 2, primaryGeometry.height() / 2 - wpadlg->height() / 2);
-        wpadlg->show();
-        connect(wpadlg, &WpaWifiDialog::conn_done, this, [ = ]() {
-            QString txt(tr("Conn WLAN Success"));
-            mw->objKyDBus->showDesktopNotify(txt);
-            mw->on_btnWifiList_clicked();
-        });
-        connect(wpadlg, &WpaWifiDialog::conn_failed, this, [ = ]() {
-            QString txt(tr("Confirm your WLAN password or usable of wireless card"));
-            mw->objKyDBus->showDesktopNotify(txt);
-            mw->on_btnWifiList_clicked();
-        });
-        return;
-    }
-
-
-    //企业wifi内容逻辑暂时不动
-
-    QString uuid = getUuidByWifiName(wifiName);
-
-    mw->is_stop_check_net_state = 1;
-    emit activateWirelessConnection(wifiName,uuid);
-
-    /*QString cur_secu;
-    if (wifiSecu.contains("WPA3"))
-        cur_secu = "sae";
-    else if (wifiSecu.contains("--"))
-        cur_secu = "--";
-    else
-        cur_secu = "wpa-psk";*/
-
-
-
-
-}
-
-//需要密码的wifi连接
-void OneConnForm::on_btnConnPWD_clicked()
-{
-    qDebug()<<"on_btnConnPWD_clicked";
-    mw->m_is_inputting_wifi_password = false; //点击连接表示密码输入已完成
-    bool bIsNotSaved = false;
-    qDebug()<<"A button named btnConnPWD about wifi net is clicked.";
-    QString uuid = getUuidByWifiName(wifiName);
-
-    if (lbPwdTip->isVisible()) {
-        lbPwdTip->hide();
-        mw->m_wifi_list_pwd_changed.removeOne(wifiName);
-    }
-
-//TODO:connect not saved wireless
-//    if (!uuid.isEmpty())
-//    {
-//        bIsNotSaved = true;
-//    }
-
-    emit activateWirelessConnectionWithPWD(wifiName,ui->lePassword->text(),bIsNotSaved,uuid);
-}
-
-//点击后弹出连接隐藏wifi网络窗口
-void OneConnForm::on_btnHideConn_clicked()
-{
-    QApplication::setQuitOnLastWindowClosed(false);
-    DlgHideWifi *connHidWifi = new DlgHideWifi(0, mw);
-    connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    connHidWifi->show();
-}
-
-bool OneConnForm::isWifiConfExist(QString netName)
-{
-    //dbusWifiMac = ""; //这个函数之前是用来获取已经连接的wifi的MAC地址
-
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> m_reply = m_interface.call("ListConnections");
-
-    QList<QDBusObjectPath> m_objNets = m_reply.value();
-    foreach (QDBusObjectPath objNet, m_objNets){
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objNet.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage reply = m_interface.call("GetSettings");
-        const QDBusArgument &dbusArg = reply.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg >> map;
-
-        for(QString key : map.keys() ){
-            QMap<QString,QVariant> innerMap = map.value(key);
-            if (key == "connection") {
-                for (QString inner_key : innerMap.keys()) {
-                    if (inner_key == "id"){
-                        if (netName == innerMap.value(inner_key).toString()) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-
-    } // end foreach (QDBusObjectPath objNet, m_objNets)
-
-    return false;
-}
-
-void OneConnForm::setlbPwdTipVisble(const bool &visible)
-{
-    lbPwdTip->setVisible(visible);
-}
-
-//设置密码隐藏或可见
-void OneConnForm::on_checkBoxPwd_clicked()
-{
-    if (ui->lePassword->echoMode() == QLineEdit::Password) {
-        ui->checkBoxPwd->setChecked(true);
-        ui->lePassword->setEchoMode(QLineEdit::Normal);
-    } else {
-        ui->checkBoxPwd->setChecked(false);
-        ui->lePassword->setEchoMode(QLineEdit::Password);
-    }
-}
-
-//void OneConnForm::on_checkBoxPwd_released()
-//{
-//    ui->checkBoxPwd->setChecked(false);
-//    ui->lePassword->setEchoMode(QLineEdit::Password);
-//}
-
-void OneConnForm::on_lePassword_textEdited(const QString &arg1)
-{
-    ui->lePassword->setStyleSheet("QLineEdit{border:2px solid rgba(28, 47, 146, 1);border-radius:4px;background:rgba(0,0,0,0.2);}");
-
-    if (ui->lePassword->text().size() < 6) {
-        ui->btnConnPWD->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
-                                   "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}"
-                                   "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}");
-        ui->btnConnPWD->setEnabled(false);
-        disconnect(ui->lePassword, SIGNAL(returnPressed()), this, SLOT(on_btnConnPWD_clicked()));
-        if (ui->lePassword->text().size() == 0) {
-            ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);border-radius:4px;background:rgba(0,0,0,0.2);}");
-        }
-    } else {
-        ui->btnConnPWD->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}"
-                                      "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                                      "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}");
-        connect(ui->lePassword, SIGNAL(returnPressed()), this, SLOT(on_btnConnPWD_clicked()));
-        ui->btnConnPWD->setEnabled(true);
-    }
-}
-
-void OneConnForm::on_btnInfo_clicked()
-{
-    QPoint pos = QCursor::pos();
-    QRect primaryGeometry;
-    for (QScreen *screen : qApp->screens()) {
-        if (screen->geometry().contains(pos)) {
-            primaryGeometry = screen->geometry();
-        }
-    }
-
-    if (primaryGeometry.isEmpty()) {
-        primaryGeometry = qApp->primaryScreen()->geometry();
-    }
-
-    BackThread *bt = new BackThread();
-    QString connProp = bt->getConnProp(wifiUuid);
-    QStringList propList = connProp.split("|");
-    QString v4method, addr, mask, gateway, dns, v6method, v6addr;
-    foreach (QString line, propList) {
-        if (line.startsWith("method:")) {
-            v4method = line.split(":").at(1);
-        }
-        if (line.startsWith("v4addr:")) {
-            addr = line.split(":").at(1);
-        }
-        if (line.startsWith("mask:")) {
-            mask = line.split(":").at(1);
-        }
-        if (line.startsWith("v6method:")) {
-            v6method = line.split(":").at(1);
-        }
-        if (line.startsWith("v6addr:")) {
-            v6addr = line.right(line.length() - line.indexOf(":") - 1);
-        }
-        if (line.startsWith("gateway:")) {
-            gateway= line.split(":").at(1);
-        }
-        if (line.startsWith("dns:")) {
-            dns = line.split(":").at(1);
-        }
-    }
-    // qDebug()<<"v4method:"<<v4method<<" addr:"<<addr<<" mask:"<<mask<<" gateway:"<<gateway<<" dns:"<<dns;
-
-    cf->setProp(wifiName, wifiUuid, v4method, addr, v6method, v6addr, mask, gateway, dns, this->isActive, true);
-    qDebug() << Q_FUNC_INFO << __LINE__ << wifiName << wifiUuid;
-    cf->move(primaryGeometry.width() / 2 - cf->width() / 2, primaryGeometry.height() / 2 - cf->height() / 2);
-    cf->show();
-    cf->raise();
-
-    bt->deleteLater();
-}
-
-// Wifi连接结果，0成功 1失败 2没有配置文件
-void OneConnForm::slotConnWifiResult(int connFlag)
-{
-    qDebug()<<"Function slotConnWifiResult receives a number: "<<connFlag;
-
-    if (!connType.isEmpty()) {
-        QString strConntype = "nmcli connection modify '" + wifiName + "' wifi-sec.psk-flags 2";
-        system(strConntype.toUtf8().data());
-    }
-    connType = "";
-
-    emit connDone(connFlag);
-
-    if (connFlag == 0) {
-        if (mw->isHuaWeiPC) {
-            //network-manager可能会连接到其他bssid对应的网络，改成我们想要连接的那个网络
-            QtConcurrent::run([=]() {
-                QString currConnWifiBssid;
-                KylinDBus myKylinDbus;
-                QStringList wifiListInfo;
-                QList<QString> wifiSsidAndUuid =  myKylinDbus.getAtiveWifiBSsidUuid(wifiListInfo);
-                if (wifiSsidAndUuid.size() > 1 && wifiSsidAndUuid.at(1).length() == 17) {
-                    qDebug() << "想要连接的wifi的bssid是 " << wifiSsidAndUuid.at(1);
-                    currConnWifiBssid = wifiSsidAndUuid.at(1);
-                }
-
-                qDebug() << "实际连接的wifi的bssid是 " << wifiBSsid;
-                if (currConnWifiBssid != wifiBSsid && !currConnWifiBssid.isEmpty()) {
-                    QString modityCmd = "nmcli connection modify \""+ wifiName + "\" " + "802-11-wireless.bssid " + wifiBSsid;
-                    int res = system(modityCmd.toUtf8().data());
-                    qDebug()<<"Modified bssid for wifi. ssid="<<wifiName<<". bssid="<<wifiBSsid<<". res="<<res;
-                    QString reconnectWifiCmd = "nmcli connection up \"" + wifiName + "\"";
-                    qDebug()<<"Trying to connect wifi. ssid="<<wifiName;
-                    system(reconnectWifiCmd.toUtf8().data());
-                } else {
-                    emit requestRefreshWifiList();
-                }
-            });
-        }
-
-        disconnect(this, SIGNAL(selectedOneWifiForm(QString,int)), mw, SLOT(oneWifiFormSelected(QString,int)));
-        if (lbPwdTip&&lbPwdTip->isVisible())
-            this->lbPwdTip->hide();
-    }
-
-    if(connFlag == 1)
-    {
-        if (hasPwd) {
-            if (mw)
-                mw->m_wifi_list_pwd_changed.append(wifiName);
-            if (lbPwdTip)
-                this->lbPwdTip->show();
-        } else {
-            mw->m_networkResourceInstance->removeConnection(getUuidByWifiName(wifiName));
-            hasPwd = false;
-        }
-
-    }
-
-    if (connFlag == 2 || connFlag == 4 || connFlag == 1) {
-        mw->currSelNetName = "";
-        showLePassword();
-    }
-
-    this->stopWifiWaiting(true);
-
-    mw->is_stop_check_net_state = 0;
-}
-
-void OneConnForm::waitAnimStep()
-{
-    QString qpmQss = "QLabel{background-image:url(':/res/s/conning-a/";
-    qpmQss.append(QString::number(this->waitPage));
-    qpmQss.append(".png');}");
-    ui->lbWaitingIcon->setStyleSheet(qpmQss);
-
-    this->waitPage ++;
-    if (this->waitPage > TOTAL_PAGE) {
-        this->waitPage = 1; //循环播放8张图片
-    }
-
-    this->countCurrentTime += FRAME_SPEED;
-    if (this->countCurrentTime >= LIMIT_TIME) {
-        QString cmd = "kill -9 $(pidof nmcli)"; //杀掉当前正在进行的有关nmcli命令的进程
-        int status = system(cmd.toUtf8().data());
-        if (status != 0) {
-            qDebug()<<"execute 'kill -9 $(pidof nmcli)' in function 'waitAnimStep' failed";
-        }
-
-        this->stopWifiWaiting(true); //动画超出时间限制，强制停止动画
-
-        mw->is_stop_check_net_state = 0;
-    }
-}
-
-void OneConnForm::startWifiWaiting(bool isToConnect)
-{
-    qDebug() << "startWifiWaiting " << isToConnect;
-    this->isWaiting = true;
-    if (isToConnect) {
-        ui->btnCancel->show();
-        ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);}");
-    } else {
-        ui->lbWaitingIcon->move(ui->lbWaitingIcon->x() - 24, ui->lbWaitingIcon->y());
-        ui->btnDisConn->hide();
-        ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);}");
-    }
-    this->countCurrentTime = 0;
-    this->waitPage = 1; //总共有8张图片
-    this->waitTimer->start(FRAME_SPEED);
-    ui->lbWaiting->show();
-    ui->lbWaitingIcon->show();
-
-    mw->setTrayLoading(true);
-}
-
-void OneConnForm::stopWifiWaiting(bool isUpdateTrayIcon)
-{
-    qDebug() << "stopWifiWaiting";
-    ui->lbWaitingIcon->move(380, 20);
-    ui->btnCancel->hide();
-    this->isWaiting = false;
-    this->waitTimer->stop();
-    ui->lbWaiting->hide();
-    ui->lbWaitingIcon->hide();
-
-    if (isUpdateTrayIcon) {
-        mw->setTrayLoading(false);
-        mw->getActiveInfoAndSetTrayIcon();
-    }
-}
-
-void OneConnForm::on_btnCancel_clicked()
-{
-    KylinDBus myKylinDbus;
-    QStringList wifiListInfo;
-    QList<QString> wifiSsidAndUuid =  myKylinDbus.getAtiveWifiBSsidUuid(wifiListInfo);
-    if (wifiSsidAndUuid.size() >= 1 && wifiSsidAndUuid.at(0).length() != 17) {
-        QString currentConnectWifiUuid = wifiSsidAndUuid.at(0);
-        kylin_network_set_con_down(currentConnectWifiUuid.toUtf8().data());
-    }
-    this->stopWifiWaiting(true);
-}
-
-/**
- * @brief OneConnForm::getWifiConfig
- * @param wc
- * @return
- */
-bool OneConnForm::getWifiConfig(WifiConfig &wc, QString netName)
-{
-    bool isConfiged = false;
-    QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager/Settings",
-                                      "org.freedesktop.NetworkManager.Settings",
-                                      QDBusConnection::systemBus() );
-    QDBusReply<QList<QDBusObjectPath>> m_reply = m_interface.call("ListConnections");
-
-    QList<QDBusObjectPath> m_objNets = m_reply.value();
-    foreach (QDBusObjectPath objNet, m_objNets){
-        QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                  objNet.path(),
-                                  "org.freedesktop.NetworkManager.Settings.Connection",
-                                  QDBusConnection::systemBus());
-        QDBusMessage reply = m_interface.call("GetSettings");
-        const QDBusArgument &dbusArg = reply.arguments().at( 0 ).value<QDBusArgument>();
-        QMap<QString,QMap<QString,QVariant>> map;
-        dbusArg >> map;
-
-        for(QString key : map.keys() ){
-            QMap<QString,QVariant> innerMap = map.value(key);
-            if (key == "connection") {
-                for (QString inner_key : innerMap.keys()) {
-                    if (inner_key == "id"){
-                        if (netName == innerMap.value(inner_key).toString()) {
-                            isConfiged = true;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (isConfiged) {
-            for(QString key : map.keys()) {
-                QMap<QString,QVariant> eapMap = map.value(key);
-                if (key == "802-1x") {
-                    wc.connectName = netName;
-                    for (QString eap_key : eapMap.keys()) {
-                        if (eap_key == "ca-cert"){
-                            qDebug() << "OneConnForm::getWifiConfig client-cert path = " << eapMap.value(eap_key).toString();
-                            wc.caCert = eapMap.value(eap_key).toString();
-                        } else if (eap_key == "client-cert"){
-                            qDebug() << "OneConnForm::getWifiConfig client-cert path = " << eapMap.value(eap_key).toString();
-                            wc.clientCert = eapMap.value(eap_key).toString();
-                        } else if (eap_key == "eap") {
-                            wc.eap = eapMap.value(eap_key).toStringList().at(0);
-                            qDebug() << "OneConnForm::getWifiConfig eap = " << eapMap.value(eap_key).toStringList().at(0);
-                        } else if (eap_key == "identity") {
-                            wc.identity = eapMap.value(eap_key).toString();
-                        } else if (eap_key == "private-key") {
-                            wc.privateKey = eapMap.value(eap_key).toString();
-                        } else if (eap_key == "anonymous-identity") {
-                            wc.anonymousIdentity = eapMap.value(eap_key).toString();
-                        }
-                    }
-                }
-            }
-            return true;
-        }
-
-    } // end foreach (QDBusObjectPath objNet, m_objNets)
-
-    return false;
-}
-
-QString OneConnForm::getUuidByWifiName(const QString &wifiname)
-{
-    KylinDBus mKylinDBus;
-    return mKylinDBus.checkHasWifiConfigFile(wifiname);
-}
diff --git a/src/frontend/list-items/oneconnform.h b/src/frontend/list-items/oneconnform.h
deleted file mode 100644
index 527fe34d..00000000
--- a/src/frontend/list-items/oneconnform.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef ONECONNFORM_H
-#define ONECONNFORM_H
-
-#include <QWidget>
-#include <QScreen>
-#include <QThread>
-#include <QDialog>
-#include <QLineEdit>
-#include <QShortcut>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QHBoxLayout>
-
-#include "confform.h"
-#include "backthread.h"
-#include "ksimplenm.h"
-#include "wpawifidialog.h"
-//#include "kylinnetworkconnect.h"
-
-#define FRAME_SPEED 150
-#define LIMIT_TIME 90*1000
-#define TOTAL_PAGE 8
-
-#define W_ITEM 424
-#define H_ITEM 60
-#define H_ITEM_BIG 138
-#define H_ITEM_MIDDLE 106
-#define H_WIFI_ITEM_BIG_EXTEND 78 //138 - 60
-#define H_WIFI_ITEM_SMALL_EXTEND 46 //106 - 60
-#define Y_LINE 59
-#define X_LINE 2
-#define Y_LINE_SMALL_EXTEND 105
-#define X_LINE_SMALL_EXTEND 2
-#define Y_LINE_BIG_EXTEND 137
-#define X_LINE_BIG_EXTEND 2
-
-class OldMainWindow;
-
-namespace Ui {
-class OneConnForm;
-}
-
-class OneConnForm : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit OneConnForm(QWidget *parent = 0, OldMainWindow *mw = 0, ConfForm *confForm = 0, KSimpleNM *ksnm = 0);
-    ~OneConnForm();
-
-    // category:1->normal protocol 1->wifi 6 2->wifi 6+
-    void setSignal(QString lv, QString secu, QString category = "0", bool hasSignalStrength = true);
-    int getSignal();
-    void setWifiName(QString name, QString bssid, QString uuid, QString isname, bool isHW, bool is9006C);
-    QString getName();
-    void setRate(QString rate);
-    void setLine(bool isShow);
-    void setWifiInfo(QString str1, QString str2, QString str3, int freq);
-
-    void setSelected(bool isSelected, bool isCurrName);
-    void setHideItem(bool isHideItem, bool isShowHideBtn);
-    void setTopItem(bool isSelected);
-    void setAct(bool isAct);
-
-    void setConnedString(bool showLable, QString str, QString str1);
-
-    void setLePassword();
-
-    bool isWifiConfExist(QString netName);
-    void setlbPwdTipVisble(const bool&);
-
-    QString getUuidByWifiName(const QString &wifiname);
-
-    QString wifiName;
-    QString wifiBSsid;
-    QString wifiUuid;
-    QString wifiIfName;
-    QString connType;
-    QString wifiSecu;
-    QLabel * lbFreq = nullptr;
-    QLabel * lbPwdTip = nullptr;
-    bool isHuaweiPC;
-    bool isHuaWei9006C;
-    bool isSelected;
-    bool isActive;
-    bool isConnected;
-    bool isTopItem;
-    int signalLv;
-    int m_signal;
-
-public slots:
-    void waitAnimStep();
-    void startWifiWaiting(bool isToConnect);
-    void stopWifiWaiting(bool isUpdateTrayIcon);
-    void onBtnPropertyClicked();
-    void onNoConnetion();
-    void onNotSavedConnection();
-
-protected:
-    void mousePressEvent(QMouseEvent *event);
-    bool eventFilter(QObject *obj, QEvent *event);
-
-private:
-    bool getWifiConfig(WifiConfig &wc, QString netName);
-    bool checkIsSaved();
-    void showLePassword();
-
-private slots:
-    void on_btnConn_clicked();
-    void on_btnConnSub_clicked();
-    void on_btnDisConn_clicked();
-    void toConnectWirelessNetwork();
-
-    void slotConnWifi();
-    void slotConnWifiPWD();
-    void slotConnWifiResult(int connFlag);
-
-    void on_btnConnPWD_clicked();
-
-    void on_btnHideConn_clicked();
-
-    void on_lePassword_textEdited(const QString &arg1);
-
-    void on_btnInfo_clicked();
-
-    void on_btnCancel_clicked();
-
-    void on_checkBoxPwd_clicked();
-
-    bool onMenuTriggered(QAction *);
-
-private:
-    QTimer *waitTimer = nullptr;
-    int waitPage;
-    int countCurrentTime;
-    bool isWaiting = false;
-    int psk_flag = 0; //密码存储策略
-    int getPskFlag();
-    bool m_connWithPwd = true; //是否使用密码连接
-
-    Ui::OneConnForm *ui = nullptr;
-    OldMainWindow *mw = nullptr;
-    ConfForm *cf = nullptr;
-    KSimpleNM *ks = nullptr;
-    bool hasPwd;
-
-    QString leQssLow, leQssHigh;
-    QLabel * lbNameText = nullptr;
-    QHBoxLayout * lbNameLyt = nullptr;
-    QString key_mgmt, funcBtnQss;
-    QPushButton *btnProperty = nullptr;
-    QMenu * m_menu = nullptr;
-    KyWiredConnectOperation *m_networkConnect = nullptr;
-
-signals:
-    void selectedOneWifiForm(QString wifiName, int extendLength);
-    void connDone(int connFlag);
-    void requestHandleWifiDisconn();
-    void requestRefreshWifiList();
-
-    void sigConnWifi(QString, QString);
-    void sigConnWifiPWD(QString, QString, QString, QString, QString);
-    void sigConnWifiPsk(QString);
-
-    void activateWirelessConnection(const QString &connectSsid, const QString &connectUuid);
-    void activateWirelessConnectionWithPWD(const QString &connectSsid, const QString &psk, bool isNotSaved, const QString &connectUuid);
-};
-
-#endif // ONECONNFORM_H
diff --git a/src/frontend/list-items/onelancform.cpp b/src/frontend/list-items/onelancform.cpp
deleted file mode 100644
index ae326f10..00000000
--- a/src/frontend/list-items/onelancform.cpp
+++ /dev/null
@@ -1,632 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#include "onelancform.h"
-#include "ui_onelancform.h"
-#include "mainwindow.h"
-#include "kylinwiredwidget.h"
-
-#include <time.h>
-
-OneLancForm::OneLancForm(QWidget *parent, KyConnectItem *wiredConnectItem) :
-    QWidget(parent),
-    ui(new Ui::OneLancForm)
-{
-    ui->setupUi(this);
-
-    ui->btnConnSub->setText(tr("Connect"));//"连接"
-    ui->btnConn->setText(tr("Connect"));//"连接"
-    ui->btnDisConn->setText(tr("Disconnect"));//"断开连接"
-    ui->btnCancel->setText(tr("Cancel"));//取消连接
-
-    ui->lbConned->setAlignment(Qt::AlignLeft);
-
-    leQssLow = "QLineEdit{border:none;background:transparent;font-size:14px;}";
-    leQssHigh = "QLineEdit{border:none;background:transparent;font-size:14px;}";
-
-    ui->leInfo_1->setStyleSheet(leQssLow);
-    ui->leInfo_2->setStyleSheet(leQssLow);
-    ui->leInfo_3->setStyleSheet(leQssLow);
-    ui->leInfo_4->setStyleSheet(leQssLow);
-    ui->btnInfo->setStyleSheet("QPushButton{border:none;background:transparent;}");
-    ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(156,156,156,0.1);}");
-    ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(156,156,156,0);}");
-    ui->lbName->setStyleSheet("QLabel{font-size:14px;}");
-    ui->lbConned->setStyleSheet("QLabel{font-size:14px;}");
-    ui->btnConnSub->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}"
-                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}");
-    ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
-                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}");
-    ui->btnConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}"
-                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}");
-    ui->btnCancel->setStyleSheet("QPushButton{border:none;background:transparent;color:white;font-size:14px;}");
-    ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);}");
-    ui->lbWaitingIcon->setStyleSheet("QLabel{border:0px;background-color:transparent;}");
-
-    ui->btnInfo->setCursor(QCursor(Qt::PointingHandCursor));
-    ui->btnInfo->setFocusPolicy(Qt::NoFocus);
-    ui->btnConnSub->setFocusPolicy(Qt::NoFocus);
-    ui->btnConn->setFocusPolicy(Qt::NoFocus);
-    ui->btnDisConn->setFocusPolicy(Qt::NoFocus);
-    ui->btnCancel->setFocusPolicy(Qt::NoFocus);
-
-    ui->wbg->hide();
-    ui->wbg_2->show();
-    ui->lbName->show();
-    ui->btnConnSub->hide();
-    ui->btnConn->hide();
-    ui->btnDisConn->hide();
-    ui->btnCancel->hide();
-    ui->line->show();
-    ui->lbWaiting->hide();
-    ui->lbWaitingIcon->hide();
-
-
-    m_wiredConnectItem = wiredConnectItem;
-
-    this->isSelected = false;
-    this->isActive = false;
-
-    this->setAttribute(Qt::WA_Hover,true);
-    this->installEventFilter(this);
-    ui->btnInfo->setAttribute(Qt::WA_Hover,true);
-    ui->btnInfo->installEventFilter(this);
-
-
-    this->waitTimer = new QTimer(this);
-#if 0
-    connect(waitTimer, SIGNAL(timeout()), this, SLOT(waitAnimStep()));
-
-    connect(mw, SIGNAL(waitLanStop()), this, SLOT(stopWaiting()));
-    connect(mw, &MainWindow::lanClicked, this, [ = ](QString name) {
-        if (QString::compare(name, this->ssidName) == 0 && !this->isActive) {
-            on_btnConn_clicked();
-        }
-    });
-#endif
-    m_updateSpeedTimer = new QTimer(this);
-    connect(m_updateSpeedTimer, &QTimer::timeout, this, &OneLancForm::updateNetworkSpeed);
-    if (nullptr != m_wiredConnectItem
-            && NetworkManager::ActiveConnection::State::Activated == m_wiredConnectItem->m_connectState) {
-        m_updateSpeedTimer->start(1000);
-    }
-
-    ui->btnConn->setShortcut(Qt::Key_Return);//将字母区回车键与连接按钮绑定在一起
-    ui->btnConnSub->setShortcut(Qt::Key_Return);//点击连接按钮触发回车键
-
-    m_wiredConnectOperation = new KyWiredConnectOperation();
-
-    srand((unsigned)time(NULL));
-}
-
-OneLancForm::~OneLancForm()
-{
-    delete m_wiredConnectItem;
-    delete m_wiredConnectOperation;
-    delete ui;
-}
-
-void OneLancForm::constructActiveConnectionEmptyItem()
-{
-    setLanName(tr("Not connected"), tr("Not connected"), "--", "--");//"当前未连接任何 以太网"
-    setIcon(false);
-    setConnedString(1, tr("Disconnected"), "");//"未连接"
-    isConnected = false;
-    setTopItem(false);//"当前未连接任何 以太网"
-    setAct(true);
-    move(L_VERTICAL_LINE_TO_ITEM, 0);
-    show();
-    setLine(false);
-}
-
-void OneLancForm::constructActiveConnectionItem(int index)
-{
-    setLanName(m_wiredConnectItem->m_connectName,
-               tr("Ethernet"), m_wiredConnectItem->m_connectUuid,
-               m_wiredConnectItem->m_ifaceName);//第二个参数本来是strLanName，但目前不需要翻译
-    setIcon(true);
-    //setLanInfo(m_wiredConnectItem->m_ipv4, m_wiredConnectItem->m_ipv6,
-    //           m_wiredConnectItem->m_bandWith, m_wiredConnectItem->m_hardAddress);
-    //setConnedString(true, tr("NetOn,IfName:"), m_wiredConnectItem->m_ifaceName);
-    setConnedString(1, tr("NetOn,"), "");
-    isConnected = true;
-    setTopItem(false);
-    setLine(true);
-    setAct(true);
-    move(L_VERTICAL_LINE_TO_ITEM, index*H_NORMAL_ITEM);
-    show();
-}
-
-void OneLancForm::constructConnectionItem(int index)
-{
-    setLanName(m_wiredConnectItem->m_connectName,
-               tr("Ethernet"), m_wiredConnectItem->m_connectUuid,
-               m_wiredConnectItem->m_ifaceName);
-    setIcon(true);
-    setLine(true);
-    //setLanInfo(m_wiredConnectItem->m_ipv4, m_wiredConnectItem->m_ipv6,
-    //           tr("Disconnected"), m_wiredConnectItem->m_hardAddress);
-    setConnedString(0, tr("Disconnected"), "");//"未连接"
-    move(L_VERTICAL_LINE_TO_ITEM, index * H_NORMAL_ITEM);
-    setSelected(false, false);
-    show();
-}
-
-void OneLancForm::mousePressEvent(QMouseEvent *)
-{
-    emit selectedOneLanForm(ssidName, uuidName);//避免重名情况
-}
-
-//事件过滤器
-bool OneLancForm::eventFilter(QObject *obj, QEvent *event)
-{
-    if (obj == ui->btnInfo) {
-        if(event->type() == QEvent::HoverEnter) {
-            ui->leInfo_1->setStyleSheet(leQssHigh);
-            ui->leInfo_2->setStyleSheet(leQssHigh);
-            ui->leInfo_3->setStyleSheet(leQssHigh);
-            ui->leInfo_4->setStyleSheet(leQssHigh);
-            return true;
-        } else if(event->type() == QEvent::HoverLeave) {
-            ui->leInfo_1->setStyleSheet(leQssLow);
-            ui->leInfo_2->setStyleSheet(leQssLow);
-            ui->leInfo_3->setStyleSheet(leQssLow);
-            ui->leInfo_4->setStyleSheet(leQssLow);
-            return true;
-        }
-    } else if (obj == this) {
-        if (event->type() == QEvent::HoverEnter) {
-            if (!this->isTopItem) {
-                if (!this->isSelected) {
-                    ui->btnConn->show();
-                    ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(156,156,156,0.1);}");
-                    ui->wbg_2->show();
-                }
-            }
-            return true;
-        } else if(event->type() == QEvent::HoverLeave) {
-            ui->btnConn->hide();
-            ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(156,156,156,0);}");
-            ui->wbg_2->hide();
-            return true;
-        }
-    }
-
-    return QWidget::eventFilter(obj,event);
-}
-
-// 是否当前连接的网络，字体设置不同
-void OneLancForm::setAct(bool isAct)
-{
-    if (isAct) {
-        ui->lbConned->show();
-        ui->btnConnSub->hide();
-    } else {
-        ui->lbConned->hide();
-        ui->btnConnSub->hide();
-    }
-    isActive = isAct;
-}
-
-// 是否选中
-void OneLancForm::setSelected(bool isSelected, bool isCurrName)
-{
-    if (isSelected) {
-        resize(W_ITEM, H_ITEM_EXTEND);
-        ui->wbg->show();
-        ui->wbg_2->hide();
-        ui->line->move(X_LINE_EXTEND, Y_LINE_EXTEND);
-        ui->btnConn->hide();
-        ui->btnConnSub->show();
-
-        this->isSelected = true;
-    } else {
-        resize(W_ITEM, H_ITEM);
-        ui->wbg->hide();
-        ui->wbg_2->show();
-        ui->line->move(X_LINE, Y_LINE);
-        if(isCurrName){
-            ui->btnConn->show();
-        }else{
-            ui->btnConn->hide();
-        }
-        ui->btnConnSub->hide();
-
-        this->isSelected = false;
-    }
-
-    ui->btnDisConn->hide();
-
-    this->isTopItem = false;
-}
-
-//设置顶部这个item的显示
-void OneLancForm::setTopItem(bool isSelected)
-{
-    if (isSelected) {
-        resize(W_ITEM, H_ITEM_EXTEND);
-        ui->wbg->show();
-        ui->btnConnSub->hide();
-        this->isSelected = true;
-        ui->line->move(X_LINE_EXTEND, Y_LINE_EXTEND);
-    } else {
-        resize(W_ITEM, H_ITEM);
-        ui->wbg->hide();
-        ui->btnConnSub->hide();
-        this->isSelected = false;
-        ui->line->move(X_LINE, Y_LINE);
-    }
-    if (isConnected) {
-        ui->btnDisConn->show();
-    } else {
-        ui->btnDisConn->hide();
-    }
-
-    ui->btnConn->hide();
-    ui->wbg_2->hide();
-
-    this->isTopItem = true;
-}
-
-//设置网络名称
-void OneLancForm::setLanName(QString ssid, QString transSsid, QString uuid, QString interface)
-{
-    //处理过长SSID
-    QString displayName;
-    if(ssid.length() > 23){
-        displayName = ssid.mid(0, 20) + "...";
-    }else{
-        displayName = ssid;
-    }
-    ui->lbName->setText(displayName);
-    ssidName = ssid;
-    m_sConnectType = transSsid;
-    uuidName = uuid;
-    ifName = interface;
-}
-
-//根据有线网络连接与否，设置显示'已连接'文字的控件的可见与否
-void OneLancForm::setConnedString(bool showLable, QString str, QString ifname)
-{
-    if (!showLable) {
-        ui->lbConned->hide();
-        ui->lbName->move(63, 18);
-    } else {
-        ui->lbConned->setText(str+ifname);
-    }
-}
-
-//设置item被扩展后出现的网络信息
-void OneLancForm::setLanInfo(QString str1, QString str2, QString str3, QString str4)
-{
-    if (str2 == "" || str2 == "auto") {
-        str2 = tr("No Configuration");
-    }
-
-    if (str1 == "" || str1 == "auto") {
-        str1 = tr("No Configuration");
-//        str2 = tr("No Configuration");
-    }
-
-    if (str4 == "--" || str4 == "") {
-        str1 = tr("No Configuration");
-        str4 = tr("No IfName");
-    }
-
-    QString strIPv4 = QString(tr("IPv4："));
-    QString strIPv6 = QString(tr("IPv6："));
-    QString strBW = QString(tr("BandWidth："));
-    QString strMAC = QString(tr("MAC："));
-
-    ui->leInfo_1->setText(strIPv4 + str1);
-    ui->leInfo_2->setText(strIPv6 + str2);
-    ui->leInfo_3->setText(strBW + str3);
-    ui->leInfo_4->setText(strMAC + str4);
-}
-
-//根据网络是否连接，设置网络状态图标
-void OneLancForm::setIcon(bool isOn)
-{
-    if (isOn) {
-        if (!QIcon::fromTheme("network-wired-connected-symbolic").isNull()) {
-            ui->lbIcon->setPixmap(QIcon::fromTheme("network-wired-connected-symbolic").pixmap(32,32));
-            ui->lbIcon->setProperty("useIconHighlightEffect", 0x10);
-        } else {
-            ui->lbIcon->setPixmap(QIcon(":/res/l/network-online.png").pixmap(32,32));
-        }
-    } else {
-        if (!QIcon::fromTheme("network-wired-disconnected-symbolic").isNull()) {
-            ui->lbIcon->setPixmap(QIcon::fromTheme("network-wired-disconnected-symbolic").pixmap(32,32));
-            ui->lbIcon->setProperty("useIconHighlightEffect", 0x10);
-        } else {
-            ui->lbIcon->setPixmap(QIcon(":/res/l/network-offline.png").pixmap(32,32));
-        }
-    }
-}
-
-//设置item下方横线的可见与否
-void OneLancForm::setLine(bool isShow)
-{
-    if (isShow) {
-        ui->line->show();
-    } else {
-        ui->line->hide();
-    }
-}
-
-void OneLancForm::slotConnLan()
-{
-    //mw->startLoading();
-    this->startWaiting(true);
-    //emit sigConnLan(ui->lbName->text(), ifName);
-    emit sigConnLan(uuidName, ifName, m_sConnectType);
-}
-
-//点击网络断开按钮，执行该函数
-void OneLancForm::on_btnDisConn_clicked()
-{
-    qDebug()<<"DisConnect button about lan net is clicked, current wired net name is "<<ui->lbName->text();
-    m_wiredConnectOperation->deactivateWiredConnection(ssidName, uuidName);
-
-#if 0
-    this->startWaiting(false);
-    mw->is_stop_check_net_state = 1;
-
-    //使用有线网ssid断开网络
-    //kylin_network_set_con_down(ssidName.toUtf8().data());
-    //使用有线网uuid断开网络
-    //kylin_network_set_con_down(uuidName.toUtf8().data());
-    m_networkConnect->deactivateConnection(ui->lbName->text(), uuidName);
-    //使用dbus接口断开网络
-    //toDisConnWiredNetwork(uuidName);
-
-    disconnect(this, SIGNAL(selectedOneLanForm(QString, QString)), mw, SLOT(oneTopLanFormSelected(QString, QString)));
-
-    emit requestHandleLanDisconn();
-#endif
-}
-
-void OneLancForm::toDisConnWiredNetwork(QString netUuid)
-{
-    QDBusInterface interface( "org.freedesktop.NetworkManager",
-                              "/org/freedesktop/NetworkManager",
-                              "org.freedesktop.DBus.Properties",
-                              QDBusConnection::systemBus() );
-
-    //获取已经连接了那些网络，及这些网络对应的网络类型(ethernet or wifi)
-    QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
-    QList<QVariant> outArgs = result.arguments();
-    QVariant first = outArgs.at(0);
-    QDBusVariant dbvFirst = first.value<QDBusVariant>();
-    QVariant vFirst = dbvFirst.variant();
-    QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
-
-    QDBusObjectPath activeConnPath;
-    dbusArgs.beginArray();
-    while (!dbusArgs.atEnd()) {
-        dbusArgs >> activeConnPath;
-
-        QDBusInterface interfacePro( "org.freedesktop.NetworkManager",
-                                  activeConnPath.path(),
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-
-        QDBusReply<QVariant> replyUuid = interfacePro.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Uuid");
-        if (replyUuid.value().toString() == netUuid) {
-            //断开当前连接网络
-            QDBusInterface disConnIf("org.freedesktop.NetworkManager",
-                                       "/org/freedesktop/NetworkManager",
-                                       "org.freedesktop.NetworkManager",
-                                       QDBusConnection::systemBus() );
-
-            QDBusReply<QDBusObjectPath> disReply = disConnIf.call("DeactivateConnection", QVariant::fromValue(activeConnPath));
-        }
-    }
-    dbusArgs.endArray();
-}
-
-
-//点击了连接网络按钮，执行该函数
-void OneLancForm::on_btnConn_clicked()
-{
-    qDebug()<<"A button named btnConn about lan net is clicked.";
-    toConnectWiredNetwork();
-}
-
-//点击了item被扩展中的连接网络按钮，执行该函数
-void OneLancForm::on_btnConnSub_clicked()
-{
-    qDebug()<<"A button named btnConnSub about lan net is clicked.";
-    toConnectWiredNetwork();
-}
-
-void OneLancForm::toConnectWiredNetwork()
-{
-    /*
-    if (mw->is_stop_check_net_state == 1) {
-        return;
-    }
-
-    mw->is_stop_check_net_state = 1;
-
-    QThread *t = new QThread();
-    BackThread *bt = new BackThread();
-    bt->moveToThread(t);
-    connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-    connect(t, SIGNAL(started()), this, SLOT(slotConnLan()));
-    connect(this, SIGNAL(sigConnLan(QString, QString, QString)), bt, SLOT(execConnLan(QString, QString, QString)));
-    connect(bt, SIGNAL(connDone(int)), mw, SLOT(connLanDone(int)));
-    connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-    t->start();
-    */
-    QString devName = "enp2s0";
-    m_wiredConnectOperation->activateWiredConnection(uuidName, devName);
-}
-
-//点击列表中item扩展后显示信息的位置时，执行该函数，用于显示网络配置界面
-void OneLancForm::on_btnInfo_clicked()
-{
-    QPoint pos = QCursor::pos();
-    QRect primaryGeometry;
-    for (QScreen *screen : qApp->screens()) {
-        if (screen->geometry().contains(pos)) {
-            primaryGeometry = screen->geometry();
-        }
-    }
-
-    if (primaryGeometry.isEmpty()) {
-        primaryGeometry = qApp->primaryScreen()->geometry();
-    }
-
-    BackThread *bt = new BackThread();
-    QString connProp = bt->getConnProp(uuidName);
-    QStringList propList = connProp.split("|");
-    QString v4method, addr, mask, gateway, dns, v6method, v6addr;
-    foreach (QString line, propList) {
-        if (line.startsWith("method:")) {
-            v4method = line.split(":").at(1);
-        }
-        if (line.startsWith("v4addr:")) {
-            addr = line.split(":").at(1);
-        }
-        if (line.startsWith("mask:")) {
-            mask = line.split(":").at(1);
-        }
-        if (line.startsWith("v6method:")) {
-            v6method = line.split(":").at(1);
-        }
-        if (line.startsWith("v6addr:")) {
-            v6addr = line.right(line.length() - line.indexOf(":") - 1);
-        }
-        if (line.startsWith("gateway:")) {
-            gateway= line.split(":").at(1);
-        }
-        if (line.startsWith("dns:")) {
-            dns = line.split(":").at(1);
-        }
-    }
-    // qDebug()<<v4method<<addr<<mask<<gateway<<dns;
-
-    connect(cf, SIGNAL(requestRefreshLanList(int)), mw, SLOT(onBtnNetListClicked(int)));
-    cf->setProp(ui->lbName->text(), uuidName, v4method, addr, v6method, v6addr, mask, gateway, dns, this->isActive, false);
-    qDebug() << Q_FUNC_INFO << __LINE__ << ui->lbName->text() << uuidName;
-    cf->move(primaryGeometry.width() / 2 - cf->width() / 2, primaryGeometry.height() / 2 - cf->height() / 2);
-    cf->show();
-    cf->raise();
-    cf->activateWindow();
-
-    bt->deleteLater();
-}
-
-void OneLancForm::waitAnimStep()
-{
-    QString qpmQss = "QLabel{background-image:url(':/res/s/conning-a/";
-    qpmQss.append(QString::number(this->waitPage));
-    qpmQss.append(".png');}");
-    ui->lbWaitingIcon->setStyleSheet(qpmQss);
-
-    this->waitPage ++;
-    if (this->waitPage > TOTAL_PAGE) {
-        this->waitPage = 1; //循环播放8张图片
-    }
-
-    this->countCurrentTime += FRAME_SPEED;
-    if (this->countCurrentTime >= LIMIT_TIME) {
-        QString cmd = "kill -9 $(pidof nmcli)"; //杀掉当前正在进行的有关nmcli命令的进程
-        int status = system(cmd.toUtf8().data());
-        if (status != 0) {
-            qDebug()<<"execute 'kill -9 $(pidof nmcli)' in function 'waitAnimStep' failed";
-        }
-
-        this->stopWaiting(); //动画超出时间限制，强制停止动画
-
-        mw->is_stop_check_net_state = 0;
-    }
-}
-
-void OneLancForm::startWaiting(bool isToConnect)
-{
-    if (isToConnect) {
-        ui->btnCancel->show();
-        ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);}");
-    } else {
-        ui->lbWaitingIcon->move(ui->lbWaitingIcon->x() - 24, ui->lbWaitingIcon->y());
-        ui->btnDisConn->hide();
-        ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);}");
-    }
-    this->countCurrentTime = 0;
-    this->waitPage = 1; //总共有8张图片
-    this->waitTimer->start(FRAME_SPEED);
-    ui->lbWaiting->show();
-    ui->lbWaitingIcon->show();
-
-    mw->setTrayLoading(true);
-}
-
-void OneLancForm::stopWaiting()
-{
-    ui->lbWaitingIcon->move(380, 20);
-    ui->btnCancel->hide();
-
-    this->waitTimer->stop();
-    ui->lbWaiting->hide();
-    ui->lbWaitingIcon->hide();
-
-    KylinDBus myKylinDbus;
-    QList<QString> actLanSsidUuidState =  myKylinDbus.getAtiveLanSsidUuidState();
-    if (actLanSsidUuidState.size() >= 3) {
-        for (int i=0; i<actLanSsidUuidState.size()-1; i++) {
-            if (actLanSsidUuidState.at(i) == uuidName && actLanSsidUuidState.at(i+1) == "connecting") {
-                kylin_network_set_con_down(uuidName.toUtf8().data());
-            }
-        }
-    }
-
-    mw->setTrayLoading(false);
-    mw->getActiveInfoAndSetTrayIcon();
-}
-
-void OneLancForm::updateNetworkSpeed()
-{
-    KyWiredWidget *wiredWidget = (KyWiredWidget *)parentWidget();
-   // wiredWidget->updateDeviceRefreshRate(m_wiredConnectItem->m_ifaceName, 1000);
-   // wiredWidget->updateNetworkSpeed(m_wiredConnectItem);
-
-    return;
-}
-
-void OneLancForm::on_btnCancel_clicked()
-{
-    QString cmd = "kill -9 $(pidof nmcli)"; //杀掉当前正在进行的有关nmcli命令的进程
-    int status = system(cmd.toUtf8().data());
-    if (status != 0) {
-        qDebug()<<"execute 'kill -9 $(pidof nmcli)' in function 'on_btnCancel_clicked' failed";
-    }
-
-    KylinDBus myKylinDbus;
-    QList<QString> lanSsidAndUuid =  myKylinDbus.getAtiveLanSsidUuidState();
-    if (lanSsidAndUuid.contains(uuidName)) {
-        kylin_network_set_con_down(uuidName.toUtf8().data());
-    }
-
-    this->stopWaiting();
-    mw->is_stop_check_net_state = 0;
-}
diff --git a/src/frontend/list-items/onelancform.h b/src/frontend/list-items/onelancform.h
deleted file mode 100644
index a91ccc74..00000000
--- a/src/frontend/list-items/onelancform.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef ONELANCFORM_H
-#define ONELANCFORM_H
-
-#include <QWidget>
-#include <QScreen>
-#include <QThread>
-#include <QEvent>
-
-#include "confform.h"
-#include "kylin-network-interface.h"
-#include "backend/dbus-interface/kylinwiredconnectoperation.h"
-#include "backthread.h"
-#include "ksimplenm.h"
-#include "backend/dbus-interface/kylinconnectitem.h"
-
-
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusObjectPath>
-#include <QDBusReply>
-#include <QDBusObjectPath>
-#include <QVariant>
-#include <QVariantMap>
-
-#define FRAME_SPEED 150
-#define LIMIT_TIME 60*1000
-#define TOTAL_PAGE 8
-
-#define W_ITEM 424
-#define H_ITEM 60
-#define H_ITEM_EXTEND 162
-#define Y_LINE 59
-#define X_LINE 2
-#define Y_LINE_EXTEND 161
-#define X_LINE_EXTEND 2
-
-class OldMainWindow;
-
-namespace Ui {
-class OneLancForm;
-}
-
-class OneLancForm : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit OneLancForm(QWidget *parent = 0, KyConnectItem *wiredConnectItem = 0);
-    ~OneLancForm();
-
-public:
-    void constructConnectionItem(int index);
-    void constructActiveConnectionItem(int index);
-    void constructActiveConnectionEmptyItem();
-
-    void setLanName(QString ssid, QString transSsid, QString uuid, QString interface);
-    void setIcon(bool isOn);
-    void setLine(bool isShow);
-    void setLanInfo(QString str1, QString str2, QString str3, QString str4);
-
-    void setSelected(bool isSelected, bool isCurrName);
-    void setTopItem(bool isSelected);
-    void setAct(bool isAct);
-
-    void setConnedString(bool showLable, QString str, QString ifname);
-
-    bool isSelected;
-    bool isTopItem;
-    bool isActive;
-    bool isConnected;
-    QString ssidName;
-    QString m_sConnectType;
-    QString uuidName;
-    QString ifName;
-
-public slots:
-    void waitAnimStep();
-    void startWaiting(bool isToConnect);
-    void stopWaiting();
-    void updateNetworkSpeed();
-
-protected:
-    void mousePressEvent(QMouseEvent *event);
-    bool eventFilter(QObject *obj, QEvent *event);
-
-private slots:
-    void on_btnConn_clicked();
-    void on_btnConnSub_clicked();
-    void on_btnDisConn_clicked();
-    void toConnectWiredNetwork();
-    void toDisConnWiredNetwork(QString netUuid);
-
-    void slotConnLan();
-
-    void on_btnInfo_clicked();
-
-    void on_btnCancel_clicked();
-
-private:
-    QTimer *waitTimer = nullptr;
-    QTimer *m_updateSpeedTimer = nullptr;
-    int waitPage;
-    int countCurrentTime;
-
-    Ui::OneLancForm *ui = nullptr;
-    OldMainWindow *mw = nullptr;
-    ConfForm *cf = nullptr;
-    KSimpleNM *ks = nullptr;
-    KyWiredConnectOperation *m_wiredConnectOperation = nullptr;
-
-    QString leQssLow, leQssHigh;
-    KyConnectItem *m_wiredConnectItem = nullptr;
-
-signals:
-    void selectedOneLanForm(QString lanName, QString uniqueName);
-    void connDone(int connFlag);
-    void requestHandleLanDisconn();
-
-    void sigConnLan(QString, QString, QString);
-};
-
-#endif // ONELANCFORM_H
diff --git a/src/frontend/mainwindow.cpp b/src/frontend/mainwindow.cpp
index 481c92f0..857e2daf 100644
--- a/src/frontend/mainwindow.cpp
+++ b/src/frontend/mainwindow.cpp
@@ -1,4810 +1,506 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
 #include "mainwindow.h"
-#include "ui_mainwindow.h"
-#include "oneconnform.h"
-#include "onelancform.h"
-#include "wifi-auth-thread.h"
-#include "hotspot/dlghotspotcreate.h"
-#include "wireless-security/dlghidewifi.h"
-#include "sysdbusregister.h"
-#include "kylinwiredwidget.h"
-#include "nmdemo.h"
+#include "customstyle.h"
+#include <KWindowEffects>
+#include <QApplication>
+#include <QDebug>
+#include <QDBusReply>
+#include <QKeyEvent>
+#include <QProcess>
 
+#include "kylinnetworkdeviceresource.h"
 #include "../backend/dbus-interface/kylinagentinterface.h"
 
-#include <algorithm>//sort函数包含的头文件
+#define MAINWINDOW_WIDTH 420
+#define MAINWINDOW_HEIGHT 456
+#define THEME_SCHAME "org.ukui.style"
+#define COLOR_THEME "styleName"
 
-#include <KWindowEffects>
-#include <QFont>
-#include <QFontMetrics>
-#include <QDir>
-#include <QtConcurrent>
-
-QString llname, lwname, hideWiFiConn;
-
-OldMainWindow::OldMainWindow(QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::MainWindow)
+MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
-    ui->setupUi(this);
-    //QIcon::setThemeName("ukui-icon-theme-default");
-    // 如果使用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);
-    //this->setWindowFlags(Qt::FramelessWindowHint | Qt::Popup);//QTool
-    this->setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);//QTool
-    this->setAttribute(Qt::WA_TranslucentBackground);//设置窗口背景透明
-
-    firstlyStart(); //先执行一些不耗时的一级启动项
-}
-
-OldMainWindow::~OldMainWindow()
-{
-    trayIcon->deleteLater();
-    trayIconMenu->deleteLater();
-    delete ui;
+    firstlyStart();
 }
 
 /**
- * @brief MainWindow::firstlyStart 一级启动
+ * @brief MainWindow::showMainwindow show主窗口，同时也作为dbus接口提供给外部组件调用
  */
-void OldMainWindow::firstlyStart()
+void MainWindow::showMainwindow()
 {
-    qDebug()<<"Loading qss...";
-    UseQssFile::setStyle("style.qss");
+    if (!m_loadFinished) {
+        m_secondaryStartTimer->stop();
+        secondaryStart();
+    }
+    this->resetWindowPosition();
+    this->showNormal();
+    this->raise();
+    this->activateWindow();
+    emit this->mainWindowVisibleChanged(true);
+}
 
-    qDebug()<<"Painting blurRegion...";
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
+/**
+ * @brief MainWindow::hideMainwindow 隐藏主页面时要进行的操作，后续可以添加到此函数
+ */
+void MainWindow::hideMainwindow()
+{
+    this->hide();
+    emit this->mainWindowVisibleChanged(false);
+}
 
-    editQssString(); //编辑部分控件QSS
-    createTopLanUI(); //创建顶部有线网item
-    createTopWifiUI(); //创建顶部无线网item
-    createOtherUI(); //创建上传下载控件，列表区无item时的说明控件
-    createListAreaUI(); //创建列表区域的控件
-    createLeftAreaUI(); //创建左侧区域控件
+/**
+ * @brief MainWindow::setWiredDefaultDevice 设置有线设备默认网卡
+ */
+void MainWindow::setWiredDefaultDevice(QString deviceName)
+{
+    m_lanWidget->updateDefaultDevice(deviceName);
+}
 
-    lcardname = "-1";
-    wcardname = "-1";
-    llname = "-1";
-    lwname = "-1";
-    hideWiFiConn = "Connect to Hidden WLAN Network";
+/**
+ * @brief MainWindow::hideMainwindow 设置无线设备默认网卡
+ */
+void MainWindow::setWirelessDefaultDevice(QString deviceName)
+{
+    m_wlanWidget->updateDefaultDevice(deviceName);
+}
 
-    createTrayIcon();
-    connect(trayIcon, &QSystemTrayIcon::activated, this, &OldMainWindow::iconActivated);
-    connect(mShowWindow, &QAction::triggered, this, &OldMainWindow::on_showWindowAction);
-    connect(mAdvConf, &QAction::triggered, this, &OldMainWindow::actionTriggerSlots);
-    connect(this,&OldMainWindow::showPbSignal,trayIcon,&QSystemTrayIcon::activated);
-
-    //checkSingleAndShowTrayicon();
-    //trayIcon->setVisible(true);
-
-    m_secondary_start_timer = new QTimer(this);
-    connect(m_secondary_start_timer, &QTimer::timeout, this, [ = ]() {
-        m_secondary_start_timer->stop();
+/**
+ * @brief MainWindow::firstlyStart 一级启动，执行重要且不耗时的启动操作
+ */
+void MainWindow::firstlyStart()
+{
+    initWindowProperties();
+    initUI();
+    initDbusConnnect();
+    initWindowTheme();
+    initTrayIcon();
+    installEventFilter(this);
+    m_secondaryStartTimer = new QTimer(this);
+    connect(m_secondaryStartTimer, &QTimer::timeout, this, [ = ]() {
+        m_secondaryStartTimer->stop();
         secondaryStart();//满足条件后执行比较耗时的二级启动
     });
-    m_secondary_start_timer->start(5 * 1000);
-}
-
-/**
- * @brief MainWindow::secondaryStart 二级启动
- */
-void OldMainWindow::secondaryStart()
-{
-    m_networkResourceInstance = KyNetworkResourceManager::getInstance();
-    //m_networkResourceInstance = new KyNetworkResourceManager();
-
-    if (m_load_finished)
-        return;
-    // 连接kds的dbus接收rfkill变化的信号&获取当前WIFI状态
-    qDebug()<<"Initing kdsDbus...";
-    kdsDbus = new QDBusInterface("org.ukui.kds", \
-                               "/", \
-                               "org.ukui.kds.interface", \
-                               QDBusConnection::systemBus());
-    QDBusConnection::systemBus().connect(kdsDbus->service(), kdsDbus->path(), kdsDbus->interface(), "signalRfkillStatusChanged", this, SLOT(onRfkillStatusChanged()));
-
-    PrimaryManager();
-    toStart();
-
-    qDebug()<<"Init objKyDbus...";
-    objKyDBus = new KylinDBus(this);
-    objKyDBus->initConnectionInfo();
-    connect(objKyDBus, SIGNAL(toGetWifiListFinished(QStringList)), this, SLOT(loadWifiListDone(QStringList)));
-
-    objNetSpeed = new NetworkSpeed();
-
-    qDebug()<<"Init confForm...";
-    QApplication::setQuitOnLastWindowClosed(false);
-    this->confForm = new ConfForm();
-
-    qDebug()<<"Init ksnm...";
-    this->ksnm = new KSimpleNM();
-
-    NmDemo* a = new NmDemo(this);
-    a->show();
-#if 0
-    connect(ksnm, SIGNAL(getLanListFinished(QStringList)), this, SLOT(getLanListDone(QStringList)));
-    connect(ksnm, SIGNAL(getWifiListFinished(QStringList)), this, SLOT(getWifiListDone(QStringList)));
-    connect(ksnm, SIGNAL(getConnListFinished(QStringList)), this, SLOT(getConnListDone(QStringList)));
-    connect(ksnm, SIGNAL(requestRevalueUpdateWifi()), this, SLOT(onRequestRevalueUpdateWifi()));
-#endif
-    qDebug()<<"Init LoadingDiv...";
-    loading = new LoadingDiv(this);
-    loading->move(40,0);
-    connect(loading, SIGNAL(toStopLoading() ), this, SLOT(on_checkOverTime() ));
-
-    checkIsWirelessDevicePluggedIn(); //检测无线网卡是否插入
-    //initLanSlistAndGetReconnectNetList(); //初始化有线网列表
-    initNetwork(); //初始化网络
-    initTimer(); //初始化定时器
-    initActNetDNS();//初始化已连接网络的DNS
-    getSystemFontFamily();//建立GSetting监听系统字体
-
-    qDebug()<<"Init button connections...";
-    connect(ui->btnNetList, &QPushButton::clicked, this, &OldMainWindow::onBtnNetListClickeds);
-    connect(btnWireless, &SwitchButton::clicked,this, &OldMainWindow::onBtnWifiClicked);
-    connect(btnWired, &SwitchButton::clicked, this, &OldMainWindow::onBtnLanClicked);
-    connect(this, &OldMainWindow::onWiredDeviceChanged, this, &OldMainWindow::setLanSwitchStatus);
-
-    QVariant wifi_state = BackThread::getSwitchState(WIFI_SWITCH_OPENED);
-    QVariant lan_state = BackThread::getSwitchState(LAN_SWITCH_OPENED);
-    if (!wifi_state.isNull() && wifi_state.isValid()) {
-        //设置WiFi开关状态
-        if (wifi_state.toBool() && !btnWireless->getSwitchStatus())
-            onBtnWifiClicked(1);
-        else if (!wifi_state.toBool() && btnWireless->getSwitchStatus())
-            onBtnWifiClicked(0);
-    }
-    if (!lan_state.isNull() && lan_state.isValid()) {
-        //设置lan开关状态
-        if (lan_state.toBool() && !btnWired->getSwitchStatus())
-            onBtnLanClicked(1);
-        else if (!lan_state.toBool() && btnWired->getSwitchStatus())
-            onBtnLanClicked(0);
-    }
-    connect(btnWired, &SwitchButton::switchStatusChanged, this, [ = ]() {
-        BackThread::saveSwitchButtonState(LAN_SWITCH_OPENED, btnWired->getSwitchStatus());
-    });
-    connect(btnWireless, &SwitchButton::switchStatusChanged, this, [ = ]() {
-        BackThread::saveSwitchButtonState(WIFI_SWITCH_OPENED, btnWireless->getSwitchStatus());
-    });
-    if (!objKyDBus->isWiredCableOn) {
-        btnWired->blockSignals(true);
-        btnWired->setSwitchStatus(false);
-        btnWired->setEnabled(false);
-        btnWired->blockSignals(false);
-    }
-
-    ui->btnNetList->setAttribute(Qt::WA_Hover,true);
-    ui->btnNetList->installEventFilter(this);
-    ui->btnWifiList->setAttribute(Qt::WA_Hover,true);
-    ui->btnWifiList->installEventFilter(this);
-    hasWifiConnected = false;
+    m_secondaryStartTimer->start(5 * 1000);
 
+    //加载key ring
     agent_init();
-
-    //检查有线网络的个数是否为0,如果是0，则新建一个有线网络
-    checkIfWiredNetExist();
-    m_load_finished = true;
 }
 
-void OldMainWindow::checkSingleAndShowTrayicon()
+/**
+ * @brief MainWindow::secondaryStart 二级启动，可以将较耗时的初始化操作放到此处执行
+ */
+void MainWindow::secondaryStart()
 {
-    int fd = 0;
-    try {
-        QStringList homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
-        QString lockPath = QString(homePath.at(0) + "/.config/kylin-nm-lock-%1.lock").arg(getenv("DISPLAY")).toUtf8().data();
-        fd = open(lockPath.toUtf8().data(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
-        if (fd < 0) {
-            throw -1;
-        }
-    } catch(...) {
-        fd = open("/tmp/kylin-nm-lock", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
-        if (fd < 0) {
-            exit(0);
-        }
+    if (m_loadFinished)
+        return;
+    m_loadFinished = true;
+}
+
+/**
+ * @brief MainWindow::initWindowProperties 初始化一些窗口属性
+ */
+void MainWindow::initWindowProperties()
+{
+    this->setWindowTitle(tr("kylin-nm"));
+    this->setWindowIcon(QIcon::fromTheme("kylin-network", QIcon(":/res/x/setup.png")));
+    this->setFixedSize(MAINWINDOW_WIDTH, MAINWINDOW_HEIGHT);
+//    //绘制毛玻璃特效
+//    this->setAttribute(Qt::WA_TranslucentBackground, true);
+//    QPainterPath path;
+//    auto rect = this->rect();
+//    path.addRoundedRect(rect, 6, 6);
+//    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
+}
+
+/**
+ * @brief MainWindow::initUI 初始化窗口内控件
+ */
+void MainWindow::initUI()
+{
+    m_centralWidget = new QTabWidget(this);
+    this->setCentralWidget(m_centralWidget);
+    m_centralWidget->tabBar()->setFixedWidth(this->width());
+    m_lanWidget = new LanPage(m_centralWidget);
+    m_wlanWidget = new WlanPage(m_centralWidget);
+    connect(this, &MainWindow::mainWindowVisibleChanged, m_wlanWidget, &WlanPage::onMainWindowVisibleChanged);
+//    m_centralWidget->addTab(m_lanWidget, QIcon::fromTheme("network-wired-connected-symbolic", QIcon::fromTheme("network-wired-symbolic", QIcon(":/res/l/network-online.svg"))), tr("LAN"));
+//    m_centralWidget->addTab(m_wlanWidget, QIcon::fromTheme("network-wireless-signal-excellent-symbolic", QIcon(":/res/x/wifi-list-bg.svg")), tr("WLAN"));
+
+    m_centralWidget->addTab(m_lanWidget, tr(""));
+    m_centralWidget->addTab(m_wlanWidget,tr(""));
+    m_tabBarLayout = new QHBoxLayout(this);
+    m_lanLabel = new QLabel(tr("LAN"));
+    m_lanLabel->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+    m_wlanLabel = new QLabel(tr("WLAN"));
+    m_wlanLabel->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+    m_tabBarLayout->addWidget(m_lanLabel);
+    m_tabBarLayout->addWidget(m_wlanLabel);
+    m_centralWidget->tabBar()->setLayout(m_tabBarLayout);
+}
+
+/**
+ * @brief MainWindow::initTrayIcon 初始化托盘图标和托盘右键菜单
+ */
+void MainWindow::initTrayIcon()
+{
+    m_trayIcon = new QSystemTrayIcon();
+    m_trayIconMenu = new QMenu();
+    m_showMainwindowAction = new QAction(tr("Show MainWindow"),this);
+    m_showSettingsAction = new QAction(tr("Settings"),this);
+
+    m_trayIcon->setToolTip(QString(tr("kylin-nm")));
+    m_showSettingsAction->setIcon(QIcon::fromTheme("document-page-setup-symbolic", QIcon(":/res/x/setup.png")) );
+    m_trayIconMenu->addAction(m_showMainwindowAction);
+    m_trayIconMenu->addAction(m_showSettingsAction);
+    m_trayIcon->setContextMenu(m_trayIconMenu);
+    m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic"));
+
+    connect(m_trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::onTrayIconActivated);
+    connect(m_showMainwindowAction, &QAction::triggered, this, &MainWindow::onShowMainwindowActionTriggled);
+    connect(m_showSettingsAction, &QAction::triggered, this, &MainWindow::onShowSettingsActionTriggled);
+    m_trayIcon->show();
+}
+
+void MainWindow::initDbusConnnect()
+{
+    connect(m_lanWidget, &LanPage::deviceStatusChanged, this, &MainWindow::deviceStatusChanged);
+    connect(m_lanWidget, &LanPage::deviceNameChanged, this, &MainWindow::deviceNameChanged);
+    connect(m_wlanWidget, &WlanPage::deviceStatusChanged, this, &MainWindow::deviceStatusChanged);
+    connect(m_wlanWidget, &WlanPage::deviceNameChanged, this, &MainWindow::deviceNameChanged);
+
+    connect(m_wlanWidget, &WlanPage::activateFailed, this, &MainWindow::activateFailed);
+    connect(m_wlanWidget, &WlanPage::deactivateFailed, this, &MainWindow::deactivateFailed);
+    connect(m_lanWidget, &LanPage::activateFailed, this, &MainWindow::activateFailed);
+    connect(m_lanWidget, &LanPage::deactivateFailed, this, &MainWindow::deactivateFailed);
+
+    connect(m_lanWidget, &LanPage::lanAdd, this, &MainWindow::lanAdd);
+    connect(m_lanWidget, &LanPage::lanRemove, this, &MainWindow::lanRemove);
+    connect(m_lanWidget, &LanPage::lanUpdate, this, &MainWindow::lanUpdate);
+    connect(m_lanWidget, &LanPage::lanActiveConnectionStateChanged, this, &MainWindow::lanActiveConnectionStateChanged);
+    connect(m_lanWidget, &LanPage::lanConnectChanged, this, &MainWindow::onRefreshTrayIcon);
+
+
+    connect(m_wlanWidget, &WlanPage::wlanAdd, this, &MainWindow::wlanAdd);
+    connect(m_wlanWidget, &WlanPage::wlanRemove, this, &MainWindow::wlanRemove);
+    connect(m_wlanWidget, &WlanPage::wlanActiveConnectionStateChanged, this, &MainWindow::wlanactiveConnectionStateChanged);
+    connect(m_wlanWidget, &WlanPage::hotspotDeactivated, this, &MainWindow::hotspotDeactivated);
+    connect(m_wlanWidget, &WlanPage::hotspotActivated, this, &MainWindow::hotspotActivated);
+    connect(m_wlanWidget, &WlanPage::secuTypeChange, this, &MainWindow::secuTypeChange);
+    connect(m_wlanWidget, &WlanPage::signalStrengthChange, this, &MainWindow::signalStrengthChange);
+    connect(m_wlanWidget, &WlanPage::wlanConnectChanged, this, &MainWindow::onRefreshTrayIcon);
+}
+
+/**
+ * @brief MainWindow::resetWindowPosition 重新计算窗口位置
+ */
+void MainWindow::resetWindowPosition()
+{
+#define MARGIN 4
+#define PANEL_TOP 1
+#define PANEL_LEFT 2
+#define PANEL_RIGHT 3
+//#define PANEL_BOTTOM 4
+    if (!m_positionInterface) {
+        m_positionInterface = new QDBusInterface("org.ukui.panel",
+                            "/panel/position",
+                            "org.ukui.panel",
+                            QDBusConnection::sessionBus());
     }
-
-
-    if (lockf(fd, F_TLOCK, 0)) {
-        //syslog(LOG_ERR, "Can't lock single file, kylin-network-manager is already running!");
-        //qDebug()<<"Can't lock single file, kylin-network-manager is already running!";
-        //exit(0);
-    } else {
-        trayIcon->setVisible(true);
+    QDBusReply<QVariantList> reply = m_positionInterface->call("GetPrimaryScreenGeometry");
+    //reply获取的参数共5个，分别是 主屏可用区域的起点x坐标，主屏可用区域的起点y坐标，主屏可用区域的宽度，主屏可用区域高度，任务栏位置
+    if (!m_positionInterface->isValid() || !reply.isValid() || reply.value().size() < 5) {
+        qCritical() << QDBusConnection::sessionBus().lastError().message();
+        this->setGeometry(0, 0, this->width(), this->height());
+        return;
     }
-}
-
-void OldMainWindow::justShowTrayIcon()
-{
-    trayIcon->setVisible(true);
-}
-
-bool OldMainWindow::eventFilter(QObject *obj, QEvent *event)
-{
-    if (obj == ui->btnNetList) {
-        if (event->type() == QEvent::HoverEnter) {
-            if (!is_btnLanList_clicked) {
-                ui->lbNetListBG->setStyleSheet(btnBgHoverQss);
-            }
-            return true;
-        } else if(event->type() == QEvent::HoverLeave) {
-            if (!is_btnLanList_clicked) {
-                ui->lbNetListBG->setStyleSheet(btnBgLeaveQss);
-            }
-            return true;
-        }
-    }
-
-    if (obj == ui->btnWifiList) {
-        if (event->type() == QEvent::HoverEnter) {
-            if (!is_btnWifiList_clicked) {
-                ui->lbWifiListBG->setStyleSheet(btnBgHoverQss);
-            }
-            return true;
-        } else if(event->type() == QEvent::HoverLeave) {
-            if (!is_btnWifiList_clicked) {
-                ui->lbWifiListBG->setStyleSheet(btnBgLeaveQss);
-            }
-            return true;
-        }
-    }
-
-    return QWidget::eventFilter(obj,event);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// 初始化控件、网络、定时器
-
-// 初始化界面各控件
-void OldMainWindow::editQssString()
-{
-    btnOffQss = "QLabel{min-width: 37px; min-height: 37px;max-width:37px; max-height: 37px;border-radius: 4px; background-color:rgba(255,255,255,0)}";
-    btnOnQss = "QLabel{min-width: 37px; min-height: 37px;max-width:37px; max-height: 37px;border-radius: 4px; background-color:rgba(61,107,229,1)}";
-    btnBgOffQss = "QLabel{min-width: 48px; min-height: 22px;max-width:48px; max-height: 22px;border-radius: 10px; background-color:rgba(255,255,255,0.2)}";
-    btnBgOnQss = "QLabel{min-width: 48px; min-height: 22px;max-width:48px; max-height: 22px;border-radius: 10px; background-color:rgba(61,107,229,1);}";
-    btnBgHoverQss = "QLabel{border-radius: 4px; background-color:rgba(156,156,156,0.3)}";
-    btnBgLeaveQss = "QLabel{border-radius: 4px; background-color:rgba(255,255,255,0)}";
-    leftBtnQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0);}"
-                 "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(156,156,156,0.3);}"
-                 "QPushButton:Pressed{border-radius:4px;background-color:rgba(156,156,156,0.3);}";
-    funcBtnQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0);color:rgba(107,142,235,0.97);font-size:14px;}"
-                 "QPushButton:Hover{border:0px;border-radius:4px;background-color:rgba(255,255,255,0);color:rgba(151,175,241,0.97);font-size:14px;}"
-                 "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0);color:rgba(61,107,229,0.97);font-size:14px;}";
-}
-
-void OldMainWindow::createTopLanUI()
-{
-    qDebug()<<"Creating Top Lan UI...";
-    topLanListWidget = new KyWiredWidget(ui->centralWidget);
-    topLanListWidget->setType(ACTIVECONNECTION);
-    topLanListWidget->move(W_LEFT_AREA, Y_TOP_ITEM);
-    topLanListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM + H_GAP_UP + X_ITEM);
-
-    connect(topLanListWidget, &KyWiredWidget::updateSpeed, this, &OldMainWindow::on_setNetSpeeds);
-
-    /*顶部的一个item*/
-    lbTopLanList = new QLabel(topLanListWidget);
-    lbTopLanList->setText(tr("Ethernet Networks"));//"可用网络列表"
-    lbTopLanList->resize(W_MIDDLE_WORD, H_MIDDLE_WORD);
-    lbTopLanList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_GAP_UP);
-    QFont fontTopLanList( "Noto Sans CJK SC", 14);
-    lbTopLanList->setFont(fontTopLanList);
-    lbTopLanList->show();
-    /*新建有线网按钮*/
-    btnCreateNet = new QPushButton(topLanListWidget);
-    btnCreateNet->resize(W_BTN_FUN, H_BTN_FUN);
-    btnCreateNet->move(X_BTN_FUN, Y_BTN_FUN);
-    btnCreateNet->setText(tr("New LAN"));//"新建网络"
-    btnCreateNet->setStyleSheet(funcBtnQss);
-    btnCreateNet->setFocusPolicy(Qt::NoFocus);
-    btnCreateNet->show();
-    connect(btnCreateNet,SIGNAL(clicked()),this,SLOT(onBtnCreateNetClicked()));
-}
-
-void OldMainWindow::createTopWifiUI()
-{
-    qDebug()<<"Creating Top Wifi UI...";
-    topWifiListWidget = new QWidget(ui->centralWidget);
-    topWifiListWidget->move(W_LEFT_AREA, Y_TOP_ITEM);
-    topWifiListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM + H_GAP_UP + X_ITEM);
-    /*顶部的一个item*/
-    lbTopWifiList = new QLabel(topWifiListWidget);
-    lbTopWifiList->setText(tr("WLAN Networks"));//"可用网络列表"
-    lbTopWifiList->resize(W_MIDDLE_WORD, H_MIDDLE_WORD);
-    lbTopWifiList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_GAP_UP);
-    QFont fontTopWifiList( "Noto Sans CJK SC", 14);
-    lbTopWifiList->setFont(fontTopWifiList);
-    lbTopWifiList->show();
-    /*新建有线网按钮*/
-    btnAddNet = new QPushButton(topWifiListWidget);
-    btnAddNet->move(X_BTN_FUN, Y_BTN_FUN);
-    btnAddNet->setText(tr("Hide WLAN"));//"加入网络"
-    btnAddNet->setStyleSheet(funcBtnQss);
-    int textWidth = QFontMetrics(btnAddNet->font()).width(btnAddNet->text());
-    btnAddNet->resize(textWidth > W_BTN_FUN ? textWidth : W_BTN_FUN, H_BTN_FUN);
-    btnAddNet->setFocusPolicy(Qt::NoFocus);
-    btnAddNet->show();
-    connect(btnAddNet,SIGNAL(clicked()),this,SLOT(onBtnAddNetClicked()));
-}
-
-void OldMainWindow::createOtherUI()
-{
-    qDebug()<<"Creating Other Ui...";
-    lbLoadDown = new QLabel(ui->centralWidget);
-    lbLoadDown->move(X_ITEM + 129, Y_TOP_ITEM + 32);
-    lbLoadDown->resize(65, 20);
-    lbLoadDownImg = new QLabel(ui->centralWidget);
-    lbLoadDownImg->move(X_ITEM + 112, Y_TOP_ITEM + 35);
-    lbLoadDownImg->resize(16, 16);
-
-    lbLoadUp = new QLabel(ui->centralWidget);
-    lbLoadUp->move(X_ITEM + 187, Y_TOP_ITEM + 32);
-    lbLoadUp->resize(65, 20);
-    lbLoadUpImg = new QLabel(ui->centralWidget);
-    lbLoadUpImg->move(X_ITEM + 170, Y_TOP_ITEM + 35);
-    lbLoadUpImg->resize(16, 16);
-
-    lbLoadDownImg->setStyleSheet("QLabel{background-image:url(:/res/x/load-down.png);}");
-    lbLoadUpImg->setStyleSheet("QLabel{background-image:url(:/res/x/load-up.png);}");
-
-    lbNoItemTip = new QLabel(ui->centralWidget);
-    lbNoItemTip->resize(W_NO_ITEM_TIP, H_NO_ITEM_TIP);
-    lbNoItemTip->move(this->width()/2 - W_NO_ITEM_TIP/2 + W_LEFT_AREA/2, this->height()/2);
-    lbNoItemTip->setStyleSheet("QLabel{border:none;background:transparent;}");
-    lbNoItemTip->setText(tr("No usable network in the list"));//列表暂无可连接网络
-    lbNoItemTip->setAlignment(Qt::AlignCenter);
-    lbNoItemTip->hide();
-}
-
-void OldMainWindow::createListAreaUI()
-{
-    qDebug()<<"Creating List Area Ui...";
-    scrollAreal = new QScrollArea(ui->centralWidget);
-    scrollAreal->move(W_LEFT_AREA, Y_TOP_ITEM + H_NORMAL_ITEM + H_GAP_UP + X_ITEM + H_GAP_DOWN);
-    scrollAreal->resize(W_SCROLL_AREA, H_SCROLL_AREA);
-    scrollAreal->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scrollAreal->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-
-    scrollAreaw = new QScrollArea(ui->centralWidget);
-    scrollAreaw->move(W_LEFT_AREA, Y_TOP_ITEM + H_NORMAL_ITEM + H_GAP_UP + X_ITEM + H_GAP_DOWN);
-    scrollAreaw->resize(W_SCROLL_AREA, H_SCROLL_AREA);
-    scrollAreaw->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scrollAreaw->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-
-    lanListWidget = new KyWiredWidget(scrollAreal);
-    lanListWidget->setType(CONNECTION);
-    wifiListWidget = new QWidget(scrollAreaw);
-    lbLanList = new QLabel(lanListWidget);
-    lbWifiList = new QLabel(wifiListWidget);
-
-    ui->lbNetwork->setStyleSheet("QLabel{font-size:20px;}");
-    ui->lbNetwork->show();
-
-    topLanListWidget->setStyleSheet("QWidget{border:none;}");
-    topLanListWidget->setStyleSheet("background-color:transparent;");
-
-    topWifiListWidget->setStyleSheet("QWidget{border:none;}");
-    topWifiListWidget->setStyleSheet("background-color:transparent;");
-
-    lbLoadUp->setStyleSheet("QLabel{font-size:14px;}");
-    lbLoadDown->setStyleSheet("QLabel{font-size:14px;}");
-    lbLoadUp->setText("0KB/s");
-    lbLoadDown->setText("0KB/s.");
-    lbLoadUp->hide();
-    lbLoadDown->hide();
-    lbLoadUpImg->hide();
-    lbLoadDownImg->hide();
-
-    this->on_setNetSpeed();
-
-    scrollAreal->setStyleSheet("QScrollArea{border:none;}");
-    scrollAreal->viewport()->setStyleSheet("background-color:transparent;");
-    //scrollAreal->verticalScrollBar()->setStyleSheet(scrollBarQss);////
-
-    scrollAreaw->setStyleSheet("QScrollArea{border:none;}");
-    scrollAreaw->viewport()->setStyleSheet("background-color:transparent;");
-    //scrollAreaw->verticalScrollBar()->setStyleSheet(scrollBarQss);////
-}
-
-void OldMainWindow::createLeftAreaUI()
-{
-    qDebug()<<"Creating Left Area Ui...";
-    btnWireless = new SwitchButton(this);
-    btnWireless->setStyleSheet("SwitchButton{border:none;background-color:rgba(255,255,255,0.12);}");
-    btnWired = new SwitchButton(this);
-    btnWired->setStyleSheet("SwitchButton{border:none;background-color:rgba(255,255,255,0.12);}");
-    ui->btnNetList->setFocusPolicy(Qt::NoFocus);
-    QString txtEthernet(tr("Ethernet"));
-    ui->btnNetList->setToolTip(txtEthernet);
-    ui->lbNetListBG->setStyleSheet(btnOffQss);
-    //设置PushButton背景透明
-    QPalette paletteLan = ui->btnNetListImg->palette();
-    paletteLan.setColor(QPalette::Highlight, Qt::transparent);
-    paletteLan.setBrush(QPalette::Button, QBrush(QColor(1,1,1,0)));
-    ui->btnNetListImg->setPalette(paletteLan);
-    //添加PushButton的svg图片
-    if (!QIcon::fromTheme("network-wired-connected-symbolic").isNull()) {
-        ui->btnNetListImg->setIcon(QIcon::fromTheme("network-wired-connected-symbolic"));
-    } else if (!QIcon::fromTheme("network-wired-symbolic").isNull()) {
-        ui->btnNetListImg->setIcon(QIcon::fromTheme("network-wired-symbolic"));
-    } else {
-        ui->btnNetListImg->setIcon(QIcon(":/res/x/net-list-bg.svg"));
-    }
-    ui->btnNetListImg->setProperty("useIconHighlightEffect", true);
-    ui->btnNetListImg->setProperty("iconHighlightEffectMode", true);
-
-    ui->btnWifiList->setFocusPolicy(Qt::NoFocus);
-    QString txtWifi("WLAN");
-    ui->btnWifiList->setToolTip(txtWifi);
-    ui->lbWifiListBG->setStyleSheet(btnOffQss);
-    //设置PushButton背景透明
-    QPalette paletteWifi = ui->btnWifiListImg->palette();
-    paletteWifi.setColor(QPalette::Highlight, Qt::transparent);
-    paletteWifi.setBrush(QPalette::Button, QBrush(QColor(1,1,1,0)));
-    ui->btnWifiListImg->setPalette(paletteWifi);
-    //添加PushButton的svg图片
-    if (!QIcon::fromTheme("network-wireless-signal-excellent-symbolic").isNull())
-        ui->btnWifiListImg->setIcon(QIcon::fromTheme("network-wireless-signal-excellent-symbolic"));
-    else
-        ui->btnWifiListImg->setIcon(QIcon(":/res/x/wifi-list-bg.svg"));
-    ui->btnWifiListImg->setProperty("useIconHighlightEffect", true);
-    ui->btnWifiListImg->setProperty("iconHighlightEffectMode", true);
-
-    ui->btnNet->hide();
-
-    btnWireless->setGeometry(412,20,50,24);
-    btnWired->setGeometry(412,20,50,24);
-
-    ui->btnHotspot->setStyleSheet(leftBtnQss);
-    ui->btnHotspot->setFocusPolicy(Qt::NoFocus);
-    QString txtHotSpot(tr("HotSpot"));
-    ui->btnHotspot->setToolTip(txtHotSpot);
-    ui->btnHotspot->hide();
-    ui->lbHotImg->hide();
-    ui->lbHotImg->setStyleSheet("QLabel{background-image:url(:/res/x/hot-spot-off.svg);}");
-    ui->lbHotBG->hide();
-    ui->lbHotBG->setStyleSheet(btnOffQss);
-
-    ui->btnFlyMode->setStyleSheet(leftBtnQss);
-    ui->btnFlyMode->setFocusPolicy(Qt::NoFocus);
-    QString txtFlyMode(tr("FlyMode"));
-    ui->btnFlyMode->setToolTip(txtFlyMode);
-    ui->btnFlyMode->hide();
-    ui->lbFlyImg->hide();
-    ui->lbFlyImg->setStyleSheet("QLabel{background-image:url(:/res/x/fly-mode-off.svg);}");
-    ui->lbFlyBG->hide();
-    ui->lbFlyBG->setStyleSheet(btnOffQss);
-
-    ui->btnAdvConf->setStyleSheet(leftBtnQss);
-    ui->btnAdvConf->setFocusPolicy(Qt::NoFocus);
-    QString txtAdvanced(tr("Advanced"));
-    ui->btnAdvConf->setToolTip(txtAdvanced);
-    //设置PushButton背景透明
-    QPalette paletteConf = ui->btnConfImg->palette();
-    paletteConf.setColor(QPalette::Highlight, Qt::transparent);
-    paletteConf.setBrush(QPalette::Button, QBrush(QColor(1,1,1,0)));
-    ui->btnConfImg->setPalette(paletteConf);
-    //添加PushButton的svg图片
-    ui->btnConfImg->setIcon(QIcon(":/res/x/control.svg"));
-    ui->btnConfImg->setProperty("useIconHighlightEffect", true);
-    ui->btnConfImg->setProperty("iconHighlightEffectMode", true);
-}
-
-// 初始化有线网列表,初始化可回连wifi列表
-void OldMainWindow::initLanSlistAndGetReconnectNetList()
-{
-    qDebug()<<"Init Net List...";
-    canReconnectWifiList.clear();
-    const int BUF_SIZE = 1024;
-    char buf[BUF_SIZE];
-
-    FILE * p_file = NULL;
-
-    //p_file = popen("export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli -f type,device,name connection show", "r");
-    //nmcli -f type,uuid,name connection show
-    p_file = popen("export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli -f type,uuid,name connection show", "r");
-    if (!p_file) {
-        //syslog(LOG_ERR, "Error occurred when popen cmd 'nmcli connection show'");
-        qDebug()<<"Error occurred when popen cmd 'nmcli connection show";
-    }
-
-    int trimNamePos = 0;
-    while (fgets(buf, BUF_SIZE, p_file) != NULL) {
-        QString strSlist = "";
-        QString line(buf);
-        strSlist = line.trimmed();
-        if (strSlist.indexOf("UUID") != -1 || strSlist.indexOf("NAME") != -1) {
-            trimNamePos = strSlist.indexOf("NAME");
-            oldLanSlist.append(strSlist);
-        }
-        if (strSlist.indexOf("802-3-ethernet") != -1 || strSlist.indexOf("ethernet") != -1) {
-            oldLanSlist.append(strSlist);
-        }
-        if (strSlist.indexOf("802-11-wireless") != -1 || strSlist.indexOf("wifi") != -1) {
-            if (trimNamePos != 0) {
-                QString mywifiname = strSlist.mid(trimNamePos).trimmed();//这里没有考虑wifi为空格的情况
-                if (!canReconnectWifiList.contains(mywifiname)) {
-                    canReconnectWifiList.append(mywifiname);
-                }
-            }
-        }
-    }
-
-    pclose(p_file);
-}
-
-// 初始化网络
-void OldMainWindow::initNetwork()
-{
-    qDebug()<<"Init Net interface & list...";
-    BackThread *bt = new BackThread();
-    IFace *iface = bt->execGetIface();
-
-    wcardname = iface->wname;
-    lwname = iface->wname;
-    lcardname = iface->lname;
-    llname = iface->lname;
-    confForm->lcard = lcardname;
-    confForm->wcard = wcardname;
-
-    mwBandWidth = bt->execChkLanWidth(lcardname);
-
-    // 开关状态
-    qDebug()<<"===";
-    qDebug()<<"state of network: '0' is connected, '1' is disconnected, '2' is net device switch off";
-    //syslog(LOG_DEBUG, "state of network: '0' is connected, '1' is disconnected, '2' is net device switch off");
-    qDebug()<<"current network state:  lan state ="<<iface->lstate<<",  wifi state ="<<iface->wstate ;
-    //syslog(LOG_DEBUG, "current network state:  wired state =%d,  wifi state =%d", iface->lstate, iface->wstate);
-    qDebug()<<"===";
-
-    if (iface->wstate == 0 || iface->wstate == 1) {
-        btnWireless->setSwitchStatus(true);
-    } else {
-        btnWireless->setSwitchStatus(false);
-    }
-
-    // 初始化网络列表
-    if (iface->wstate != 2) {
-        if (iface->wstate == 0) {
-            connWifiDone(3);
-        } else {
-            if (iface->lstate == 0) {
-                connLanDone(3);
-            }
-        }
-        is_init_wifi_list = 1;
-        on_btnWifiList_clicked();
-
-        ui->btnNetList->setStyleSheet("QPushButton{border:0px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);}");
-        ui->btnWifiList->setStyleSheet("QPushButton{border:none;}");
-    } else {
-        objKyDBus->setWifiSwitchState(false); //通知控制面板wifi未开启
-        if (iface->lstate != 2) {
-            if (iface->lstate == 0) {
-                connLanDone(3);
-            }
-            onBtnNetListClickeds();
-
-            ui->btnNetList->setStyleSheet("QPushButton{border:0px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);}");
-            ui->btnWifiList->setStyleSheet("QPushButton{border:none;}");
-        } else {
-            BackThread *m_bt = new BackThread();
-            IFace *m_iface = m_bt->execGetIface();
-
-            //写成信号监听自动执行，避免阻塞主线程
-           disconnect_time = 1;
-           connect (m_bt, &BackThread::btFinish, this, [ = ](){
-               disconnect_time ++;
-               if (disconnect_time <= 3) {
-                   m_bt->disConnLanOrWifi("ethernet");
-               } else {
-                   m_bt->disconnect();
-               }
-           });
-            m_bt->disConnLanOrWifi("ethernet");
-
-            delete m_iface;
-            m_bt->deleteLater();
-
-            char *chr = "nmcli networking on";
-            Utils::m_system(chr);
-
-            onBtnNetListClickeds();
-
-            ui->btnNetList->setStyleSheet("QPushButton{border:0px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);}");
-            ui->btnWifiList->setStyleSheet("QPushButton{border:none;}");
-        }
-    }
-    ksnm->execGetConnList();
-
-    QString actWifiUuid = objKyDBus->getActiveWifiUuid();
-    objKyDBus->getConnectNetIp(actWifiUuid);
-    objKyDBus->getWifiIp(actWifiUuid);
-    confForm->actWifiIpv6Addr = objKyDBus->dbusActiveWifiIpv6;
-}
-
-// 初始化定时器
-void OldMainWindow::initTimer()
-{
-    qDebug()<<"Init Timer...";
-    //应用启动后，需要连接可连接的网络
-    QTimer::singleShot(1*1000, this, SLOT(toReconnectWifi() ));
-
-    //循环检测wifi列表的变化，可用于更新wifi列表
-    numberForWifiScan = 0;
-    QObject::connect(this, SIGNAL(loadWifiListAfterScan()), this, SLOT(onLoadWifiListAfterScan()));
-    QObject::connect(this, SIGNAL(refreshWifiListAfterScan()), this, SLOT(onRefreshWifiListAfterScan()));
-    QObject::connect(this, SIGNAL(requestReconnecWifi()), this, SLOT(onRequestReconnecWifi()));
-    checkWifiListChanged = new QTimer(this);
-    checkWifiListChanged->setTimerType(Qt::PreciseTimer);
-    QObject::connect(checkWifiListChanged, SIGNAL(timeout()), this, SLOT(onRequestScanAccesspoint()));
-    checkWifiListChanged->start(10*1000);
-
-    //网线插入时定时执行
-    wiredCableUpTimer = new QTimer(this);
-    wiredCableUpTimer->setTimerType(Qt::PreciseTimer);
-  //  QObject::connect(wiredCableUpTimer, SIGNAL(timeout()), this, SLOT(onCarrierUpHandle()));
-
-    //网线拔出时定时执行
-//    wiredCableDownTimer = new QTimer(this);
-//    wiredCableDownTimer->setTimerType(Qt::PreciseTimer);
-//    QObject::connect(wiredCableDownTimer, SIGNAL(timeout()), this, SLOT(onCarrierDownHandle()));
-    //connect(this, SIGNAL(carrierDownHandle()), this, SLOT(onCarrierDownHandle()));
-
-    //定时处理异常网络，即当点击Lan列表按钮时，若lstate=2，但任然有有线网连接的情况
-    deleteLanTimer = new QTimer(this);
-    deleteLanTimer->setTimerType(Qt::PreciseTimer);
-//    QObject::connect(deleteLanTimer, SIGNAL(timeout()), this, SLOT(onDeleteLan()));
-
-    //定时获取网速
-    setNetSpeed = new QTimer(this);
-    setNetSpeed->setTimerType(Qt::PreciseTimer);
-//    QObject::connect(setNetSpeed, SIGNAL(timeout()), this, SLOT(on_setNetSpeed()));
-//    setNetSpeed->start(1000);
-}
-
-//初始化已经连接网络的DNS
-void OldMainWindow::initActNetDNS()
-{
-    qDebug()<<"Init Active Net Dns...";
-    QList<QString> currConnLanSsidUuidState =objKyDBus->getAtiveLanSsidUuidState();
-
-    if (currConnLanSsidUuidState.size() > 0) {
-        oldActLanName = currConnLanSsidUuidState.at(0);
-        objKyDBus->getLanIpDNS(currConnLanSsidUuidState.at(1), true);
-        oldDbusActLanDNS = objKyDBus->dbusActLanDNS;
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// 任务栏托盘管理、托盘图标处理
-
-void OldMainWindow::createTrayIcon()
-{
-    qDebug()<<"Creating Tray Icon...";
-    trayIcon = new QSystemTrayIcon();
-    trayIcon->setToolTip(QString(tr("kylin-nm")));
-
-    trayIconMenu = new QMenu();
-
-    mShowWindow = new QAction(tr("Show MainWindow"),this);
-    mAdvConf = new QAction(tr("Advanced"),this);
-    mAdvConf->setIcon(QIcon::fromTheme("document-page-setup-symbolic", QIcon(":/res/x/setup.png")) );
-
-    trayIconMenu->addAction(mShowWindow);
-    trayIconMenu->addAction(mAdvConf);
-    trayIcon->setContextMenu(trayIconMenu);
-
-    // 初始化托盘所有Icon
-    if (!QIcon::fromTheme("network-wired-connected-symbolic").isNull()) {
-        iconLanOnline = QIcon::fromTheme("network-wired-connected-symbolic");
-    } else if (!QIcon::fromTheme("network-wired-symbolic").isNull()) {
-        iconLanOnline = QIcon::fromTheme("network-wired-symbolic");
-    } else {
-        iconLanOnline = QIcon(":/res/x/net-list-bg.svg");
-    }
-    if (!QIcon::fromTheme("network-wired-disconnected-symbolic").isNull()) {
-        iconLanOffline = QIcon::fromTheme("network-wired-disconnected-symbolic");
-    } else {
-        iconLanOffline = QIcon::fromTheme("network-wired-offline-symbolic");
-    }
-    iconWifiFull = QIcon::fromTheme("network-wireless-signal-excellent-symbolic");
-    iconWifiHigh = QIcon::fromTheme("network-wireless-signal-good-symbolic");
-    iconWifiMedium = QIcon::fromTheme("network-wireless-signal-ok");
-    iconWifiLow = QIcon::fromTheme("network-wireless-signal-low");
-
-    loadIcons.append(QIcon::fromTheme("kylin-network-1"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-2"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-3"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-4"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-5"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-6"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-7"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-8"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-9"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-10"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-11"));
-    loadIcons.append(QIcon::fromTheme("kylin-network-12"));
-
-    iconTimer = new QTimer(this);
-    connect(iconTimer, SIGNAL(timeout()), this, SLOT(iconStep()));
-
-    setTrayIcon(iconLanOnline);
-}
-
-void OldMainWindow::iconStep()
-{
-    if (currentIconIndex > 11) {
-        currentIconIndex = 0;
-    }
-    setTrayIcon(loadIcons.at(currentIconIndex));
-    currentIconIndex ++;
-}
-
-void OldMainWindow::setTrayIcon(QIcon icon)
-{
-    trayIcon->setIcon(icon);
-}
-
-void OldMainWindow::setTrayIconOfWifi(int signal){
-    if (signal > 75) {
-        setTrayIcon(iconWifiFull);
-    } else if(signal > 55 && signal <= 75) {
-        setTrayIcon(iconWifiHigh);
-    } else if(signal > 35 && signal <= 55) {
-        setTrayIcon(iconWifiMedium);
-    } else if( signal <= 35) {
-        setTrayIcon(iconWifiLow);
-    }
-}
-
-void OldMainWindow::setTrayLoading(bool isLoading)
-{
-    if (isLoading) {
-        currentIconIndex = 0;
-        iconTimer->start(60);
-    } else {
-        iconTimer->stop();
-    }
-}
-
-void OldMainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason)
-{
-    if (!m_load_finished) {
-        m_secondary_start_timer->stop();
-        secondaryStart();
-    }
-    switch (reason) {
-    case QSystemTrayIcon::Trigger:
-    case QSystemTrayIcon::MiddleClick:
-        handleIconClicked();
-
-        if (this->isHidden()) {
-            this->showNormal();
-            this->raise();
-            this->activateWindow();
-
-            currSelNetName = "";
-            if (is_btnLanList_clicked == 1&& is_stop_check_net_state==0) {
-                onBtnNetListClicked(0);
-            }
-
-            if (!is_init_wifi_list && !is_connect_hide_wifi && is_stop_check_net_state==0) {
-                is_stop_check_net_state = 1;
-                if (is_btnWifiList_clicked == 1) {
-                    BackThread *loop_bt = new BackThread();
-                    IFace *loop_iface = loop_bt->execGetIface();
-
-                    if (loop_iface->wstate != 2) {
-                        //current_wifi_list_state = UPDATE_WIFI_LIST;
-                        //checkIfConnectedWifiExist();
-                        //this->ksnm->execGetWifiList(); //更新wifi列表
-                        this->on_btnWifiList_clicked(); //加载wifi列表
-                    }
-
-                    delete loop_iface;
-                    loop_bt->deleteLater();
-                }
-                is_stop_check_net_state = 0;
-            }
-        } else {
-            this->m_is_inputting_wifi_password = false;
-            this->hide();
-            numberForWifiScan = 0;
-        }
+    QVariantList position_list = reply.value();
+    int position = position_list.at(4).toInt();
+    switch(position){
+    case PANEL_TOP:
+        //任务栏位于上方
+        this->setGeometry(position_list.at(0).toInt() + position_list.at(2).toInt() - this->width() - MARGIN,
+                          position_list.at(1).toInt() + MARGIN,
+                          this->width(), this->height());
         break;
-    case QSystemTrayIcon::DoubleClick:
-        //this->hide();
+        //任务栏位于左边
+    case PANEL_LEFT:
+        this->setGeometry(position_list.at(0).toInt() + MARGIN,
+                          position_list.at(1).toInt() + reply.value().at(3).toInt() - this->height() - MARGIN,
+                          this->width(), this->height());
         break;
-    case QSystemTrayIcon::Context:
-        //右键点击托盘图标弹出菜单
-//        showTrayIconMenu();
+        //任务栏位于右边
+    case PANEL_RIGHT:
+        this->setGeometry(position_list.at(0).toInt() + position_list.at(2).toInt() - this->width() - MARGIN,
+                          position_list.at(1).toInt() + reply.value().at(3).toInt() - this->height() - MARGIN,
+                          this->width(), this->height());
         break;
+        //任务栏位于下方
     default:
+        this->setGeometry(position_list.at(0).toInt() + position_list.at(2).toInt() - this->width() - MARGIN,
+                          position_list.at(1).toInt() + reply.value().at(3).toInt() - this->height() - MARGIN,
+                          this->width(), this->height());
         break;
     }
+    qDebug() << " Position of ukui-panel is " << position << "; Position of mainwindow is " << this->geometry() << "." << Q_FUNC_INFO << __LINE__;
 }
 
-void OldMainWindow::handleIconClicked()
+/**
+ * @brief MainWindow::resetTrayIconTool 重新获取网络连接状态并重新设置图标和tooltip
+ */
+void MainWindow::resetTrayIconTool()
 {
-    QRect availableGeometry = qApp->primaryScreen()->availableGeometry();
-    QRect screenGeometry = qApp->primaryScreen()->geometry();
+    //ZJP_TODO 检测当前连接的是有线还是无线，是否可用，设置图标和tooltip,图标最好提前define
+//    int connectivity = objKyDBus->getNetworkConectivity();
+//    qDebug() << "Value of current network Connectivity property : "<< connectivity;
+//    switch (connectivity) {
+//    case UnknownConnectivity:
+//    case Portal:
+//    case Limited:
+//        setTrayIcon(iconLanOnlineNoInternet);
+//        trayIcon->setToolTip(QString(tr("Network Connected But Can Not Access Internet")));
+//        break;
+//    case NoConnectivity:
+//    case Full:
+//        setTrayIcon(iconLanOnline);
+//        trayIcon->setToolTip(QString(tr("kylin-nm")));
+//        break;
+//    }
+    qDebug() << "Has set tray icon to be XXX." << Q_FUNC_INFO << __LINE__;
+}
 
-    QDesktopWidget* desktopWidget = QApplication::desktop();
-    QRect deskMainRect = desktopWidget->availableGeometry(0);//获取可用桌面大小
-    QRect screenMainRect = desktopWidget->screenGeometry(0);//获取设备屏幕大小
-    QRect deskDupRect = desktopWidget->availableGeometry(1);//获取可用桌面大小
-    QRect screenDupRect = desktopWidget->screenGeometry(1);//获取设备屏幕大小
 
-    int n = objKyDBus->getTaskBarPos("position");
-    int m = objKyDBus->getTaskBarHeight("height");
-    int d = 4; //窗口边沿到任务栏距离
-
-    if (isHuaWeiPC) {
-        //qDebug() << "-------------------------------------> HUAWEI PC";
-        //qDebug("primary screen  changed, geometry is  x=%d, y=%d, windth=%d, height=%d", m_priX, m_priY, m_priWid, m_priHei);
-        if (n == 0) {
-            //任务栏在下侧
-            this->move(m_priX + m_priWid - this->width() - d, m_priY + m_priHei - this->height() - m - d);
-        } else if(n == 1) {
-            //任务栏在上侧
-            this->move(m_priX + m_priWid - this->width() - d, m_priY + m + d);
-        } else if (n == 2) {
-            //任务栏在左侧
-            this->move(m_priX + m + d, m_priY + m_priHei - this->height() - d);
-        } else if (n == 3) {
-            //任务栏在右侧
-            this->move(m_priX + m_priWid - this->width() - m - d, m_priY + m_priHei - this->height() - d);
-        }
+/**
+ * @brief MainWindow::initWindowTheme 初始化窗口主题并创建信号槽
+ */
+void MainWindow::initWindowTheme()
+{
+    const QByteArray style_id(THEME_SCHAME);
+    if (QGSettings::isSchemaInstalled(style_id)) {
+        m_styleGsettings = new QGSettings(style_id);
+//        resetWindowTheme();
+        connect(m_styleGsettings, &QGSettings::changed, this, &MainWindow::onThemeChanged);
     } else {
-        if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()) {
-            if (n == 0) {
-                //任务栏在下侧
-                this->move(availableGeometry.x() + availableGeometry.width() - this->width() - d, screenMainRect.y() + availableGeometry.height() - this->height() - m - d);
-            } else if(n == 1) {
-                //任务栏在上侧
-                this->move(availableGeometry.x() + availableGeometry.width() - this->width() - d, screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m + d);
-            } else if (n == 2) {
-                //任务栏在左侧
-                if (screenGeometry.x() == 0) {//主屏在左侧
-                    this->move(m + d, screenMainRect.y() + screenMainRect.height() - this->height() - d);
-                } else {//主屏在右侧
-                    this->move(screenMainRect.x() + m + d, screenMainRect.y() + screenMainRect.height() - this->height() - d);
-                }
-            } else if (n == 3) {
-                //任务栏在右侧
-                if (screenGeometry.x() == 0) {//主屏在左侧
-                    this->move(screenMainRect.width() - this->width() - m - d, screenMainRect.y() + screenMainRect.height() - this->height() - d);
-                } else {//主屏在右侧
-                    this->move(screenMainRect.x() + screenMainRect.width() - this->width() - m - d, screenMainRect.y() + screenMainRect.height() - this->height() - d);
-                }
-            }
-        } else if(screenGeometry.width() == availableGeometry.width() ) {
-            if (trayIcon->geometry().y() > availableGeometry.height()/2) {
-                //任务栏在下侧
-                if (screenGeometry.height() - 20 < availableGeometry.height()) {
-                    //任务栏隐藏
-                    this->move(availableGeometry.x() + availableGeometry.width() - this->width() - d, screenMainRect.y() + availableGeometry.height() - this->height() - m );
-                } else {
-                    //任务栏不隐藏
-                    this->move(availableGeometry.x() + availableGeometry.width() - this->width() - d, screenMainRect.y() + availableGeometry.height() - this->height() - d);
-                }
-            } else {
-                //任务栏在上侧
-                if (screenGeometry.height() - 20 < availableGeometry.height()) {
-                    //任务栏隐藏
-                    this->move(availableGeometry.x() + availableGeometry.width() - this->width() - d, screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m );
-                } else {
-                    //任务栏不隐藏
-                    this->move(availableGeometry.x() + availableGeometry.width() - this->width() - d, screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + d);
-                }
-            }
-        } else if (screenGeometry.height() == availableGeometry.height()) {
-            if (trayIcon->geometry().x() > availableGeometry.width()/2) {
-                //任务栏在右侧
-                if (screenGeometry.width() - 20 < availableGeometry.width()) {
-                    //任务栏隐藏
-                    this->move(availableGeometry.x() + availableGeometry.width() - this->width() - m, screenMainRect.y() + screenGeometry.height() - this->height() - d - 3);
-                } else {
-                    //任务栏不隐藏
-                    this->move(availableGeometry.x() + availableGeometry.width() - this->width() - d, screenMainRect.y() + screenGeometry.height() - this->height() - d - 3);
-                }
-            } else {
-                //任务栏在左侧
-                if (screenGeometry.width() - 20 < availableGeometry.width()) {
-                    //任务栏隐藏
-                    this->move(screenGeometry.width() - availableGeometry.width() + m, screenMainRect.y() + screenGeometry.height() - this->height() - d - 3);
-                } else {
-                    //任务栏不隐藏
-                    this->move(screenGeometry.width() - availableGeometry.width() + d, screenMainRect.y() + screenGeometry.height() - this->height() - d - 3);
-                }
-            }
-        }
-    }
-}
-
-void OldMainWindow::showTrayIconMenu()
-{
-    QRect availableGeometry = qApp->primaryScreen()->availableGeometry();
-    QRect screenGeometry = qApp->primaryScreen()->geometry();
-
-    QDesktopWidget* desktopWidget = QApplication::desktop();
-    QRect screenMainRect = desktopWidget->screenGeometry(0);//获取设备屏幕大小
-    QRect screenDupRect = desktopWidget->screenGeometry(1);//获取设备屏幕大小
-
-    QPoint cursorPoint =  QCursor::pos();//返回相对显示器的全局坐标
-    int cursor_x = cursorPoint.x();
-    int cursor_y = cursorPoint.y();
-
-    int n = objKyDBus->getTaskBarPos("position");
-    int m = objKyDBus->getTaskBarHeight("height");
-    int d = 0; //窗口边沿到任务栏距离
-    int s = 80; //窗口边沿到屏幕边沿距离
-
-    if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()) {
-        if (n == 0) { //任务栏在下侧
-            trayIconMenu->move(availableGeometry.x() + cursor_x - trayIconMenu->width()/2, screenMainRect.y() + availableGeometry.height() - trayIconMenu->height() - m - d);
-        } else if(n == 1) { //任务栏在上侧
-            trayIconMenu->move(availableGeometry.x() + cursor_x - trayIconMenu->width()/2, screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m + d);
-        } else if (n == 2) { //任务栏在左侧
-            trayIconMenu->move(m + d, cursor_y - trayIconMenu->height()/2);
-        } else if (n == 3) { //任务栏在右侧
-            trayIconMenu->move(screenMainRect.width() - trayIconMenu->width() - m - d, cursor_y - trayIconMenu->height()/2);
-        }
-    } else if(screenGeometry.width() == availableGeometry.width() ) {
-        if (trayIcon->geometry().y() > availableGeometry.height()/2) { //任务栏在下侧
-            trayIconMenu->move(availableGeometry.x() + cursor_x - trayIconMenu->width()/2, screenMainRect.y() + availableGeometry.height() - trayIconMenu->height() - d);
-        } else { //任务栏在上侧
-            trayIconMenu->move(availableGeometry.x() + cursor_x - trayIconMenu->width()/2, screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + d);
-        }
-    } else if (screenGeometry.height() == availableGeometry.height()) {
-        if (trayIcon->geometry().x() > availableGeometry.width()/2) { //任务栏在右侧
-            trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width() - d, cursor_y - trayIconMenu->height()/2);
-        } else { //任务栏在左侧
-            trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + d, cursor_y - trayIconMenu->height()/2);
-        }
-    }
-}
-
-void OldMainWindow::on_showWindowAction()
-{
-    if (!m_load_finished) {
-        m_secondary_start_timer->stop();
-        secondaryStart();
-    }
-    handleIconClicked();
-    this->showNormal();
-    this->raise();
-    this->activateWindow();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-//加载动画,获取当前连接的网络和状态并设置图标
-
-void OldMainWindow::startLoading()
-{
-    qDebug()<<"Start loading...";
-    loading->startLoading();
-    setTrayLoading(true);
-}
-
-void OldMainWindow::stopLoading()
-{
-    qDebug()<<"Stop loading!";
-    loading->stopLoading();
-    setTrayLoading(false);
-    getActiveInfoAndSetTrayIcon();
-}
-
-void OldMainWindow::on_checkOverTime()
-{
-    QString cmd = "kill -9 $(pidof nmcli)"; //杀掉当前正在进行的有关nmcli命令的进程
-    int status = system(cmd.toUtf8().data());
-    if (status != 0) {
-        qDebug()<<"execute 'kill -9 $(pidof nmcli)' in function 'on_checkOverTime' failed";
-        //syslog(LOG_ERR, "execute 'kill -9 $(pidof nmcli)' in function 'on_checkOverTime' failed");
-    }
-    this->stopLoading(); //超时停止等待动画
-    is_stop_check_net_state = 0;
-}
-
-void OldMainWindow::getActiveInfoAndSetTrayIcon()
-{
-    //bool hasNetConnecting =objKyDBus->checkNetworkConnectivity();
-    //if (hasNetConnecting) {
-    //    this->setTrayLoading(true);
-    //    return;
-    //}
-
-    int wifiSignal = 0;
-    if (activeWifiSignalLv == 0) {
-        wifiSignal = objKyDBus->getActiveWifiSignal();
-        if (wifiSignal != 0) {
-            activeWifiSignalLv = wifiSignal;
-        }
-    }
-
-    QString actLanName = "--";
-    QString actWifiName = "--";
-
-    activecon *act = kylin_network_get_activecon_info();
-    int index = 0;
-    while (act[index].con_name != NULL) {
-        if (QString(act[index].type) == "ethernet" || QString(act[index].type) == "802-3-ethernet" || QString(act[index].type) == "bluetooth") {
-            actLanName = QString(act[index].con_name);
-        }
-        if (QString(act[index].type) == "wifi" || QString(act[index].type) == "802-11-wireless") {
-            actWifiName = QString(act[index].con_name);
-        }
-        index ++;
-    }
-    // 设置图标
-    if (actLanName != "--") {
-        QList<QString> lanstate = objKyDBus->getAtiveLanSsidUuidState();
-        //qDebug() << Q_FUNC_INFO << lanstate;
-        if (lanstate[2] == "connected") {
-            setTrayIcon(iconLanOnline);
-        }
-        else {
-            setTrayLoading(true);
-        }
-    } else if (actLanName == "--" && actWifiName != "--" && activeWifiSignalLv != 0) {
-        setTrayIconOfWifi(activeWifiSignalLv);
-        emit this->actWifiSignalLvChanaged(activeWifiSignalLv);
-    } else if (actWifiName == "--") {
-        setTrayIcon(iconLanOffline);
-    }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-//网络设备管理
-
-//网线插拔处理,由kylin-dbus-interface.cpp调用
-void OldMainWindow::onPhysicalCarrierChanged(bool flag)
-{
-#if 0
-    this->startLoading();
-    if (flag) {
-        isHandlingWiredCableOn = true;
-        is_stop_check_net_state = 1;
-        qDebug()<<"wired physical cable is already plug in";
-        //syslog(LOG_DEBUG,"wired physical cable is already plug in");
-        wiredCableUpTimer->start(4000);
-//        onBtnLanClicked(4);
-    } else {
-        qDebug()<<"wired physical cable is already plug out";
-        //syslog(LOG_DEBUG,"wired physical cable is already plug out");
-        QtConcurrent::run([=](){
-            while (1) {
-                BackThread *bt = new BackThread();
-                IFace *iface = bt->execGetIface();
-                if (iface->lstate != 0) {
-                    is_stop_check_net_state = 1;
-                    sleep(2);
-                    //wiredCableDownTimer->start(2000);
-                    emit carrierDownHandle();
-                    emit btnWired->clicked(5);
-                    delete iface;
-                    bt->deleteLater();
-                    break;
-                }
-                delete iface;
-                bt->deleteLater();
-                sleep(2);
-            }
-        });
-    }
-#endif
-}
-
-void OldMainWindow::onCarrierUpHandle()
-{
-#if 0
-    wiredCableUpTimer->stop();
-
-    //检查有线网络的个数是否为0,如果是0，则新建一个有线网络
-    checkIfWiredNetExist();
-
-    this->stopLoading();
-    onBtnNetListClicked(1);
-    is_stop_check_net_state = 0;
-    isHandlingWiredCableOn = false;
-    emit btnWired->clicked(4);
-#endif
-}
-
-void OldMainWindow::onCarrierDownHandle()
-{
-    //syslog(LOG_DEBUG, "Wired net is disconnected");
-#if 0
-    QString txt(tr("Wired net is disconnected"));
-    objKyDBus->showDesktopNotify(txt);
-    currSelNetName = "";
-    oldActLanName = "";
-    oldDbusActLanDNS = 0;
-    //emit this->waitLanStop();
-    //this->ksnm->execGetLanList();
-
-    //wiredCableDownTimer->stop();
-    this->stopLoading();
-    onBtnNetListClicked(0);
-    is_stop_check_net_state = 0;
-#endif
-}
-
-void OldMainWindow::onDeleteLan()
-{
-    deleteLanTimer->stop();
-    BackThread *btn_bt = new BackThread();
-    //写成信号监听自动执行，避免阻塞主线程
-    disconnect_time = 1;
-    connect (btn_bt, &BackThread::btFinish, this, [ = ](){
-        disconnect_time ++;
-        if (disconnect_time <= 3) {
-            btn_bt->disConnLanOrWifi("ethernet");
-        } else {
-            btn_bt->disconnect();
-        }
-    });
-    btn_bt->disConnLanOrWifi("ethernet");
-    btn_bt->deleteLater();
-
-    this->stopLoading();
-    onBtnNetListClicked(0);
-    is_stop_check_net_state = 0;
-}
-
-void OldMainWindow::checkIfWiredNetExist()
-{
-    qDebug()<<"Checking Wired Net (num is 0?)...";
-    if (objKyDBus->getWiredNetworkNumber() == 0) {
-        objKyDBus->toCreateNewLan();
-    }
-}
-
-//无线网卡插拔处理
-void OldMainWindow::onNetworkDeviceAdded(QDBusObjectPath objPath)
-{
-    //仅处理无线网卡插入情况
-    objKyDBus->isWirelessCardOn = false;
-    objKyDBus->getObjectPath();
-    if (objKyDBus->multiWirelessPaths.isEmpty())
-        return;
-
-    if (objKyDBus->multiWirelessPaths.at(0).path() == objPath.path()) { //证明添加的是无线网卡
-        is_wireless_adapter_ready = 0;
-        if (objKyDBus->isWirelessCardOn) {
-            //syslog(LOG_DEBUG,"wireless device is already plug in");
-            qDebug()<<"wireless device is already plug in";
-            is_wireless_adapter_ready = 1;
-            onBtnWifiClicked(4);
-            objKyDBus->getWirelessCardName();
-        }
-    }
-}
-
-void OldMainWindow::onNetworkDeviceRemoved(QDBusObjectPath objPath)
-{
-    if (objKyDBus->multiWirelessPaths.isEmpty())
-        return;
-    //仅处理无线网卡拔出情况
-    if (objKyDBus->multiWirelessPaths.at(0).path() == objPath.path()) {
-        objKyDBus->isWirelessCardOn = false;
-        objKyDBus->getObjectPath(); //检查是不是还有无线网卡
-        if (!objKyDBus->isWirelessCardOn) {
-            //syslog(LOG_DEBUG,"wireless device is already plug out");
-            qDebug()<<"wireless device is already plug out";
-            is_wireless_adapter_ready = 0;
-            onBtnWifiClicked(5);
-        } else {
-            objKyDBus->getWirelessCardName();
-            //syslog(LOG_DEBUG,"wireless device is already plug out, but one more wireless exist");
-            qDebug()<<"wireless device is already plug out, but one more wireless exist";
-        }
-    }
-}
-
-void OldMainWindow::checkIsWirelessDevicePluggedIn()
-{
-    qDebug()<<"Checking wireless device...";
-    //启动时判断是否有无线网卡
-    //KylinDBus kDBus3;
-    if (objKyDBus->isWirelessCardOn) {
-        is_wireless_adapter_ready = 1;
-    } else {
-        is_wireless_adapter_ready = 0;
-    }
-}
-
-void OldMainWindow::getLanBandWidth()
-{
-    BackThread *bt = new BackThread();
-    IFace *iface = bt->execGetIface();
-
-    lcardname = iface->lname;
-
-    mwBandWidth = bt->execChkLanWidth(lcardname);
-}
-
-//检测网络设备状态
-bool OldMainWindow::checkLanOn()
-{
-    BackThread *bt = new BackThread();
-    IFace *iface = bt->execGetIface();
-    bt->deleteLater();
-    int state = iface->lstate;
-    if (state == 2) {
-        return false;
-    } else {
-        return true;
-    }
-}
-
-bool OldMainWindow::checkWlOn()
-{
-    BackThread *bt = new BackThread();
-    IFace *iface = bt->execGetIface();
-    bt->deleteLater();
-    int state = iface->wstate;
-    if (state == 2) {
-        return false;
-    } else {
-        return true;
-    }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-//有线网与无线网按钮响应
-
-void OldMainWindow::onBtnNetClicked()
-{
-    if (checkLanOn()) {
-        QThread *t = new QThread();
-        BackThread *bt = new BackThread();
-        bt->moveToThread(t);
-        connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-        connect(t, SIGNAL(started()), bt, SLOT(execDisNet()));
-        connect(bt, SIGNAL(disNetDone()), this, SLOT(disNetDone()));
-        connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-        t->start();
-
-    } else {
-        is_stop_check_net_state = 1;
-        QThread *t = new QThread();
-        BackThread *bt = new BackThread();
-        bt->moveToThread(t);
-        connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-        connect(t, SIGNAL(started()), bt, SLOT(execEnNet()));
-        connect(bt, SIGNAL(enNetDone()), this, SLOT(enNetDone()));
-        connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-        t->start();
-    }
-
-    this->startLoading();
-}
-
-void OldMainWindow::onBtnWifiClicked(int flag)
-{
-    qDebug()<<"Value of flag passed into function 'onBtnWifiClicked' is:  "<<flag;
-    //syslog(LOG_DEBUG, "Value of flag passed into function 'onBtnWifiClicked' is: %d", flag);
-
-    if (is_wireless_adapter_ready == 1) {
-        // flag: 0->UI点击关闭 1->UI点击打开 2->gsetting打开 3->gsetting关闭 4->网卡热插 5->网卡热拔
-        // 当连接上无线网卡时才能打开wifi开关
-        // 网络开关关闭时，点击Wifi开关时，程序先打开有线开关
-        if (flag == 0 || flag == 1 || flag == 4 || flag == 5) {
-            if (checkWlOn()) {
-                if (flag != 4) { //以防第二张无线网卡插入时断网
-                    is_stop_check_net_state = 1;
-                    objKyDBus->setWifiSwitchState(false);
-                    lbTopWifiList->hide();
-                    btnAddNet->hide();
-
-                    QThread *t = new QThread();
-                    BackThread *bt = new BackThread();
-                    bt->moveToThread(t);
-                    btnWireless->setSwitchStatus(true);
-                    connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-                    connect(t, SIGNAL(started()), bt, SLOT(execDisWifi()));
-                    connect(bt, SIGNAL(disWifiDone()), this, SLOT(disWifiDone()));
-                    connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-                    t->start();
-                    this->startLoading();
-                }
-            } else {
-                if (is_fly_mode_on == 0) {
-                    //on_btnWifiList_clicked();
-                    is_stop_check_net_state = 1;
-                    objKyDBus->setWifiCardState(true);
-                    objKyDBus->setWifiSwitchState(true);
-
-                    QThread *t = new QThread();
-                    BackThread *bt = new BackThread();
-                    bt->moveToThread(t);
-                    btnWireless->setSwitchStatus(true);
-                    connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-                    connect(t, SIGNAL(started()), bt, SLOT(execEnWifi()));
-                    connect(bt, SIGNAL(enWifiDone()), this, SLOT(enWifiDone()));
-                    connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-                    t->start();
-                    this->startLoading();
-                }
-            }
-        } else if(flag == 2) {
-            if (is_fly_mode_on == 0) {
-                //on_btnWifiList_clicked();
-                is_stop_check_net_state = 1;
-                lbTopWifiList->show();
-                btnAddNet->show();
-
-                QThread *t = new QThread();
-                BackThread *bt = new BackThread();
-                btnWireless->setSwitchStatus(true);
-                bt->moveToThread(t);
-                connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-                connect(t, SIGNAL(started()), bt, SLOT(execEnWifi()));
-                connect(bt, SIGNAL(enWifiDone()), this, SLOT(enWifiDone()));
-                connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-                t->start();
-                this->startLoading();
-            }
-        } else if(flag == 3) {
-            is_stop_check_net_state = 1;
-            lbTopWifiList->hide();
-            btnAddNet->hide();
-
-            QThread *t = new QThread();
-            BackThread *bt = new BackThread();
-            btnWireless->setSwitchStatus(true);
-            bt->moveToThread(t);
-            connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-            connect(t, SIGNAL(started()), bt, SLOT(execDisWifi()));
-            connect(bt, SIGNAL(disWifiDone()), this, SLOT(disWifiDone()));
-            connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-            t->start();
-            this->startLoading();
-        } else {
-            qDebug()<<"receive an invalid value in function onBtnWifiClicked";
-            //syslog(LOG_DEBUG, "receive an invalid value in function onBtnWifiClicked");
-        }
-    } else {
-        lbTopWifiList->hide();
-        btnAddNet->hide();
-
-        if (flag == 0) {
-             objKyDBus->setWifiSwitchState(false);
-             objKyDBus->setWifiCardState(false);
-        }
-
-        QString txt(tr("No wireless card detected")); //未检测到无线网卡
-        objKyDBus->showDesktopNotify(txt);
-        qDebug()<<"No wireless card detected";
-        //syslog(LOG_DEBUG, "No wireless card detected");
-
-        disWifiStateKeep();
+        qWarning() << "Gsettings interface \"org.ukui.style\" is not exist!" << Q_FUNC_INFO << __LINE__;
     }
 }
 
 /**
- * @brief MainWindow::onBtnLanClicked 有线网按钮状态更改
- * @param flag falg=0 0 UI关闭， 1 UI打开 ，2收到打开信息，3收到关闭信息，4有线设备插入，5有线设备拔出
+ * @brief MainWindow::resetWindowTheme 读取和设置窗口主题
  */
-void OldMainWindow::onBtnLanClicked(int flag)
+void MainWindow::resetWindowTheme()
 {
-    switch (flag) {
-    case 0: {
-        qDebug()<<"On btnWired clicked! will close switch button----------------------------";
-       // m_networkDevice.disconnectDevice();
-        emit this->onWiredDeviceChanged(false);
-#if 0
-        QtConcurrent::run([=]() {
-            QString close_device_cmd = "nmcli device set " + llname + " managed false";
-            int res = system(close_device_cmd.toUtf8().data());
-            qDebug()<<"Trying to close ethernet device : "<<llname<<". res="<<res;
-            if (res == 0) {
-                emit this->onWiredDeviceChanged(false);
-            } else {
-                qWarning()<<"Close ethernet device failed!";
-            }
-        });
-#endif
-        break;
-    }
-    case 1: {
-        qDebug()<<"On btnWired clicked! will open switch button++++++++++++++++++++++++++++";
-        //m_networkDevice.setDeviceAutoConnect();
-         emit this->onWiredDeviceChanged(true);
-#if 0
-        QtConcurrent::run([=]() {
-            QString open_device_cmd = "nmcli device set " + llname + " managed true";
-            int res = system(open_device_cmd.toUtf8().data());
-            qDebug()<<"Trying to open ethernet device : "<<llname<<". res="<<res;
-            if (res == 0) {
-                emit this->onWiredDeviceChanged(true);
-            } else {
-                qWarning()<<"Open ethernet device failed!";
-            }
-        });
-#endif
-        break;
-    }
-    case 2: {
-        emit this->onWiredDeviceChanged(true);
-        break;
-    }
-    case 3: {
-        emit this->onWiredDeviceChanged(false);
-        break;
-    }
-    case 4: {
-        btnWired->setEnabled(true);
-        qDebug()<<"Set btnwired enabled=true!";
-        //获取有线设备托管状态，是否需要打开开关
-        if (BackThread::execGetIface()->lstate != 2) {
-            emit this->onWiredDeviceChanged(true);
-        }
-        break;
-    }
-    case 5: {
-        btnWired->blockSignals(true);
-        btnWired->setSwitchStatus(false);
-        qDebug()<<"Set btnwired enabled=false!";
-        btnWired->setEnabled(false);
-        btnWired->blockSignals(false);
-        break;
-    }
-    default:
-        break;
-    }
-}
-
-void OldMainWindow::setLanSwitchStatus(bool is_opened)
-{
-    if (is_opened) {
-        btnWired->setSwitchStatus(true);
-        ksnm->execGetLanList();
-    } else {
-        btnWired->setSwitchStatus(false);
-        ksnm->execGetLanList();
-    }
-}
-
-void OldMainWindow::onBtnNetListClickeds(int flag)
-{
-    this->scrollAreal->show();
-    topLanListWidget->constructWiredActiveConnectList();
-    lanListWidget->constructWiredConnectList();
-    this->scrollAreaw->hide();
-    this->topWifiListWidget->hide();
-
-    lbLoadDown->show();
-    lbLoadUp->show();
-    lbLoadDownImg->show();
-    lbLoadUpImg->show();
-}
-
-void OldMainWindow::onBtnNetListClicked(int flag)
-{
-#if 0
-    this->is_btnLanList_clicked = 1;
-    this->is_btnWifiList_clicked = 0;
-    end_rcv_rates = 0;
-    end_tx_rates = 0;
-
-    ui->lbNetListBG->setStyleSheet(btnOnQss);
-    ui->lbWifiListBG->setStyleSheet(btnOffQss);
-
-    BackThread *bt = new BackThread();
-    IFace *iface = bt->execGetIface();
-
-    lbLoadDown->hide();
-    lbLoadUp->hide();
-    lbLoadDownImg->hide();
-    lbLoadUpImg->hide();
-
-    lbNoItemTip->hide();
-
-    ui->lbNetwork->setText(tr("Ethernet"));
-    btnWireless->hide();
-    btnWired->show();
-
-    // 强行设置为打开
-    if (flag == 1) {
-        this->startLoading();
-        this->ksnm->execGetLanList();
-        this->scrollAreal->show();
-        this->topLanListWidget->show();
-        this->scrollAreaw->hide();
-        this->topWifiListWidget->hide();
+    if (!m_styleGsettings) { return; }
+    QString currentTheme = m_styleGsettings->get(COLOR_THEME).toString();
+    auto app = static_cast<QApplication*>(QCoreApplication::instance());
+    if(currentTheme == "ukui-dark" || currentTheme == "ukui-black"){
+        app->setStyle(new CustomStyle("ukui-dark"));
+        qDebug() << "Has set color theme to ukui-dark." << Q_FUNC_INFO << __LINE__;
+        emit qApp->paletteChanged(qApp->palette());
         return;
     }
-
-    if (iface->lstate == 0 || iface->lstate == 1 ||  iface->lstate == 4) {
-        this->startLoading();
-        this->ksnm->execGetLanList();
-    } else if (iface->lstate == 3) {
-        this->ksnm->isUseOldLanSlist = true;
-        QStringList slistLan;
-        slistLan.append("empty");
-        getLanListDone(slistLan);
-    } else {
-        this->startLoading();
-        this->ksnm->execGetLanList();
-    }
-
-    this->scrollAreal->show();
-    this->topLanListWidget->show();
-    this->scrollAreaw->hide();
-    this->topWifiListWidget->hide();
-
-    delete iface;
-    bt->deleteLater();
-#endif
+    app->setStyle(new CustomStyle("ukui-light"));
+    qDebug() << "Has set color theme to " << currentTheme << Q_FUNC_INFO << __LINE__;
+    emit qApp->paletteChanged(qApp->palette());
+    return;
 }
 
-void OldMainWindow::on_btnWifiList_clicked()
+/**
+ * @brief MainWindow::showControlCenter 打开控制面板网络界面
+ */
+void MainWindow::showControlCenter()
 {
-    is_stop_check_net_state = 1;
-    current_wifi_list_state = LOAD_WIFI_LIST;
-    this->is_btnWifiList_clicked = 1;
-    this->is_btnLanList_clicked = 0;
-    end_rcv_rates = 0;
-    end_tx_rates = 0;
-
-    if (this->is_btnLanList_clicked == 1) {
-        return;
-    }
-
-    BackThread *bt = new BackThread();
-    IFace *iface = bt->execGetIface();
-
-    if (iface->wstate != 0) {
-        lbLoadDown->hide();
-        lbLoadUp->hide();
-        lbLoadDownImg->hide();
-        lbLoadUpImg->hide();
-        hasWifiConnected = false;
+    QProcess process;
+    if (m_lanWidget->m_isLanConnected == false && m_wlanWidget->m_wlanIsConnected == true){
+        process.startDetached("ukui-control-center --wlanconnect");
     } else {
-        hasWifiConnected = true;
-    }
-
-    ui->lbNetListBG->setStyleSheet(btnOffQss);
-    ui->lbWifiListBG->setStyleSheet(btnOnQss);
-
-    lbNoItemTip->hide();
-
-    ui->lbNetwork->setText("WLAN");
-    btnWireless->show();
-    btnWired->hide();
-
-    if (iface->wstate == 0 || iface->wstate == 1) {
-        qDebug()<<"现在的WiFi的开关是已经打开状态";
-        btnWireless->setSwitchStatus(true);
-        lbTopWifiList->show();
-        btnAddNet->show();
-        this->startLoading();
-        if (isHuaWeiPC) {
-            QtConcurrent::run([=]() {
-                if (m_connected_by_self) {
-                    m_connected_by_self = false;
-                } else {
-                    if (this->isRadioWifiTurningOn) {
-                        qDebug() << "Turning wifi switch on now, stop to load wifi list";
-                    } else {
-                        bShowPb = false;  //不可以showpb
-                        objKyDBus->requestScanWifi(); //要求后台扫描AP
-                        sleep(2);
-                        qDebug() << "scan finished, will load wifi list";
-                        emit loadWifiListAfterScan();
-                    }
-                }
-            });
-        } else {
-            //this->objKyDBus->toGetWifiList(); //这一句是使用dbus的方法获取wifilist
-            this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
-        }
-    } else if (iface->wstate == 3) {
-        qDebug()<<"现在的WiFi的开关是正在配置状态";
-
-        this->ksnm->isUseOldWifiSlist = true;
-        QStringList slistWifi;
-        slistWifi.append("empty");
-        getWifiListDone(slistWifi);
-
-        btnWireless->setSwitchStatus(true);
-        lbTopWifiList->show();
-        btnAddNet->show();
-        is_stop_check_net_state = 0;
-    } else {
-        qDebug()<<"现在WiFi的开关是关闭状态";
-        //btnWireless->setSwitchStatus(false);其他部分已经对关掉wifi开关进行处理，此处不再处理。有几率出现打开关闭再打开的现象，因此注释掉关闭的动作
-        delete topWifiListWidget; //清空top列表
-        createTopWifiUI(); //创建顶部无线网item
-        lbTopWifiList->hide();
-        btnAddNet->hide();
-
-        // 清空wifi列表
-        wifiListWidget = new QWidget(scrollAreaw);
-        wifiListWidget->resize(W_LIST_WIDGET, H_WIFI_ITEM_BIG_EXTEND);
-        scrollAreaw->setWidget(wifiListWidget);
-        scrollAreaw->move(W_LEFT_AREA, Y_SCROLL_AREA);
-
-        // 当前连接的wifi
-        OneConnForm *ccf = new OneConnForm(topWifiListWidget, this, confForm, ksnm);
-        ccf->setWifiName(tr("Not connected"), "--", "--", "--", isHuaWeiPC, isHuaWei9006C);//"当前未连接任何 Wifi"
-        ccf->setSignal("0", "--", "0", false);
-        ccf->setRate("0");
-        ccf->setConnedString(1, tr("Disconnected"), "");//"未连接"
-        ccf->isConnected = false;
-        ccf->setTopItem(false);
-        ccf->setAct(true);
-        ccf->move(L_VERTICAL_LINE_TO_ITEM, 0);
-        ccf->show();
-        ccf->lbFreq->hide();
-
-        this->lanListWidget->hide();
-        this->wifiListWidget->show();
-
-        getActiveInfoAndSetTrayIcon();
-        is_stop_check_net_state = 0;
-    }
-
-    this->scrollAreal->hide();
-    this->topLanListWidget->hide();
-    this->scrollAreaw->show();
-    this->topWifiListWidget->show();
-
-    delete iface;
-    bt->deleteLater();
-}
-
-void OldMainWindow::onLoadWifiListAfterScan()
-{
-    current_wifi_list_state = LOAD_WIFI_LIST;
-    this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC); //加载wifi列表
-    objKyDBus->getWirelessCardName();
-}
-
-void OldMainWindow::on_wifi_changed()
-{
-    QString actWifiUuid = objKyDBus->getActiveWifiUuid();
-    objKyDBus->getConnectNetIp(actWifiUuid);
-    objKyDBus->getWifiIp(actWifiUuid);
-    confForm->actWifiIpv6Addr = objKyDBus->dbusActiveWifiIpv6;
-    if (oldWifiIpv4Method == "") {
-        oldWifiIpv4Method = objKyDBus-> dbusWifiIpv4Method;
-    }
-    if (objKyDBus->dbusWifiIpv4 != "" && objKyDBus->dbusActiveWifiIpv4 != "" && objKyDBus->dbusWifiIpv4 != objKyDBus->dbusActiveWifiIpv4 &&objKyDBus-> dbusWifiIpv4Method == "manual") {
-        //在第三方nm-connection-editor进行新的IP配置后，重新连接网络
-        oldWifiIpv4Method = "manual";
-        qDebug()<<"Ipv4.address of current activated wifi is:"<<objKyDBus->dbusActiveWifiIpv4 << ". Real ipv4.address is:" << objKyDBus->dbusWifiIpv4;
-        emit this->reConnectWifi(actWifiUuid);
-        emit this->configurationChanged();
-    } else if (objKyDBus-> dbusWifiIpv4Method == "auto" && oldWifiIpv4Method == "manual") {
-        oldWifiIpv4Method = "auto";
-        qDebug()<<"Ipv4.method is set to auto.";
-        emit this->reConnectWifi(actWifiUuid);
-        emit this->configurationChanged();
-    } else if (!objKyDBus->dbusActiveWifiIpv6.isEmpty() && objKyDBus->dbusActiveWifiIpv6 != objKyDBus->dbusWifiIpv6 && objKyDBus->dbusWifiIpv6Method == "manual") {
-        //在第三方nm-connection-editor或kylin-nm配置页进行新的IPV6配置后，重新连接网络
-        emit this->reConnectWifi(actWifiUuid);
-        emit this->configurationChanged();
+        process.startDetached("ukui-control-center --wiredconnect");
     }
 }
 
 /**
- * @brief MainWindow::onNewConnAdded 获取新的连接列表
- * @param type 0为有线，1为无线
+ * @brief MainWindow::onTrayIconActivated 点击托盘图标的槽函数
  */
-void OldMainWindow::onNewConnAdded(int type) {
-    if (type == 1) {
-//        isAddedWifi = true;
-    }
-    this->ksnm->execGetConnList();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//网络列表加载与更新
-
-// 获取lan列表回调
-void OldMainWindow::getLanListDone(QStringList slist)
+void MainWindow::onTrayIconActivated()
 {
-#if 0
-    if (this->is_btnWifiList_clicked == 1) {
+    if (this->isVisible()) {
+        qDebug() << "Received signal of tray icon activated, will hide mainwindow." << Q_FUNC_INFO << __LINE__;
+        hideMainwindow();
         return;
     }
+    qDebug() << "Received signal of tray icon activated, will show mainwindow." << Q_FUNC_INFO << __LINE__;
+    this->showMainwindow();
+}
 
-    //要求使用上一次获取到的列表
-    if (this->ksnm->isUseOldLanSlist) {
-        slist = oldLanSlist;
-        this->ksnm->isUseOldLanSlist = false;
-    }
+void MainWindow::onShowMainwindowActionTriggled()
+{
+    showMainwindow();
+}
 
-    //若slist为空，则也使用上一次获取到的列表
-    if (slist.size() == 1 && slist.at(0) == "") {
-        if (oldLanSlist.size() == 1 && oldLanSlist.at(0) == "") {
-            return;
-        } else {
-            slist = oldLanSlist;
-        }
-    }
+void MainWindow::onShowSettingsActionTriggled()
+{
+    showControlCenter();
+}
 
-    delete topLanListWidget; // 清空top列表
-    createTopLanUI(); //创建顶部有线网item
-
-    // 清空lan列表
-    lanListWidget = new QWidget(scrollAreal);
-    lanListWidget->resize(W_LIST_WIDGET, H_NORMAL_ITEM + H_LAN_ITEM_EXTEND);
-    scrollAreal->setWidget(lanListWidget);
-    scrollAreal->move(W_LEFT_AREA, Y_SCROLL_AREA);
-
-    // 获取当前连接有线网的SSID和UUID
-    QList<QString> actLanSsidName;
-    QList<QString> actLanUuidName;
-    QList<QString> actLanStateName;
-    QList<QString> currConnLanSsidUuidState =objKyDBus->getAtiveLanSsidUuidState();
-
-    bool hasCurrentLanConnected = false;
-    if (currConnLanSsidUuidState.contains("connected")) {
-        hasCurrentLanConnected = true;
-    }
-
-    // 若当前没有任何一个有线网连接，设置有线列表顶部的item状态为未连接
-    if (!hasCurrentLanConnected) {
-        OneLancForm *ccf = new OneLancForm(topLanListWidget, this, confForm, ksnm);
-        ccf->setLanName(tr("Not connected"), tr("Not connected"), "--", "--");//"当前未连接任何 以太网"
-        ccf->setIcon(false);
-        ccf->setConnedString(1, tr("Disconnected"), "");//"未连接"
-        ccf->isConnected = false;
-        ifLanConnected = false;
-        lbLoadDown->hide();
-        lbLoadUp->hide();
-        lbLoadDownImg->hide();
-        lbLoadUpImg->hide();
-        ccf->setTopItem(false);//"当前未连接任何 以太网"
-        ccf->setAct(true);
-        ccf->move(L_VERTICAL_LINE_TO_ITEM, 0);
-        ccf->show();
-        ccf->setLine(false);
-        currTopLanItem = 1;
-    }
-    if (currConnLanSsidUuidState.size() != 0) {
-        int i = 0;
-        do {
-            actLanSsidName.append(currConnLanSsidUuidState.at(i)); //有线网络名称
-            actLanUuidName.append(currConnLanSsidUuidState.at(i+1)); //有线网络唯一ID
-            actLanStateName.append(currConnLanSsidUuidState.at(i+2)); //有线网络连接状态
-            i += 3;
-        } while(i<currConnLanSsidUuidState.size());
-        currTopLanItem = actLanSsidName.size();
-    }
-
-    // 填充可用网络列表
-    QString headLine = slist.at(0);
-    int indexUuid, indexName;
-    headLine = headLine.trimmed();
-
-    bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-    if (isChineseExist) {
-        indexUuid = headLine.indexOf("UUID") + 2;
-        indexName = headLine.indexOf("名称") + 2;
+void MainWindow::onThemeChanged(const QString &key)
+{
+    if (key == COLOR_THEME) {
+        qDebug() << "Received signal of theme changed, will reset theme." << Q_FUNC_INFO << __LINE__;
+//        resetWindowTheme();
+        emit qApp->paletteChanged(qApp->palette());
     } else {
-        indexUuid = headLine.indexOf("UUID");
-        indexName = headLine.indexOf("NAME");
+        qDebug() << "Received signal of theme changed, key=" << key << " will do nothing." << Q_FUNC_INFO << __LINE__;
     }
-
-    for(int i = 1, j = 0; i < slist.size(); i ++) {
-        QString line = slist.at(i);
-        QString ltype = line.mid(0, indexUuid).trimmed();
-        QString nuuid = line.mid(indexUuid, indexName - indexUuid).trimmed();
-        QString nname = line.mid(indexName).trimmed();
-        if (nname=="") {
-            nname = " "; //防止有线网络的名称为空
-        }
-        bool isActiveNet = false; //isActiveNet用来表明nname是否是活动的连接
-
-        //仅仅对有线网络进行添加列表处理
-        if (ltype != "802-11-wireless" && ltype != "wifi" && ltype != "bridge" && ltype != "bluetooth" && ltype != "" && ltype != "--") {
-            objKyDBus->getLanIpDNS(nuuid, true); //使用UUID获取有线网的ip和dns信息
-            QString macLan = getMacByUuid(nuuid); //有线网对应的mac地址
-
-            QString macInterface = "--";
-            QString mIfName = "--";
-            if (objKyDBus->dbusIfName != "--") {
-                mIfName = objKyDBus->dbusIfName;
-                macInterface = objKyDBus->getLanMAC(objKyDBus->dbusIfName); //有限网卡对应的mac地址
-
-                if (macLan!="" && macLan!="--" && macLan != macInterface) {
-                    //continue; //有线网的permenant mac地址与网卡的地址不同，则不在列表中显示
-                    macInterface = macLan;
-                }
-            } else {
-                if (objKyDBus->multiWiredIfName.length() > 0)
-                    mIfName = objKyDBus->multiWiredIfName.at(0); //使用默认的网络接口
-                else
-                    mIfName = "";
-                macInterface = objKyDBus->dbusMacDefault; //使用默认的MAC地址
-            }
-
-            //**********************创建已经连接的有线网item********************//
-            if (currConnLanSsidUuidState.size() != 0) {//证明有已经连接的有线网络
-                for (int kk=0; kk<actLanSsidName.size(); kk++) {
-                    //actLanSsidName.at(kk).contains(nname)是为了防止名称中部分空格被trimmed()删除导致名称无法对应，witch caused 显示错误
-                    if ((nname == actLanSsidName.at(kk) || actLanSsidName.at(kk).contains(nname)) && nuuid == actLanUuidName.at(kk) && actLanStateName.at(kk) == "connected") {
-                        topLanListWidget->resize(topLanListWidget->width(), topLanListWidget->height() + H_NORMAL_ITEM*kk);
-                        isActiveNet = true; //名为nname的网络是已经连接的有线网络
-                        ifLanConnected = true;
-
-                        objKyDBus->getConnectNetIp(nuuid);
-                        confForm->actLanIpv6Addr = objKyDBus->dbusActiveLanIpv6;
-                        getLanBandWidth();
-                        //QString strLanName = TranslateLanName(nname); //进行中英文系统环境下有线网络名称的汉化
-
-                        OneLancForm *ccfAct = new OneLancForm(topLanListWidget, this, confForm, ksnm);
-                        connect(ccfAct, SIGNAL(selectedOneLanForm(QString, QString)), this, SLOT(oneTopLanFormSelected(QString, QString)));
-                        connect(ccfAct, SIGNAL(requestHandleLanDisconn()), this, SLOT(handleLanDisconn()));
-                        ccfAct->setLanName(nname, ltype, nuuid, mIfName);//第二个参数本来是strLanName，但目前不需要翻译
-                        ccfAct->setIcon(true);
-                        ccfAct->setLanInfo(objKyDBus->dbusActiveLanIpv4, objKyDBus->dbusActiveLanIpv6, mwBandWidth, macInterface);
-                        ccfAct->isConnected = true;
-                        ccfAct->setTopItem(false);
-                        ccfAct->setAct(true);
-                        ccfAct->move(L_VERTICAL_LINE_TO_ITEM, kk*H_NORMAL_ITEM);
-                        ccfAct->show();
-
-                        if (actLanSsidName.size() == 1) {
-                            lbLoadDown->show();
-                            lbLoadUp->show();
-                            lbLoadDownImg->show();
-                            lbLoadUpImg->show();
-                            currConnIfname = mIfName;
-                            ccfAct->setConnedString(1, tr("NetOn,"), "");//"已连接"
-                        } else {
-                            lbLoadDown->hide();
-                            lbLoadUp->hide();
-                            lbLoadDownImg->hide();
-                            lbLoadUpImg->hide();
-                            ccfAct->setConnedString(1, tr("NetOn,IfName:"), mIfName);//"已连接"
-                        }
-
-                        if (kk != actLanSsidName.size() - 1) {
-                            ccfAct->setLine(true);
-                        } else {
-                            ccfAct->setLine(false); //最后一个item不显示下划线
-                        }
-                        if (!objKyDBus->dbusLanIpv4.isEmpty()) {
-                            if (!objKyDBus->dbusActiveLanIpv4.isEmpty() && objKyDBus->dbusActiveLanIpv4 != objKyDBus->dbusLanIpv4) {
-//                                qDebug() << Q_FUNC_INFO << __LINE__ << objKyDBus->dbusActiveLanIpv4 << objKyDBus->dbusLanIpv4;
-                                //在第三方nm-connection-editor进行新的IP配置后，重新连接网络
-                                objKyDBus->reConnectWiredNet(nuuid);
-                                emit this->configurationChanged();
-                            } else if ((oldActLanName == actLanSsidName.at(kk)) && (oldDbusActLanDNS != objKyDBus->dbusActLanDNS)) {
-                                //在第三方nm-connection-editor进行新的DNS配置后，重新连接网络
-                                objKyDBus->reConnectWiredNet(nuuid);
-                                emit this->configurationChanged();
-                            } else if (!objKyDBus->dbusActiveLanIpv6.isEmpty() && objKyDBus->dbusActiveLanIpv6 != objKyDBus->dbusLanIpv6 && objKyDBus->dbusLanIpv6Method == "manual") {
-//                                qDebug() << Q_FUNC_INFO << __LINE__ << objKyDBus->dbusActiveLanIpv6 << objKyDBus->dbusLanIpv6 <<  objKyDBus->dbusLanIpv6Method;
-                                //在第三方nm-connection-editor或kylin-nm配置页进行新的IPV6配置后，重新连接网络
-                                objKyDBus->reConnectWiredNet(nuuid);
-                                emit this->configurationChanged();
-                            }
-                            actLanUuid = nuuid;
-                            actLanIpv4Method = "manual";
-                        } else {
-                            //已连接WiFi未改变但IP获取方式改变，重连之
-                            if (actLanUuid == nuuid && actLanIpv4Method == "manual") {
-                                objKyDBus->reConnectWiredNet(nuuid);
-                                emit this->configurationChanged();
-                            }
-                            actLanUuid = nuuid;
-                            actLanIpv4Method = "auto";
-                        }
-
-                        currSelNetName = "";
-                        objKyDBus->dbusActiveLanIpv4 = "";
-                        objKyDBus->dbusActiveLanIpv6 = "";
-                        oldActLanName = actLanSsidName.at(kk);
-                        oldDbusActLanDNS = objKyDBus->dbusActLanDNS;
-                        lbTopLanList->move(lbTopLanList->x(), lbTopLanList->y() + kk*60);
-                        btnCreateNet->move(btnCreateNet->x(), btnCreateNet->y() + kk*60);
-                        scrollAreal->move(scrollAreal->x(), scrollAreal->y() + kk*60);
-                        qDebug()<<"already insert an active lan network item in the top of lan list";
-                        //syslog(LOG_DEBUG, "already insert an active lan network item in the top of lan list");
-                    }
-                }
-            }
-
-            //**********************创建未连接的有线网item********************//
-            if (!isActiveNet) {
-                lanListWidget->resize(W_LIST_WIDGET, lanListWidget->height() + H_NORMAL_ITEM);
-                //QString strLanName = TranslateLanName(nname);
-
-                OneLancForm *ocf = new OneLancForm(lanListWidget, this, confForm, ksnm);
-                connect(ocf, SIGNAL(selectedOneLanForm(QString, QString)), this, SLOT(oneLanFormSelected(QString, QString)));
-                ocf->setLanName(nname, ltype, nuuid, mIfName);
-                ocf->setIcon(true);
-                ocf->setLine(true);
-                ocf->setLanInfo(objKyDBus->dbusLanIpv4, objKyDBus->dbusLanIpv6, tr("Disconnected"), macInterface);
-                ocf->setConnedString(0, tr("Disconnected"), "");//"未连接"
-                ocf->move(L_VERTICAL_LINE_TO_ITEM, j * H_NORMAL_ITEM);
-                ocf->setSelected(false, false);
-                ocf->show();
-
-                for (int kk=0; kk<actLanSsidName.size(); kk++) {
-                    if (nname == actLanSsidName.at(kk) && nuuid == actLanUuidName.at(kk) &&  actLanStateName.at(kk) == "connecting") {
-                            ocf->startWaiting(true);
-                    }
-                }
-                j ++;
-            }
-        }
-    }
-
-    QList<OneLancForm *> itemList = lanListWidget->findChildren<OneLancForm *>();
-    int n = itemList.size();
-    if (n >= 1) {
-        OneLancForm *lastItem = itemList.at(n-1);
-        lastItem->setLine(false); //最后一个item不显示下划线
-        lbNoItemTip->hide();
-    } else {
-        lbNoItemTip->show();
-        lbNoItemTip->setText(tr("No Other Wired Network Scheme"));
-    }
-
-    this->lanListWidget->show();
-    this->topLanListWidget->show();
-    this->wifiListWidget->hide();
-    this->topWifiListWidget->hide();
-
-    this->stopLoading();
-    oldLanSlist = slist;
-    is_stop_check_net_state = 0;
-    //有线网按钮状态校准
-    if (btnWired->isEnabled() && !objKyDBus->isWiredCableOn) {
-        emit btnWired->clicked(5);
-    }
-    if (btnWired->isEnabled() && !btnWired->getSwitchStatus() && BackThread::execGetIface()->lstate != 2) {
-        btnWired->setSwitchStatus(true);
-    }
-#endif
 }
 
-// 获取wifi列表回调
-void OldMainWindow::onRequestRevalueUpdateWifi()
+void MainWindow::onRefreshTrayIcon()
 {
-    if (!isReConnAfterTurnOnWifi) {
-        isReConnAfterTurnOnWifi = false;
-        is_stop_check_net_state = 1;
-        current_wifi_list_state = LOAD_WIFI_LIST;
+    //更新托盘图标显示
+    if (m_lanWidget->m_isLanConnected == true){
+        m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic"));
+    } else if (m_wlanWidget->m_wlanIsConnected == true && m_lanWidget->m_isLanConnected == false){
+        m_trayIcon->setIcon(QIcon::fromTheme("network-wireless-signal-excellent-symbolic"));
+    } else if (m_wlanWidget->m_wlanIsConnected == false && m_lanWidget->m_isLanConnected == false){
+        m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic"));
     }
 }
 
-// 获取wifi列表回调
-void OldMainWindow::getWifiListDone(QStringList slist)
+/**
+ * @brief MainWindow::keyPressEvent 按esc键关闭主界面
+ * @param event
+ */
+void MainWindow::keyPressEvent(QKeyEvent *event)
 {
-    //要求使用上一次获取到的列表
-    if (this->ksnm->isUseOldWifiSlist) {
-        slist = oldWifiSlist;
-        this->ksnm->isUseOldWifiSlist = false;
+    if (event->key() == Qt::Key_Escape) {
+        hideMainwindow();
     }
-
-    if (slist.isEmpty() || slist.size() == 1) {
-        if (oldWifiSlist.isEmpty() || oldWifiSlist.size() == 1) {
-            this->stopLoading();
-            return;
-        } else {
-            slist = oldWifiSlist;
-        }
-    }
-
-
-    slist = priorityList(slist);
-
-    if (isHuaWeiPC) {
-        if (slist.size() >= 2) {
-            wifiListOptimize(slist);
-            //getFinalWifiList(slist);
-        }
-    }
-    if (current_wifi_list_state == RECONNECT_WIFI) {
-        //qDebug()<<"======优选后的列表为======";
-        //foreach (QString line, slist) {
-        //    qDebug()<<line;
-        //}
-        //qDebug()<<"========================";
-        QVector<structWifiProperty> targetWifiStructList = connectableWifiPriorityList(slist);
-        if (!targetWifiStructList.isEmpty()) {
-            if (!isReconnectingWifi) {
-                QtConcurrent::run([=]() {
-                    int current_try_time = 0;
-                    isReconnectingWifi = true; //保证对于连续发出的重连信号，只处理第一个
-                    ifCanReconnectWifiNow = false;
-                    //若使用配置文件连接失败且还有可以回连的wifi，继续尝试回连下一个
-                    QStringList tried_list;
-                    this->startLoading();
-                    is_stop_check_net_state = 1;
-                    for (current_try_time; current_try_time < targetWifiStructList.length(); current_try_time++) {
-                        QString wifiSsid = objKyDBus->getWifiSsid(targetWifiStructList.at(current_try_time).objectPath);
-                        qDebug() << "开始回连  objectPath: " << targetWifiStructList.at(current_try_time).objectPath;
-                        qDebug() << "开始回连  wifiSsid: " << wifiSsid;
-                        if (tried_list.contains(wifiSsid) || m_wifi_list_pwd_changed.contains(wifiSsid)) {
-                            //如果已有同名AP尝试过重连了或此AP已被标记为密码错误，就不再尝试此AP，以防多个同名AP连续尝试连接均失败
-                            continue;
-                        }
-                        emit this->startReconnectWifi(wifiSsid);
-                        QString modifyCmd = "nmcli connection modify \""+ wifiSsid + "\" " + "802-11-wireless.bssid " + targetWifiStructList.at(current_try_time).bssid;
-                        int mdf_res = system(modifyCmd.toUtf8().data());
-                        qDebug()<<"Modification finished, cmd = "<<modifyCmd<<". res = "<<mdf_res;
-                        QString reconnectWifiCmd = "nmcli connection up \"" + wifiSsid + "\"";
-                        qDebug()<<"Trying to connect wifi. ssid="<<wifiSsid;
-                        int con_res = system(reconnectWifiCmd.toUtf8().data());
-                        qDebug()<<"Reconnect finished, cmd = "<<reconnectWifiCmd<<". res = "<<con_res;
-
-                        if (con_res == 0) {
-                            m_connected_by_self = false;
-                            //回连成功，停止
-                            this->stopLoading();
-                            is_stop_check_net_state = 0;
-                            break;
-                        }
-                        if (!m_wifi_list_pwd_changed.contains(wifiSsid)) {
-                            m_wifi_list_pwd_changed.append(wifiSsid);
-                        }
-                        //回连失败，继续
-                        emit this->stopReconnectWifi(wifiSsid, con_res);
-                        tried_list.append(wifiSsid);
-                    }
-                    this->stopLoading();
-                    is_stop_check_net_state = 0;
-                    isReconnectingWifi = false;
-                    ifCanReconnectWifiNow = true;
-                    emit loadWifiListAfterScan();
-                    //current_wifi_list_state = LOAD_WIFI_LIST;
-                });
-            }
-        }
-        current_wifi_list_state = LOAD_WIFI_LIST;
-        oldWifiSlist = slist;
-        return;
-    }
-
-    if (this->is_btnLanList_clicked == 1 && current_wifi_list_state != REFRESH_WIFI) {
-        oldWifiSlist = slist;
-        return;
-    }
-
-    if ((current_wifi_list_state == LOAD_WIFI_LIST || current_wifi_list_state == REFRESH_WIFI) && !this->m_is_inputting_wifi_password) {
-        if (!isReconnectingWifi) {
-            loadWifiListDone(slist);
-            is_init_wifi_list = 0;
-        } else {
-            qDebug() << "正在进行wifi的回连操作，现在停止加载wifi界面";
-            oldWifiSlist = slist;
-            return;
-        }
-    }
-
-    if (current_wifi_list_state == UPDATE_WIFI_LIST || this->m_is_inputting_wifi_password) {
-        //如果WiFi连接状态发生了改变，需要刷新整个列表，否则只需要比对新旧列表更新即可
-        if (m_isWifiConnected && objKyDBus->checkWifiConnectivity() != WIFI_CONNECTED) {
-            //qDebug() << "loadwifi的列表";
-            loadWifiListDone(slist);
-        } else if (!m_isWifiConnected && objKyDBus->checkWifiConnectivity() == WIFI_CONNECTED) {
-            loadWifiListDone(slist);
-        } else {
-            //qDebug() << "updatewifi的列表";
-            updateWifiListDone(slist);
-            current_wifi_list_state = LOAD_WIFI_LIST;
-        }
-    }
-
-    oldWifiSlist = slist;
+    return QWidget::keyPressEvent(event);
 }
 
-// 获取已保存的连接列表回调
-void OldMainWindow::getConnListDone(QStringList slist)
-{
-    if (isInitConnList) {
-        for (int i = 1; i < slist.length() - 1; i++) {
-            oldConnSlist << slist.at(i).trimmed();
-        }
-        isInitConnList = false;
-        return;
-    } else {
-        QStringList newConnSlist;
-        for (int i = 1; i < slist.length() - 1; i++) {
-            newConnSlist << slist.at(i).trimmed();
-        }
-        for (auto s : newConnSlist) {
-            if (!oldConnSlist.contains(s)) {
-                lastAddedConn = s;
-                break;
-            }
-        }
-//        if (isAddedWifi) {
-//            isAddedWifi = false;
-//            //如果是新添加的wifi，尝试激活这个wifi
-//            if (! is_stop_check_net_state) {
-//                this->is_stop_check_net_state = 1;
-//                BackThread *bt = new BackThread();
-////                connect(bt, SIGNAL(connDone(int)), this, SLOT(connWifiDone(int)));
-//                connect(bt, &BackThread::connDone, this, [ = ](int res) {
-//                    connWifiDone(res);
-//                    bt->deleteLater();
-//                });
-//                bt->execConnWifi(lastAddedConn, objKyDBus->dbusWiFiCardName);
-//            }
-//        }
-        oldConnSlist.clear();
-        oldConnSlist = newConnSlist;
-        return;
-    }
-}
-//QStringList MainWindow::priorityList(QStringList slist){
-//    QStringList ret;
-//    ret.append(slist[0]);
-//    QString headLine = slist.at(0);
-//    int indexSignal,indexSecu, indexFreq, indexBSsid, indexName,indexPath,indexCate;
-//    headLine = headLine.trimmed();
-//    bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-//    if (isChineseExist) {
-//        indexSignal = headLine.indexOf("SIGNAL");
-//        indexSecu = headLine.indexOf("安全性");
-//        indexFreq = headLine.indexOf("频率") + 4;
-//        indexBSsid = headLine.indexOf("BSSID") + 6;
-//        indexName = indexBSsid + 19;
-//        indexPath = headLine.indexOf("DBUS-PATH");
-//        indexCate = headLine.indexOf("CATEGORY");
-//    } else {
-//        indexSignal = headLine.indexOf("SIGNAL");
-//        indexSecu = headLine.indexOf("SECURITY");
-//        indexFreq = headLine.indexOf("FREQ");
-//        indexBSsid = headLine.indexOf("BSSID");
-//        indexName = indexBSsid + 19;
-//        indexPath = headLine.indexOf("DBUS-PATH");
-//        indexCate = headLine.indexOf("CATEGORY");
-//    }
-//    QStringList p1,p2,p3,p4,p5,p6,p7;//按照信号与频段划分为6个列表
-//    for(int i=1;i<slist.size();i++){
-//        QString line = slist.at(i);
-//        int conSignal = line.mid(indexSignal,3).trimmed().toInt();
-//        int conFreq = line.mid(indexFreq,4).trimmed().toInt();
-//        if(conSignal > 75 && conFreq >= 5000){
-//            p1.append(line);
-//            continue;
-//        }else if(conSignal > 55 && conFreq >= 5000){
-//            p2.append(line);
-//            continue;
-//        }else if(conSignal > 75){
-//            p3.append(line);
-//            continue;
-//        }else if(conSignal > 55){
-//            p4.append(line);
-//            continue;
-//        }else if(conSignal > 35){
-//            p5.append(line);
-//            continue;
-//        }else if(conSignal > 15){
-//            p6.append(line);
-//            continue;
-//        }else{
-//            p7.append(line);
-//        }
-//    }
-//    QVector<QStringList> listVec;
-//    listVec<<p1<<p2<<p3<<p4<<p5<<p6<<p7;
-//    for(auto list:listVec){
-//        list = sortApByCategory(list,indexCate);
-//        ret += list;
-//    }
-//    return ret;
-//}
-
-QStringList OldMainWindow::priorityList(QStringList slist){
-    QStringList ret;
-    ret.append(slist[0]);
-    QString headLine = slist.at(0);
-    int indexSignal,indexSecu, indexFreq, indexBSsid, indexName, indexPath, indexCate;
-    headLine = headLine.trimmed();
-    bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-    if (isChineseExist) {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("安全性");
-        indexFreq = headLine.indexOf("频率") + 4;
-        indexBSsid = headLine.indexOf("BSSID") + 6;
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-
-    } else {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("SECURITY");
-        indexFreq = headLine.indexOf("FREQ");
-        indexBSsid = headLine.indexOf("BSSID");
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-    }
-    QStringList p1,p2,p3;//按照信号与category划分为3个列表
-    for(int i=1;i<slist.size();i++){
-        QString line = slist.at(i);
-        int conSignal = line.mid(indexSignal,3).trimmed().toInt();
-        int conCate = line.mid(indexCate, 1).trimmed().toInt();
-        if (!isHuaWei9006C) {
-            conCate = 0;
-        }
-        if(conSignal > 55 && conCate == 2){
-            p1.append(line);
-            continue;
-        }else if(conSignal > 55 && conCate == 1){
-            p2.append(line);
-            continue;
-        }else{
-            p3.append(line);
-            continue;
-        }
-    }
-    QVector<QStringList> listVec;
-    listVec<<p1<<p2<<p3;
-    for(auto list:listVec){
-        list = sortApByFreq(list,indexFreq, indexSignal);
-        ret += list;
-    }
-
-    return ret;
-}
-
-QStringList OldMainWindow::sortApByFreq(QStringList list, int freqIndex, int signalIndex)
-{
-    QStringList ret;
-    QStringList p1,p2,p3,p4,p5,p6,p7;
-    for(auto line:list){
-        int conSignal = line.mid(signalIndex,3).trimmed().toInt();
-        int conFreq = line.mid(freqIndex,4).trimmed().toInt();
-        if(conSignal > 75 && conFreq >= 5000){
-            p1.append(line);
-            continue;
-        }else if(conSignal > 55 && conFreq >= 5000){
-            p2.append(line);
-            continue;
-        }else if(conSignal > 75){
-            p3.append(line);
-            continue;
-        }else if(conSignal > 55){
-            p4.append(line);
-            continue;
-        }else if(conSignal > 35){
-            p5.append(line);
-            continue;
-        }else if(conSignal > 15){
-            p6.append(line);
-            continue;
-        }else{
-            p7.append(line);
-        }
-    }
-    ret<<p1<<p2<<p3<<p4<<p5<<p6<<p7;
-    return ret;
-}
-
-QVector<QStringList> OldMainWindow::repetitionFilter(QVector<QStringList>){
-    QVector<QStringList> ret;
-    return ret;
-}
-
-QStringList OldMainWindow::sortApByCategory(QStringList list,int cateIndex){
-    QStringList ret;
-    for(auto line:list){
-        int conCate = line.mid(cateIndex).trimmed().toInt();
-        if(conCate == 2){
-            ret.append(line);
-        }
-    }
-    for(auto line:list){
-        int conCate = line.mid(cateIndex).trimmed().toInt();
-        if(conCate == 1){
-            ret.append(line);
-        }
-    }
-    for(auto line:list){
-        int conCate = line.mid(cateIndex).trimmed().toInt();
-        if(conCate == 0){
-            ret.append(line);
-        }
-    }
-    return ret;
-}
-
-//进行wifi列表优化选择，分为2.4G和5G进行选择，先每种频率形成一个列表
-//同一个列表中同名wifi只有一个，再按信号强度由大到小合并列表
-void OldMainWindow::wifiListOptimize(QStringList& slist)
-{
-    if (slist.size() < 2) return ;
-
-    QString headLine = slist.at(0);
-    int indexSignal, indexSecu, indexFreq, indexBSsid, indexName, indexPath, indexCate;
-    headLine = headLine.trimmed();
-    bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-    if (isChineseExist) {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("安全性");
-        indexFreq = headLine.indexOf("频率") + 4;
-        indexBSsid = headLine.indexOf("BSSID") + 6;
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-    } else {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("SECURITY");
-        indexFreq = headLine.indexOf("FREQ");
-        indexBSsid = headLine.indexOf("BSSID");
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-    }
-
-    QStringList targetList; //slist优化，同名同频同类别(category)AP中只留信号最强
-    targetList<<slist.at(0);    //把第一行加进去
-//    hasStarWifiInfo = "";
-//    hasStarWifiName = "";
-    for (int ii = 1;ii < slist.size();ii++) {
-        if ((ii+1) == slist.size()) {
-            break;
-        }
-        QString currentWifiInfo = slist.at(ii);
-        bool ifContinue = false;
-        bool isConnected = false;
-
-        QString conName = currentWifiInfo.mid(indexName).trimmed();
-//        int conSignal = currentWifiInfo.mid(indexSignal,3).trimmed().toInt();
-        int conFreq = currentWifiInfo.mid(indexFreq,4).trimmed().toInt();
-        int conCate = currentWifiInfo.mid(indexCate,1).trimmed().toInt();
-        if (!isHuaWei9006C) {
-            conCate = 0;
-        }
-
-        if ("*" == currentWifiInfo.mid(0,indexSignal).trimmed()) {
-//            hasStarWifiInfo = currentWifiInfo;
-//            hasStarWifiName = conName;
-            isConnected = true;
-        }
-
-        for (int jj=1;jj<ii;jj++) {//仅与排在它前面的wifi比较即可
-            QString compareWifiInfo = slist.at(jj);
-            QString name = compareWifiInfo.mid(indexName).trimmed();
-//            int signal = compareWifiInfo.mid(indexSignal,3).trimmed().toInt();
-            int freq = compareWifiInfo.mid(indexFreq,4).trimmed().toInt();
-            int category = compareWifiInfo.mid(indexCate,1).trimmed().toInt();
-            if (!isHuaWei9006C) {
-                category = 0;
-            }
-            if (conName == name) {
-                if (conFreq < 5000 && freq < 5000 && conCate == category) {
-                    //若前面有同频同category的同名wifi，它的信号一定比此wifi强
-                    ifContinue = true;
-                    break;
-                }
-                if (conFreq >= 5000 && freq >= 5000 && conCate == category) {
-                    ifContinue = true;
-                    break;
-                }
-            }
-        }
-        if (ifContinue && !isConnected)  continue;
-        targetList << currentWifiInfo;
-    }
-
-//    //上面的选网方法容易把存在同名wifi的情况下把已经连接的那个wifi给去掉
-//    //在这种情况下，把连接的wifi信息加回去
-//    int changePosition = 100000;
-//    for (int kk=1;kk<targetList.size();kk++) {
-//        QString wifiInfo = slist.at(kk);
-//        QString wifiName = wifiInfo.mid(indexName).trimmed();
-//        if (hasStarWifiName == wifiName) {
-//            changePosition = kk;
-//            break;
-//        }
-//    }
-
-//    if (changePosition < 100000) {
-//        //证明确实有已经连接的wifi被去掉了
-//        targetList.replace(changePosition, hasStarWifiInfo);
-//    }
-
-    slist = targetList;
-}
-
-//最终优选出来的wifi列表
-void OldMainWindow::getFinalWifiList(QStringList &slist)
-{
-    if(slist.size() < 2) return ;
-    QString headLine = slist.at(0);
-    int indexSignal,indexSecu, indexFreq, indexBSsid, indexName,indexPath;
-    headLine = headLine.trimmed();
-    bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-    if (isChineseExist) {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("安全性");
-        indexFreq = headLine.indexOf("频率") + 4;
-        indexBSsid = headLine.indexOf("BSSID") + 6;
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexName = headLine.lastIndexOf("SSID");
-    } else {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("SECURITY");
-        indexFreq = headLine.indexOf("FREQ");
-        indexBSsid = headLine.indexOf("BSSID");
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexName = headLine.lastIndexOf("SSID");
-    }
-
-    QStringList deleteWifiStr;
-    for(int ii = 1;ii < slist.size();ii++){
-        if ((ii+1) == slist.size()) {
-            break;
-        }
-        QString wifiInfo = slist.at(ii);
-        QString conName = wifiInfo.mid(indexName).trimmed();
-        int conSignal = wifiInfo.mid(indexSignal,3).trimmed().toInt();
-        int conFreq = wifiInfo.mid(indexFreq,4).trimmed().toInt();
-        for(int jj=ii+1;jj<slist.size();jj++){
-            QString wifiStr = slist.at(jj);
-            QString name = wifiStr.mid(indexName).trimmed();
-            int signal = wifiStr.mid(indexSignal,3).trimmed().toInt();
-            int freq = wifiStr.mid(indexFreq,4).trimmed().toInt();
-            if(conName == name){
-                if (conFreq >= 5000) {
-                    //排在前面的一个是5Gwifi，并且信号也强一些
-                    deleteWifiStr.append(wifiStr);
-                } else {
-                    //排在前面的一个是2.4G
-                    if (freq >= 5000) {
-                        //排在后面的一个是5G
-                        if (signal >= 55) {
-                            //排在后面的一个是5Gwifi信号强度 >= 3格，选5G
-                            deleteWifiStr.append(wifiInfo);
-                        } else {
-                            deleteWifiStr.append(wifiStr);
-                        }
-                    } else {
-                        //排在后面的一个是2.4G
-                        deleteWifiStr.append(wifiStr);
-                    }
-                }
-                break;
-            }
-        }
-    }
-    foreach (QString deleteStr, deleteWifiStr) {
-        slist.removeOne(deleteStr);
-    }
-}
-
-//从有配置文件的wifi选出最优wifi进行连接,同时考虑用户手动设置的优先级,这个函数在回连中用到
-QVector<structWifiProperty> OldMainWindow::connectableWifiPriorityList(const QStringList slist){
-    QVector<structWifiProperty> selectedWifiListStruct;
-    if(slist.size()<2) return selectedWifiListStruct;
-    OneConnForm *ocf = new OneConnForm();
-    QString headLine = slist.at(0);
-    int indexSignal,indexSecu, indexFreq, indexBSsid, indexName, indexPath,indexCate;
-    headLine = headLine.trimmed();
-
-    bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-    if (isChineseExist) {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("安全性");
-        indexFreq = headLine.indexOf("频率") + 4;
-        indexBSsid = headLine.indexOf("BSSID") + 6;
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-    } else {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("SECURITY");
-        indexFreq = headLine.indexOf("FREQ");
-        indexBSsid = headLine.indexOf("BSSID");
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-    }
-
-    QStringList tmp = slist;
-    for (int iter=1; iter<tmp.size(); iter++) {
-        QString line = tmp.at(iter);
-        QString wifiname = line.mid(indexName).trimmed();
-        QString wifibssid = line.mid(indexBSsid, indexPath-indexBSsid).trimmed();
-        QString wificate = line.mid(indexCate, 1).trimmed();
-        if (!isHuaWei9006C) {
-            wificate = "0";
-        }
-        QString wififreq = line.mid(indexFreq, 4).trimmed();
-        QString wifiObjectPath;
-        if (indexCate >= 0) {
-            wifiObjectPath = line.mid(indexPath,indexCate-indexPath).trimmed();
-        } else {
-            wifiObjectPath = line.mid(indexPath,indexName-indexPath).trimmed();
-        }
-        QString wifiAutoConnection = "no";
-        QString wifiPriority;
-
-        if (ocf->isWifiConfExist(wifiname) && canReconnectWifiList.contains(wifiname)) {
-            QString tmpPath = "/tmp/kylin-nm-lanprop-" + QDir::home().dirName();
-            QString getInfoCmd = "nmcli -f connection.autoconnect,connection.autoconnect-priority connection show '" + wifiname + "' > " + tmpPath;
-            Utils::m_system(getInfoCmd.toUtf8().data());
-            QFile file(tmpPath);
-            if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-                //syslog(LOG_ERR, "Can't open the file /tmp/kylin-nm-lanprop in function connectableWifiPriorityList!");
-                qDebug()<<"Can't open the file /tmp/kylin-nm-lanprop in function connectableWifiPriorityList!";
-            }
-            QString txt = file.readAll();
-            QStringList txtLine = txt.split("\n");
-            file.close();
-            foreach (QString line, txtLine) {
-                if (line.startsWith("connection.autoconnect:")) {
-                    wifiAutoConnection = line.mid(25).trimmed(); //connection.autoconnect:有23个字符
-                }
-                if (line.startsWith("connection.autoconnect-priority:")) {
-                    wifiPriority = line.mid(34).trimmed(); //connection.autoconnect-priority:有32个字符
-                }
-            }
-
-            //可以自动回连，则加入列表
-            if (wifiAutoConnection == "是" || wifiAutoConnection == "yes") {
-                qDebug("Connectable wifi SSID:%s , category:%s ,frequence:%s",wifibssid.toUtf8().data(),wificate.toUtf8().data(),wififreq.toUtf8().data());
-                structWifiProperty myWifiProStruct;
-                myWifiProStruct.objectPath = wifiObjectPath;
-                myWifiProStruct.bssid = wifibssid;
-                myWifiProStruct.priority = wifiPriority.toInt();
-                selectedWifiListStruct.append(myWifiProStruct);
-            }
-        }
-    }
-
-    //再按照wifiPriority进行排序，先简单的选出最高优先级的wifi进行连接
-    if (selectedWifiListStruct.size() > 1) {
-        devListSort(&selectedWifiListStruct);
-        //foreach (structWifiProperty wifiPriorityAfterSort, selectedWifiListStruct) {
-        //    qDebug() << wifiPriorityAfterSort.bssid << " 的自动连接优先级是 ： " << wifiPriorityAfterSort.priority;
-        //}
-    }
-    ocf->deleteLater();
-    return selectedWifiListStruct;
-}
-
-//排序
-void OldMainWindow::devListSort(QVector<structWifiProperty> *list)
-{
-//    qSort(list->begin(), list->end(), subDevListSort);
-    std::sort(list->begin(), list->end(), subDevListSort);
-}
-bool OldMainWindow::subDevListSort(const structWifiProperty &info1, const structWifiProperty &info2)
-{
-    return info1.priority > info2.priority;
-}
-
-// 加载wifi列表
-void OldMainWindow::loadWifiListDone(QStringList slist)
-{
-//    qDebug() << "kkkkkkkkkkkkkkkkkkkkkkkk";
-//    foreach (QString kkkkk, slist) {
-//        qDebug() << kkkkk;
-//    }
-//    qDebug() << "kkkkkkkkkkkkkkkkkkkkkkkk";
-//    qDebug() << "                        ";
-
-    delete topWifiListWidget; //清空top列表
-    createTopWifiUI(); //创建topWifiListWidget
-    // 清空wifi列表
-    wifiListWidget = new QWidget(scrollAreaw);
-    wifiListWidget->resize(W_LIST_WIDGET, H_WIFI_ITEM_BIG_EXTEND);
-    scrollAreaw->setWidget(wifiListWidget);
-    scrollAreaw->move(W_LEFT_AREA, Y_SCROLL_AREA);
-    dbus_wifiList.clear();
-
-    // 获取当前无线网的连接状态，正在连接wifiActState==1，已经连接wifiActState==2, 未连接wifiActState==3
-    int wifiActState = objKyDBus->checkWifiConnectivity(); //检查wifi的连接状态
-    if (wifiActState == WIFI_CONNECTED) {
-        m_isWifiConnected = true;
-    } else {
-        m_isWifiConnected = false;
-    }
-//    if (isWifiBeConnUp && wifiActState == 1) {
-//        wifiActState = 2;
-//    }
-
-    QList<QString> currConnWifiBSsidUuid;
-    currConnWifiBSsidUuid = objKyDBus->getAtiveWifiBSsidUuid(slist);
-//    bool isLoop = true;
-//    do {
-//        currConnWifiBSsidUuid = objKyDBus->getAtiveWifiBSsidUuid(slist);
-//        if (currConnWifiBSsidUuid.size() == 1 && currConnWifiBSsidUuid.at(0).length() != 17) {
-//            sleep(1); //等于1说明只获取到uuid，1秒后再获取一次
-//        } else {
-//            isLoop = false;
-//        }
-//    } while (isLoop);
-
-    // 获取当前连接的wifi name
-    QString actWifiName = "--";
-    QString actWifiId = "--";
-    actWifiSsid = "--";
-    actWifiUuid = "--";
-    if (currConnWifiBSsidUuid.size() > 1) {
-        actWifiUuid = currConnWifiBSsidUuid.at(0);
-        for (int i=1; i<currConnWifiBSsidUuid.size(); i++) {
-            actWifiBssidList.append(currConnWifiBSsidUuid.at(i));
-            //qDebug() << "debug: 获取到的bssid是：" << currConnWifiBSsidUuid.at(i);
-        }
-        //qDebug() << "debug: 获取到的uuid是：" << actWifiUuid;
-    } else {
-        actWifiBssidList.append("--");
-    }
-
-    activecon *act = kylin_network_get_activecon_info();
-    int index = 0;
-    while (act[index].con_name != NULL) {
-        if (QString(act[index].type) == "wifi" || QString(act[index].type) == "802-11-wireless") {
-            actWifiName = QString(act[index].con_name);
-            break;
-        }
-        index ++;
-    }
-
-    // 填充可用网络列表
-    QString headLine = slist.at(0);
-    int indexSignal,indexSecu, indexFreq, indexBSsid, indexName, indexPath, indexCate;
-    headLine = headLine.trimmed();
-
-    bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-    if (isChineseExist) {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("安全性");
-        indexFreq = headLine.indexOf("频率") + 4;
-        indexBSsid = headLine.indexOf("BSSID") + 6;
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-    } else {
-        indexSignal = headLine.indexOf("SIGNAL");
-        indexSecu = headLine.indexOf("SECURITY");
-        indexFreq = headLine.indexOf("FREQ");
-        indexBSsid = headLine.indexOf("BSSID");
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-    }
-    QStringList wnames;
-    int count = 0;
-    QString actWifiBssid = " ";
-    for (int i = 1; i < slist.size(); i ++) {
-        QString line = slist.at(i);
-        QString wbssid = line.mid(indexBSsid, 17).trimmed();
-        int Path = line.indexOf("/org/");
-        QString wDbusPath;
-        if (indexCate >= 0) {
-            wDbusPath = line.mid(Path,indexCate-Path).trimmed();
-        } else {
-            wDbusPath = line.mid(Path,indexName-Path).trimmed();
-        }
-        QDBusInterface interface("org.freedesktop.NetworkManager",
-                                  wDbusPath,
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-        QDBusReply<QVariant> reply = interface.call("Get","org.freedesktop.NetworkManager.AccessPoint","Ssid");
-        QString wname = reply.value().toString();
-
-        if (actWifiBssidList.contains(wbssid)) {
-            actWifiName = wname;
-        }
-        if ("*" == line.mid(0,indexSignal).trimmed()) {
-            //在华为的电脑中，因为前面的优选工作，即使有已经连接的wifi，也可能会被筛选出去
-            actWifiBssid = wbssid;
-        }
-    }
-
-    // 根据当前连接的wifi 设置OneConnForm
-    OneConnForm *ccf = new OneConnForm(topWifiListWidget, this, confForm, ksnm);
-    if (actWifiName == "--" || wifiActState == WIFI_CONNECTING || actWifiBssidList.at(0) == "--" || actWifiBssid == " ") {
-        ccf->setWifiName(tr("Not connected"), "--", "--", "--", isHuaWeiPC, isHuaWei9006C);//"当前未连接任何 Wifi"
-        ccf->setSignal("0", "--" , "0", false);
-        activeWifiSignalLv = 0;
-        ccf->setConnedString(1, tr("Disconnected"), "");//"未连接"
-        ccf->isConnected = false;
-        ccf->lbFreq->hide();
-        ifWLanConnected = false;
-        lbLoadDown->hide();
-        lbLoadUp->hide();
-        lbLoadDownImg->hide();
-        lbLoadUpImg->hide();
-        ccf->setTopItem(false);
-        dbus_wifiList.append(QStringList("--")); //没有已连接wifi时，第一个元素为--
-    } else {
-        QProcess * process = new QProcess;
-        QString name = actWifiName;
-        process->start(QString("nmcli -f 802-11-wireless.ssid connection show \"%1\"").arg(name));
-        connect(process, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), this, [ = ]() {
-            process->deleteLater();
-        });
-        connect(process, &QProcess::readyReadStandardOutput, this, [ = ]() {
-            QString str = process->readAllStandardOutput();
-            actWifiSsid = str.mid(str.lastIndexOf(" ") + 1, str.length() - str.lastIndexOf(" ") - 2); //获取到ssid时，以ssid为准
-        });
-        connect(process, &QProcess::readyReadStandardError, this, [ = ]() {
-            actWifiSsid = actWifiName; //没有获取到ssid时，以wifi名为准
-        });
-        process->waitForFinished();
-    }
-    ccf->setAct(true);
-    ccf->move(L_VERTICAL_LINE_TO_ITEM, 0);
-    ccf->show();
-
-    if (actWifiBssidList.size()==1 && actWifiBssidList.at(0)=="--") {
-        actWifiId = actWifiName;
-        actWifiName = "--";
-    }
-    for (int i = 1, j = 0; i < slist.size(); i ++) {
-        QString line = slist.at(i);
-        QString wsignal = line.mid(indexSignal, 3).trimmed();
-        QString wsecu = line.mid(indexSecu, indexFreq - indexSecu).trimmed();
-        QString wbssid = line.mid(indexBSsid, 17).trimmed();
-        QString wfreq = line.mid(indexFreq, 4).trimmed();
-        QString wcate;
-        if (indexCate >= 0)
-            wcate = line.mid(indexCate, 1).trimmed();
-        else
-            wcate = QString::number(0);
-        QString wDbusPath;
-        if (indexCate >= 0) {
-            wDbusPath = line.mid(indexPath,indexCate-indexPath).trimmed();
-        } else {
-            wDbusPath = line.mid(indexPath,indexName-indexPath).trimmed();
-        }
-        QDBusInterface interface("org.freedesktop.NetworkManager",
-                                  wDbusPath,
-                                  "org.freedesktop.DBus.Properties",
-                                  QDBusConnection::systemBus() );
-        QDBusReply<QVariant> reply = interface.call("Get","org.freedesktop.NetworkManager.AccessPoint","Ssid");
-        QString wname = reply.value().toString();
-
-        if (!isHuaWeiPC) {
-            //如果不是华为的电脑，选择wifi在这里执行
-            if (actWifiName != "--" && actWifiName == wname) {
-                if (!actWifiBssidList.contains(wbssid)) {
-                    continue; //若当前热点ssid名称和已经连接的wifi的ssid名称相同，但bssid不同，则跳过
-                }
-            }
-            if ((wnames.contains(wname) && wbssid != actWifiBssid)) {
-                continue; //过滤相同名称的wifi
-            }
-        } else {
-//            if ((actWifiName == wname) && actWifiBssidList.size()>=1) {
-//                //防止列表中没有已经连接的那个wifi
-//                wbssid = actWifiBssidList.at(0);
-//                actWifiBssid = actWifiBssidList.at(0);
-//            }
-            if ((wnames.contains(wname) && wbssid != actWifiBssid)) {
-                continue; //过滤相同名称的wifi
-            }
-        }
-
-        int max_freq = wfreq.toInt();
-        int min_freq = wfreq.toInt();
-        for (int k = i; k < slist.size(); k ++) {
-            QString m_DbusPath;
-            if (indexCate >= 0) {
-                m_DbusPath = slist.at(k).mid(indexPath,indexCate-indexPath).trimmed();
-            } else {
-                m_DbusPath = slist.at(k).mid(indexPath,indexName-indexPath).trimmed();
-            }
-            QDBusInterface m_interface("org.freedesktop.NetworkManager",
-                                    m_DbusPath,
-                                    "org.freedesktop.DBus.Properties",
-                                    QDBusConnection::systemBus() );
-            QDBusReply<QVariant> m_reply = m_interface.call("Get","org.freedesktop.NetworkManager.AccessPoint","Ssid");
-            QString m_name = m_reply.value().toString();
-
-            if (wname == m_name) {
-                if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() > max_freq) {
-                    max_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt();
-                } else if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() < min_freq) {
-                    min_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt();
-                }
-            }
-        }
-        //qDebug()<<"Wifi ssid="<<wname<<". max_freq="<<max_freq<<". min_freq="<<min_freq;
-        int freqState = 0;
-        if (max_freq < 3000) {
-            //只有2.4GHZ
-            freqState = 1;
-        } else if (min_freq >= 5000) {
-            //只有5GHZ
-            freqState = 2;
-        }
-        if (wname != "" && wname != "--") {
-            //qDebug() << "wifi的 actWifiBssid: " << actWifiBssid << "      wcate = " << wcate;
-            //qDebug() << "wifi的 bssid: " << wbssid << "当前连接的wifi的bssid: " << actWifiBssidList;
-            if (actWifiBssid == wbssid && wifiActState == WIFI_CONNECTED) {
-                //对于已经连接的wifi
-                connect(this, &OldMainWindow::actWifiSignalLvChanaged, ccf, [ = ](const int &signalLv) {
-                    ccf->setSignal(QString::number(signalLv), wsecu, wcate, true);
-                });
-                connect(ccf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int)));
-                connect(ccf, SIGNAL(requestHandleWifiDisconn()), this, SLOT(handleWifiDisconn()));
-                QString path;
-                if (indexCate >= 0) {
-                    path = line.mid(indexPath, indexCate - indexPath).trimmed();
-                } else {
-                    path = line.mid(indexPath, indexName - indexPath).trimmed();
-                }
-                QString m_name;
-                if (path != "" && !path.isEmpty()) m_name= this->objKyDBus->getWifiSsid(path);
-                if (m_name.isEmpty() || m_name == "") {
-                    ccf->setWifiName(wname, wbssid, actWifiUuid, objKyDBus->dbusWiFiCardName, isHuaWeiPC, isHuaWei9006C);
-                    if (!canReconnectWifiList.contains(wname)) {
-                        canReconnectWifiList.append(wname);
-                    } else {
-                        canReconnectWifiList.removeOne(wname);
-                        canReconnectWifiList.append(wname);
-                    }
-                } else {
-                    ccf->setWifiName(m_name, wbssid, actWifiUuid, objKyDBus->dbusWiFiCardName, isHuaWeiPC, isHuaWei9006C);
-                    if (!canReconnectWifiList.contains(m_name)) {
-                        canReconnectWifiList.append(m_name);
-                    } else {
-                        canReconnectWifiList.removeOne(m_name);
-                        canReconnectWifiList.append(m_name);
-                    }
-                }
-
-                //ccf->setRate(wrate);
-                int signal;
-                if (wsignal.toInt() == 0)
-                    signal = ccf->getSignal();
-                else
-                    signal = wsignal.toInt();
-                ccf->setSignal(QString::number(signal), wsecu, wcate, true);
-                setTrayIconOfWifi(wsignal.toInt());
-                activeWifiSignalLv = wsignal.toInt();
-                //objKyDBus->getWifiMac(wname);
-                if (freqState == 0) {
-                    //该WiFi含2.4G和5G的AP，需要判断当前连接的是那种类型
-                    if (wfreq.toInt() >= 5000)
-                        ccf->setWifiInfo(wsecu, wsignal, wbssid, 2);
-                    else
-                        ccf->setWifiInfo(wsecu, wsignal, wbssid, 1);
-                } else {
-                    ccf->setWifiInfo(wsecu, wsignal, wbssid, freqState);
-                }
-                ccf->setConnedString(1, tr("NetOn,"), wsecu);//"已连接"
-                ccf->isConnected = true;
-                ifWLanConnected = true;
-                lbLoadDown->show();
-                lbLoadUp->show();
-                lbLoadDownImg->show();
-                lbLoadUpImg->show();
-                ccf->setTopItem(false);
-                currSelNetName = "";
-                qDebug()<<"already insert an active wifi item in the top of wifi list";
-                //syslog(LOG_DEBUG, "already insert an active wifi item in the top of wifi list");
-                if (m_name.isEmpty() || m_name == "") {
-                    dbus_wifiList.insert(0, QStringList()<<wname<<wsignal<<wsecu<<QString::number(max_freq)<<QString::number(min_freq)<<wcate);
-                } else {
-                    dbus_wifiList.insert(0, QStringList()<<m_name<<wsignal<<wsecu<<QString::number(max_freq)<<QString::number(min_freq)<<wcate);
-                }
-            } else {
-                //对于未连接的wifi
-                wifiListWidget->resize(W_LIST_WIDGET, wifiListWidget->height() + H_NORMAL_ITEM);
-
-                OneConnForm *ocf = new OneConnForm(wifiListWidget, this, confForm, ksnm);
-                connect(ocf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneWifiFormSelected(QString,int)));
-                QString path;
-                if (indexCate >= 0) {
-                    path = line.mid(indexPath, indexCate - indexPath).trimmed();
-                } else {
-                    path = line.mid(indexPath, indexName - indexPath).trimmed();
-                }
-                QString m_name;
-                if (path != "" && !path.isEmpty()) m_name= this->objKyDBus->getWifiSsid(path);
-                if (m_name.isEmpty() || m_name == "") {
-                    ocf->setWifiName(wname, wbssid, actWifiUuid, objKyDBus->dbusWiFiCardName, isHuaWeiPC, isHuaWei9006C);
-                } else {
-                    ocf->setWifiName(m_name, wbssid, actWifiUuid, objKyDBus->dbusWiFiCardName, isHuaWeiPC, isHuaWei9006C);
-                }
-                if (m_wifi_list_pwd_changed.contains(ocf->getName())) {
-                    ocf->setlbPwdTipVisble(true);
-                } else {
-                    ocf->setlbPwdTipVisble(false);
-                }
-                //ocf->setRate(wrate);
-                ocf->setLine(true);
-                ocf->setSignal(wsignal, wsecu, wcate, true);
-                //objKyDBus->getWifiMac(wname);
-                ocf->setWifiInfo(wsecu, wsignal, wbssid, freqState);
-                ocf->setConnedString(0, tr("Disconnected"), wsecu);
-                ocf->move(L_VERTICAL_LINE_TO_ITEM, j * H_NORMAL_ITEM);
-                ocf->setSelected(false, false);
-                ocf->show();
-
-                if ((actWifiBssidList.contains(wbssid) && wifiActState == WIFI_CONNECTING) || (actWifiId == wname && wifiActState == WIFI_CONNECTING)) {
-                    ocf->startWifiWaiting(true);
-                }
-
-                j ++;
-                count ++;
-
-                if (m_name.isEmpty() || m_name == "") {
-                    dbus_wifiList.append(QStringList()<<wname<<wsignal<<wsecu<<QString::number(max_freq)<<QString::number(min_freq)<<wcate);
-                } else {
-                    dbus_wifiList.append(QStringList()<<m_name<<wsignal<<wsecu<<QString::number(max_freq)<<QString::number(min_freq)<<wcate);
-                }
-            }
-
-            wnames.append(wname);
-        }
-    }
-
-    QList<OneConnForm *> itemList = wifiListWidget->findChildren<OneConnForm *>();
-    int n = itemList.size();
-    if (n >= 1) {
-        OneConnForm *lastItem = itemList.at(n-1);
-        lastItem->setLine(false); //最后一个item不需要下划线
-        lbNoItemTip->hide();
-        lbTopWifiList->show();
-        btnAddNet->show();
-    } else {
-        if (ifWLanConnected) {
-            lbNoItemTip->show();
-            lbNoItemTip->setText(tr("No Other Wireless Network Scheme"));
-        } else {
-            lbNoItemTip->hide();
-            lbTopWifiList->hide();
-            btnAddNet->hide();
-        }
-    }
-
-    this->lanListWidget->hide();
-    this->topLanListWidget->hide();
-    this->wifiListWidget->show();
-    this->topWifiListWidget->show();
-
-    if (!this->isReconnectingWifi)
-        this->stopLoading();
-    is_stop_check_net_state = 0;
-    is_connect_hide_wifi = 0;
-
-    actWifiBssidList.clear();
-    wnames.clear();
-    emit this->getWifiListFinished();
-    bShowPb = true;  //可以showpb
-}
-
-// 更新wifi列表
-void OldMainWindow::updateWifiListDone(QStringList slist)
-{
-    qDebug()<<"Refreshed wifi list.";
-    if (hasWifiConnected) {
-        lbLoadDown->show();
-        lbLoadUp->show();
-        lbLoadDownImg->show();
-        lbLoadUpImg->show();
-    }
-
-    if (this->ksnm->isExecutingGetLanList){ return;}
-
-    //获取表头信息
-    QString lastHeadLine = oldWifiSlist.at(0);
-    int lastIndexName;
-    lastHeadLine = lastHeadLine.trimmed();
-//    bool isChineseInIt = lastHeadLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-    lastIndexName = lastHeadLine.lastIndexOf("SSID");
-
-    QString headLine = slist.at(0);
-    int indexSecu, indexFreq, indexBSsid, indexName, indexPath, indexCate;
-    headLine = headLine.trimmed();
-    bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
-    if (isChineseExist) {
-        indexSecu = headLine.indexOf("安全性");
-        indexFreq = headLine.indexOf("频率") + 4;
-        indexBSsid = headLine.indexOf("BSSID") + 6;
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-    } else {
-        indexSecu = headLine.indexOf("SECURITY");
-        indexFreq = headLine.indexOf("FREQ");
-        indexBSsid = headLine.indexOf("BSSID");
-        indexPath = headLine.indexOf("DBUS-PATH");
-        indexCate = headLine.indexOf("CATEGORY");
-        indexName = headLine.lastIndexOf("SSID");
-    }
-
-    //列表中去除已经减少的wifi
-    for (int i=1; i<oldWifiSlist.size(); i++){
-        QString line = oldWifiSlist.at(i);
-        QString lastWname = line.mid(lastIndexName).trimmed();
-        for (int j=1; j<slist.size(); j++){
-            QString line = slist.at(j);
-            QString wname = line.mid(indexName).trimmed();
-
-            if (lastWname == wname){break;} //在slist最后之前找到了lastWname，则停止
-            if (j == slist.size()-1) {
-                QList<OneConnForm *> wifiList = wifiListWidget->findChildren<OneConnForm *>();
-                for (int pos = 0; pos < wifiList.size(); pos ++) {
-                    OneConnForm *ocf = wifiList.at(pos);
-                    if (ocf->getName() == lastWname) {
-                        if (ocf->isActive == true){break;
-                        } else {
-                            delete ocf;
-                            //删除元素下面的的所有元素上移
-                            for (int after_pos = pos+1; after_pos < wifiList.size(); after_pos ++) {
-                                OneConnForm *after_ocf = wifiList.at(after_pos);
-                                if (lastWname == currSelNetName) {after_ocf->move(L_VERTICAL_LINE_TO_ITEM, after_ocf->y() - H_NORMAL_ITEM - H_WIFI_ITEM_BIG_EXTEND);}
-                                else {after_ocf->move(L_VERTICAL_LINE_TO_ITEM, after_ocf->y() - H_NORMAL_ITEM);}
-                            }
-                            wifiListWidget->resize(W_LIST_WIDGET, wifiListWidget->height() - H_NORMAL_ITEM);
-                            //从向外提供的wifi列表中找到并删除这一行
-                            QStringList list_to_remove;
-                            foreach (QStringList list, dbus_wifiList) {
-                                if (list.at(0).trimmed() == lastWname) {
-                                    list_to_remove = list;
-                                    break;
-                                }
-                            }
-                            if (!list_to_remove.isEmpty()) {
-                                dbus_wifiList.removeOne(list_to_remove);
-                            }
-//                            qDebug()<<"移除了一个WiFi，将会向控制面板发送信号。ssid="<<lastWname;
-//                            emit this->getWifiListFinished();
-                            break;
-                        }
-                    }
-                }
-
-            } //end if (j == slist.size()-1)
-        } //end (int j=1; j<slist.size(); j++)
-    }
-
-    //列表中插入新增的wifi
-    QStringList wnames;
-    int count = 0;
-    for(int i = 1; i < slist.size(); i++){
-        QString line = slist.at(i);
-        QString wsignal = line.mid(0, indexSecu).trimmed();
-        QString wsecu = line.mid(indexSecu, indexFreq - indexSecu).trimmed();
-        QString wbssid = line.mid(indexBSsid, 17).trimmed();
-        QString wname = line.mid(indexName).trimmed();
-        QString wfreq = line.mid(indexFreq, 4).trimmed();
-        QString wpath;
-        if (indexCate >= 0) {
-            wpath = line.mid(indexPath, indexCate - indexPath).trimmed();
-        } else {
-            wpath = line.mid(indexPath, indexName - indexPath).trimmed();
-        }
-        QString wcate = line.mid(indexCate, 1).trimmed();
-
-        if(wname == "" || wname == "--"){continue;}
-
-        bool isContinue = false;
-        foreach (QString addName, wnames) {
-            // 重复的网络名称，跳过不处理
-            if(addName == wname){isContinue = true;}
-        }
-        if(isContinue){continue;}
-
-        int max_freq = wfreq.toInt();
-        int min_freq = wfreq.toInt();
-        for (int k = 0; k < slist.size(); k ++) {
-            QString m_name = slist.at(k).mid(indexName).trimmed();
-//            QString m_name = this->objKyDBus->getWifiSsid(QString("/org/freedesktop/NetworkManager/AccessPoint/%1").arg(slist.at(k).mid(slist.at(k).lastIndexOf("/") + 1).trimmed()));
-            if (wname == m_name) {
-                if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() > max_freq) {
-                    max_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt();
-                } else if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() < min_freq) {
-                    min_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt();
-                }
-            }
-        }
-
-        //qDebug()<<"Wifi ssid="<<wname<<". max_freq="<<max_freq<<". min_freq="<<min_freq;
-        int freqState = 0;
-        if (max_freq < 3000) {
-            //只有2.4GHZ
-            freqState = 1;
-        } else if (min_freq >= 5000) {
-            //只有5GHZ
-            freqState = 2;
-        }
-
-        wnames.append(wname);
-        for (int j=1; j < oldWifiSlist.size(); j++) {
-            QString line = oldWifiSlist.at(j);
-            QString lastWname = line.mid(lastIndexName).trimmed();
-            if (lastWname == wname){break;} //上一次的wifi列表已经有名为wname的wifi，则停止
-            if (j == oldWifiSlist.size()-1) { //到lastSlist最后一个都没找到，执行下面流程
-                QList<OneConnForm *> wifiList = wifiListWidget->findChildren<OneConnForm *>();
-                int n = wifiList.size();
-                int posY = 0;
-                if (n >= 1) {
-                    OneConnForm *lastOcf = wifiList.at(n-1);
-                    lastOcf->setLine(true);
-                    if (lastOcf->wifiName == currSelNetName) {
-                        posY = lastOcf->y()+H_NORMAL_ITEM + H_WIFI_ITEM_BIG_EXTEND;
-                    } else {
-                        posY = lastOcf->y()+H_NORMAL_ITEM;
-                    }
-                }
-
-                wifiListWidget->resize(W_LIST_WIDGET, wifiListWidget->height() + H_NORMAL_ITEM);
-                OneConnForm *addItem = new OneConnForm(wifiListWidget, this, confForm, ksnm);
-                connect(addItem, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneWifiFormSelected(QString,int)));
-                QString m_name;
-                if (wpath != "" && !wpath.isEmpty()) m_name= this->objKyDBus->getWifiSsid(wpath);
-                if (m_name.isEmpty() || m_name == "") {
-                    addItem->setWifiName(wname, wbssid, actWifiUuid, objKyDBus->dbusWiFiCardName, isHuaWeiPC, isHuaWei9006C);
-                } else {
-                    addItem->setWifiName(m_name, wbssid, actWifiUuid, objKyDBus->dbusWiFiCardName, isHuaWeiPC, isHuaWei9006C);
-                }
-                if (m_wifi_list_pwd_changed.contains(addItem->getName())) {
-                    addItem->setlbPwdTipVisble(true);
-                } else {
-                    addItem->setlbPwdTipVisble(false);
-                }
-                //addItem->setRate(wrate);
-                addItem->setLine(false);
-                addItem->setSignal(wsignal, wsecu, wcate, true);
-                //objKyDBus->getWifiMac(wname);
-                addItem->setWifiInfo(wsecu, wsignal, wbssid, freqState);
-                addItem->setConnedString(0, tr("Disconnected"), wsecu);//"未连接"
-                addItem->move(L_VERTICAL_LINE_TO_ITEM, posY);
-                addItem->setSelected(false, false);
-                addItem->show();
-                if (m_name.isEmpty() || m_name == "") {
-                    dbus_wifiList.append(QStringList()<<wname<<wsignal<<wsecu<<QString::number(max_freq)<<QString::number(min_freq)<<wcate);
-                } else {
-                    dbus_wifiList.append(QStringList()<<m_name<<wsignal<<wsecu<<QString::number(max_freq)<<QString::number(min_freq)<<wcate);
-                }
-
-                count += 1;
-//                qDebug()<<"新增了一个WiFi，将会向控制面板发送信号。ssid="<<lastWname;
-//                emit this->getWifiListFinished();
-            }
-        }
-    }
-
-    this->lanListWidget->hide();
-    this->topLanListWidget->hide();
-    this->wifiListWidget->show();
-    this->topWifiListWidget->show();
-    this->stopLoading();
-    is_stop_check_net_state = 0;
-    emit this->getWifiListFinished();
-}
-
-//用于中英文系统有线网络名称国际话
-QString OldMainWindow::TranslateLanName(QString lanName)
-{
-    QString returnLanName = lanName;
-
-    if (lanName == "有线连接") {
-        returnLanName = tr("Wired connection");
-    } else if (lanName.indexOf("有线连接") != -1) {
-        QStringList strList = lanName.split(" ");
-        if (strList.size() >= 2 && strList.at(1) != "") {
-            returnLanName = tr("Wired connection") + " " + strList.at(1);
-        }
-    }
-
-    if (lanName == "Wired connection") {
-        returnLanName = tr("Wired connection");
-    } else if (lanName.indexOf("Wired connection") != -1) {
-        QStringList strList = lanName.split(" ");
-        if (strList.size() >= 3 && strList.at(2) != "") {
-            returnLanName = tr("Wired connection") + " " + strList.at(2);
-        }
-    }
-
-    if (lanName == "以太网连接") {
-        returnLanName = tr("Ethernet connection");
-    } else if (lanName.indexOf("以太网连接") != -1) {
-        QStringList strList = lanName.split(" ");
-        if (strList.size() >= 2 && strList.at(1) != "") {
-            returnLanName = tr("Ethernet connection") + " " + strList.at(1);
-        }
-    }
-
-    if (lanName == "Ethernet connection") {
-        returnLanName = tr("Ethernet connection");
-    } else if (lanName.indexOf("Ethernet connection") != -1) {
-        QStringList strList = lanName.split(" ");
-        if (strList.size() >= 3 && strList.at(2) != "") {
-            returnLanName = tr("Ethernet connection") + " " + strList.at(2);
-        }
-    }
-
-    return returnLanName;
-}
-
-//使用uuid获取对应的mac地址
-QString OldMainWindow::getMacByUuid(QString uuidName)
-{
-    QString resultMac = "";
-
-    QString tmpPath = "/tmp/kylin-nm-lanprop-" + QDir::home().dirName();
-    QString cmd = "nmcli connection show '" + uuidName + "' > " + tmpPath;
-    Utils::m_system(cmd.toUtf8().data());
-
-    QFile file(tmpPath);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        //syslog(LOG_ERR, "Can't open the file /tmp/kylin-nm-lanprop!");
-        qDebug()<<"Can't open the file /tmp/kylin-nm-lanprop!"<<endl;
-    }
-
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-
-    foreach (QString line, txtLine) {
-        if (line.startsWith("802-3-ethernet.mac-address:")) {
-            resultMac = line.mid(30).trimmed();
-        }
-    }
-
-    return resultMac;
-}
-
-void OldMainWindow::checkIfConnectedWifiExist()
-{
-    //在点击托盘图标时，判读有无wifi的连接，若wstate不为0，但是有wifi连接，就断开
-    BackThread *bt = new BackThread();
-    IFace *iface = bt->execGetIface();
-    if (iface->wstate != 0) {
-        QString toDisConnWifi = "nmcli connection down '" + actWifiUuid + "'";
-        system(toDisConnWifi.toUtf8().data());
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//主窗口其他按钮点击响应
-
-void OldMainWindow::on_btnAdvConf_clicked()
-{
-//    if (!kysec_is_disabled() && kysec_get_3adm_status()) {
-//        //三权分立启用的操作
-//        qDebug() << "三权分立启用的操作------>";
-//        QMessageBox msgBox;
-//        msgBox.setWindowTitle(QObject::tr("kylin-nm"));
-//        msgBox.setIcon(QMessageBox::Warning);
-//        msgBox.setText(QObject::tr("Insufficient permissions"));
-//        msgBox.addButton(QMessageBox::Ok);
-//        msgBox.button(QMessageBox::Ok)->setText(QObject::tr("OK"));
-//        msgBox.exec();
-//    } else {
-//        //三权分立未启用的操作
-//        qDebug() << "三权分立未启用的操作";
-//        QProcess *qprocess = new QProcess(this);
-//        qprocess->start("nm-connection-editor &");
-//    }
-    QProcess p(0);
-    p.startDetached("nm-connection-editor &");
-    p.waitForStarted();
-    return;
-}
-
-void OldMainWindow::on_btnFlyMode_clicked()
-{
-    if (is_fly_mode_on == 0) {
-        is_fly_mode_on = 1;
-
-        onBtnWifiClicked(0);
-        on_btnWifiList_clicked();
-    } else {
-        is_fly_mode_on = 0;
-    }
-}
-
-void OldMainWindow::on_btnHotspot_clicked()
-{
-    if (is_wireless_adapter_ready == 1) {
-        if (is_hot_sopt_on == 0) {
-            ui->lbHotImg->setStyleSheet("QLabel{background-image:url(:/res/x/hot-spot-on.svg);}");
-            ui->lbHotBG->setStyleSheet(btnOnQss);
-            is_hot_sopt_on = 1;
-
-            QApplication::setQuitOnLastWindowClosed(false);
-            DlgHotspotCreate *hotCreate = new DlgHotspotCreate(objKyDBus->dbusWiFiCardName);
-            connect(hotCreate,SIGNAL(updateHotspotList()),this,SLOT(on_btnWifiList_clicked() ));
-            connect(hotCreate,SIGNAL(btnHotspotState()),this,SLOT(on_btnHotspotState() ));
-            hotCreate->show();
-        } else {
-            on_btnHotspotState();
-
-            BackThread objBT;
-            objBT.disConnLanOrWifi("wifi");
-
-            sleep(2);
-            on_btnWifiList_clicked();
-        }
-    }
-}
-
-void OldMainWindow::onBtnAddNetClicked()
-{
-    QApplication::setQuitOnLastWindowClosed(false);
-    DlgHideWifi *connHidWifi = new DlgHideWifi(0, this);
-    connect(connHidWifi, SIGNAL(reSetWifiList() ), this, SLOT(on_btnWifiList_clicked()) );
-    connHidWifi->show();
-}
-
-void OldMainWindow::onBtnCreateNetClicked()
-{
-    QPoint pos = QCursor::pos();
-    QRect primaryGeometry;
-    for (QScreen *screen : qApp->screens()) {
-        if (screen->geometry().contains(pos)) {
-            primaryGeometry = screen->geometry();
-        }
-    }
-
-    if (primaryGeometry.isEmpty()) {
-        primaryGeometry = qApp->primaryScreen()->geometry();
-    }
-
-    QApplication::setQuitOnLastWindowClosed(false);
-    ConfForm *m_cf = new ConfForm();
-    m_cf->cbTypeChanged(3);
-    m_cf->move(primaryGeometry.width() / 2 - m_cf->width() / 2, primaryGeometry.height() / 2 - m_cf->height() / 2);
-    m_cf->show();
-}
-
-/* 右键菜单打开网络设置界面 */
-void OldMainWindow::actionTriggerSlots()
-{
-    if (!m_load_finished) {
-        m_secondary_start_timer->stop();
-        secondaryStart();
-    }
-    this->move(-500, -500);
-    this->showNormal();
-    this->raise();
-    this->activateWindow();
-    QProcess p(0);
-    p.startDetached("nm-connection-editor &");
-    p.waitForStarted();
-    return;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//处理窗口变化、网络状态变化
-
-//列表中item的扩展与收缩
-void OldMainWindow::oneLanFormSelected(QString lanName, QString uniqueName)
-{
-    if (currSelNetName == uniqueName) {
-        return;
-    }
-#if 0
-    QList<OneLancForm *> topLanList = topLanListWidget->findChildren<OneLancForm *>();
-    QList<OneLancForm *> lanList = lanListWidget->findChildren<OneLancForm *>();
-
-    //**********************先处理下方列表********************//
-    // 下方所有元素回到原位
-    for (int i = 0, j = 0;i < lanList.size(); i ++) {
-        OneLancForm *ocf = lanList.at(i);
-        if (ocf->isActive == true) {
-            ocf->move(L_VERTICAL_LINE_TO_ITEM, 0);
-        }
-        if (ocf->isActive == false) {
-            ocf->move(L_VERTICAL_LINE_TO_ITEM, j * H_NORMAL_ITEM);
-            j ++;
-        }
-    }
-
-    //是否与上一次选中同一个网络框
-    if (currSelNetName == uniqueName) {
-        // 缩小所有选项卡
-//        for (int i = 0;i < lanList.size(); i ++) {
-//            OneLancForm *ocf = lanList.at(i);
-//            if (ocf->uuidName == uniqueName) {
-//                ocf->setSelected(false, true);
-//            } else {
-//                ocf->setSelected(false, false);
-//            }
-//        }
-
-//        currSelNetName = "";
-    } else {
-        int selectY = 0;
-        for (int i = 0;i < lanList.size(); i ++) {
-            OneLancForm *ocf = lanList.at(i);
-            if (ocf->uuidName == uniqueName) {
-                selectY = ocf->y(); //获取选中item的y坐标
-                break;
-            }
-        }
-
-        // 选中元素下面的所有元素下移 H_LAN_ITEM_EXTEND
-        for (int i = 0;i < lanList.size(); i ++) {
-            OneLancForm *ocf = lanList.at(i);
-            if (ocf->y() > selectY) {
-                ocf->move(L_VERTICAL_LINE_TO_ITEM, ocf->y() + H_LAN_ITEM_EXTEND);
-            }
-        }
-
-        for (int i = 0;i < lanList.size(); i ++) {
-            OneLancForm *ocf = lanList.at(i);
-            if (ocf->uuidName == uniqueName) {
-                ocf->setSelected(true, false);
-                selectY = ocf->y();
-            } else {
-                ocf->setSelected(false, false);
-            }
-        }
-
-        currSelNetName = uniqueName;
-    }
-
-    QList<OneLancForm *> itemList = lanListWidget->findChildren<OneLancForm *>();
-    int n = itemList.size();
-    if (n >= 1) {
-        OneLancForm *lastItem = itemList.at(n-1);
-        lastItem->setLine(false);
-    }
-
-    //**********************处理上方列表-界面所有控件回原位********************//
-    topLanListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM*currTopLanItem + H_GAP_UP + X_ITEM); // 顶部的item缩小
-    lbTopLanList->move(X_MIDDLE_WORD, H_NORMAL_ITEM*currTopLanItem + H_GAP_UP);
-    btnCreateNet->move(X_BTN_FUN, Y_BTN_FUN + H_NORMAL_ITEM*(currTopLanItem-1));
-    scrollAreal->move(W_LEFT_AREA, Y_SCROLL_AREA + H_NORMAL_ITEM*(currTopLanItem-1));
-    lbNoItemTip->move(this->width()/2 - W_NO_ITEM_TIP/2 + W_LEFT_AREA/2, this->height()/2 + H_NORMAL_ITEM*(currTopLanItem-1)/2);
-
-    for (int i = topLanList.size() - 1;i >= 0; i --) {
-        OneLancForm *ocf = topLanList.at(i);
-        ocf->setTopItem(false);
-        ocf->move(L_VERTICAL_LINE_TO_ITEM, (topLanList.size() - 1 - i) * H_NORMAL_ITEM);
-    }
-#endif
-}
-
-void OldMainWindow::oneTopLanFormSelected(QString lanName, QString uniqueName)
-{
-#if 0
-    //应设计要求，选中同一选项卡不再缩小
-    if (currSelNetName == uniqueName) return;
-    QList<OneLancForm *> topLanList = topLanListWidget->findChildren<OneLancForm *>();
-    QList<OneLancForm *> lanList = lanListWidget->findChildren<OneLancForm *>();
-
-    // 顶部所有元素回到原位
-    for (int i = topLanList.size() - 1;i >= 0; i --) {
-        OneLancForm *ocf = topLanList.at(i);
-        ocf->move(L_VERTICAL_LINE_TO_ITEM, (topLanList.size() - 1 - i) * H_NORMAL_ITEM);
-    }
-
-    if (currSelNetName == uniqueName) {
-        // 与上一次选中同一个网络框，缩小当前选项卡
-//        topLanListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM*currTopLanItem + H_GAP_UP + X_ITEM);
-//        lbTopLanList->move(X_MIDDLE_WORD, H_NORMAL_ITEM*currTopLanItem + H_GAP_UP);
-//        btnCreateNet->move(X_BTN_FUN, Y_BTN_FUN + H_NORMAL_ITEM*(currTopLanItem-1));
-//        scrollAreal->move(W_LEFT_AREA, Y_SCROLL_AREA + H_NORMAL_ITEM*(currTopLanItem-1));
-//        lbNoItemTip->move(this->width()/2 - W_NO_ITEM_TIP/2 + W_LEFT_AREA/2, this->height()/2 + H_NORMAL_ITEM*(currTopLanItem-1)/2);
-
-//        foreach (OneLancForm *ocf, topLanList) {
-//            ocf->setTopItem(false);
-//        }
-
-//        currSelNetName = "";
-    } else {
-        // 没有与上一次选中同一个网络框，放大当前选项卡
-
-        //下方列表所有元素缩小并回到原位
-        for (int i = 0; i < lanList.size(); i ++) {
-            OneLancForm *ocf = lanList.at(i);
-            ocf->setSelected(false, false);
-            ocf->move(L_VERTICAL_LINE_TO_ITEM, i*H_NORMAL_ITEM);
-        }
-
-        topLanListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM*currTopLanItem + H_LAN_ITEM_EXTEND + H_GAP_UP + X_ITEM);
-        lbTopLanList->move(X_MIDDLE_WORD, H_NORMAL_ITEM*currTopLanItem + H_LAN_ITEM_EXTEND + H_GAP_UP);
-        btnCreateNet->move(X_BTN_FUN, Y_BTN_FUN + H_LAN_ITEM_EXTEND + H_NORMAL_ITEM*(currTopLanItem-1));
-        scrollAreal->move(W_LEFT_AREA, Y_SCROLL_AREA + H_LAN_ITEM_EXTEND + H_NORMAL_ITEM*(currTopLanItem-1));
-        lbNoItemTip->move(this->width()/2 - W_NO_ITEM_TIP/2 + W_LEFT_AREA/2, this->height()/2 + 80 +  + H_NORMAL_ITEM*(currTopLanItem-1)/2);
-
-        int selectY = 0;
-        for (int i = 0;i < topLanList.size(); i ++) {
-            OneLancForm *ocf = topLanList.at(i);
-            if (ocf->uuidName == uniqueName) {
-                selectY = ocf->y(); //获取选中item的y坐标
-                break;
-            }
-        }
-
-        // 选中元素下面的所有元素下移 H_LAN_ITEM_EXTEND
-        for (int i = 0;i < topLanList.size(); i ++) {
-            OneLancForm *ocf = topLanList.at(i);
-            if (ocf->y() > selectY) {
-                ocf->move(L_VERTICAL_LINE_TO_ITEM, ocf->y() + H_LAN_ITEM_EXTEND);
-            }
-        }
-
-        //选中的元素进行扩展
-        for (int i = 0;i < topLanList.size(); i ++) {
-            OneLancForm *ocf = topLanList.at(i);
-            if (ocf->uuidName == uniqueName) {
-                ocf->setTopItem(true);
-                selectY = ocf->y();
-            } else {
-                ocf->setTopItem(false);
-            }
-        }
-
-        currSelNetName = uniqueName;
-    }
-
-#endif
-}
-
-void OldMainWindow::oneWifiFormSelected(QString wifibssid, int extendLength)
-{
-    if (currSelNetName == wifibssid) {
-        //与win逻辑一致，点击同一选项不再缩小选项卡
-        return;
-    }
-    if (extendLength == H_WIFI_ITEM_SMALL_EXTEND) {
-        this->m_is_inputting_wifi_password = true;
-    } else {
-        this->m_is_inputting_wifi_password = false;
-    }
-
-    QList<OneConnForm *>topWifiList = topWifiListWidget->findChildren<OneConnForm *>();
-    QList<OneConnForm *> wifiList = wifiListWidget->findChildren<OneConnForm *>();
-
-    //******************先处理下方列表****************//
-    // 下方所有元素回到原位
-    for (int i = 0, j = 0;i < wifiList.size(); i ++) {
-        OneConnForm *ocf = wifiList.at(i);
-        if (ocf->isActive == true) {
-            ocf->move(L_VERTICAL_LINE_TO_ITEM, 0);
-        }
-        if (ocf->isActive == false) {
-            ocf->move(L_VERTICAL_LINE_TO_ITEM, j * H_NORMAL_ITEM);
-            j ++;
-        }
-    }
-
-    //是否与上一次选中同一个网络框
-    if (currSelNetName == wifibssid) {
-//        // 缩小所有选项卡
-//        for (int i = 0;i < wifiList.size(); i ++) {
-//            OneConnForm *ocf = wifiList.at(i);
-//            if (ocf->wifiBSsid == wifibssid) {
-//                if (ocf->wifiBSsid == hideWiFiConn) {
-//                    ocf->setHideItem(true, true);
-//                } else {
-//                    ocf->setSelected(false, true);
-//                }
-//            } else {
-//                if (ocf->wifiBSsid == hideWiFiConn) {
-//                    ocf->setHideItem(true, true);
-//                } else {
-//                    ocf->setSelected(false, false);
-//                }
-//            }
-
-//        }
-//        currSelNetName = "";
-    } else {
-        int selectY = 0;
-        for (int i = 0;i < wifiList.size(); i ++) {
-            OneConnForm *ocf = wifiList.at(i);
-            if (ocf->wifiBSsid == wifibssid) {
-                selectY = ocf->y(); //获取选中item的y坐标
-                scrollAreaw->verticalScrollBar()->setValue(selectY);
-                break;
-            }
-        }
-
-        // 选中元素下面的所有元素下移 H_WIFI_ITEM_BIG_EXTEND
-        for (int i = 0;i < wifiList.size(); i ++) {
-            OneConnForm *ocf = wifiList.at(i);
-            if (ocf->y() > selectY) {
-                ocf->move(L_VERTICAL_LINE_TO_ITEM, ocf->y() + extendLength);
-            }
-        }
-
-        for (int i = 0;i < wifiList.size(); i ++) {
-            OneConnForm *ocf = wifiList.at(i);
-            if (ocf->wifiBSsid == wifibssid) {
-                if (ocf->wifiBSsid == hideWiFiConn) {
-                    ocf->setHideItem(true, true);
-                } else {
-                    ocf->setSelected(true, false);
-                }
-            } else {
-                if (ocf->wifiBSsid == hideWiFiConn) {
-                    ocf->setHideItem(true, true);
-                } else {
-                    ocf->setSelected(false, false);
-                }
-            }
-        }
-
-        currSelNetName = wifibssid;
-    }
-
-    //最后一个item没有下划线
-    QList<OneConnForm *> itemList = wifiListWidget->findChildren<OneConnForm *>();
-    int n = itemList.size();
-    if (n >= 1) {
-        OneConnForm *lastItem = itemList.at(n-1);
-        lastItem->setLine(false);
-    }
-
-    //********************处理上方列表-界面所有控件回原位******************//
-    // 顶部的item缩小
-    topWifiListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM + H_GAP_UP + X_ITEM);
-    lbTopWifiList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_GAP_UP);
-    btnAddNet->move(X_BTN_FUN, Y_BTN_FUN);
-    scrollAreaw->move(W_LEFT_AREA, Y_SCROLL_AREA);
-    lbNoItemTip->move(this->width()/2 - W_NO_ITEM_TIP/2 + W_LEFT_AREA/2, this->height()/2);
-
-    OneConnForm *ocf = topWifiList.at(0);
-    ocf->setTopItem(false);
-}
-void OldMainWindow::oneTopWifiFormSelected(QString wifibssid, int extendLength)
-{
-    //应设计师要求，此处展开后点击不再收起
-    if (currSelNetName == wifibssid) return;
-    QList<OneConnForm *>topWifiList = topWifiListWidget->findChildren<OneConnForm *>();
-    QList<OneConnForm *> wifiList = wifiListWidget->findChildren<OneConnForm *>();
-
-    if (currSelNetName == wifibssid) {
-        // 与上一次选中同一个网络框，缩小当前选项卡
-//        topWifiListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM + H_GAP_UP + X_ITEM);
-//        lbTopWifiList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_GAP_UP);
-//        btnAddNet->move(X_BTN_FUN, Y_BTN_FUN);
-//        scrollAreaw->move(W_LEFT_AREA, Y_SCROLL_AREA);
-//        lbNoItemTip->move(this->width()/2 - W_NO_ITEM_TIP/2 + W_LEFT_AREA/2, this->height()/2);
-
-//        OneConnForm *ocf = topWifiList.at(0);
-//        ocf->setTopItem(false);
-
-//        currSelNetName = "";
-    } else {
-        // 没有与上一次选中同一个网络框，放大当前选项卡
-
-        for(int i = 0;i < wifiList.size(); i ++) {
-            // 所有元素回到原位
-            OneConnForm *ocf = wifiList.at(i);
-            ocf->setSelected(false, false);
-            ocf->move(L_VERTICAL_LINE_TO_ITEM, i * H_NORMAL_ITEM);
-        }
-
-        topWifiListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM + H_WIFI_ITEM_BIG_EXTEND + H_GAP_UP + X_ITEM);
-        lbTopWifiList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_WIFI_ITEM_BIG_EXTEND + H_GAP_UP);
-        btnAddNet->move(X_BTN_FUN, Y_BTN_FUN + H_WIFI_ITEM_BIG_EXTEND);
-        scrollAreaw->move(W_LEFT_AREA, Y_SCROLL_AREA + H_WIFI_ITEM_BIG_EXTEND);
-        lbNoItemTip->move(this->width()/2 - W_NO_ITEM_TIP/2 + W_LEFT_AREA/2, this->height()/2 + 65);
-
-        OneConnForm *ocf = topWifiList.at(0);
-        ocf->setTopItem(true);
-
-        currSelNetName = wifibssid;
-    }
-}
-
-//断开网络处理
-void OldMainWindow::handleLanDisconn()
-{
-    //syslog(LOG_DEBUG, "Wired net is disconnected");
-    qDebug()<<"Wired net is disconnected!";
-
-    QString txt(tr("Wired net is disconnected"));
-    emit this->actWiredConnectionChanged();
-    objKyDBus->showDesktopNotify(txt);
-    currSelNetName = "";
-    oldActLanName = "";
-    oldDbusActLanDNS = 0;
-    emit this->waitLanStop();
-    this->ksnm->execGetLanList();
-}
-
-void OldMainWindow::handleWifiDisconn()
-{
-    hasWifiConnected = false;
-    currSelNetName = "";
-    this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
-    QtConcurrent::run([=]() {
-        handleWifiDisconnLoading();
-    });
-}
-void OldMainWindow::handleWifiDisconnLoading()
-{
-    //syslog(LOG_DEBUG, "WLAN is disconnected");
-    qDebug()<<"WLAN is disconnected!";
-    QString txt(tr("WLAN is disconnected"));
-    objKyDBus->showDesktopNotify(txt);
-
-    //setTrayLoading(false);
-    //getActiveInfoAndSetTrayIcon();
-}
-
-//网络开关处理，打开与关闭网络
-void OldMainWindow::enNetDone()
-{
-    BackThread *bt = new BackThread();
-    mwBandWidth = bt->execChkLanWidth(lcardname);
-
-    // 打开网络开关时如果Wifi开关是打开的，设置其样式
-    if (checkWlOn()) {
-        btnWireless->setSwitchStatus(true);
-    }
-
-    onBtnNetListClicked(1);
-    is_stop_check_net_state = 0;
-
-    qDebug()<<"debug: already turn on the switch of lan network";
-    //syslog(LOG_DEBUG, "Already turn on the switch of lan network");
-}
-void OldMainWindow::disNetDone()
-{
-    this->is_btnLanList_clicked = 1;
-    this->is_btnWifiList_clicked = 0;
-
-    ui->lbNetListBG->setStyleSheet(btnOnQss);
-    ui->lbWifiListBG->setStyleSheet(btnOffQss);
-
-    ui->lbNetwork->setText(tr("Ethernet"));
-    btnWireless->hide();
-    btnWired->show();
-
-    delete topLanListWidget; // 清空top列表
-    createTopLanUI(); //创建顶部有线网item
-
- #if 0
-    // 清空lan列表
-    lanListWidget = new QWidget(scrollAreal);
-    lanListWidget->resize(W_LIST_WIDGET, H_NORMAL_ITEM + H_LAN_ITEM_EXTEND);
-    scrollAreal->setWidget(lanListWidget);
-    scrollAreal->move(W_LEFT_AREA, Y_SCROLL_AREA);
-
-
-    // 当前连接的lan
-    OneLancForm *ccf = new OneLancForm(topLanListWidget, this, confForm, ksnm);
-    ccf->setLanName(tr("Not connected"), tr("Not connected"), "--", "--");//"当前未连接任何 以太网"
-    ccf->setIcon(false);
-    ccf->setConnedString(1, tr("Disconnected"), "");//"未连接"
-    ccf->isConnected = false;
-    ccf->setTopItem(false);
-    ccf->setAct(true);
-    ccf->move(L_VERTICAL_LINE_TO_ITEM, 0);
-    ccf->show();
-#endif
-    btnWireless->setSwitchStatus(false);
-
-    this->lanListWidget->show();
-    this->wifiListWidget->hide();
-    this->scrollAreal->show();
-    this->topLanListWidget->show();
-    this->scrollAreaw->hide();
-    this->topWifiListWidget->hide();
-
-    qDebug()<<"debug: already turn off the switch of lan network";
-    //syslog(LOG_DEBUG, "Already turn off the switch of lan network");
-
-    this->stopLoading();
-}
-
-void OldMainWindow::enWifiDone()
-{
-    if (isHuaWeiPC) {
-        //这里先不做什么，因为onRfkillStatusChanged这个函数也在处理wifi开关
-    } else {
-        //on_btnWifiList_clicked();
-        current_wifi_list_state = LOAD_WIFI_LIST;
-        if (is_btnWifiList_clicked) {
-            this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
-        }
-        objKyDBus->getWirelessCardName();
-        qDebug()<<"debug: already turn on the switch of wifi network";
-        //syslog(LOG_DEBUG, "Already turn on the switch of wifi network");
-    }
-}
-void OldMainWindow::disWifiDone()
-{
-    if (isHuaWeiPC) {
-        //这里先不做什么，因为onRfkillStatusChanged这个函数也在处理wifi开关
-    } else {
-        disWifiDoneChangeUI();
-        this->stopLoading();
-        is_stop_check_net_state = 0;
-        qDebug()<<"debug: already turn on the switch of wifi network";
-        //syslog(LOG_DEBUG, "Already turn on the switch of wifi network");
-    }
-}
-void OldMainWindow::disWifiStateKeep()
-{
-    if (this->is_btnLanList_clicked == 1) {
-        btnWireless->setSwitchStatus(false);
-    }
-    if (this->is_btnWifiList_clicked== 1) {
-        disWifiDoneChangeUI();
-        getActiveInfoAndSetTrayIcon();
-    }
-}
-void OldMainWindow::disWifiDoneChangeUI()
-{
-    wifiListWidget = new QWidget(scrollAreaw);
-    wifiListWidget->resize(W_LIST_WIDGET, H_WIFI_ITEM_BIG_EXTEND);
-    scrollAreaw->setWidget(wifiListWidget);
-    scrollAreaw->move(W_LEFT_AREA, Y_SCROLL_AREA);
-
-    lbTopWifiList->move(X_MIDDLE_WORD, H_NORMAL_ITEM + H_GAP_UP);
-    btnAddNet->move(X_BTN_FUN, Y_BTN_FUN);
-    topWifiListWidget->resize(W_TOP_LIST_WIDGET, H_NORMAL_ITEM + H_GAP_UP + X_ITEM);
-
-    QList<OneConnForm *> wifiList = topWifiListWidget->findChildren<OneConnForm *>();
-    for (int i = 0; i < wifiList.size(); i ++) {
-        OneConnForm *ocf = wifiList.at(i);
-        if (ocf->isActive == true) {
-            ocf->setSelected(false, false);
-            ocf->setWifiName(tr("Not connected"), "--", "--", "--", isHuaWeiPC, isHuaWei9006C);//"当前未连接任何 Wifi"
-            ocf->setSignal("0", "--", "0", false);
-            ocf->setConnedString(1, tr("Disconnected"), "");//"未连接"
-            ocf->lbFreq->hide();
-            lbLoadDown->hide();
-            lbLoadUp->hide();
-            lbLoadDownImg->hide();
-            lbLoadUpImg->hide();
-            ocf->isConnected = false;
-            ocf->setTopItem(false);
-            disconnect(ocf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int)));
-        } else {
-            ocf->deleteLater();
-        }
-    }
-
-    btnWireless->setSwitchStatus(false);
-
-    this->lanListWidget->hide();
-    this->topLanListWidget->hide();
-    this->wifiListWidget->show();
-    this->topWifiListWidget->show();
-    this->scrollAreal->hide();
-    this->scrollAreaw->show();
-}
-
-void OldMainWindow::on_btnHotspotState()
-{
-    ui->lbHotImg->setStyleSheet("QLabel{background-image:url(:/res/x/hot-spot-off.svg);}");
-    ui->lbHotBG->setStyleSheet(btnOffQss);
-    is_hot_sopt_on = 0;
-}
-
-//执行wifi的重新连接
-void OldMainWindow::toReconnectWifi()
-{
-    if (ifCanReconnectWifiNow) {
-        if (isHuaWeiPC) {
-            qDebug() << "Execute reconnect wifi now, first get wifi list then reconnect";
-            current_wifi_list_state = RECONNECT_WIFI;
-            this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
-        }
-    } else {
-        qDebug() << "Execute reconnect wifi now or wlan already connected, stop to exec if another request launched";
-    }
-
-}
-
-//处理外界对网络的连接与断开
-void OldMainWindow::onExternalConnectionChange(QString type, bool isConnUp)
-{
-    isReconnectingWifi = false;
-
-    if ( (type == "802-11-wireless" || type == "wifi") && !isConnUp ){
-        QTimer::singleShot(2*1000, this, SLOT(onToResetValue() ));
-    }
-    if (type == "802-11-wireless" || type == "wifi") {
-        addNumberForWifi += 1;
-    }
-
-    if (addNumberForWifi == 2) {
-        //断开一个wifi的时候，如果存在回连，可能接连发出两个信号
-        //当连续发出wifi断开与连接的信号时，短时间内addNumberForWifi值为2
-        is_stop_check_net_state = 1;
-        if (is_connect_net_failed) {
-            qDebug()<<"debug: connect wifi failed just now, no need to refresh wifi interface";
-            is_connect_net_failed = 0;
-            is_stop_check_net_state = 0;
-        } else if (is_wifi_reconnected) {
-            qDebug()<<"debug: wifi reconnected just now, no need to refresh wifi interface";
-            is_wifi_reconnected = 0;
-            is_stop_check_net_state = 0;
-        }else {
-            QTimer::singleShot(2*1000, this, SLOT(onExternalWifiChange() ));
-        }
-        addNumberForWifi = 0;
-        return;
-    }
-
-    if ( (type == "802-11-wireless" || type == "wifi") && isConnUp ){
-        addNumberForWifi = 0;
-    }
-
-    QTimer::singleShot(4*1000, this, SLOT(onToSetTrayIcon() ));
-
-    if (type == "") {
-        is_stop_check_net_state = 0;
-        return;
-    }
-
-    if (isToSetLanValue) {
-        if (type == "802-3-ethernet" || type == "ethernet") {
-            isLanBeConnUp = true;
-            isLanBeConnUp = isConnUp;
-        }
-    }
-
-    if (isToSetWifiValue) {
-        if (type == "802-11-wireless" || type == "wifi") {
-            isWifiBeConnUp = true;
-            isWifiBeConnUp = isConnUp;
-        }
-    }
-
-    if (!is_connect_hide_wifi && !is_stop_check_net_state) {
-        is_stop_check_net_state = 1;
-        if (type == "802-3-ethernet" || type == "ethernet") {
-            if (is_connect_net_failed) {
-                qDebug()<<"debug: connect wired network failed, no need to refresh wired interface";
-                is_connect_net_failed = 0;
-                is_stop_check_net_state = 0;
-            } else {
-                isToSetLanValue = false;
-                QTimer::singleShot(2*1000, this, SLOT(onExternalLanChange() ));
-            }
-        }
-
-        if (type == "802-11-wireless" || type == "wifi") {
-            addNumberForWifi = 0;
-            if (is_connect_net_failed) {
-                qDebug()<<"debug: connect wifi failed just now, no need to refresh wifi interface";
-                is_connect_net_failed = 0;
-                is_stop_check_net_state = 0;
-            } else if (is_wifi_reconnected) {
-                qDebug()<<"debug: wifi reconnected just now, no need to refresh wifi interface";
-                is_wifi_reconnected = 0;
-                is_stop_check_net_state = 0;
-            }else {
-                isToSetWifiValue = false;
-                QTimer::singleShot(2*1000, this, SLOT(onExternalWifiChange() ));
-            }
-        }
-    }
-}
-
-void OldMainWindow::onExternalLanChange()
-{
-    emit this->actWiredConnectionChanged();
-    if (is_btnLanList_clicked) {
-        onBtnNetListClicked(0);
-    } else {
-        is_stop_check_net_state = 0;
-    }
-
-    isToSetLanValue = true;
-}
-
-void OldMainWindow::onExternalWifiChange()
-{
-//    if (!isWifiBeConnUp) {
-//        //QString txt(tr("WiFi already disconnect"));
-//        //objKyDBus->showDesktopNotify(txt);
-//    }
-//    if (isWifiBeConnUp) {
-//        //QString txt(tr("WiFi already connected external"));
-//        //objKyDBus->showDesktopNotify(txt);
-//    }
-    if (m_connected_by_self) {
-        is_stop_check_net_state = 0;
-        m_connected_by_self = false;
-        return;
-    }
-
-    if (is_btnWifiList_clicked) {
-         on_btnWifiList_clicked();
-    } else {
-        is_stop_check_net_state = 0;
-    }
-
-    isToSetWifiValue = true;
-}
-
-void OldMainWindow::onToSetTrayIcon()
-{
-    getActiveInfoAndSetTrayIcon();
-}
-
-void OldMainWindow::onToResetValue()
-{
-    addNumberForWifi = 0;
-}
-
-void OldMainWindow::onWifiSwitchChange()
-{
-    if (is_btnWifiList_clicked) {
-        //this->ksnm->execGetWifiList();
-        on_btnWifiList_clicked();
-    }
-}
-
-//处理外界对wifi开关的打开与关闭
-void OldMainWindow::onExternalWifiSwitchChange(bool wifiEnabled)
-{
-    if (!is_stop_check_net_state) {
-        is_stop_check_net_state = 1;
-        if (wifiEnabled) {
-            qDebug()<<"debug: external wifi switch turn on";
-            //syslog(LOG_DEBUG, "debug: external wifi switch turn on");
-            QTimer::singleShot(4*1000, this, SLOT(onWifiSwitchChange() ));
-            objKyDBus->setWifiSwitchState(true);
-        } else {
-            qDebug()<<"debug: external wifi switch turn off";
-            //syslog(LOG_DEBUG, "debug: external wifi switch turn off");
-            QTimer::singleShot(3*1000, this, SLOT(onWifiSwitchChange() ));
-            objKyDBus->setWifiSwitchState(false);//通知控制面板wifi开关已经关闭
-        }
-    }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-//循环处理部分，目前仅on_checkWifiListChanged 与on_setNetSpeed两个函数在运行
-
-void OldMainWindow::onRequestScanAccesspoint()
-{
-    if (isHuaWeiPC) {
-        numberForWifiScan += 1;
-        int numScanPerSecond0 = 0;
-        int numScanPerSecond1 = 0;
-        if (numberForWifiScan > 12) {
-            numScanPerSecond0 = (numberForWifiScan-12)/6; //获取除数
-            numScanPerSecond1 = (numberForWifiScan-12)%6; //获取余数
-        }
-
-        if (is_init_wifi_list || is_connect_hide_wifi) {
-            return; //遇到启动软件第一次加载wifi列表的时候，或正在连接隐藏wifi，停止更新
-        }
-
-        if (is_stop_check_net_state==0 && this->is_btnWifiList_clicked==1) {
-            if (this->isVisible()) {
-                this->toScanWifi(1);
-            } else {
-                switch (numberForWifiScan) {
-                case 1 :
-                    this->toScanWifi(0);
-                    break;
-                case 2:
-                    this->toScanWifi(0);
-                    break;
-                case 3:
-                    this->toScanWifi(0);
-                    break;
-                case 6:
-                    this->toScanWifi(0);
-                    break;
-                case 9:
-                    this->toScanWifi(0);
-                    break;
-                case 12:
-                    this->toScanWifi(0);
-                    break;
-                }
-
-                if ((numScanPerSecond0 != 0) && (numScanPerSecond1 == 0)) {
-                    this->toScanWifi(0);
-                }
-            } // end if(this->isVisible())
-        }
-
-        if (numberForWifiScan > 500) numberForWifiScan = 0;
-    } else {
-        if (is_init_wifi_list || is_connect_hide_wifi) {
-            return; //遇到启动软件第一次加载wifi列表的时候，或正在连接隐藏wifi，停止更新
-        }
-
-        if (is_stop_check_net_state==0 && this->is_btnWifiList_clicked==1 && this->isVisible()) {
-            BackThread *loop_bt = new BackThread();
-            IFace *loop_iface = loop_bt->execGetIface();
-
-            if (loop_iface->wstate != 2) {
-                current_wifi_list_state = UPDATE_WIFI_LIST;
-                this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC); //更新wifi列表
-            }
-
-            delete loop_iface;
-            loop_bt->deleteLater();
-        }
-    }
-}
-
-void OldMainWindow::toScanWifi(bool isShow)
-{
-    QtConcurrent::run([=](){
-        BackThread *loop_bt = new BackThread();
-        IFace *loop_iface = loop_bt->execGetIface();
-
-        if (loop_iface->wstate != 2) {
-            if (loop_iface->wstate == 0) {
-                if (isShow) {
-                    objKyDBus->requestScanWifi(); //要求后台扫描AP
-                }
-            }
-
-            if (loop_iface->wstate == 1) {
-                objKyDBus->requestScanWifi(); //要求后台扫描AP
-            }
-
-            sleep(2);
-            if (isShow) {
-                //只有在显示窗口时更新wifi列表
-                emit this->refreshWifiListAfterScan();
-            }
-        }
-
-        delete loop_iface;
-        loop_bt->deleteLater();
-    });
-}
-
-void OldMainWindow::onRefreshWifiListAfterScan()
-{
-    current_wifi_list_state = REFRESH_WIFI;
-    this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC); //更新wifi列表
-}
-
-void OldMainWindow::onRequestReconnecWifi()
-{
-    qDebug() << "Receive request reconnect wifi signal, then to reconnect wifi";
-    toReconnectWifi();
-}
-
-void OldMainWindow::on_setNetSpeeds(qulonglong rx, qulonglong tx)
-{
-    long int delta_rcv = rx/1024;
-    long int delta_tx = tx/1024;
-
-    //简易滤波
-    if (delta_rcv < 0 || delta_tx < 0) {
-        delta_rcv = 0;
-        delta_tx = 0;
-    }
-
-    int rcv_num = delta_rcv;
-    int tx_num = delta_tx;
-
-    QString str_rcv;
-    QString str_tx;
-
-    if (rcv_num < 1024) {
-        str_rcv = QString::number(rcv_num) + "KB/s.";
-    } else {
-        int remainder;
-        if (rcv_num%1024 < 100) {
-            remainder = 0;
-        } else {
-            remainder = (rcv_num%1024)/100;
-        }
-        str_rcv = QString::number(rcv_num/1024) + "."  + QString::number(remainder) + "MB/s.";
-    }
-
-    if (tx_num < 1024) {
-        str_tx = QString::number(tx_num) + "KB/s";
-    } else {
-        int remainder;
-        if (tx_num%1024 < 100) {
-            remainder = 0;
-        } else {
-            remainder = (tx_num%1024)/100;
-        }
-        str_tx = QString::number(tx_num/1024) + "."  + QString::number(remainder) + "MB/s";
-    }
-
-    lbLoadDown->setText(str_rcv);
-    lbLoadUp->setText(str_tx);
-
-    int offset = str_rcv.length() * 7;
-    lbLoadUp->move(X_ITEM + offset + 145, Y_TOP_ITEM + 32);
-    lbLoadUpImg->move(X_ITEM + offset + 128, Y_TOP_ITEM + 35);
-    return;
-}
-
-void OldMainWindow::on_setNetSpeed()
-{
-    if (this->isVisible() && is_stop_check_net_state==0) {
-        if (is_btnWifiList_clicked == 1) {
-            if ( objNetSpeed->getCurrentDownloadRates(objKyDBus->dbusWiFiCardName.toUtf8().data(), &start_rcv_rates, &start_tx_rates) == -1) {
-                start_rcv_rates = end_rcv_rates;
-            }
-        }
-        else if(is_btnLanList_clicked == 1) {
-            if ( objNetSpeed->getCurrentDownloadRates(currConnIfname.toUtf8().data(), &start_rcv_rates, &start_tx_rates) == -1) {
-                start_tx_rates = end_tx_rates;
-            }
-        }
-        long int delta_rcv = (start_rcv_rates - end_rcv_rates)/1024;
-        long int delta_tx = (start_tx_rates - end_tx_rates)/1024;
-
-        //简易滤波
-        if (delta_rcv < 0 || delta_tx < 0) {
-            delta_rcv = 0;
-            delta_tx = 0;
-        }
-        else if (end_rcv_rates == 0 || end_tx_rates == 0){
-            delta_rcv = 0;
-            delta_tx = 0;
-        }
-
-        end_rcv_rates = start_rcv_rates;
-        end_tx_rates = start_tx_rates;
-
-        int rcv_num = delta_rcv;
-        int tx_num = delta_tx;
-
-        QString str_rcv;
-        QString str_tx;
-
-        if (rcv_num < 1024) {
-            str_rcv = QString::number(rcv_num) + "KB/s.";
-        } else {
-            int remainder;
-            if (rcv_num%1024 < 100) {
-                remainder = 0;
-            } else {
-                remainder = (rcv_num%1024)/100;
-            }
-            str_rcv = QString::number(rcv_num/1024) + "."  + QString::number(remainder) + "MB/s.";
-        }
-
-        if (tx_num < 1024) {
-            str_tx = QString::number(tx_num) + "KB/s";
-        } else {
-            int remainder;
-            if (tx_num%1024 < 100) {
-                remainder = 0;
-            } else {
-                remainder = (tx_num%1024)/100;
-            }
-            str_tx = QString::number(tx_num/1024) + "."  + QString::number(remainder) + "MB/s";
-        }
-
-        lbLoadDown->setText(str_rcv);
-        lbLoadUp->setText(str_tx);
-
-        int offset = str_rcv.length() * 7;
-        lbLoadUp->move(X_ITEM + offset + 145, Y_TOP_ITEM + 32);
-        lbLoadUpImg->move(X_ITEM + offset + 128, Y_TOP_ITEM + 35);
-    }
-    else {
-        end_rcv_rates = 0;
-        end_tx_rates = 0;
-    }
-}
-
-void OldMainWindow::connLanDone(int connFlag)
-{
-    emit this->waitLanStop(); //停止加载动画
-
-    // Lan连接结果，0点击连接成功 1因网线未插入失败 2因mac地址匹配不上失败 3开机启动网络工具时已经连接
-    if (connFlag == 0) {
-        //syslog(LOG_DEBUG, "Wired net already connected by clicking button");
-        qDebug()<<"Wired net already connected by clicking button!";
-        //this->ksnm->execGetLanList();
-
-        QString txt(tr("Conn Ethernet Success"));
-        emit this->actWiredConnectionChanged();
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    if (connFlag == 1) {
-        //syslog(LOG_DEBUG, "without network line connect to computer.");
-        qDebug()<<"without network line connect to computer.!";
-
-        QString txt(tr("Without Lan Cable"));
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    if (connFlag == 2) {
-        qDebug()<<"Conn Ethernet Success";
-        //syslog(LOG_DEBUG, "Conn Ethernet Success");
-        this->ksnm->execGetLanList();
-        QString txt(tr("Conn Ethernet Success"));
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    if (connFlag == 3) {
-        qDebug()<<"Launch kylin-nm, wired network already connected";
-        //syslog(LOG_DEBUG, "Launch kylin-nm, wired network already connected");
-    }
-
-    if (connFlag == 4) {
-        qDebug()<<"IP configuration could not be reserved";
-        //syslog(LOG_DEBUG, "IP configuration could not be reserved");
-        is_connect_net_failed = 1;
-        QString txt(tr("IP configuration could not be reserved"));
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    if (connFlag == 5) {
-        //syslog(LOG_DEBUG, "The MACs of the device and the connection do not match.");
-        qDebug()<<"The MACs of the device and the connection do not match.";
-        is_connect_net_failed = 1;
-        QString txt(tr("MAC Address Mismatch"));
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    if (connFlag == 6) {
-        //syslog(LOG_DEBUG, "Connection Be Killed");
-        qDebug()<<"Connection Be Killed";
-        is_connect_net_failed = 1;
-        QString txt(tr("Connection Be Killed"));
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    if (connFlag == 7) {
-        qDebug()<<"Connect Bluetooth Network Failed";
-        //syslog(LOG_DEBUG, "Connect Bluetooth Network Failed");
-        is_connect_net_failed = 1;
-        QString txt(tr("Connect Bluetooth Network Failed"));
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    if (connFlag == 8) {
-        qDebug()<<"Carrier/link changed";
-        //syslog(LOG_DEBUG, "Carrier/link changed");
-        is_connect_net_failed = 1;
-        QString txt(tr("Carrier/link changed"));
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    if (connFlag == 9) {
-        qDebug()<<"Connect Wired Network Failed";
-        //syslog(LOG_DEBUG, "Connect Wired Network Failed");
-        is_connect_net_failed = 1;
-        QString txt(tr("Connect Wired Network Failed"));
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    if (connFlag == 10) {
-        qDebug()<<"Connect VPN Network Failed";
-        is_connect_net_failed = 1;
-        QString txt(tr("Connect VPN Network Failed"));
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    this->stopLoading();
-    this->is_stop_check_net_state = 0;
-}
-
-void OldMainWindow::connWifiDone(int connFlag)
-{
-    // Wifi连接结果，0点击连接成功 1失败 2没有配置文件 3开机启动网络工具时已经连接 4密码错误 5找不到已保存的网络
-    if (connFlag == 0) {
-        //syslog(LOG_DEBUG, "Wi-Fi already connected by clicking button");
-        qDebug()<<"Wi-Fi connected succeed. res=0";
-        if (!isHuaWeiPC) {
-            //如果不是华为电脑，使用获取连接信号的方式更新列表
-            this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
-        } else {
-            //如果是华为电脑，连接wifi后判断到portal网络弹出认证框
-            WifiAuthThread *wifi_auth_thread=new WifiAuthThread();
-            wifi_auth_thread->start();
-        }
-
-        QString txt(tr("Conn WLAN Success"));
-        objKyDBus->showDesktopNotify(txt);
-    } else if (connFlag == 1) {
-        //syslog(LOG_DEBUG, "Confirm your WLAN password or usable of wireless card");
-        qWarning()<<"Wi-Fi connected failed. res=1";
-        //is_stop_check_net_state = 0;
-        is_connect_net_failed = 1;
-        is_connect_hide_wifi = 0;
-        QString txt(tr("Confirm your WLAN password or usable of wireless card"));
-        objKyDBus->showDesktopNotify(txt);
-    } else if (connFlag == 3) {
-        //syslog(LOG_DEBUG, "Launch kylin-nm, Wi-Fi already connected");
-        qWarning()<<"Wi-Fi connected failed. res=3";
-    } else if (connFlag == 4) {
-        //syslog(LOG_DEBUG, "Confirm your WLAN password");
-        is_connect_net_failed = 1;
-        QString txt(tr("Confirm your WLAN password"));
-        qWarning()<<"Wi-Fi connected failed. res=4";
-        objKyDBus->showDesktopNotify(txt);
-    } else if (connFlag == 5) {
-        //syslog(LOG_DEBUG, "Selected WLAN has not been scanned.");
-        is_connect_net_failed = 1;
-        QString txt(tr("Selected WLAN has not been scanned."));
-        qWarning()<<"Wi-Fi connected failed. res=5";
-        objKyDBus->showDesktopNotify(txt);
-    } else if (connFlag == 6) {
-        //syslog(LOG_DEBUG, "Connect Hidden WLAN Success.");
-        this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
-        QString txt(tr("Connect Hidden WLAN Success"));
-        qWarning()<<"Connect Hidden WLAN Success. res=6";
-        objKyDBus->showDesktopNotify(txt);
-    }
-
-    this->stopLoading();
-    is_stop_check_net_state = 0;
-}
-
-void OldMainWindow::onRequestRefreshWifiList()
-{
-    this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
-}
-
-//重新绘制背景色
-void OldMainWindow::paintEvent(QPaintEvent *event)
-{
-    double trans = objKyDBus->getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
-
-bool OldMainWindow::event(QEvent *event)
+/**
+ * @brief MainWindow::eventFilter 事件过滤器
+ * @param watched
+ * @param event
+ * @return
+ */
+bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 {
     if (event->type() == QEvent::ActivationChange) {
-        if (QApplication::activeWindow() != this) {
-            this->m_is_inputting_wifi_password = false;
-            this->hide();
-            numberForWifiScan = 0;
+        if(QApplication::activeWindow() != this) {
+            hideMainwindow();
         }
     }
-
-    return QMainWindow::event(event);
+    return QMainWindow::eventFilter(watched,event);
 }
 
-///////////////////////////////////////////////////////////////////////////////
-QPixmap OldMainWindow::drawSymbolicColoredPixmap(const QPixmap &source)
+/**
+ * @brief MainWindow::getWirelessList 获取wifi列表，供dbus调用
+ * @param map
+ */
+void MainWindow::getWirelessList(QMap<QString, QVector<QStringList> > &map)
 {
-    QColor gray(128,128,128);
-    QColor standard (31,32,34);
-    QImage img = source.toImage();
-    for (int x = 0; x < img.width(); x++) {
-        for (int y = 0; y < img.height(); y++) {
-            auto color = img.pixelColor(x, y);
-            if (color.alpha() > 0) {
-                if (qAbs(color.red()-gray.red())<20 && qAbs(color.green()-gray.green())<20 && qAbs(color.blue()-gray.blue())<20) {
-                    color.setRed(255);
-                    color.setGreen(255);
-                    color.setBlue(255);
-                    img.setPixelColor(x, y, color);
-                } else if(qAbs(color.red()-standard.red())<20 && qAbs(color.green()-standard.green())<20 && qAbs(color.blue()-standard.blue())<20) {
-                    color.setRed(255);
-                    color.setGreen(255);
-                    color.setBlue(255);
-                    img.setPixelColor(x, y, color);
-                } else {
-                    img.setPixelColor(x, y, color);
-                }
-            }
-        }
-    }
-    return QPixmap::fromImage(img);
-}
-
-QPixmap OldMainWindow::drawSymbolicBlackColoredPixmap(const QPixmap &source)
-{
-    QImage img = source.toImage();
-    for (int x = 0; x < img.width(); x++) {
-        for (int y = 0; y < img.height(); y++) {
-            auto color = img.pixelColor(x, y);
-            if (color.alpha() > 0) {
-                if (qAbs(color.red())>=200 && qAbs(color.green())>=200 && qAbs(color.blue())>=200) {
-                    color.setRed(56);
-                    color.setGreen(56);
-                    color.setBlue(56);
-                    img.setPixelColor(x, y, color);
-                }
-            }
-        }
-    }
-    return QPixmap::fromImage(img);
-}
-
-const QPixmap OldMainWindow::loadSvg(const QString &fileName, const int size)
-{
-    QPixmap pixmap(size, size);
-    QSvgRenderer renderer(fileName);
-    pixmap.fill(Qt::transparent);
-
-    QPainter painter;
-    painter.begin(&pixmap);
-    renderer.render(&painter);
-    painter.end();
-
-    return pixmap;
-}
-
-void OldMainWindow::getSystemFontFamily()
-{
-    qDebug()<<"Init Font Gsettings...";
-    const QByteArray id("org.ukui.style");
-    QGSettings * fontSetting = new QGSettings(id, QByteArray(), this);
-    connect(fontSetting, &QGSettings::changed,[=](QString key) {
-        if ("systemFont" == key || "systemFontSize" ==key) {
-            QFont font = this->font();
-            int width = font.pointSize();
-            for (auto widget : qApp->allWidgets()) {
-                widget->setFont(font);
-            }
-        }
-    });
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//解决双屏幕问题用到的dbus方法
-void OldMainWindow::PrimaryManager()
-{
-    qDebug()<<"Init primary settings...";
-    //QDBusConnection conn = QDBusConnection::sessionBus();
-    mDbusXrandInter = new QDBusInterface(DBUS_NAME,
-                                         DBUS_PATH,
-                                         DBUS_INTERFACE,
-                                         QDBusConnection::sessionBus());
-
-    isHuaWeiPC = false;
-    isHuaWei9006C = false;
-    QDBusMessage message = QDBusMessage::createMethodCall(DBUS_NAME,
-                               DBUS_PATH,
-                               DBUS_INTERFACE,
-                               "height");
-    QDBusMessage response = QDBusConnection::sessionBus().call(message);
-    if (response.type() == QDBusMessage::ReplyMessage) {
-        isHuaWeiPC = true;
-
-        //继续判断是990或者9006c
-        QProcess * processCpuinfo = new QProcess(this);
-        processCpuinfo->start(QString("cat /proc/cpuinfo"));
-        connect(processCpuinfo, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), this, [ = ]() {
-            processCpuinfo->deleteLater();
-        });
-        connect(processCpuinfo, &QProcess::readyReadStandardOutput, this, [ = ]() {
-            QString ctrCpuinfo = processCpuinfo->readAllStandardOutput();
-            if (ctrCpuinfo.indexOf("HUAWEI Kirin 9006C") != -1) {
-                isHuaWei9006C = true;
-            }
-        });
-        processCpuinfo->waitForFinished();
-    }
-
-    connect(mDbusXrandInter, SIGNAL(screenPrimaryChanged(int,int,int,int)),
-            this, SLOT(priScreenChanged(int,int,int,int)));
-}
-
-void OldMainWindow::toStart()
-{
-    qDebug()<<"Init geometry...";
-    m_priX = getScreenGeometry("x");
-    m_priY = getScreenGeometry("y");
-    m_priWid = getScreenGeometry("width");
-    m_priHei = getScreenGeometry("height");
-    if (m_priWid == 0 || m_priHei == 0) {
-        QRect rect = QApplication::desktop()->screenGeometry(0);
-        m_priX=rect.x();
-        m_priY=rect.y();
-        m_priWid=rect.width();
-        m_priHei=rect.height();
-    }
-
-    //qDebug("Start: Primary screen geometry is x=%d, y=%d, windth=%d, height=%d", m_priX, m_priY, m_priWid, m_priHei);
-}
-
-int OldMainWindow::getScreenGeometry(QString methodName)
-{
-    int res = 0;
-    QDBusMessage message = QDBusMessage::createMethodCall(DBUS_NAME,
-                               DBUS_PATH,
-                               DBUS_INTERFACE,
-                               methodName);
-    QDBusMessage response = QDBusConnection::sessionBus().call(message);
-    if (response.type() == QDBusMessage::ReplyMessage)
-    {
-        if(response.arguments().isEmpty() == false) {
-            int value = response.arguments().takeFirst().toInt();
-            res = value;
-            qDebug() << value;
-        }
-    } else {
-        qDebug()<< "to get message about "<< methodName<<" of screen failed";
-        //syslog(LOG_DEBUG, "to get message about %s of screen failed", methodName.toUtf8().data());
-    }
-    return res;
-}
-
-void OldMainWindow::requestRefreshWifiList()
-{
-    if (isHuaWeiPC) {
-        QtConcurrent::run([=](){
-            qDebug()<<"Received signal to refresh wifi from ukcc, current_wifi_list_state="<<current_wifi_list_state;
-            objKyDBus->requestScanWifi(); //要求后台扫描AP
-            sleep(2);
-            emit refreshWifiListAfterScan();
-        });
-    } else {
-        current_wifi_list_state = REFRESH_WIFI;
-        qDebug()<<"Received signal to refresh wifi from ukcc, current_wifi_list_state="<<current_wifi_list_state;
-        this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
+    map.clear();
+    if (nullptr != m_wlanWidget) {
+        m_wlanWidget->getWirelessList(map);
     }
 }
 
-/* get primary screen changed */
-void OldMainWindow::priScreenChanged(int x, int y, int width, int height)
+/**
+ * @brief MainWindow::getWiredList 获取lan列表，供dbus调用
+ * @param map
+ */
+void MainWindow::getWiredList(QMap<QString, QVector<QStringList>> &map)
 {
-    m_priX = x;
-    m_priY = y;
-    m_priWid = width;
-    m_priHei = height;
-    qDebug("primary screen  changed, geometry is  x=%d, y=%d, windth=%d, height=%d", x, y, width, height);
-    //syslog(LOG_DEBUG, "primary screen  changed, geometry is  x=%d, y=%d, windth=%d, height=%d", x, y, width, height);
-}
-
-// 通过kds的dbus发现rfkill状态变化
-void OldMainWindow::onRfkillStatusChanged()
-{
-    if (canExecHandleWifiSwitchChange) {
-        canExecHandleWifiSwitchChange = false;
-        qDebug() << "收到信号了，开始处理wifi开关的处理问题";
-        if (isHuaWeiPC) {
-            QDBusReply<int> reply = kdsDbus->call("getCurrentWlanMode");
-            if (reply.isValid()){
-                int current = reply.value();
-
-                if (current == -1){
-                    qWarning("Error Occur When Get Current WlanMode");
-                    //syslog(LOG_DEBUG, "Error Occur When Get Current WlanMode");
-                    return;
-                }
-                if (!current) {
-                    is_stop_check_net_state = 1;
-                    lbTopWifiList->hide();
-                    btnAddNet->hide();
-                    objKyDBus->setWifiSwitchState(false);
-
-                    QThread *rfkill_t = new QThread();
-                    BackThread *rfkill_bt = new BackThread();
-                    rfkill_bt->moveToThread(rfkill_t);
-                    btnWireless->setSwitchStatus(true);
-                    connect(rfkill_t, SIGNAL(finished()), rfkill_t, SLOT(deleteLater()));
-                    connect(rfkill_t, SIGNAL(started()), rfkill_bt, SLOT(rfkillExecDisWifi()));
-                    connect(rfkill_bt, SIGNAL(disWifiDoneByRfkill()), this, SLOT(rfkillDisableWifiDone()));
-                    connect(rfkill_bt, SIGNAL(btFinishByRfkill()), rfkill_t, SLOT(quit()));
-                    rfkill_t->start();
-                    this->startLoading();
-                } else {
-                    if (is_fly_mode_on == 0) {
-                        on_btnWifiList_clicked();
-                        is_stop_check_net_state = 1;
-                        isRadioWifiTurningOn = true;
-                        objKyDBus->setWifiCardState(true);
-                        objKyDBus->setWifiSwitchState(true);
-
-                        QThread *rfkill_t = new QThread();
-                        BackThread *rfkill_bt = new BackThread();
-                        rfkill_bt->moveToThread(rfkill_t);
-                        btnWireless->setSwitchStatus(true);
-                        connect(rfkill_t, SIGNAL(finished()), rfkill_t, SLOT(deleteLater()));
-                        connect(rfkill_t, SIGNAL(started()), rfkill_bt, SLOT(rfKillexecEnWifi()));
-                        connect(rfkill_bt, SIGNAL(enWifiDoneByRfkill()), this, SLOT(rfkillEnableWifiDone()));
-                        connect(rfkill_bt, SIGNAL(btFinishByRfkill()), rfkill_t, SLOT(quit()));
-                        rfkill_t->start();
-                        this->startLoading();
-                    }
-                }
-            }
-        }
+    map.clear();
+    if (nullptr != m_lanWidget) {
+        m_lanWidget->getWiredList(map);
     }
 }
 
-//wifi开关关闭
-void OldMainWindow::rfkillDisableWifiDone()
+/**
+ * @brief MainWindow::activeWirelessAp 开启热点，供dbus调用
+ * @param apName
+ * @param apPassword
+ * @param apDevice
+ */
+void MainWindow::activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice)
 {
-    canExecHandleWifiSwitchChange = true;
-    if (is_btnWifiList_clicked)
-        disWifiDoneChangeUI();
-
-    qDebug()<<"debug: already turn off the switch of wifi network detected by kds policy";
-    //syslog(LOG_DEBUG, "Already turn off the switch of wifi network detected by kds policy");
-
-    this->stopLoading();
-    is_stop_check_net_state = 0;
+    m_wlanWidget->activeWirelessAp(apName, apPassword, apDevice);
 }
 
-//wifi开关打开
-void OldMainWindow::rfkillEnableWifiDone()
+/**
+ * @brief MainWindow::activeWirelessAp 断开热点，供dbus调用
+ * @param apName
+ */
+void MainWindow::deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice)
 {
-    canExecHandleWifiSwitchChange = true;
-    if (is_btnWifiList_clicked) {
-        QtConcurrent::run([=]() {
-            qDebug()<<"Already turn on the switch of wifi network detected by kds policy";
-            usleep(1600*1000);
-            objKyDBus->requestScanWifi(); //要求后台扫描AP
-            isReConnAfterTurnOnWifi = true;
-            qDebug() << "Scan finished after truning wifi switch on, ready to reconnect wifi";
-            usleep(1600*1000);
-            emit this->requestReconnecWifi();
-
-            //emit loadWifiListAfterScan();
-            isRadioWifiTurningOn = false;
-        });
-    } else {
-        current_wifi_list_state = LOAD_WIFI_LIST;
-        //on_btnWifiList_clicked();
-        isRadioWifiTurningOn = false;
-    }
+    m_wlanWidget->deactiveWirelessAp(apName, apPassword, apDevice);
 }
 
-void OldMainWindow::showPb(QString type, QString name)
+/**
+ * @brief MainWindow::activeWirelessAp 获取热点，供dbus调用
+ * @param list
+ */
+void MainWindow::getStoredApInfo(QStringList &list)
 {
-    bShowPb = false;
-    if (type != "wifi") {
-        onBtnNetListClicked(1);
-    }
-    else {
-        on_btnWifiList_clicked();
-    }
-    emit showPbSignal(QSystemTrayIcon::Trigger);
-    if (name.isEmpty() || name == "") return;
-    qDebug()<<"A "<<type<<" named "<<name<<" clicked! mainwindow.cpp ShowPb(QString,QString):void";
-    if (type == "wifi") {
-        QtConcurrent::run([=]() {
-            int runtime = 0;
-            //等待扫描完成
-            while(!bShowPb)
-            {
-                usleep(500*1000);
-                runtime++;
-                if(runtime > 10)
-                    break;
-            }
-            qDebug()<<__FUNCTION__<<__LINE__<<runtime;
-            emit this->wifiClicked(name);
-        });
-    } else {
-        emit this->lanClicked(name);
-    }
+    m_wlanWidget->getStoredApInfo(list);
+}
+
+
+void MainWindow::setWiredDeviceEnable(const QString& devName, bool enable)
+{
+    m_lanWidget->setWiredDeviceEnable(devName, enable);
+}
+void MainWindow::showPropertyWidget(QString devName, QString ssid)
+{
+    KyNetworkDeviceResourse *devResourse = new KyNetworkDeviceResourse();
+    QStringList wiredDeviceList;
+    wiredDeviceList.clear();
+    devResourse->getNetworkDeviceList(NetworkManager::Device::Type::Ethernet, wiredDeviceList);
+    if (wiredDeviceList.contains(devName)) {
+      qDebug() <<   "showPropertyWidget device type wired device name " << devName << " uuid " << ssid;
+      m_lanWidget->showDetailPage(devName, ssid);
+      delete devResourse;
+      devResourse = nullptr;
+      return;
+    }
+
+    QStringList wirelessDeviceList;
+    wirelessDeviceList.clear();
+    devResourse->getNetworkDeviceList(NetworkManager::Device::Type::Wifi, wirelessDeviceList);
+    if (wirelessDeviceList.contains(devName)) {
+      qDebug() <<   "showPropertyWidget device type wireless device name " << devName << " ssid " << ssid;
+      m_wlanWidget->showDetailPage(devName, ssid);
+      delete devResourse;
+      devResourse = nullptr;
+      return;
+    }
+
+    qWarning() <<   "showPropertyWidget no such device " << devName;
+    delete devResourse;
+    devResourse = nullptr;
+}
+
+void MainWindow::showCreateWiredConnectWidget(const QString devName)
+{
+    qDebug() << "showCreateWiredConnectWidget! devName = " << devName;
+    NetDetail *netDetail = new NetDetail(devName, "", "", false, false, true, this);
+    netDetail->show();
+}
+
+//有线连接断开
+void MainWindow::activateWired(const QString& devName, const QString& connUuid)
+{
+    m_lanWidget->activateWired(devName, connUuid);
+}
+void MainWindow::deactivateWired(const QString& devName, const QString& connUuid)
+{
+    m_lanWidget->deactivateWired(devName, connUuid);
+}
+
+//无线连接断开
+void MainWindow::activateWireless(const QString& devName, const QString& ssid)
+{
+    m_wlanWidget->activateWireless(devName, ssid);
+}
+
+void MainWindow::deactivateWireless(const QString& devName, const QString& ssid)
+{
+    m_wlanWidget->deactivateWireless(devName, ssid);
 }
diff --git a/src/frontend/mainwindow.h b/src/frontend/mainwindow.h
index efcabf73..065a7db0 100644
--- a/src/frontend/mainwindow.h
+++ b/src/frontend/mainwindow.h
@@ -1,458 +1,125 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "ksimplenm.h"
-#include "loadingdiv.h"
-#include "confform.h"
-#include "kylin-dbus-interface.h"
-#include "kylin-network-interface.h"
-#include "utils.h"
-#include "switchbutton.h"
-#include "backend/dbus-interface/kylinnetworkresourcemanager.h"
-#include "kylinwiredwidget.h"
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <xcb/xcb.h>
-
 #include <QMainWindow>
-#include <QWidget>
-#include <QLabel>
+#include <QTableWidget>
+#include <QGSettings/QGSettings>
+#include <QTimer>
 #include <QSystemTrayIcon>
-#include <QDesktopWidget>
-#include <QScrollBar>
-#include <QScrollArea>
-#include <QPushButton>
-#include <QScreen>
 #include <QMenu>
 #include <QAction>
-#include <QAction>
-#include <QHBoxLayout>
-#include <QPainter>
-#include <QPainterPath>
-#include <QDebug>
-#include <QString>
-#include <QTimer>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusObjectPath>
-#include <QDBusObjectPath>
-#include <QVariant>
-#include <QStandardPaths>
-#include <QStringList>
-#include <QToolTip>
-#include <QSvgRenderer>
-//#include <kysec/libkysec.h>
-//#include <kysec/status.h>
-//#include <QMessageBox>
+#include <QDBusInterface>
+#include "lanpage.h"
+#include "wlanpage.h"
+#include "netdetails/netdetail.h"
 
-#define W_LEFT_AREA 41
-#define W_VERTICAL_LINE 1 //左边竖线宽度
-#define W_RIGHT_AREA 438 //41 + 1 + 438 = 480
-#define L_VERTICAL_LINE_TO_ITEM 4 //竖线到item左侧的距离
+class LanPage;
 
-#define X_LEFT_WIFI_BALL 416 //白色小球在左边
-#define X_RIGHT_WIFI_BALL 440 //白色小球在右边
-#define Y_WIFI_BALL 23 //白色小球y坐标
-#define X_ITEM 46 //item到窗口左侧的距离 41 + 1 + 4 = 46
-#define W_ITEM 424
-
-#define Y_TOP_ITEM 57 //顶部item、topLanListWidget、topWifiListWidget的y坐标
-#define H_NORMAL_ITEM 60 //一个没有扩展的，普通item的高度
-#define H_GAP_UP 10 //H_NORMAL_ITEM 与 H_MIDDLE_WORD之间的间距
-#define H_MIDDLE_WORD 46 //"显示‘可用网络列表’的label"
-#define H_GAP_DOWN 5 //57 + 60 + 10 + 46 + 5 = 178
-#define X_MIDDLE_WORD 19
-#define W_MIDDLE_WORD 260
-
-#define H_LAN_ITEM_EXTEND 102 //162 - 60
-#define H_WIFI_ITEM_BIG_EXTEND 78 //138 - 60
-#define H_WIFI_ITEM_SMALL_EXTEND 46 //106 - 60
-
-#define Y_SCROLL_AREA 178
-#define W_SCROLL_AREA 450
-#define H_SCROLL_AREA 360
-
-#define W_TOP_LIST_WIDGET 435
-#define W_LIST_WIDGET 440
-
-#define W_BTN_FUN 59
-#define H_BTN_FUN 14
-#define X_BTN_FUN 360
-#define Y_BTN_FUN 87 //新建网络，加入网络按钮的宽高、x坐标、y坐标
-
-#define W_NO_ITEM_TIP 240
-#define H_NO_ITEM_TIP 24
-
-#define DBUS_NAME       "org.ukui.SettingsDaemon"
-#define DBUS_PATH       "/org/ukui/SettingsDaemon/wayland"
-#define DBUS_INTERFACE  "org.ukui.SettingsDaemon.wayland"
-
-#define LOAD_WIFI_LIST 0
-#define UPDATE_WIFI_LIST 1
-#define RECONNECT_WIFI 2
-#define REFRESH_WIFI 3
-
-class OneConnForm;
-class ConfForm;
-class KyWiredWidget;
-
-namespace Ui {
-class MainWindow;
-}
-
-class OldMainWindow : public QMainWindow
+class MainWindow : public QMainWindow
 {
     Q_OBJECT
-
 public:
-    explicit OldMainWindow(QWidget *parent = 0);
-    ~OldMainWindow();
+    explicit MainWindow(QWidget *parent = nullptr);
+    void showMainwindow();
+    void hideMainwindow();
 
-    void justShowTrayIcon();
+    void setWiredDefaultDevice(QString deviceName);
+    void setWirelessDefaultDevice(QString deviceName);
 
-    void editQssString();
-    void createTopLanUI();
-    void createTopWifiUI();
-    void createOtherUI();
-    void createListAreaUI();
-    void createLeftAreaUI();
+    //for dbus
+    void getWirelessList(QMap<QString, QVector<QStringList> > &map);
+    void getWiredList(QMap<QString, QVector<QStringList>> &map);
+    //开启热点
+    void activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice);
+    //断开热点
+    void deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice);
+    //获取热点
+    void getStoredApInfo(QStringList &list);
+    //有线连接断开
+    void activateWired(const QString& devName, const QString& connUuid);
+    void deactivateWired(const QString& devName, const QString& connUuid);
+    //无线连接断开
+    void activateWireless(const QString& devName, const QString& ssid);
+    void deactivateWireless(const QString& devName, const QString& ssid);
 
-    void startLoading();
-    void stopLoading();
-
-    void setTrayIcon(QIcon icon);
-    void setTrayIconOfWifi(int);
-    void setTrayLoading(bool isLoading);
-    void getActiveInfoAndSetTrayIcon();
-
-    void initTimer();
-    void checkIsWirelessDevicePluggedIn();
-
-    void initActNetDNS();
-    void PrimaryManager();
-    void toStart();
-    int  getScreenGeometry(QString methodName);
-    void showPb(QString type, QString name);
-
-    QIcon iconLanOnline, iconLanOffline;
-    QIcon iconWifiFull, iconWifiHigh, iconWifiMedium, iconWifiLow;
-    QIcon iconConnecting;
-    QList<QIcon> loadIcons;
-    QString mwBandWidth;
-    KylinDBus *objKyDBus = nullptr;
-    NetworkSpeed *objNetSpeed = nullptr;
-    SwitchButton *btnWireless = nullptr;
-    SwitchButton *btnWired = nullptr;
-    KyNetworkResourceManager *m_networkResourceInstance = nullptr;
-    //状态设置,0为假，1为真
-    int current_wifi_list_state = LOAD_WIFI_LIST;
-    int is_init_wifi_list = 0; //是否在启动软件时正在获取wifi的列表
-    int is_btnLanList_clicked = 1; //是否处于有线网界面
-    int is_btnWifiList_clicked = 0; //是否处于无线网界面
-    int is_wireless_adapter_ready = 1; //主机是否插入无线网卡
-    int is_keep_wifi_turn_on_state = 1; //是否要执行wifi开关变为打开样式
-    int is_stop_check_net_state = 0; //是否要在进行其他操作时停止检查网络状态
-    int is_connect_net_failed = 0; //刚才是否连接网络失败
-    int is_wifi_reconnected = 0;//刚才是否主动重连wifi导致wifi断开
-    int is_fly_mode_on = 0; //是否已经打开飞行模式
-    int is_hot_sopt_on = 0; //是否已经打开热点
-    int is_connect_hide_wifi = 0; //是否正在连接隐藏wifi
-    int currSelNetNum = 0; //当前选中的item序号
-    bool isLanBeConnUp = false; //lan是否连接上
-    bool isWifiBeConnUp = false; //wifi是否是连接上
-    bool isToSetLanValue = true; //本次执行是否进行赋值
-    bool isToSetWifiValue = true; //本次执行是否进行赋值
-    bool isReconnectingWifi = false; //是否正在执行wifi的回连
-    bool isReconnectingLan = false; //是否正在执行lan的回连
-    bool m_is_inputting_wifi_password = false; //是否正在输入密码
-    int addNumberForWifi = 0; //短时间内收到关于wifi连接信号的次数
-    bool isHuaWeiPC;
-    bool isHuaWei9006C;
-    bool isHandlingWiredCableOn = false;
-    bool ifCanReconnectWifiNow = true;
-    bool isReConnAfterTurnOnWifi = false;//是否是在打开wifi的开关后回连wifi
-    bool isRadioWifiTurningOn = false; //是否正在打开wifi开关
-    bool bShowPb = false; //是否可以showPb
-    bool canExecHandleWifiSwitchChange = true;
-    QVector<QStringList> dbus_wifiList; //其他组件通过dbus接口获取到的wifi列表,第一个元素一定为已连接wifi，若没有已连接wifi则显示为--
-    void requestRefreshWifiList(); //申请刷新wifi列表
-
-    QString currSelNetName = ""; //当前ScrollArea中选中的网络名称
-    QStringList canReconnectWifiList; //当前可以回连的wifi列表
-    QString currConnIfname = ""; //当前连接的有线网对应网卡名称，只有一个有线网连接的情况
-    QString oldWifiIpv4Method = ""; //原来的wifi的ipv4地址获取方式,自动还是手动
-    int numberForWifiScan; //该值控制wifi的扫描
-
-    int m_priX;
-    int m_priY;
-    int m_priWid;
-    int m_priHei;
-
-    QStringList m_wifi_list_pwd_changed; //WiFi密码以改变的WiFi列表（990/9a0自动回连失败）
-    KyNetworkDeviceResourse m_networkDevice;
+    void setWiredDeviceEnable(const QString& devName, bool enable);
 
+    //唤起属性页 根据网卡类型 参数2 为ssid/uuid
+    void showPropertyWidget(QString devName, QString ssid);
+    //唤起新建有线连接界面
+    void showCreateWiredConnectWidget(const QString devName);
 
+signals:
+    //设备插拔
+    void deviceStatusChanged();
+    //设备名称变化
+    void deviceNameChanged(QString oldName, QString newName);
+    //有线无线列表更新（有线增删、无线增加减少）
+    void lanAdd(QString devName, QStringList info);
+    void lanRemove(QString dbusPath);
+    void lanUpdate(QString devName, QStringList info);
+    void wlanAdd(QString devName, QStringList info);
+    void wlanRemove(QString devName,QString ssid);
+    void wlanactiveConnectionStateChanged(QString devName, QString ssid, int status);
+    void lanActiveConnectionStateChanged(QString devName, QString uuid, int status);
+    void activateFailed(QString errorMessage);
+    void deactivateFailed(QString errorMessage);
+    //热点断开
+    void hotspotDeactivated(QString devName, QString ssid);
+    void hotspotActivated(QString devName, QString ssid);
+    //信号强度变化
+    void signalStrengthChange(QString devName, QString ssid, int strength);
+    //安全性变化
+    void secuTypeChange(QString devName, QString ssid, QString secuType);
+    void mainWindowVisibleChanged(const bool &visible);
 public slots:
-    void onPhysicalCarrierChanged(bool flag);
-    void onCarrierUpHandle();
-    void onCarrierDownHandle();
-    void onDeleteLan();
-    void onNetworkDeviceAdded(QDBusObjectPath objPath);
-    void onNetworkDeviceRemoved(QDBusObjectPath objPath);
-    void getLanBandWidth();
-    void checkIfWiredNetExist();
-
-    void onExternalConnectionChange(QString type, bool isConnUp);
-    void onExternalLanChange();
-    void onExternalWifiChange();
-    void onToSetTrayIcon();
-    void onToResetValue();
-    void onWifiSwitchChange();
-    void onExternalWifiSwitchChange(bool wifiEnabled);
-
-    void oneLanFormSelected(QString lanName, QString uniqueName);
-    void oneTopLanFormSelected(QString lanName, QString uniqueName);
-    void oneWifiFormSelected(QString wifibssid, int extendLength);
-    void oneTopWifiFormSelected(QString wifibssid, int extendLength);
-
-    void on_btnHotspot_clicked();
-    void on_btnHotspotState();
-    void on_btnWifiList_clicked();
-    void on_wifi_changed();
-
-    void connWifiDone(int connFlag);
-    void onRequestRefreshWifiList();
-    void onRefreshWifiListAfterScan();
-    void onLoadWifiListAfterScan();
-    void onRequestReconnecWifi();
-
-    //flag =0或1为普通点击、2为收到打开信息、3为收到关闭信息、4为无线网卡插入、5为无线网卡拔出
-    void onBtnWifiClicked(int flag = 0);
-    //falg=0 UI点击，1收到打开信息，2收到关闭信息，3有线设备插入，4有线设备拔出
-    void onBtnLanClicked(int flag = 0);
-    void setLanSwitchStatus(bool is_opened);
-
-    void on_showWindowAction();
-
-    void checkIfConnectedWifiExist();
-
-    void toReconnectWifi();
-
-    void rfkillDisableWifiDone();
-    void rfkillEnableWifiDone();
 
 protected:
-    bool eventFilter(QObject *obj, QEvent *event);
-    void paintEvent(QPaintEvent *event);
-    bool event(QEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
 private:
     void firstlyStart(); //一级启动
     void secondaryStart(); //二级启动
-    bool m_load_finished = false; //是否二级启动已执行完
-    QTimer * m_secondary_start_timer = nullptr; //执行二级启动的倒计时
-    void checkSingleAndShowTrayicon();
-    void initNetwork();
-    void createTrayIcon();
-    void handleIconClicked();
-    void showTrayIconMenu();
-    bool checkLanOn();
-    bool checkWlOn();
-    void getLanList();
-    void getWifiList();
-    void initLanSlistAndGetReconnectNetList();
-    QPixmap drawSymbolicColoredPixmap(const QPixmap &source);
-    QPixmap drawSymbolicBlackColoredPixmap(const QPixmap &source);
-    const QPixmap loadSvg(const QString &fileName, const int size);
-    void getSystemFontFamily();
+    bool m_loadFinished = false; //是否二级启动已执行完
+    QTimer * m_secondaryStartTimer = nullptr; //执行二级启动的倒计时
+    void initWindowProperties();
+    void initUI();
+    void initDbusConnnect();
+    void initTrayIcon();
+    void resetTrayIconTool();
+    void initWindowTheme();
+    void resetWindowTheme();
+    void showControlCenter();
 
-    Ui::MainWindow *ui;
+    //主窗口的主要构成控件
+    QTabWidget * m_centralWidget = nullptr;
+    QHBoxLayout * m_tabBarLayout = nullptr;
+    QLabel * m_lanLabel = nullptr;
+    QLabel * m_wlanLabel = nullptr;
 
-    LoadingDiv *loading = nullptr;
+    LanPage * m_lanWidget = nullptr;
+    WlanPage * m_wlanWidget = nullptr;
 
-    QDesktopWidget desktop;
-    KSimpleNM *ksnm = nullptr;
-    ConfForm *confForm = nullptr;
-    KyWiredWidget *topLanListWidget = nullptr;
-    QWidget *topWifiListWidget = nullptr;
-    KyWiredWidget *lanListWidget = nullptr;
-    QWidget *wifiListWidget = nullptr;
-    QWidget *optWifiWidget = nullptr;
+    //监听主题的Gsettings
+    QGSettings * m_styleGsettings = nullptr;
 
-    QLabel *lbLoadDown = nullptr;
-    QLabel *lbLoadDownImg = nullptr;
-    QLabel *lbLoadUp = nullptr;
-    QLabel *lbLoadUpImg = nullptr;
+    //获取和重置窗口位置
+    void resetWindowPosition();
+    QDBusInterface * m_positionInterface = nullptr;
 
-    QLabel *lbNoItemTip = nullptr;
-    bool ifLanConnected;
-    bool ifWLanConnected;
-
-    QScrollArea *scrollAreal = nullptr;
-    QScrollArea *scrollAreaw = nullptr;
-    QLabel *lbTopLanList = nullptr;
-    QLabel *lbTopWifiList = nullptr;
-    QLabel *lbLanList = nullptr;
-    QLabel *lbWifiList = nullptr;
-    QPushButton *btnAddNet = nullptr;
-    QPushButton *btnCreateNet = nullptr;
-
-    QSystemTrayIcon *trayIcon = nullptr;
-    QMenu *trayIconMenu = nullptr;
-    QAction *mShowWindow = nullptr;
-    QAction *mAdvConf = nullptr;
-    QWidget *widShowWindow = nullptr;
-    QWidget *widAdvConf = nullptr;
-
-    QString lcardname, wcardname; // 以太网卡和无线网卡名称
-
-    QString btnOffQss, btnOnQss, btnBgOffQss, btnBgOnQss, btnBgHoverQss, btnBgLeaveQss; // 主界面按钮底色
-    QString scrollBarQss, leftBtnQss, funcBtnQss;
-
-    QStringList oldLanSlist; //上一次获取Lan列表
-    QStringList oldWifiSlist; //上一次获取wifi列表
-    QStringList oldConnSlist; //上一次获取的以保存网络列表
-    bool isInitConnList = true;
-    bool isAddedWifi = false;
-    bool m_isWifiConnected = false; //专用于处理dbus获取的WiFi状态，用于对比每次刷新后的WiFi连接状态变化
-    QString lastAddedConn = "";
-    QString oldActLanName = ""; //上一次获取的已连接有线网名称
-    QString actLanUuid = ""; //当前连接的有线网uuid
-    QString actLanIpv4Method = ""; //当前连接的有线网的ip获取方式
-    int oldDbusActLanDNS = 0; //上一次获取的已连接有线网的DNS代号
-    void wifiListOptimize(QStringList& slist); //只保留同名同频信号最优AP
-    QVector<QStringList> repetitionFilter(QVector<QStringList>);
-    QStringList priorityList(QStringList);
-    QStringList sortApByCategory(QStringList,int);
-    QStringList sortApByFreq(QStringList,int, int);
-    void getFinalWifiList(QStringList& slist); //获取应该显示在wifi列表中的最优列表参数
-    QVector<structWifiProperty> connectableWifiPriorityList(const QStringList slist); //可连接wifi优先级列表
-    void devListSort(QVector<structWifiProperty> *list);
-    static bool subDevListSort(const structWifiProperty&info1,const structWifiProperty&info2);
-    //循环检测网络连接状态
-    QTimer *iconTimer = nullptr;
-    QTimer *wiredCableUpTimer = nullptr;
-    QTimer *wiredCableDownTimer = nullptr;
-    QTimer *deleteLanTimer = nullptr;
-    QTimer *checkWifiListChanged = nullptr;
-    QTimer *checkIfLanConnect = nullptr;
-    QTimer *checkIfWifiConnect = nullptr;
-    QTimer *checkIfNetworkOn = nullptr;
-    QTimer *setNetSpeed = nullptr;
-
-    int currentIconIndex;
-    int activeWifiSignalLv;
-    int disconnect_time = 0;
-    int currTopLanItem = 1; //当前连接的有线网个数
-
-    long int start_rcv_rates = 0;	//保存开始时的流量计数
-    long int end_rcv_rates = 0;	//保存结束时的流量计数
-    long int start_tx_rates = 0;   //保存开始时的流量计数
-    long int end_tx_rates = 0; //保存结束时的流量计数
-    QString actWifiSsid = "--"; //当前连接wifi的ssid
-    QStringList actWifiBssidList; //当前连接wifi的bssid
-    QString actWifiUuid = "--"; //当前连接wifi的uuid
-//    QString hasStarWifiInfo; //nmcli命令获取的wifi列表中已经连接的wifi in-use熟悉会有一个*
-//    QString hasStarWifiName;
-
-    bool hasWifiConnected;//当前是否有wifi连接
-    bool m_connected_by_self = false; //是否在本进程执行的连接操作
-    QDBusInterface *mDbusXrandInter;
-    QDBusInterface *kdsDbus;
+    //托盘图标，托盘图标右键菜单
+    QSystemTrayIcon * m_trayIcon = nullptr;
+    QMenu * m_trayIconMenu = nullptr;
+    QAction * m_showMainwindowAction = nullptr;
+    QAction * m_showSettingsAction = nullptr;
 
 private slots:
-    void iconActivated(QSystemTrayIcon::ActivationReason reason);
-
-    void onBtnNetClicked();
-//    void on_btnWifiList_clicked();
-    void onBtnNetListClicked(int flag=0);
-    void onBtnNetListClickeds(int flag=0);
-    void onNewConnAdded(int type);
-
-    void onRequestRevalueUpdateWifi();
-    void getLanListDone(QStringList slist);
-    void getWifiListDone(QStringList slist);
-    void getConnListDone(QStringList slist);
-    void loadWifiListDone(QStringList slist);
-    void updateWifiListDone(QStringList slist);
-    QString TranslateLanName(QString lanName);
-    QString getMacByUuid(QString uuidName);
-
-    void on_btnAdvConf_clicked();
-
-    void handleLanDisconn();
-    void handleWifiDisconn();
-    void handleWifiDisconnLoading();
-    void onRequestScanAccesspoint();
-    void toScanWifi(bool isShow);
-    void on_setNetSpeeds(qulonglong rx, qulonglong tx);
-    void on_setNetSpeed();
-    void on_checkOverTime();
-
-    // 后台回调
-    void enNetDone();
-    void disNetDone();
-    void enWifiDone();
-    void disWifiDone();
-    void disWifiStateKeep();
-    void disWifiDoneChangeUI();
-    void connLanDone(int connFlag);
-//    void connWifiDone(int connFlag);
-
-    void iconStep();
-    void on_btnFlyMode_clicked();
-
-    void onBtnAddNetClicked();
-    void onBtnCreateNetClicked();
-    void actionTriggerSlots();
-
-    void priScreenChanged(int x, int y, int width, int height);
-
-    void onRfkillStatusChanged();
-
-signals:
-    void showPbSignal(QSystemTrayIcon::ActivationReason act);
-    void disConnSparedNet(QString type);
-    void refreshWifiListAfterScan();
-    void loadWifiListAfterScan();
-    void carrierDownHandle();
-    void waitLanStop();
-    void configurationChanged(); //通知控制面板更新IP的信号
-    void reConnectWifi(const QString& uuid);
-    void actWifiSignalLvChanaged(const int& currentLevel);
-    void getWifiListFinished();
-    void startReconnectWifi(const QString& ssid);
-    void stopReconnectWifi(const QString& ssid, const int& result);
-    void wiredConnectionAdded();
-    void wiredConnectionRemoved();
-    void actWiredConnectionChanged();
-    void requestReconnecWifi();
-    void wifiClicked(QString);
-    void lanClicked(QString);
-    void onWiredDeviceChanged(const bool&);
+    void onTrayIconActivated();
+    void onShowMainwindowActionTriggled();
+    void onShowSettingsActionTriggled();
+    void onThemeChanged(const QString &key);
+    void onRefreshTrayIcon();
 };
 
 #endif // MAINWINDOW_H
diff --git a/src/frontend/mainwindow.ui b/src/frontend/mainwindow.ui
deleted file mode 100644
index f3ff45f2..00000000
--- a/src/frontend/mainwindow.ui
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>490</width>
-    <height>538</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>kylin-nm</string>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <widget class="QLabel" name="lbBtnNetBG">
-    <property name="geometry">
-     <rect>
-      <x>1</x>
-      <y>200</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="btnNet">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>200</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbBtnWifiBG">
-    <property name="geometry">
-     <rect>
-      <x>412</x>
-      <y>20</y>
-      <width>50</width>
-      <height>24</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="btnAdvConf">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>490</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="btnHotspot">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>348</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="btnFlyMode">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>395</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbNetwork">
-    <property name="geometry">
-     <rect>
-      <x>61</x>
-      <y>22</y>
-      <width>80</width>
-      <height>20</height>
-     </rect>
-    </property>
-    <property name="sizePolicy">
-     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-      <horstretch>0</horstretch>
-      <verstretch>0</verstretch>
-     </sizepolicy>
-    </property>
-    <property name="font">
-     <font>
-      <pointsize>12</pointsize>
-     </font>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbBtnWifiBall">
-    <property name="geometry">
-     <rect>
-      <x>440</x>
-      <y>22</y>
-      <width>20</width>
-      <height>20</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbHotImg">
-    <property name="geometry">
-     <rect>
-      <x>11</x>
-      <y>359</y>
-      <width>19</width>
-      <height>19</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbFlyImg">
-    <property name="geometry">
-     <rect>
-      <x>11</x>
-      <y>405</y>
-      <width>19</width>
-      <height>19</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbNetListBG">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>10</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbWifiListBG">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>57</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbHotBG">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>348</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbFlyBG">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>395</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="btnNetList">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>10</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="btnWifiList">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>57</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="Line" name="vLine">
-    <property name="geometry">
-     <rect>
-      <x>41</x>
-      <y>0</y>
-      <width>1</width>
-      <height>538</height>
-     </rect>
-    </property>
-    <property name="styleSheet">
-     <string notr="true">background-color: rgba(156, 156, 156,0.1);</string>
-    </property>
-    <property name="orientation">
-     <enum>Qt::Vertical</enum>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="btnNetListImg">
-    <property name="geometry">
-     <rect>
-      <x>8</x>
-      <y>18</y>
-      <width>24</width>
-      <height>24</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="btnWifiListImg">
-    <property name="geometry">
-     <rect>
-      <x>8</x>
-      <y>65</y>
-      <width>24</width>
-      <height>24</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="btnConfImg">
-    <property name="geometry">
-     <rect>
-      <x>8</x>
-      <y>497</y>
-      <width>24</width>
-      <height>24</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <zorder>lbFlyBG</zorder>
-   <zorder>lbHotBG</zorder>
-   <zorder>lbFlyImg</zorder>
-   <zorder>lbHotImg</zorder>
-   <zorder>lbBtnNetBG</zorder>
-   <zorder>btnNet</zorder>
-   <zorder>lbBtnWifiBG</zorder>
-   <zorder>btnHotspot</zorder>
-   <zorder>btnFlyMode</zorder>
-   <zorder>lbBtnWifiBall</zorder>
-   <zorder>lbNetListBG</zorder>
-   <zorder>lbWifiListBG</zorder>
-   <zorder>lbNetwork</zorder>
-   <zorder>vLine</zorder>
-   <zorder>btnNetListImg</zorder>
-   <zorder>btnNetList</zorder>
-   <zorder>btnWifiListImg</zorder>
-   <zorder>btnConfImg</zorder>
-   <zorder>btnWifiList</zorder>
-   <zorder>btnAdvConf</zorder>
-  </widget>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/new-mainwindow.cpp b/src/frontend/new-mainwindow.cpp
deleted file mode 100644
index 7984a63f..00000000
--- a/src/frontend/new-mainwindow.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-#include "new-mainwindow.h"
-#include "customstyle.h"
-#include <KWindowEffects>
-#include <QApplication>
-#include <QDebug>
-#include <QDBusReply>
-#include <QKeyEvent>
-#include <QProcess>
-
-#include "kylinnetworkdeviceresource.h"
-#include "../backend/dbus-interface/kylinagentinterface.h"
-
-#define MAINWINDOW_WIDTH 420
-#define MAINWINDOW_HEIGHT 456
-#define THEME_SCHAME "org.ukui.style"
-#define COLOR_THEME "styleName"
-
-MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
-{
-    firstlyStart();
-}
-
-/**
- * @brief MainWindow::showMainwindow show主窗口，同时也作为dbus接口提供给外部组件调用
- */
-void MainWindow::showMainwindow()
-{
-    if (!m_loadFinished) {
-        m_secondaryStartTimer->stop();
-        secondaryStart();
-    }
-    this->resetWindowPosition();
-    this->showNormal();
-    this->raise();
-    this->activateWindow();
-    emit this->mainWindowVisibleChanged(true);
-}
-
-/**
- * @brief MainWindow::hideMainwindow 隐藏主页面时要进行的操作，后续可以添加到此函数
- */
-void MainWindow::hideMainwindow()
-{
-    this->hide();
-    emit this->mainWindowVisibleChanged(false);
-}
-
-/**
- * @brief MainWindow::setWiredDefaultDevice 设置有线设备默认网卡
- */
-void MainWindow::setWiredDefaultDevice(QString deviceName)
-{
-    m_lanWidget->updateDefaultDevice(deviceName);
-}
-
-/**
- * @brief MainWindow::hideMainwindow 设置无线设备默认网卡
- */
-void MainWindow::setWirelessDefaultDevice(QString deviceName)
-{
-    m_wlanWidget->updateDefaultDevice(deviceName);
-}
-
-/**
- * @brief MainWindow::firstlyStart 一级启动，执行重要且不耗时的启动操作
- */
-void MainWindow::firstlyStart()
-{
-    initWindowProperties();
-    initUI();
-    initDbusConnnect();
-    initWindowTheme();
-    initTrayIcon();
-    installEventFilter(this);
-    m_secondaryStartTimer = new QTimer(this);
-    connect(m_secondaryStartTimer, &QTimer::timeout, this, [ = ]() {
-        m_secondaryStartTimer->stop();
-        secondaryStart();//满足条件后执行比较耗时的二级启动
-    });
-    m_secondaryStartTimer->start(5 * 1000);
-
-    //加载key ring
-    agent_init();
-}
-
-/**
- * @brief MainWindow::secondaryStart 二级启动，可以将较耗时的初始化操作放到此处执行
- */
-void MainWindow::secondaryStart()
-{
-    if (m_loadFinished)
-        return;
-    m_loadFinished = true;
-}
-
-/**
- * @brief MainWindow::initWindowProperties 初始化一些窗口属性
- */
-void MainWindow::initWindowProperties()
-{
-    this->setWindowTitle(tr("kylin-nm"));
-    this->setWindowIcon(QIcon::fromTheme("kylin-network", QIcon(":/res/x/setup.png")));
-    this->setFixedSize(MAINWINDOW_WIDTH, MAINWINDOW_HEIGHT);
-//    //绘制毛玻璃特效
-//    this->setAttribute(Qt::WA_TranslucentBackground, true);
-//    QPainterPath path;
-//    auto rect = this->rect();
-//    path.addRoundedRect(rect, 6, 6);
-//    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-}
-
-/**
- * @brief MainWindow::initUI 初始化窗口内控件
- */
-void MainWindow::initUI()
-{
-    m_centralWidget = new QTabWidget(this);
-    this->setCentralWidget(m_centralWidget);
-    m_centralWidget->tabBar()->setFixedWidth(this->width());
-    m_lanWidget = new LanPage(m_centralWidget);
-    m_wlanWidget = new WlanPage(m_centralWidget);
-    connect(this, &MainWindow::mainWindowVisibleChanged, m_wlanWidget, &WlanPage::onMainWindowVisibleChanged);
-//    m_centralWidget->addTab(m_lanWidget, QIcon::fromTheme("network-wired-connected-symbolic", QIcon::fromTheme("network-wired-symbolic", QIcon(":/res/l/network-online.svg"))), tr("LAN"));
-//    m_centralWidget->addTab(m_wlanWidget, QIcon::fromTheme("network-wireless-signal-excellent-symbolic", QIcon(":/res/x/wifi-list-bg.svg")), tr("WLAN"));
-
-    m_centralWidget->addTab(m_lanWidget, tr(""));
-    m_centralWidget->addTab(m_wlanWidget,tr(""));
-    m_tabBarLayout = new QHBoxLayout(this);
-    m_lanLabel = new QLabel(tr("LAN"));
-    m_lanLabel->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
-    m_wlanLabel = new QLabel(tr("WLAN"));
-    m_wlanLabel->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
-    m_tabBarLayout->addWidget(m_lanLabel);
-    m_tabBarLayout->addWidget(m_wlanLabel);
-    m_centralWidget->tabBar()->setLayout(m_tabBarLayout);
-}
-
-/**
- * @brief MainWindow::initTrayIcon 初始化托盘图标和托盘右键菜单
- */
-void MainWindow::initTrayIcon()
-{
-    m_trayIcon = new QSystemTrayIcon();
-    m_trayIconMenu = new QMenu();
-    m_showMainwindowAction = new QAction(tr("Show MainWindow"),this);
-    m_showSettingsAction = new QAction(tr("Settings"),this);
-
-    m_trayIcon->setToolTip(QString(tr("kylin-nm")));
-    m_showSettingsAction->setIcon(QIcon::fromTheme("document-page-setup-symbolic", QIcon(":/res/x/setup.png")) );
-    m_trayIconMenu->addAction(m_showMainwindowAction);
-    m_trayIconMenu->addAction(m_showSettingsAction);
-    m_trayIcon->setContextMenu(m_trayIconMenu);
-    m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic"));
-
-    connect(m_trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::onTrayIconActivated);
-    connect(m_showMainwindowAction, &QAction::triggered, this, &MainWindow::onShowMainwindowActionTriggled);
-    connect(m_showSettingsAction, &QAction::triggered, this, &MainWindow::onShowSettingsActionTriggled);
-    m_trayIcon->show();
-}
-
-void MainWindow::initDbusConnnect()
-{
-    connect(m_lanWidget, &LanPage::deviceStatusChanged, this, &MainWindow::deviceStatusChanged);
-    connect(m_lanWidget, &LanPage::deviceNameChanged, this, &MainWindow::deviceNameChanged);
-    connect(m_wlanWidget, &WlanPage::deviceStatusChanged, this, &MainWindow::deviceStatusChanged);
-    connect(m_wlanWidget, &WlanPage::deviceNameChanged, this, &MainWindow::deviceNameChanged);
-
-    connect(m_wlanWidget, &WlanPage::activateFailed, this, &MainWindow::activateFailed);
-    connect(m_wlanWidget, &WlanPage::deactivateFailed, this, &MainWindow::deactivateFailed);
-    connect(m_lanWidget, &LanPage::activateFailed, this, &MainWindow::activateFailed);
-    connect(m_lanWidget, &LanPage::deactivateFailed, this, &MainWindow::deactivateFailed);
-
-    connect(m_lanWidget, &LanPage::lanAdd, this, &MainWindow::lanAdd);
-    connect(m_lanWidget, &LanPage::lanRemove, this, &MainWindow::lanRemove);
-    connect(m_lanWidget, &LanPage::lanUpdate, this, &MainWindow::lanUpdate);
-    connect(m_lanWidget, &LanPage::lanActiveConnectionStateChanged, this, &MainWindow::lanActiveConnectionStateChanged);
-    connect(m_lanWidget, &LanPage::lanConnectChanged, this, &MainWindow::onRefreshTrayIcon);
-
-
-    connect(m_wlanWidget, &WlanPage::wlanAdd, this, &MainWindow::wlanAdd);
-    connect(m_wlanWidget, &WlanPage::wlanRemove, this, &MainWindow::wlanRemove);
-    connect(m_wlanWidget, &WlanPage::wlanActiveConnectionStateChanged, this, &MainWindow::wlanactiveConnectionStateChanged);
-    connect(m_wlanWidget, &WlanPage::hotspotDeactivated, this, &MainWindow::hotspotDeactivated);
-    connect(m_wlanWidget, &WlanPage::hotspotActivated, this, &MainWindow::hotspotActivated);
-    connect(m_wlanWidget, &WlanPage::secuTypeChange, this, &MainWindow::secuTypeChange);
-    connect(m_wlanWidget, &WlanPage::signalStrengthChange, this, &MainWindow::signalStrengthChange);
-    connect(m_wlanWidget, &WlanPage::wlanConnectChanged, this, &MainWindow::onRefreshTrayIcon);
-}
-
-/**
- * @brief MainWindow::resetWindowPosition 重新计算窗口位置
- */
-void MainWindow::resetWindowPosition()
-{
-#define MARGIN 4
-#define PANEL_TOP 1
-#define PANEL_LEFT 2
-#define PANEL_RIGHT 3
-//#define PANEL_BOTTOM 4
-    if (!m_positionInterface) {
-        m_positionInterface = new QDBusInterface("org.ukui.panel",
-                            "/panel/position",
-                            "org.ukui.panel",
-                            QDBusConnection::sessionBus());
-    }
-    QDBusReply<QVariantList> reply = m_positionInterface->call("GetPrimaryScreenGeometry");
-    //reply获取的参数共5个，分别是 主屏可用区域的起点x坐标，主屏可用区域的起点y坐标，主屏可用区域的宽度，主屏可用区域高度，任务栏位置
-    if (!m_positionInterface->isValid() || !reply.isValid() || reply.value().size() < 5) {
-        qCritical() << QDBusConnection::sessionBus().lastError().message();
-        this->setGeometry(0, 0, this->width(), this->height());
-        return;
-    }
-    QVariantList position_list = reply.value();
-    int position = position_list.at(4).toInt();
-    switch(position){
-    case PANEL_TOP:
-        //任务栏位于上方
-        this->setGeometry(position_list.at(0).toInt() + position_list.at(2).toInt() - this->width() - MARGIN,
-                          position_list.at(1).toInt() + MARGIN,
-                          this->width(), this->height());
-        break;
-        //任务栏位于左边
-    case PANEL_LEFT:
-        this->setGeometry(position_list.at(0).toInt() + MARGIN,
-                          position_list.at(1).toInt() + reply.value().at(3).toInt() - this->height() - MARGIN,
-                          this->width(), this->height());
-        break;
-        //任务栏位于右边
-    case PANEL_RIGHT:
-        this->setGeometry(position_list.at(0).toInt() + position_list.at(2).toInt() - this->width() - MARGIN,
-                          position_list.at(1).toInt() + reply.value().at(3).toInt() - this->height() - MARGIN,
-                          this->width(), this->height());
-        break;
-        //任务栏位于下方
-    default:
-        this->setGeometry(position_list.at(0).toInt() + position_list.at(2).toInt() - this->width() - MARGIN,
-                          position_list.at(1).toInt() + reply.value().at(3).toInt() - this->height() - MARGIN,
-                          this->width(), this->height());
-        break;
-    }
-    qDebug() << " Position of ukui-panel is " << position << "; Position of mainwindow is " << this->geometry() << "." << Q_FUNC_INFO << __LINE__;
-}
-
-/**
- * @brief MainWindow::resetTrayIconTool 重新获取网络连接状态并重新设置图标和tooltip
- */
-void MainWindow::resetTrayIconTool()
-{
-    //ZJP_TODO 检测当前连接的是有线还是无线，是否可用，设置图标和tooltip,图标最好提前define
-//    int connectivity = objKyDBus->getNetworkConectivity();
-//    qDebug() << "Value of current network Connectivity property : "<< connectivity;
-//    switch (connectivity) {
-//    case UnknownConnectivity:
-//    case Portal:
-//    case Limited:
-//        setTrayIcon(iconLanOnlineNoInternet);
-//        trayIcon->setToolTip(QString(tr("Network Connected But Can Not Access Internet")));
-//        break;
-//    case NoConnectivity:
-//    case Full:
-//        setTrayIcon(iconLanOnline);
-//        trayIcon->setToolTip(QString(tr("kylin-nm")));
-//        break;
-//    }
-    qDebug() << "Has set tray icon to be XXX." << Q_FUNC_INFO << __LINE__;
-}
-
-
-/**
- * @brief MainWindow::initWindowTheme 初始化窗口主题并创建信号槽
- */
-void MainWindow::initWindowTheme()
-{
-    const QByteArray style_id(THEME_SCHAME);
-    if (QGSettings::isSchemaInstalled(style_id)) {
-        m_styleGsettings = new QGSettings(style_id);
-//        resetWindowTheme();
-        connect(m_styleGsettings, &QGSettings::changed, this, &MainWindow::onThemeChanged);
-    } else {
-        qWarning() << "Gsettings interface \"org.ukui.style\" is not exist!" << Q_FUNC_INFO << __LINE__;
-    }
-}
-
-/**
- * @brief MainWindow::resetWindowTheme 读取和设置窗口主题
- */
-void MainWindow::resetWindowTheme()
-{
-    if (!m_styleGsettings) { return; }
-    QString currentTheme = m_styleGsettings->get(COLOR_THEME).toString();
-    auto app = static_cast<QApplication*>(QCoreApplication::instance());
-    if(currentTheme == "ukui-dark" || currentTheme == "ukui-black"){
-        app->setStyle(new CustomStyle("ukui-dark"));
-        qDebug() << "Has set color theme to ukui-dark." << Q_FUNC_INFO << __LINE__;
-        emit qApp->paletteChanged(qApp->palette());
-        return;
-    }
-    app->setStyle(new CustomStyle("ukui-light"));
-    qDebug() << "Has set color theme to " << currentTheme << Q_FUNC_INFO << __LINE__;
-    emit qApp->paletteChanged(qApp->palette());
-    return;
-}
-
-/**
- * @brief MainWindow::showControlCenter 打开控制面板网络界面
- */
-void MainWindow::showControlCenter()
-{
-    QProcess process;
-    if (m_lanWidget->m_isLanConnected == false && m_wlanWidget->m_wlanIsConnected == true){
-        process.startDetached("ukui-control-center --wlanconnect");
-    } else {
-        process.startDetached("ukui-control-center --wiredconnect");
-    }
-}
-
-/**
- * @brief MainWindow::onTrayIconActivated 点击托盘图标的槽函数
- */
-void MainWindow::onTrayIconActivated()
-{
-    if (this->isVisible()) {
-        qDebug() << "Received signal of tray icon activated, will hide mainwindow." << Q_FUNC_INFO << __LINE__;
-        hideMainwindow();
-        return;
-    }
-    qDebug() << "Received signal of tray icon activated, will show mainwindow." << Q_FUNC_INFO << __LINE__;
-    this->showMainwindow();
-}
-
-void MainWindow::onShowMainwindowActionTriggled()
-{
-    showMainwindow();
-}
-
-void MainWindow::onShowSettingsActionTriggled()
-{
-    showControlCenter();
-}
-
-void MainWindow::onThemeChanged(const QString &key)
-{
-    if (key == COLOR_THEME) {
-        qDebug() << "Received signal of theme changed, will reset theme." << Q_FUNC_INFO << __LINE__;
-//        resetWindowTheme();
-        emit qApp->paletteChanged(qApp->palette());
-    } else {
-        qDebug() << "Received signal of theme changed, key=" << key << " will do nothing." << Q_FUNC_INFO << __LINE__;
-    }
-}
-
-void MainWindow::onRefreshTrayIcon()
-{
-    //更新托盘图标显示
-    if (m_lanWidget->m_isLanConnected == true){
-        m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic"));
-    } else if (m_wlanWidget->m_wlanIsConnected == true && m_lanWidget->m_isLanConnected == false){
-        m_trayIcon->setIcon(QIcon::fromTheme("network-wireless-signal-excellent-symbolic"));
-    } else if (m_wlanWidget->m_wlanIsConnected == false && m_lanWidget->m_isLanConnected == false){
-        m_trayIcon->setIcon(QIcon::fromTheme("network-wired-disconnected-symbolic"));
-    }
-}
-
-/**
- * @brief MainWindow::keyPressEvent 按esc键关闭主界面
- * @param event
- */
-void MainWindow::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_Escape) {
-        hideMainwindow();
-    }
-    return QWidget::keyPressEvent(event);
-}
-
-/**
- * @brief MainWindow::eventFilter 事件过滤器
- * @param watched
- * @param event
- * @return
- */
-bool MainWindow::eventFilter(QObject *watched, QEvent *event)
-{
-    if (event->type() == QEvent::ActivationChange) {
-        if(QApplication::activeWindow() != this) {
-            hideMainwindow();
-        }
-    }
-    return QMainWindow::eventFilter(watched,event);
-}
-
-/**
- * @brief MainWindow::getWirelessList 获取wifi列表，供dbus调用
- * @param map
- */
-void MainWindow::getWirelessList(QMap<QString, QVector<QStringList> > &map)
-{
-    map.clear();
-    if (nullptr != m_wlanWidget) {
-        m_wlanWidget->getWirelessList(map);
-    }
-}
-
-/**
- * @brief MainWindow::getWiredList 获取lan列表，供dbus调用
- * @param map
- */
-void MainWindow::getWiredList(QMap<QString, QVector<QStringList>> &map)
-{
-    map.clear();
-    if (nullptr != m_lanWidget) {
-        m_lanWidget->getWiredList(map);
-    }
-}
-
-/**
- * @brief MainWindow::activeWirelessAp 开启热点，供dbus调用
- * @param apName
- * @param apPassword
- * @param apDevice
- */
-void MainWindow::activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice)
-{
-    m_wlanWidget->activeWirelessAp(apName, apPassword, apDevice);
-}
-
-/**
- * @brief MainWindow::activeWirelessAp 断开热点，供dbus调用
- * @param apName
- */
-void MainWindow::deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice)
-{
-    m_wlanWidget->deactiveWirelessAp(apName, apPassword, apDevice);
-}
-
-/**
- * @brief MainWindow::activeWirelessAp 获取热点，供dbus调用
- * @param list
- */
-void MainWindow::getStoredApInfo(QStringList &list)
-{
-    m_wlanWidget->getStoredApInfo(list);
-}
-
-
-void MainWindow::setWiredDeviceEnable(const QString& devName, bool enable)
-{
-    m_lanWidget->setWiredDeviceEnable(devName, enable);
-}
-void MainWindow::showPropertyWidget(QString devName, QString ssid)
-{
-    KyNetworkDeviceResourse *devResourse = new KyNetworkDeviceResourse();
-    QStringList wiredDeviceList;
-    wiredDeviceList.clear();
-    devResourse->getNetworkDeviceList(NetworkManager::Device::Type::Ethernet, wiredDeviceList);
-    if (wiredDeviceList.contains(devName)) {
-      qDebug() <<   "showPropertyWidget device type wired device name " << devName << " uuid " << ssid;
-      m_lanWidget->showDetailPage(devName, ssid);
-      delete devResourse;
-      devResourse = nullptr;
-      return;
-    }
-
-    QStringList wirelessDeviceList;
-    wirelessDeviceList.clear();
-    devResourse->getNetworkDeviceList(NetworkManager::Device::Type::Wifi, wirelessDeviceList);
-    if (wirelessDeviceList.contains(devName)) {
-      qDebug() <<   "showPropertyWidget device type wireless device name " << devName << " ssid " << ssid;
-      m_wlanWidget->showDetailPage(devName, ssid);
-      delete devResourse;
-      devResourse = nullptr;
-      return;
-    }
-
-    qWarning() <<   "showPropertyWidget no such device " << devName;
-    delete devResourse;
-    devResourse = nullptr;
-}
-
-void MainWindow::showCreateWiredConnectWidget(const QString devName)
-{
-    qDebug() << "showCreateWiredConnectWidget! devName = " << devName;
-    NetDetail *netDetail = new NetDetail(devName, "", "", false, false, true, this);
-    netDetail->show();
-}
-
-//有线连接断开
-void MainWindow::activateWired(const QString& devName, const QString& connUuid)
-{
-    m_lanWidget->activateWired(devName, connUuid);
-}
-void MainWindow::deactivateWired(const QString& devName, const QString& connUuid)
-{
-    m_lanWidget->deactivateWired(devName, connUuid);
-}
-
-//无线连接断开
-void MainWindow::activateWireless(const QString& devName, const QString& ssid)
-{
-    m_wlanWidget->activateWireless(devName, ssid);
-}
-
-void MainWindow::deactivateWireless(const QString& devName, const QString& ssid)
-{
-    m_wlanWidget->deactivateWireless(devName, ssid);
-}
diff --git a/src/frontend/new-mainwindow.h b/src/frontend/new-mainwindow.h
deleted file mode 100644
index da6185f1..00000000
--- a/src/frontend/new-mainwindow.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QMainWindow>
-#include <QTableWidget>
-#include <QGSettings/QGSettings>
-#include <QTimer>
-#include <QSystemTrayIcon>
-#include <QMenu>
-#include <QAction>
-#include <QDBusInterface>
-#include "lanpage.h"
-#include "wlanpage.h"
-#include "netdetails/netdetail.h"
-
-class MainWindow : public QMainWindow
-{
-    Q_OBJECT
-public:
-    explicit MainWindow(QWidget *parent = nullptr);
-    void showMainwindow();
-    void hideMainwindow();
-
-    void setWiredDefaultDevice(QString deviceName);
-    void setWirelessDefaultDevice(QString deviceName);
-
-    //for dbus
-    void getWirelessList(QMap<QString, QVector<QStringList> > &map);
-    void getWiredList(QMap<QString, QVector<QStringList>> &map);
-    //开启热点
-    void activeWirelessAp(const QString apName, const QString apPassword, const QString apDevice);
-    //断开热点
-    void deactiveWirelessAp(const QString apName, const QString apPassword, const QString apDevice);
-    //获取热点
-    void getStoredApInfo(QStringList &list);
-    //有线连接断开
-    void activateWired(const QString& devName, const QString& connUuid);
-    void deactivateWired(const QString& devName, const QString& connUuid);
-    //无线连接断开
-    void activateWireless(const QString& devName, const QString& ssid);
-    void deactivateWireless(const QString& devName, const QString& ssid);
-
-    void setWiredDeviceEnable(const QString& devName, bool enable);
-
-    //唤起属性页 根据网卡类型 参数2 为ssid/uuid
-    void showPropertyWidget(QString devName, QString ssid);
-    //唤起新建有线连接界面
-    void showCreateWiredConnectWidget(const QString devName);
-
-signals:
-    //设备插拔
-    void deviceStatusChanged();
-    //设备名称变化
-    void deviceNameChanged(QString oldName, QString newName);
-    //有线无线列表更新（有线增删、无线增加减少）
-    void lanAdd(QString devName, QStringList info);
-    void lanRemove(QString dbusPath);
-    void lanUpdate(QString devName, QStringList info);
-    void wlanAdd(QString devName, QStringList info);
-    void wlanRemove(QString devName,QString ssid);
-    void wlanactiveConnectionStateChanged(QString devName, QString ssid, int status);
-    void lanActiveConnectionStateChanged(QString devName, QString uuid, int status);
-    void activateFailed(QString errorMessage);
-    void deactivateFailed(QString errorMessage);
-    //热点断开
-    void hotspotDeactivated(QString devName, QString ssid);
-    void hotspotActivated(QString devName, QString ssid);
-    //信号强度变化
-    void signalStrengthChange(QString devName, QString ssid, int strength);
-    //安全性变化
-    void secuTypeChange(QString devName, QString ssid, QString secuType);
-    void mainWindowVisibleChanged(const bool &visible);
-public slots:
-
-protected:
-    void keyPressEvent(QKeyEvent *event);
-    bool eventFilter(QObject *watched, QEvent *event) override;
-
-private:
-    void firstlyStart(); //一级启动
-    void secondaryStart(); //二级启动
-    bool m_loadFinished = false; //是否二级启动已执行完
-    QTimer * m_secondaryStartTimer = nullptr; //执行二级启动的倒计时
-    void initWindowProperties();
-    void initUI();
-    void initDbusConnnect();
-    void initTrayIcon();
-    void resetTrayIconTool();
-    void initWindowTheme();
-    void resetWindowTheme();
-    void showControlCenter();
-
-    //主窗口的主要构成控件
-    QTabWidget * m_centralWidget = nullptr;
-    QHBoxLayout * m_tabBarLayout = nullptr;
-    QLabel * m_lanLabel = nullptr;
-    QLabel * m_wlanLabel = nullptr;
-
-    LanPage * m_lanWidget = nullptr;
-    WlanPage * m_wlanWidget = nullptr;
-
-    //监听主题的Gsettings
-    QGSettings * m_styleGsettings = nullptr;
-
-    //获取和重置窗口位置
-    void resetWindowPosition();
-    QDBusInterface * m_positionInterface = nullptr;
-
-    //托盘图标，托盘图标右键菜单
-    QSystemTrayIcon * m_trayIcon = nullptr;
-    QMenu * m_trayIconMenu = nullptr;
-    QAction * m_showMainwindowAction = nullptr;
-    QAction * m_showSettingsAction = nullptr;
-
-private slots:
-    void onTrayIconActivated();
-    void onShowMainwindowActionTriggled();
-    void onShowSettingsActionTriggled();
-    void onThemeChanged(const QString &key);
-    void onRefreshTrayIcon();
-};
-
-#endif // MAINWINDOW_H
diff --git a/src/frontend/nmdemo.cpp b/src/frontend/nmdemo.cpp
index 04b98922..9addcce8 100644
--- a/src/frontend/nmdemo.cpp
+++ b/src/frontend/nmdemo.cpp
@@ -1,5 +1,4 @@
 #include "nmdemo.h"
-#include "../wireless-security/dlghidewifi.h"
 #include <QTime>
 #include <QTimeZone>
 
diff --git a/src/frontend/tab-pages/lanpage.h b/src/frontend/tab-pages/lanpage.h
index 8a8d39f2..3abb0893 100644
--- a/src/frontend/tab-pages/lanpage.h
+++ b/src/frontend/tab-pages/lanpage.h
@@ -15,6 +15,8 @@
 #include "list-items/lanlistitem.h"
 #include "tab-pages/tabpage.h"
 
+class LanListItem;
+
 class LanPage : public TabPage
 {
     Q_OBJECT
diff --git a/src/frontend/wireless-security/dlghidewifi.cpp b/src/frontend/wireless-security/dlghidewifi.cpp
deleted file mode 100644
index 21e4bc3a..00000000
--- a/src/frontend/wireless-security/dlghidewifi.cpp
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "dlghidewifi.h"
-#include "kylinheadfile.h"
-#include "ui_dlghidewifi.h"
-#include "backthread.h"
-#include "mainwindow.h"
-#include "kylin-dbus-interface.h"
-#include "wpawifidialog.h"
-
-#include <unistd.h>
-#include <QPoint>
-
-#include <QStandardItemModel>
-#include <QDir>
-
-DlgHideWifi::DlgHideWifi(int type, OldMainWindow *mainWindow, QWidget *parent) :
-    isUsed(type),
-    QDialog(parent),
-    ui(new Ui::DlgHideWifi)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    this->setAttribute(Qt::WA_DeleteOnClose);
-    this->setWindowIcon(QIcon::fromTheme("kylin-network", QIcon(":/res/x/setup.png")) );
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    MyQss objQss;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{font-size:20px;}");
-
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-
-    ui->lbLeftupTitle->setText(tr("Add Hidden WLAN")); //加入隐藏WLAN
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("WLAN name")); //网络名称:
-    ui->lbSecurity->setText(tr("WLAN security")); //Wi-Fi安全性:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-
-    ui->cbxConn->clear();
-    ui->cbxConn->addItem(tr("C_reate…")); //新建...
-    KylinDBus mkylindbus;
-    QStringList wifiList = mkylindbus.getWifiSsidList();
-    foreach (QString strWifiSsid, wifiList) {
-        ui->cbxConn->addItem(strWifiSsid);
-    }
-    ui->cbxConn->setCurrentIndex(isUsed);
-    connect(ui->cbxConn,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeWindow()));
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    //ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    //ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    //ui->cbxSecurity->addItem("LEAP");
-    //ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    ui->cbxSecurity->setCurrentIndex(0);
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialog()));
-
-    if (isUsed == 0) {
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->leNetName->setText(ui->cbxConn->currentText());
-        ui->lbNetName->setEnabled(false);
-        ui->leNetName->setEnabled(false);
-        ui->lbSecurity->setEnabled(false);
-        ui->cbxSecurity->setEnabled(false);
-        ui->btnConnect->setEnabled(true);
-    }
-
-    ui->leNetName->setContextMenuPolicy(Qt::NoContextMenu); //禁止LineEdit的右键菜单
-
-    this->setFixedSize(432,358);
-
-    this->mw = mainWindow;
-}
-
-DlgHideWifi::~DlgHideWifi()
-{
-    delete ui;
-}
-
-void DlgHideWifi::mousePressEvent(QMouseEvent *event){
-    if(event->button() == Qt::LeftButton){
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-
-    return QDialog::mousePressEvent(event);
-}
-void DlgHideWifi::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-    return QDialog::mouseReleaseEvent(event);
-}
-void DlgHideWifi::mouseMoveEvent(QMouseEvent *event){
-    if(this->isPress){
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-    return QDialog::mouseMoveEvent(event);
-}
-
-//切换到其他Wi-Fi安全类型
-void DlgHideWifi::changeDialog()
-{
-    if(ui->cbxSecurity->currentIndex()==0){
-        qDebug()<<"it's not need to change dialog";
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->close();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0, mw);
-        connHidWifiWpa->show();
-        connect(connHidWifiWpa, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->close();
-        WpaWifiDialog * wpadlg = new WpaWifiDialog(mw, mw, "");
-        QPoint pos = QCursor::pos();
-        QRect primaryGeometry;
-        for (QScreen *screen : qApp->screens()) {
-            if (screen->geometry().contains(pos)) {
-                primaryGeometry = screen->geometry();
-            }
-        }
-        if (primaryGeometry.isEmpty()) {
-            primaryGeometry = qApp->primaryScreen()->geometry();
-        }
-        wpadlg->move(primaryGeometry.width() / 2 - wpadlg->width() / 2, primaryGeometry.height() / 2 - wpadlg->height() / 2);
-        wpadlg->show();
-        connect(wpadlg, &WpaWifiDialog::conn_done, this, [ = ]() {
-            QString txt(tr("Conn WLAN Success"));
-            mw->objKyDBus->showDesktopNotify(txt);
-            mw->on_btnWifiList_clicked();
-        });
-        connect(wpadlg, &WpaWifiDialog::conn_failed, this, [ = ]() {
-            QString txt(tr("Confirm your WLAN password or usable of wireless card"));
-            mw->objKyDBus->showDesktopNotify(txt);
-            mw->on_btnWifiList_clicked();
-        });
-//        DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, 0, mw);
-//        connHidWifiEapPeap->show();
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(0);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(1);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiLeap *connHidWifiLeap = new DlgHideWifiLeap();
-        connHidWifiLeap->show();
-    } else {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(0, 0, mw);
-        connHidWifiEapPeap->show();
-    }
-}
-
-//同一 Wi-Fi安全类型的窗口变换
-void DlgHideWifi::changeWindow(){
-    if (ui->cbxConn->currentIndex() == 0){
-        isUsed = ui->cbxConn->currentIndex();
-        ui->cbxConn->setCurrentIndex(0);
-        ui->leNetName->setText("");
-        ui->lbNetName->setEnabled(true);
-        ui->leNetName->setEnabled(true);
-        ui->lbSecurity->setEnabled(true);
-        ui->cbxSecurity->setEnabled(true);
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->cbxConn->currentIndex() >= 1){
-        QString tmpPath = "/tmp/kylin-nm-connshow-" + QDir::home().dirName();
-        QString currStr = "nmcli connection show '" + ui->cbxConn->currentText() + "' >" + tmpPath;
-
-        int status = system(currStr.toUtf8().data());
-        qDebug()<<"executed cmd="<<currStr<<". res="<<status;
-
-        QFile file(tmpPath);
-        if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-            qDebug()<<"Can't open the file!";
-        }
-        QString txt = file.readAll();
-        file.close();
-        if (txt.indexOf("802-11-wireless-security.key-mgmt:") != -1) {
-            if (txt.indexOf("wpa-psk") != -1) {
-                QApplication::setQuitOnLastWindowClosed(false);
-                this->hide();
-                DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(ui->cbxConn->currentIndex(), mw);
-                connHidWifiWpa->show();
-                connect(connHidWifiWpa, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-            }
-            if (txt.indexOf("wpa-eap") != -1) {
-                QApplication::setQuitOnLastWindowClosed(false);
-                this->hide();
-//                DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, ui->cbxConn->currentIndex(), mw);
-//                connHidWifiEapPeap->show();
-                WpaWifiDialog * wpadlg = new WpaWifiDialog(mw, mw, ui->cbxConn->currentText());
-                QPoint pos = QCursor::pos();
-                QRect primaryGeometry;
-                for (QScreen *screen : qApp->screens()) {
-                    if (screen->geometry().contains(pos)) {
-                        primaryGeometry = screen->geometry();
-                    }
-                }
-                if (primaryGeometry.isEmpty()) {
-                    primaryGeometry = qApp->primaryScreen()->geometry();
-                }
-                wpadlg->move(primaryGeometry.width() / 2 - wpadlg->width() / 2, primaryGeometry.height() / 2 - wpadlg->height() / 2);
-                wpadlg->show();
-                connect(wpadlg, &WpaWifiDialog::conn_done, this, [ = ]() {
-                    QString txt(tr("Conn WLAN Success"));
-                    mw->objKyDBus->showDesktopNotify(txt);
-                    mw->on_btnWifiList_clicked();
-                });
-                connect(wpadlg, &WpaWifiDialog::conn_failed, this, [ = ]() {
-                    QString txt(tr("Confirm your WLAN password or usable of wireless card"));
-                    mw->objKyDBus->showDesktopNotify(txt);
-                    mw->on_btnWifiList_clicked();
-                });
-            }
-        } else {
-            isUsed = ui->cbxConn->currentIndex();
-            ui->leNetName->setText(ui->cbxConn->currentText());
-            ui->lbNetName->setEnabled(false);
-            ui->leNetName->setEnabled(false);
-            ui->lbSecurity->setEnabled(false);
-            ui->cbxSecurity->setEnabled(false);mw->on_btnWifiList_clicked();
-            ui->btnConnect->setEnabled(true);
-        }
-    }
-}
-
-void DlgHideWifi::on_btnCancel_clicked()
-{
-    //this->close();
-    this->hide();
-}
-
-void DlgHideWifi::on_btnConnect_clicked()
-{
-    mw->is_stop_check_net_state = 1;
-    mw->is_connect_hide_wifi = 1;
-
-    QThread *t = new QThread();
-    connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-    connect(this, SIGNAL(stopSignal()), t, SLOT(quit()));
-
-    QString wifiName = ui->leNetName->text();
-
-    strWifiname = wifiName;
-    BackThread *bt = new BackThread();
-    if (isUsed == 0) {
-        bt->moveToThread(t);
-        connect(t, SIGNAL(started()), this, SLOT(slotStartConnectHiddenOpenWifi()));
-        connect(this, SIGNAL(sigConnHiddenWifi(QString, QString)), bt, SLOT(execConnHiddenWifiWPA(QString,QString)));
-        connect(bt, SIGNAL(connDone(int)), mw, SLOT(connWifiDone(int)));
-        connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-    } else {
-        bt->moveToThread(t);
-        connect(t, SIGNAL(started()), this, SLOT(slotStartConnectRememberedHiddenWifi()));
-        connect(this, SIGNAL(sigConnRememberedHiddenWifi(QString)), bt, SLOT(execConnRememberedHiddenWifi(QString)));
-        connect(bt, SIGNAL(connDone(int)), mw, SLOT(connWifiDone(int)));
-        connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-    }
-    t->start();
-    //this->close();
-    this->hide();
-}
-
-void DlgHideWifi::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-
-    if (ui->leNetName->text().size() > 32) {
-        QString cutStr = ui->leNetName->text().mid(0,32);
-        ui->leNetName->setText(cutStr);
-    }
-}
-
-void DlgHideWifi::slotStartLoading()
-{
-    mw->startLoading();
-}
-
-void DlgHideWifi::slotStartConnectHiddenOpenWifi()
-{
-    mw->startLoading();
-    emit sigConnHiddenWifi(ui->leNetName->text(), QString(""));
-}
-
-void DlgHideWifi::slotStartConnectRememberedHiddenWifi()
-{
-    mw->startLoading();
-    emit sigConnRememberedHiddenWifi(ui->leNetName->text());
-}
-
-void DlgHideWifi::on_execSecConn()
-{
-    QString str = "nmcli device wifi connect '" + strWifiname + "' password ''";
-    int status = system(str.toUtf8().data());
-    qDebug()<<"executed cmd="<<str<<". res="<<status;
-    QTimer::singleShot(3*1000, this, SLOT(emitSignal() ));
-}
-
-void DlgHideWifi::emitSignal()
-{
-    emit reSetWifiList();
-    mw->stopLoading();
-    emit this->stopSignal();
-}
-
-void DlgHideWifi::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifi.h b/src/frontend/wireless-security/dlghidewifi.h
deleted file mode 100644
index ad49262a..00000000
--- a/src/frontend/wireless-security/dlghidewifi.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFI_H
-#define DLGCONNHIDWIFI_H
-
-#include <QDialog>
-#include <QMouseEvent>
-#include <QThread>
-#include <QTimer>
-#include <QFile>
-
-class OldMainWindow;
-
-namespace Ui {
-class DlgHideWifi;
-}
-
-class DlgHideWifi : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DlgHideWifi(int type, OldMainWindow *mw = 0, QWidget *parent = 0);
-    ~DlgHideWifi();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialog();
-    void changeWindow();
-    void emitSignal();
-    void on_execSecConn();
-    void slotStartLoading();
-    void slotStartConnectHiddenOpenWifi();
-    void slotStartConnectRememberedHiddenWifi();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-signals:
-    void reSetWifiList();
-    void stopSignal();
-    void sigConnHiddenWifi(QString wifiName, QString wifiPasswd);
-    void sigConnRememberedHiddenWifi(QString wifiName);
-
-private:
-    Ui::DlgHideWifi *ui;
-    int isUsed;//=0 current wifi not used before; >=1 used
-    OldMainWindow *mw;
-    QString strWifiname;
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss;
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-};
-
-#endif // DLGCONNHIDWIFI_H
diff --git a/src/frontend/wireless-security/dlghidewifi.ui b/src/frontend/wireless-security/dlghidewifi.ui
deleted file mode 100644
index 0727ad08..00000000
--- a/src/frontend/wireless-security/dlghidewifi.ui
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifi</class>
- <widget class="QDialog" name="DlgHideWifi">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>358</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden WLAN Network</string>
-  </property>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>80</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="layoutDirection">
-    <enum>Qt::LeftToRight</enum>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>75</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>221</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>170</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>176</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>215</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>310</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>310</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>30</y>
-     <width>240</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>9</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>358</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>140</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>280</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/dlghidewifieapfast.cpp b/src/frontend/wireless-security/dlghidewifieapfast.cpp
deleted file mode 100644
index ca301e9b..00000000
--- a/src/frontend/wireless-security/dlghidewifieapfast.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "dlghidewifieapfast.h"
-#include "ui_dlghidewifieapfast.h"
-#include "kylinheadfile.h"
-#include "kylin-dbus-interface.h"
-
-DlgHideWifiEapFast::DlgHideWifiEapFast(int type, QWidget *parent) :
-    WepOrWpa(type),
-    QDialog(parent),
-    ui(new Ui::DlgHideWifiEapFast)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    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;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{border:0px;font-size:20px;color:rgba(255,255,255,0.97);background-color:transparent;}");
-    ui->lbConn->setStyleSheet(objQss.labelQss);
-    ui->lbNetName->setStyleSheet(objQss.labelQss);
-    ui->lbSecurity->setStyleSheet(objQss.labelQss);
-    ui->lbAuth->setStyleSheet(objQss.labelQss);
-    ui->lbAnonyId->setStyleSheet(objQss.labelQss);
-    ui->checkBoxAutoPCA->setStyleSheet(objQss.checkBoxCAQss);
-    ui->lbPCAfile->setStyleSheet(objQss.labelQss);
-    ui->lbInnerAuth->setStyleSheet(objQss.labelQss);
-    ui->lbUserName->setStyleSheet(objQss.labelQss);
-    ui->lbPassword->setStyleSheet(objQss.labelQss);
-
-    ui->cbxConn->setStyleSheet(objQss.cbxQss);
-    ui->cbxConn->setView(new  QListView());
-    ui->leNetName->setStyleSheet(objQss.leQss);
-    ui->cbxSecurity->setStyleSheet(objQss.cbxQss);
-    ui->cbxSecurity->setView(new  QListView());
-    ui->cbxAuth->setStyleSheet(objQss.cbxQss);
-    ui->cbxAuth->setView(new  QListView());
-    ui->leAnonyId->setStyleSheet(objQss.leQss);
-    ui->cbxAutoPCA->setStyleSheet(objQss.cbxQss);
-    ui->cbxAutoPCA->setView(new  QListView());
-    ui->lePCAfile->setStyleSheet(objQss.leQss);
-    ui->cbxInnerAuth->setStyleSheet(objQss.cbxQss);
-    ui->cbxInnerAuth->setView(new  QListView());
-    ui->leUserName->setStyleSheet(objQss.leQss);
-    ui->lePassword->setStyleSheet(objQss.leQss);
-    ui->checkBoxPwd->setStyleSheet(objQss.checkBoxQss);
-
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-
-    ui->lbLeftupTitle->setText(tr("Add hidden WLAN")); //加入隐藏WLAN
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("Network name")); //网络名称:
-    ui->lbSecurity->setText(tr("WLAN security")); //Wi-Fi安全性:
-    ui->lbAuth->setText(tr("Authentication")); //认证:
-    ui->lbAnonyId->setText(tr("Anonymous identity")); //匿名身份:
-    ui->checkBoxAutoPCA->setText(tr("Allow automatic PAC pro_visioning")); //自动PAC配置:
-    ui->lbPCAfile->setText(tr("PAC file"));//PAC文件:
-    ui->lbInnerAuth->setText(tr("Inner authentication")); //内部认证:
-    ui->lbUserName->setText(tr("Username")); //用户名:
-    ui->lbPassword->setText(tr("Password")); //密码:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-
-    ui->checkBoxAutoPCA->setFocusPolicy(Qt::NoFocus);
-    ui->checkBoxPwd->setFocusPolicy(Qt::NoFocus);
-
-    ui->cbxConn->addItem(tr("C_reate…")); //新建...
-    int status = system("nmcli connection show>/tmp/kylin-nm-connshow");
-    qDebug()<<"executed cmd=nmcli connection show>/tmp/kylin-nm-connshow. res="<<status;
-    QFile file("/tmp/kylin-nm-connshow");
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-        qDebug()<<"Can't open the file!";
-    }
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-    foreach (QString line, txtLine) {
-        if(line.indexOf("wifi") != -1){
-            QStringList subLine = line.split(" ");
-            ui->cbxConn->addItem(subLine[0]);
-        }
-    }
-    ui->cbxConn->setCurrentIndex(0);
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    ui->cbxSecurity->addItem("LEAP");
-    ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    if (WepOrWpa == 0) {
-        ui->cbxSecurity->setCurrentIndex(5);
-    } else if (WepOrWpa == 1) {
-        ui->cbxSecurity->setCurrentIndex(6);
-    }
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogSecu()));
-
-    ui->cbxAuth->addItem("TLS");
-    ui->cbxAuth->addItem("LEAP");
-    ui->cbxAuth->addItem("PWD");
-    ui->cbxAuth->addItem("FAST");
-    ui->cbxAuth->addItem(tr("Tunneled TLS"));//隧道 TLS
-    ui->cbxAuth->addItem(tr("Protected EAP (PEAP)")); //受保护的 EAP
-    ui->cbxAuth->setCurrentIndex(3);
-    connect(ui->cbxAuth,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogAuth()));
-
-    ui->checkBoxAutoPCA->setCheckState(Qt::Checked);
-
-    ui->cbxAutoPCA->addItem(tr("Anonymous")); //匿名
-    ui->cbxAutoPCA->addItem(tr("Authenticated")); //已认证
-    ui->cbxAutoPCA->addItem(tr("Both")); //两者兼用
-    ui->cbxAutoPCA->setCurrentIndex(0);
-
-    ui->lePCAfile->setText(tr("None")); //(无)
-
-    ui->cbxInnerAuth->addItem("GTC");
-    ui->cbxInnerAuth->addItem("MSCHAPv2");
-    ui->cbxInnerAuth->setCurrentIndex(0);
-
-    ui->btnConnect->setEnabled(false);
-
-    this->setFixedSize(432,673);
-}
-
-DlgHideWifiEapFast::~DlgHideWifiEapFast()
-{
-    delete ui;
-}
-
-void DlgHideWifiEapFast::mousePressEvent(QMouseEvent *event){
-    if(event->button() == Qt::LeftButton){
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-}
-void DlgHideWifiEapFast::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-}
-void DlgHideWifiEapFast::mouseMoveEvent(QMouseEvent *event){
-    if(this->isPress){
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-}
-
-void DlgHideWifiEapFast::changeDialogSecu()
-{
-    if(ui->cbxSecurity->currentIndex()==0){
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0);
-        connHidWifi->show();
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0);
-        connHidWifiWpa->show();
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(0);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(1);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiLeap *connHidWifiLeap = new DlgHideWifiLeap();
-        connHidWifiLeap->show();
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        if (WepOrWpa == 1) {
-            ui->cbxSecurity->setCurrentIndex(5);
-            WepOrWpa = 0;
-        }
-    } else {
-        if (WepOrWpa == 0){
-            ui->cbxSecurity->setCurrentIndex(6);
-            WepOrWpa = 1;
-        }
-    }
-}
-
-void DlgHideWifiEapFast::changeDialogAuth()
-{
-    if(ui->cbxAuth->currentIndex()==0){
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapTls *connHidWifiEapTls = new DlgHideWifiEapTls(WepOrWpa);
-        //connHidWifiEapTls->show();
-    } else if(ui->cbxAuth->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapLeap *connHidWifiEapLeap = new DlgHideWifiEapLeap(WepOrWpa);
-        connHidWifiEapLeap->show();
-    } else if(ui->cbxAuth->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapPwd *connHidWifiEapPwd = new DlgHideWifiEapPwd(WepOrWpa);
-        connHidWifiEapPwd->show();
-    } else if(ui->cbxAuth->currentIndex()==3) {
-        qDebug()<<"it's not need to change dialog";
-    } else if(ui->cbxAuth->currentIndex()==4) {
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapTTLS *connHidWifiEapTTls = new DlgHideWifiEapTTLS(WepOrWpa);
-        //connHidWifiEapTTls->show();
-    } else {
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(WepOrWpa);
-        //connHidWifiEapPeap->show();
-    }
-}
-
-void DlgHideWifiEapFast::on_btnCancel_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapFast::on_btnConnect_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapFast::on_checkBoxAutoPCA_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->cbxAutoPCA->setEnabled(false);
-    } else {
-        ui->cbxAutoPCA->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapFast::on_checkBoxPwd_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->lePassword ->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->lePassword->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-void DlgHideWifiEapFast::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if(ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapFast::on_leAnonyId_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if(ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapFast::on_leUserName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if(ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapFast::on_lePassword_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if(ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapFast::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifieapfast.h b/src/frontend/wireless-security/dlghidewifieapfast.h
deleted file mode 100644
index b6ec06fd..00000000
--- a/src/frontend/wireless-security/dlghidewifieapfast.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFISECFAST_H
-#define DLGCONNHIDWIFISECFAST_H
-
-#include <QDialog>
-#include <QMouseEvent>
-
-namespace Ui {
-class DlgHideWifiEapFast;
-}
-
-class DlgHideWifiEapFast : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DlgHideWifiEapFast(int type, QWidget *parent = 0);
-    ~DlgHideWifiEapFast();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialogSecu();
-    void changeDialogAuth();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_checkBoxAutoPCA_stateChanged(int arg1);
-
-    void on_checkBoxPwd_stateChanged(int arg1);
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-    void on_leAnonyId_textEdited(const QString &arg1);
-
-    void on_leUserName_textEdited(const QString &arg1);
-
-    void on_lePassword_textEdited(const QString &arg1);
-
-private:
-    Ui::DlgHideWifiEapFast *ui;
-    int WepOrWpa = 0;//0 WEP;1WPA
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss;
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-};
-
-#endif // DLGCONNHIDWIFISECFAST_H
diff --git a/src/frontend/wireless-security/dlghidewifieapfast.ui b/src/frontend/wireless-security/dlghidewifieapfast.ui
deleted file mode 100644
index 9204ba6e..00000000
--- a/src/frontend/wireless-security/dlghidewifieapfast.ui
+++ /dev/null
@@ -1,505 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifiEapFast</class>
- <widget class="QDialog" name="DlgHideWifiEapFast">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>673</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden WLAN Network</string>
-  </property>
-  <widget class="QCheckBox" name="checkBoxPwd">
-   <property name="geometry">
-    <rect>
-     <x>332</x>
-     <y>542</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>11</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>176</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>170</y>
-     <width>182</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>80</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxAuth">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>260</y>
-     <width>182</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="lePassword">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>530</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leUserName">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>485</y>
-     <width>182</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>491</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>215</y>
-     <width>182</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbPassword">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>536</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>620</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>75</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>266</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>221</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>620</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAnonyId">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>311</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leAnonyId">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>305</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxAutoPCA">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>356</y>
-     <width>100</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxAutoPCA">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>350</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbPCAfile">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>401</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="lePCAfile">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>395</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbInnerAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>446</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxInnerAuth">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>440</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>30</y>
-     <width>140</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>9</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>673</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>140</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>590</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>cbxAuth</zorder>
-  <zorder>lePassword</zorder>
-  <zorder>leUserName</zorder>
-  <zorder>lbUserName</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>lbPassword</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>lbAuth</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>lbAnonyId</zorder>
-  <zorder>leAnonyId</zorder>
-  <zorder>checkBoxAutoPCA</zorder>
-  <zorder>cbxAutoPCA</zorder>
-  <zorder>lbPCAfile</zorder>
-  <zorder>lePCAfile</zorder>
-  <zorder>lbInnerAuth</zorder>
-  <zorder>cbxInnerAuth</zorder>
-  <zorder>checkBoxPwd</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/dlghidewifieapleap.cpp b/src/frontend/wireless-security/dlghidewifieapleap.cpp
deleted file mode 100644
index 34a27e83..00000000
--- a/src/frontend/wireless-security/dlghidewifieapleap.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "dlghidewifieapleap.h"
-#include "ui_dlghidewifieapleap.h"
-#include "kylinheadfile.h"
-#include "kylin-dbus-interface.h"
-
-DlgHideWifiEapLeap::DlgHideWifiEapLeap(int type, QWidget *parent) :
-    WepOrWpa(type),
-    QDialog(parent),
-    ui(new Ui::DlgHideWifiEapLeap)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    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;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{border:0px;font-size:20px;color:rgba(255,255,255,0.97);background-color:transparent;}");
-    ui->lbConn->setStyleSheet(objQss.labelQss);
-    ui->lbNetName->setStyleSheet(objQss.labelQss);
-    ui->lbSecurity->setStyleSheet(objQss.labelQss);
-    ui->lbAuth->setStyleSheet(objQss.labelQss);
-    ui->lbUserName->setStyleSheet(objQss.labelQss);
-    ui->lbPassword->setStyleSheet(objQss.labelQss);
-
-    ui->cbxConn->setStyleSheet(objQss.cbxQss);
-    ui->cbxConn->setView(new  QListView());
-    ui->leNetName->setStyleSheet(objQss.leQss);
-    ui->cbxSecurity->setStyleSheet(objQss.cbxQss);
-    ui->cbxSecurity->setView(new  QListView());
-    ui->cbxAuth->setStyleSheet(objQss.cbxQss);
-    ui->cbxAuth->setView(new  QListView());
-    ui->leUserName->setStyleSheet(objQss.leQss);
-    ui->lePassword->setStyleSheet(objQss.leQss);
-    ui->checkBox->setStyleSheet(objQss.checkBoxQss);
-
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-
-    ui->lbLeftupTitle->setText(tr("Add hidden WLAN")); //加入隐藏WLAN
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("Network name")); //网络名称:
-    ui->lbSecurity->setText(tr("WLAN security")); //Wi-Fi安全性:
-    ui->lbAuth->setText(tr("Authentication")); //认证:
-    ui->lbUserName->setText(tr("Username")); //用户名:
-    ui->lbPassword->setText(tr("Password")); //密码:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-
-    ui->cbxConn->addItem(tr("C_reate…")); //新建...
-    int status = system("nmcli connection show>/tmp/kylin-nm-connshow");
-    qDebug()<<"executed cmd=nmcli connection show>/tmp/kylin-nm-connshow. res="<<status;
-    QFile file("/tmp/kylin-nm-connshow");
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-        qDebug()<<"Can't open the file!";
-    }
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-    foreach (QString line, txtLine) {
-        if(line.indexOf("wifi") != -1){
-            QStringList subLine = line.split(" ");
-            ui->cbxConn->addItem(subLine[0]);
-        }
-    }
-    ui->cbxConn->setCurrentIndex(0);
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    ui->cbxSecurity->addItem("LEAP");
-    ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    if (WepOrWpa == 0) {
-        ui->cbxSecurity->setCurrentIndex(5);
-    } else if (WepOrWpa == 1) {
-        ui->cbxSecurity->setCurrentIndex(6);
-    }
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogSecu()));
-
-    ui->cbxAuth->addItem("TLS");
-    ui->cbxAuth->addItem("LEAP");
-    ui->cbxAuth->addItem("PWD");
-    ui->cbxAuth->addItem("FAST");
-    ui->cbxAuth->addItem(tr("Tunneled TLS"));//隧道 TLS
-    ui->cbxAuth->addItem(tr("Protected EAP (PEAP)")); //受保护的 EAP
-    ui->cbxAuth->setCurrentIndex(1);
-    connect(ui->cbxAuth,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogAuth()));
-
-    ui->btnConnect->setEnabled(false);
-
-    this->setFixedSize(432,487);
-}
-
-DlgHideWifiEapLeap::~DlgHideWifiEapLeap()
-{
-    delete ui;
-}
-
-void DlgHideWifiEapLeap::mousePressEvent(QMouseEvent *event){
-    if(event->button() == Qt::LeftButton){
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-}
-void DlgHideWifiEapLeap::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-}
-void DlgHideWifiEapLeap::mouseMoveEvent(QMouseEvent *event){
-    if(this->isPress){
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-}
-
-void DlgHideWifiEapLeap::changeDialogSecu()
-{
-    if(ui->cbxSecurity->currentIndex()==0){
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0);
-        connHidWifi->show();
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0);
-        connHidWifiWpa->show();
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(0);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(1);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiLeap *connHidWifiLeap = new DlgHideWifiLeap();
-        connHidWifiLeap->show();
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        if (WepOrWpa == 1) {
-            ui->cbxSecurity->setCurrentIndex(5);
-            WepOrWpa = 0;
-        }
-    } else {
-        if (WepOrWpa == 0){
-            ui->cbxSecurity->setCurrentIndex(6);
-            WepOrWpa = 1;
-        }
-    }
-}
-
-void DlgHideWifiEapLeap::changeDialogAuth()
-{
-    if(ui->cbxAuth->currentIndex()==0){
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapTls *connHidWifiEapTls = new DlgHideWifiEapTls(WepOrWpa);
-        //connHidWifiEapTls->show();
-    } else if(ui->cbxAuth->currentIndex()==1) {
-        qDebug()<<"it's not need to change dialog";
-    } else if(ui->cbxAuth->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapPwd *connHidWifiEapPwd = new DlgHideWifiEapPwd(WepOrWpa);
-        connHidWifiEapPwd->show();
-    } else if(ui->cbxAuth->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapFast *connHidWifiEapFast = new DlgHideWifiEapFast(WepOrWpa);
-        connHidWifiEapFast->show();
-    } else if(ui->cbxAuth->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapTTLS *connHidWifiEapTTls = new DlgHideWifiEapTTLS(WepOrWpa);
-        connHidWifiEapTTls->show();
-    } else {
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(WepOrWpa);
-        //connHidWifiEapPeap->show();
-    }
-}
-
-void DlgHideWifiEapLeap::on_btnCancel_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapLeap::on_btnConnect_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapLeap::on_checkBox_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->lePassword ->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->lePassword->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-void DlgHideWifiEapLeap::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapLeap::on_leUserName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapLeap::on_lePassword_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapLeap::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifieapleap.h b/src/frontend/wireless-security/dlghidewifieapleap.h
deleted file mode 100644
index 18023fa4..00000000
--- a/src/frontend/wireless-security/dlghidewifieapleap.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFISECLEAP_H
-#define DLGCONNHIDWIFISECLEAP_H
-
-#include <QDialog>
-#include <QMouseEvent>
-
-namespace Ui {
-class DlgHideWifiEapLeap;
-}
-
-class DlgHideWifiEapLeap : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DlgHideWifiEapLeap(int type, QWidget *parent = 0);
-    ~DlgHideWifiEapLeap();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialogSecu();
-    void changeDialogAuth();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_checkBox_stateChanged(int arg1);
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-    void on_leUserName_textEdited(const QString &arg1);
-
-    void on_lePassword_textEdited(const QString &arg1);
-
-private:
-    Ui::DlgHideWifiEapLeap *ui;
-    int WepOrWpa = 0;//0 WEP;1WPA
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss, checkBoxCAQss;
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-};
-
-#endif // DLGCONNHIDWIFISECLEAP_H
diff --git a/src/frontend/wireless-security/dlghidewifieapleap.ui b/src/frontend/wireless-security/dlghidewifieapleap.ui
deleted file mode 100644
index f83ba1ef..00000000
--- a/src/frontend/wireless-security/dlghidewifieapleap.ui
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifiEapLeap</class>
- <widget class="QDialog" name="DlgHideWifiEapLeap">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>487</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden WLAN Network</string>
-  </property>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>215</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="lePassword">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>350</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBox">
-   <property name="geometry">
-    <rect>
-     <x>332</x>
-     <y>362</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>176</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>221</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leUserName">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>305</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>440</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>75</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>311</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>440</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxAuth">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>260</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>266</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>170</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbPassword">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>356</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>80</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>30</y>
-     <width>140</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>487</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>140</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>410</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>lePassword</zorder>
-  <zorder>checkBox</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>leUserName</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>lbUserName</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>cbxAuth</zorder>
-  <zorder>lbAuth</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>lbPassword</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/dlghidewifieappeap.cpp b/src/frontend/wireless-security/dlghidewifieappeap.cpp
deleted file mode 100644
index 566cbfb8..00000000
--- a/src/frontend/wireless-security/dlghidewifieappeap.cpp
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "dlghidewifieappeap.h"
-#include "ui_dlghidewifieappeap.h"
-#include "kylinheadfile.h"
-#include "mainwindow.h"
-#include "kylin-dbus-interface.h"
-#include <QStandardItemModel>
-#include <QDir>
-
-DlgHideWifiEapPeap::DlgHideWifiEapPeap(int type, int beUsed, OldMainWindow *mainWindow, QWidget *parent) :
-    WepOrWpa(type),
-    isUsed(beUsed),
-    QDialog(parent),
-    ui(new Ui::DlgHideWifiEapPeap)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    this->setWindowIcon(QIcon::fromTheme("kylin-network", QIcon(":/res/x/setup.png")) );
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    MyQss objQss;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{font-size:20px;}");
-    ui->checkBoxPwd->setStyleSheet(objQss.checkBoxQss);
-    ui->checkBoxPwdSec->setStyleSheet(objQss.checkBoxQss);
-
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-
-    ui->lbLeftupTitle->setText(tr("Add hidden WLAN")); //加入隐藏WLAN
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("Network name")); //网络名称:
-    ui->lbSecurity->setText(tr("WLAN security")); //Wi-Fi安全性:
-    ui->lbAuth->setText(tr("Authentication")); //认证:
-    ui->lbAnonyId->setText(tr("Anonymous identity")); //匿名身份:
-    ui->lbDomain->setText(tr("Domain")); //域名:
-    ui->lbCA->setText(tr("CA certificate")); //CA 证书:
-    ui->lbCaPwd->setText(tr("CA certificate password")); //CA 证书密码:
-    ui->checkBoxCA->setText(tr("No CA certificate is required")); //不需要CA证书
-    ui->lbPEAPver->setText(tr("PEAP version")); //PEAP版本:
-    ui->lbInnerAuth->setText(tr("Inner authentication")); //内部认证:
-    ui->lbUserName->setText(tr("Username")); //用户名:
-    ui->lbPassword->setText(tr("Password")); //密码:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-
-    ui->cbxConn->addItem("新建...");
-    int status = system("nmcli connection show>/tmp/kylin-nm-connshow");
-    qDebug()<<"executed cmd=nmcli connection show>/tmp/kylin-nm-connshow. res="<<status;
-    QFile file("/tmp/kylin-nm-connshow");
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qDebug()<<"Can't open the file!";
-    }
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-    foreach (QString line, txtLine) {
-        if (line.indexOf("wifi") != -1) {
-            QStringList subLine = line.split(" ");
-            ui->cbxConn->addItem(subLine[0]);
-        }
-    }
-    ui->cbxConn->setCurrentIndex(0);
-    connect(ui->cbxConn,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeWindow()));
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    //ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    //ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    //ui->cbxSecurity->addItem("LEAP");
-    //ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-
-    if (WepOrWpa == 0) {
-        ui->cbxSecurity->setCurrentIndex(5);
-    } else if (WepOrWpa == 1) {
-        ui->cbxSecurity->setCurrentIndex(2);
-    }
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogSecu()));
-
-    //ui->cbxAuth->addItem("TLS");
-    //ui->cbxAuth->addItem("LEAP");
-    //ui->cbxAuth->addItem("PWD");
-    //ui->cbxAuth->addItem("FAST");
-    //ui->cbxAuth->addItem(tr("Tunneled TLS"));//隧道 TLS
-    ui->cbxAuth->addItem(tr("Protected EAP (PEAP)")); //受保护的 EAP
-    ui->cbxAuth->setCurrentIndex(0);
-    //connect(ui->cbxAuth,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogAuth()));
-
-    ui->cbxCA->addItem(tr("None")); //无
-    ui->cbxCA->addItem(tr("Choose from file")); //从文件选择...
-    ui->cbxCA->setCurrentIndex(0);
-
-    ui->cbxPEAPver->addItem(tr("Automatic")); //自动
-    ui->cbxPEAPver->addItem(tr("Version 0")); //版本 0
-    ui->cbxPEAPver->addItem(tr("Version 1")); //版本 1
-    ui->cbxPEAPver->setCurrentIndex(0);
-
-    ui->cbxInnerAuth->addItem("MSCHAPv2");
-    ui->cbxInnerAuth->addItem("MDS");
-    ui->cbxInnerAuth->addItem("GTC");
-    ui->cbxInnerAuth->setCurrentIndex(0);
-
-    if (isUsed == 0) {
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->cbxConn->setCurrentIndex(isUsed);
-        ui->leNetName->setText(ui->cbxConn->currentText());
-        ui->leNetName->setEnabled(false);
-        ui->cbxSecurity->setEnabled(false);
-        ui->cbxAuth->setEnabled(false);
-        ui->leAnonyId->setEnabled(false);
-        ui->leDomain->setEnabled(false);
-        ui->cbxCA->setEnabled(false);
-        ui->leCaPwd->setEnabled(false);
-        ui->checkBoxCA->setEnabled(false);
-        ui->cbxPEAPver->setEnabled(false);
-        ui->cbxInnerAuth->setEnabled(false);
-        ui->leUserName->setText("<Hidden>");
-        ui->leUserName->setEnabled(false);
-        ui->lePassword->setText("<Hidden>");
-        ui->lePassword->setEnabled(false);
-        ui->btnConnect->setEnabled(true);
-    }
-
-    this->setFixedSize(432,700);
-
-    this->mw = mainWindow;
-}
-
-DlgHideWifiEapPeap::~DlgHideWifiEapPeap()
-{
-    delete ui;
-}
-
-void DlgHideWifiEapPeap::mousePressEvent(QMouseEvent *event){
-    if (event->button() == Qt::LeftButton) {
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-}
-void DlgHideWifiEapPeap::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-}
-void DlgHideWifiEapPeap::mouseMoveEvent(QMouseEvent *event){
-    if (this->isPress) {
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-}
-
-//切换到其他Wi-Fi安全类型
-void DlgHideWifiEapPeap::changeDialogSecu()
-{
-    if (ui->cbxSecurity->currentIndex()==0) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0);
-        connHidWifi->show();
-        connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0);
-        connHidWifiWpa->show();
-        connect(connHidWifiWpa, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        if (WepOrWpa == 0) {
-            ui->cbxSecurity->setCurrentIndex(6);
-            WepOrWpa = 1;
-        }
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(0);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(1);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiLeap *connHidWifiLeap = new DlgHideWifiLeap();
-        connHidWifiLeap->show();
-    } else {
-        if (WepOrWpa == 1) {
-            ui->cbxSecurity->setCurrentIndex(5);
-            WepOrWpa = 0;
-        }
-    }
-}
-
-//同一 Wi-Fi安全类型的Authentication变换
-void DlgHideWifiEapPeap::changeDialogAuth()
-{
-    if (ui->cbxAuth->currentIndex()==0) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapTls *connHidWifiEapTls = new DlgHideWifiEapTls(WepOrWpa, 0, mw);
-        connHidWifiEapTls->show();
-    } else if(ui->cbxAuth->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapLeap *connHidWifiEapLeap = new DlgHideWifiEapLeap(WepOrWpa);
-        connHidWifiEapLeap->show();
-    } else if(ui->cbxAuth->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapPwd *connHidWifiEapPwd = new DlgHideWifiEapPwd(WepOrWpa);
-        connHidWifiEapPwd->show();
-    } else if(ui->cbxAuth->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapFast *connHidWifiEapFast = new DlgHideWifiEapFast(WepOrWpa);
-        connHidWifiEapFast->show();
-    } else if(ui->cbxAuth->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapTTLS *connHidWifiEapTTls = new DlgHideWifiEapTTLS(WepOrWpa);
-        connHidWifiEapTTls->show();
-    } else {
-        qDebug()<<"it's not need to change dialog";
-    }
-}
-
-//同一 Wi-Fi安全类型的窗口变换
-void DlgHideWifiEapPeap::changeWindow(){
-    if (ui->cbxConn->currentIndex() == 0) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0, mw);
-        connHidWifi->show();
-        connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    } else if (ui->cbxConn->currentIndex() >= 1) {
-        QString tmpPath = "/tmp/kylin-nm-connshow-" + QDir::home().dirName();
-        QString currStr = "nmcli connection show '" + ui->cbxConn->currentText() + "' > " + tmpPath;
-
-        int status = system(currStr.toUtf8().data());
-        qDebug()<<"executed cmd="<<currStr<<". res="<<status;
-        QFile file(tmpPath);
-        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            qDebug()<<"Can't open the file!";
-        }
-        QString txt = file.readAll();
-        file.close();
-        if (txt.indexOf("802-11-wireless-security.key-mgmt:") != -1) {
-            if (txt.indexOf("wpa-psk") != -1) {
-                QApplication::setQuitOnLastWindowClosed(false);
-                this->hide();
-                DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(ui->cbxConn->currentIndex(), mw);
-                connHidWifiWpa->show();
-                connect(connHidWifiWpa, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-            }
-            if (txt.indexOf("wpa-eap") != -1) {
-                isUsed = ui->cbxConn->currentIndex();
-                ui->leNetName->setText(ui->cbxConn->currentText());
-                ui->leNetName->setEnabled(false);
-                ui->cbxSecurity->setEnabled(false);
-                ui->cbxAuth->setEnabled(false);
-                ui->leAnonyId->setEnabled(false);
-                ui->leDomain->setEnabled(false);
-                ui->cbxCA->setEnabled(false);
-                ui->leCaPwd->setEnabled(false);
-                ui->checkBoxCA->setEnabled(false);
-                ui->cbxPEAPver->setEnabled(false);
-                ui->cbxInnerAuth->setEnabled(false);
-                ui->leUserName->setText("<Hidden>");
-                ui->leUserName->setEnabled(false);
-                ui->lePassword->setText("<Hidden>");
-                ui->lePassword->setEnabled(false);
-                ui->btnConnect->setEnabled(true);
-            }
-        } else {
-            QApplication::setQuitOnLastWindowClosed(false);
-            this->hide();
-            DlgHideWifi *connHidWifi = new DlgHideWifi(ui->cbxConn->currentIndex(), mw);
-            connHidWifi->show();
-            connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-        }
-    }
-}
-
-//CA证书的Index变化
-void DlgHideWifiEapPeap::on_cbxCA_currentIndexChanged(const QString &arg1)
-{
-    if (ui->cbxCA->currentIndex() == 0) {
-        ui->leCaPwd->setText("");
-        ui->lbCaPwd->setEnabled(false);
-        ui->leCaPwd->setEnabled(false);
-    } else {
-        ui->leCaPwd->setText("");
-        ui->lbCaPwd->setEnabled(true);
-        ui->leCaPwd->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapPeap::on_btnCancel_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapPeap::on_btnConnect_clicked()
-{
-    this->close();
-}
-
-//是否显示密码
-void DlgHideWifiEapPeap::on_checkBoxPwd_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->leCaPwd->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->leCaPwd->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-//是否是不需要CA证书
-void DlgHideWifiEapPeap::on_checkBoxCA_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->cbxCA->setCurrentIndex(0);
-        ui->leCaPwd->setText("");
-        ui->lbCA->setEnabled(true);
-        ui->cbxCA->setEnabled(true);
-    } else {
-        ui->cbxCA->setCurrentIndex(0);
-        ui->leCaPwd->setText("");
-        ui->lbCA->setEnabled(false);
-        ui->cbxCA->setEnabled(false);
-    }
-}
-
-//是否显示密码
-void DlgHideWifiEapPeap::on_checkBoxPwdSec_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->lePassword->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->lePassword->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-//编辑网络名称
-void DlgHideWifiEapPeap::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->checkBoxCA->isChecked()) {
-            //勾选"不需要CA证书"
-            ui->btnConnect->setEnabled(true);
-        } else {
-            //未勾选"不需要CA证书"
-            if (ui->cbxCA->currentIndex() == 0) {
-                ui->btnConnect->setEnabled(true);
-            } else if(ui->leCaPwd->text() == "") {
-                ui->btnConnect->setEnabled(false);
-            } else {
-                ui->btnConnect->setEnabled(true);
-            }
-        }
-    }
-}
-
-//编辑匿名身份
-void DlgHideWifiEapPeap::on_leAnonyId_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leAnonyId->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leDomain->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->cbxCA->currentIndex() == 0) {
-            ui->btnConnect->setEnabled(true);
-        } else if(ui->leCaPwd->text() == "") {
-            ui->btnConnect->setEnabled(false);
-        } else {
-            ui->btnConnect->setEnabled(true);
-        }
-    }
-}
-
-//编辑域名
-void DlgHideWifiEapPeap::on_leDomain_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leAnonyId->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leDomain->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->cbxCA->currentIndex() == 0) {
-            ui->btnConnect->setEnabled(true);
-        } else if(ui->leCaPwd->text() == "") {
-            ui->btnConnect->setEnabled(false);
-        } else {
-            ui->btnConnect->setEnabled(true);
-        }
-    }
-}
-
-//编辑CA证书密码
-void DlgHideWifiEapPeap::on_leCaPwd_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leAnonyId->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leDomain->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leCaPwd->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-//编辑用户名
-void DlgHideWifiEapPeap::on_leUserName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->checkBoxCA->isChecked()) {
-            //勾选"不需要CA证书"
-            ui->btnConnect->setEnabled(true);
-        } else {
-            //未勾选"不需要CA证书"
-            if (ui->cbxCA->currentIndex() == 0) {
-                ui->btnConnect->setEnabled(true);
-            } else if(ui->leCaPwd->text() == "") {
-                ui->btnConnect->setEnabled(false);
-            } else {
-                ui->btnConnect->setEnabled(true);
-            }
-        }
-    }
-}
-
-//编辑密码
-void DlgHideWifiEapPeap::on_lePassword_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == "") {
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->checkBoxCA->isChecked()) {
-            //勾选"不需要CA证书"
-            ui->btnConnect->setEnabled(true);
-        } else {
-            //未勾选"不需要CA证书"
-            if (ui->cbxCA->currentIndex() == 0) {
-                ui->btnConnect->setEnabled(true);
-            } else if(ui->leCaPwd->text() == "") {
-                ui->btnConnect->setEnabled(false);
-            } else {
-                ui->btnConnect->setEnabled(true);
-            }
-        }
-    }
-}
-
-void DlgHideWifiEapPeap::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifieappeap.h b/src/frontend/wireless-security/dlghidewifieappeap.h
deleted file mode 100644
index 94ad7a5e..00000000
--- a/src/frontend/wireless-security/dlghidewifieappeap.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFISECPEAP_H
-#define DLGCONNHIDWIFISECPEAP_H
-
-#include <QDialog>
-#include <QMouseEvent>
-
-class OldMainWindow;
-
-namespace Ui {
-class DlgHideWifiEapPeap;
-}
-
-class DlgHideWifiEapPeap : public QDialog
-{
-    Q_OBJECT
-
-public:
-    //type: 0是动态 WEP， 1是企业wpa, beUsed:是否是之前已经连接过多网络
-    explicit DlgHideWifiEapPeap(int type, int beUsed, OldMainWindow *mw = 0, QWidget *parent = 0);
-    ~DlgHideWifiEapPeap();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialogSecu();
-    void changeDialogAuth();
-    void changeWindow();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_cbxCA_currentIndexChanged(const QString &arg1);
-
-    void on_checkBoxPwd_stateChanged(int arg1);
-
-    void on_checkBoxCA_stateChanged(int arg1);
-
-    void on_checkBoxPwdSec_stateChanged(int arg1);
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-    void on_leAnonyId_textEdited(const QString &arg1);
-
-    void on_leDomain_textEdited(const QString &arg1);
-
-    void on_leCaPwd_textEdited(const QString &arg1);
-
-    void on_leUserName_textEdited(const QString &arg1);
-
-    void on_lePassword_textEdited(const QString &arg1);
-
-private:
-    Ui::DlgHideWifiEapPeap *ui;
-    int WepOrWpa = 0;//0 WEP;1 WPA
-    int isUsed;//=0 current wifi not used before; >=1 used
-    OldMainWindow *mw;
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss, checkBoxCAQss;
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-};
-
-#endif // DLGCONNHIDWIFISECPEAP_H
diff --git a/src/frontend/wireless-security/dlghidewifieappeap.ui b/src/frontend/wireless-security/dlghidewifieappeap.ui
deleted file mode 100644
index 0154e800..00000000
--- a/src/frontend/wireless-security/dlghidewifieappeap.ui
+++ /dev/null
@@ -1,614 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifiEapPeap</class>
- <widget class="QDialog" name="DlgHideWifiEapPeap">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>700</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden WLAN Network</string>
-  </property>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>141</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxCA">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>341</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>76</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leDomain">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>301</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>71</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leCaPwd">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>381</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>650</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>181</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leAnonyId">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>261</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxCA">
-   <property name="geometry">
-    <rect>
-     <x>183</x>
-     <y>421</y>
-     <width>200</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>146</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>650</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbDomain">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>306</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbCaPwd">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>386</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxPwdSec">
-   <property name="geometry">
-    <rect>
-     <x>357</x>
-     <y>593</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxPwd">
-   <property name="geometry">
-    <rect>
-     <x>357</x>
-     <y>393</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>186</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxPEAPver">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>461</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>226</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbPEAPver">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>466</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxAuth">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>221</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbCA">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>346</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAnonyId">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>266</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbPassword">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>586</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leUserName">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>541</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxInnerAuth">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>501</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="lePassword">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>581</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbInnerAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>506</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>546</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>700</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>28</y>
-     <width>140</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>121</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>631</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>cbxCA</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>leDomain</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>leCaPwd</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>leAnonyId</zorder>
-  <zorder>checkBoxCA</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>lbDomain</zorder>
-  <zorder>lbCaPwd</zorder>
-  <zorder>checkBoxPwd</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>cbxPEAPver</zorder>
-  <zorder>lbAuth</zorder>
-  <zorder>lbPEAPver</zorder>
-  <zorder>cbxAuth</zorder>
-  <zorder>lbCA</zorder>
-  <zorder>lbAnonyId</zorder>
-  <zorder>lbPassword</zorder>
-  <zorder>leUserName</zorder>
-  <zorder>cbxInnerAuth</zorder>
-  <zorder>lePassword</zorder>
-  <zorder>lbInnerAuth</zorder>
-  <zorder>lbUserName</zorder>
-  <zorder>checkBoxPwdSec</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/dlghidewifieappwd.cpp b/src/frontend/wireless-security/dlghidewifieappwd.cpp
deleted file mode 100644
index 9d00d4ab..00000000
--- a/src/frontend/wireless-security/dlghidewifieappwd.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "dlghidewifieappwd.h"
-#include "ui_dlghidewifieappwd.h"
-#include "kylinheadfile.h"
-#include "kylin-dbus-interface.h"
-
-DlgHideWifiEapPwd::DlgHideWifiEapPwd(int type, QWidget *parent) :
-    WepOrWpa(type),
-    QDialog(parent),
-    ui(new Ui::DlgHideWifiEapPwd)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    MyQss objQss;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{border:0px;font-size:20px;color:rgba(255,255,255,0.97);background-color:transparent;}");
-    ui->lbConn->setStyleSheet(objQss.labelQss);
-    ui->lbNetName->setStyleSheet(objQss.labelQss);
-    ui->lbSecurity->setStyleSheet(objQss.labelQss);
-    ui->lbAuth->setStyleSheet(objQss.labelQss);
-    ui->lbUserName->setStyleSheet(objQss.labelQss);
-    ui->lbPassword->setStyleSheet(objQss.labelQss);
-
-    ui->cbxConn->setStyleSheet(objQss.cbxQss);
-    ui->cbxConn->setView(new  QListView());
-    ui->leNetName->setStyleSheet(objQss.leQss);
-    ui->cbxSecurity->setStyleSheet(objQss.cbxQss);
-    ui->cbxSecurity->setView(new  QListView());
-    ui->cbxAuth->setStyleSheet(objQss.cbxQss);
-    ui->cbxAuth->setView(new  QListView());
-    ui->leUserName->setStyleSheet(objQss.leQss);
-    ui->lePassword->setStyleSheet(objQss.leQss);
-    ui->checkBox->setStyleSheet(objQss.checkBoxQss);
-
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-
-
-    ui->lbLeftupTitle->setText(tr("Add hidden WLAN")); //加入隐藏WLAN
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("Network name")); //网络名称:
-    ui->lbSecurity->setText(tr("WLAN security")); //Wi-Fi安全性:
-    ui->lbAuth->setText(tr("Authentication")); //认证:
-    ui->lbUserName->setText(tr("Username")); //用户名:
-    ui->lbPassword->setText(tr("Password")); //密码:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-
-    ui->cbxConn->addItem(tr("C_reate…")); //新建...
-    int status = system("nmcli connection show>/tmp/kylin-nm-connshow");
-    qDebug()<<"executed cmd=nmcli connection show>/tmp/kylin-nm-connshow. res="<<status;
-    QFile file("/tmp/kylin-nm-connshow");
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-        qDebug()<<"Can't open the file!";
-    }
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-    foreach (QString line, txtLine) {
-        if(line.indexOf("wifi") != -1){
-            QStringList subLine = line.split(" ");
-            ui->cbxConn->addItem(subLine[0]);
-        }
-    }
-    ui->cbxConn->setCurrentIndex(0);
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    ui->cbxSecurity->addItem("LEAP");
-    ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    if (WepOrWpa == 0) {
-        ui->cbxSecurity->setCurrentIndex(5);
-    } else if (WepOrWpa == 1) {
-        ui->cbxSecurity->setCurrentIndex(6);
-    }
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogSecu()));
-
-    ui->cbxAuth->addItem("TLS");
-    ui->cbxAuth->addItem("LEAP");
-    ui->cbxAuth->addItem("PWD");
-    ui->cbxAuth->addItem("FAST");
-    ui->cbxAuth->addItem(tr("Tunneled TLS"));//隧道 TLS
-    ui->cbxAuth->addItem(tr("Protected EAP (PEAP)")); //受保护的 EAP
-    ui->cbxAuth->setCurrentIndex(2);
-    connect(ui->cbxAuth,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogAuth()));
-
-    ui->btnConnect->setEnabled(false);
-
-    this->setFixedSize(432,487);
-}
-
-DlgHideWifiEapPwd::~DlgHideWifiEapPwd()
-{
-    delete ui;
-}
-
-void DlgHideWifiEapPwd::mousePressEvent(QMouseEvent *event){
-    if(event->button() == Qt::LeftButton){
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-}
-void DlgHideWifiEapPwd::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-}
-void DlgHideWifiEapPwd::mouseMoveEvent(QMouseEvent *event){
-    if(this->isPress){
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-}
-
-void DlgHideWifiEapPwd::changeDialogSecu()
-{
-    if(ui->cbxSecurity->currentIndex()==0){
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0);
-        connHidWifi->show();
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0);
-        connHidWifiWpa->show();
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(0);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(1);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiLeap *connHidWifiLeap = new DlgHideWifiLeap();
-        connHidWifiLeap->show();
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        if (WepOrWpa == 1) {
-            ui->cbxSecurity->setCurrentIndex(5);
-            WepOrWpa = 0;
-        }
-    } else {
-        if (WepOrWpa == 0){
-            ui->cbxSecurity->setCurrentIndex(6);
-            WepOrWpa = 1;
-        }
-    }
-}
-
-void DlgHideWifiEapPwd::changeDialogAuth()
-{
-    if(ui->cbxAuth->currentIndex()==0){
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapTls *connHidWifiEapTls = new DlgHideWifiEapTls(WepOrWpa);
-        //connHidWifiEapTls->show();
-    } else if(ui->cbxAuth->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapLeap *connHidWifiEapLeap = new DlgHideWifiEapLeap(WepOrWpa);
-        connHidWifiEapLeap->show();
-    } else if(ui->cbxAuth->currentIndex()==2) {
-        qDebug()<<"it's not need to change dialog";
-    } else if(ui->cbxAuth->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapFast *connHidWifiEapFast = new DlgHideWifiEapFast(WepOrWpa);
-        connHidWifiEapFast->show();
-    } else if(ui->cbxAuth->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapTTLS *connHidWifiEapTTls = new DlgHideWifiEapTTLS(WepOrWpa);
-        connHidWifiEapTTls->show();
-    } else {
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(WepOrWpa);
-        //connHidWifiEapPeap->show();
-    }
-}
-
-void DlgHideWifiEapPwd::on_btnCancel_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapPwd::on_btnConnect_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapPwd::on_checkBox_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->lePassword ->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->lePassword->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-void DlgHideWifiEapPwd::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapPwd::on_leUserName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapPwd::on_lePassword_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapPwd::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifieappwd.h b/src/frontend/wireless-security/dlghidewifieappwd.h
deleted file mode 100644
index 33dcdbde..00000000
--- a/src/frontend/wireless-security/dlghidewifieappwd.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFISECPWD_H
-#define DLGCONNHIDWIFISECPWD_H
-
-#include <QDialog>
-#include <QMouseEvent>
-
-namespace Ui {
-class DlgHideWifiEapPwd;
-}
-
-class DlgHideWifiEapPwd : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DlgHideWifiEapPwd(int type, QWidget *parent = 0);
-    ~DlgHideWifiEapPwd();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialogSecu();
-    void changeDialogAuth();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_checkBox_stateChanged(int arg1);
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-    void on_leUserName_textEdited(const QString &arg1);
-
-    void on_lePassword_textEdited(const QString &arg1);
-
-private:
-    Ui::DlgHideWifiEapPwd *ui;
-    int WepOrWpa = 0;//0 WEP;1WPA
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss, checkBoxCAQss;
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-};
-
-#endif // DLGCONNHIDWIFISECPWD_H
diff --git a/src/frontend/wireless-security/dlghidewifieappwd.ui b/src/frontend/wireless-security/dlghidewifieappwd.ui
deleted file mode 100644
index 42ead727..00000000
--- a/src/frontend/wireless-security/dlghidewifieappwd.ui
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifiEapPwd</class>
- <widget class="QDialog" name="DlgHideWifiEapPwd">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>487</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden WLAN Network</string>
-  </property>
-  <widget class="QCheckBox" name="checkBox">
-   <property name="geometry">
-    <rect>
-     <x>333</x>
-     <y>363</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>440</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>487</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>30</y>
-     <width>140</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>170</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>266</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>311</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>80</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>75</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>440</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>215</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leUserName">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>305</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="lePassword">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>350</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>176</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>221</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbPassword">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>356</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxAuth">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>260</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>140</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>410</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>lbAuth</zorder>
-  <zorder>lbUserName</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>leUserName</zorder>
-  <zorder>lePassword</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>lbPassword</zorder>
-  <zorder>cbxAuth</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
-  <zorder>checkBox</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/dlghidewifieaptls.cpp b/src/frontend/wireless-security/dlghidewifieaptls.cpp
deleted file mode 100644
index 45b19662..00000000
--- a/src/frontend/wireless-security/dlghidewifieaptls.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "ui_dlghidewifieaptls.h"
-#include "kylinheadfile.h"
-#include "mainwindow.h"
-#include "kylin-dbus-interface.h"
-#include <QStandardItemModel>
-#include <QDir>
-
-DlgHideWifiEapTls::DlgHideWifiEapTls(int type, int beUsed, OldMainWindow *mainWindow, QWidget *parent) :
-    WepOrWpa(type),
-    isUsed(beUsed),
-    QDialog(parent),
-    ui(new Ui::DlgHideWifiEapTls)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    this->setWindowIcon(QIcon::fromTheme("kylin-network", QIcon(":/res/x/setup.png")) );
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    MyQss objQss;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{font-size:20px;}");
-    ui->checkBoxPwd->setStyleSheet(objQss.checkBoxQss);
-    ui->checkBoxPwdSec->setStyleSheet(objQss.checkBoxQss);
-
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-
-    ui->lbLeftupTitle->setText(tr("Add hidden WLAN")); //加入隐藏WLAN
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("Network name")); //网络名称:
-    ui->lbSecurity->setText(tr("WLAN security")); //Wi-Fi安全性:
-    ui->lbAuth->setText(tr("Authentication")); //认证:
-    ui->lbIdentity->setText(tr("Identity")); //身份:
-    ui->lbDomain->setText(tr("Domain")); //域名:
-    ui->lbCA->setText(tr("CA certificate")); //CA 证书:
-    ui->lbCaPwd->setText(tr("CA certificate password")); //CA 证书密码:
-    ui->checkBoxCA->setText(tr("No CA certificate is required")); //不需要CA证书
-    ui->lbUserCertify->setText(tr("User certificate")); //用户证书:
-    ui->lbUserCertifyPwd->setText(tr("User certificate password")); //用户证书密码:
-    ui->lbUserPriKey->setText(tr("User private key")); //用户私钥:
-    ui->lbUserKeyPwd->setText(tr("User key password")); //用户密钥密码:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-
-    ui->cbxConn->addItem(tr("C_reate…")); //新建...
-    int status = system("nmcli connection show>/tmp/kylin-nm-connshow");
-    qDebug()<<"executed cmd=nmcli connection show>/tmp/kylin-nm-connshow. res="<<status;
-    QFile file("/tmp/kylin-nm-connshow");
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-        qDebug()<<"Can't open the file!";
-    }
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-    foreach (QString line, txtLine) {
-        if(line.indexOf("wifi") != -1){
-            QStringList subLine = line.split(" ");
-            ui->cbxConn->addItem(subLine[0]);
-        }
-    }
-    ui->cbxConn->setCurrentIndex(0);
-    connect(ui->cbxConn,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeWindow()));
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    //ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    //ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    //ui->cbxSecurity->addItem("LEAP");
-    //ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    if (WepOrWpa == 0) {
-        ui->cbxSecurity->setCurrentIndex(5);
-    } else if (WepOrWpa == 1) {
-        ui->cbxSecurity->setCurrentIndex(2);
-    }
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogSecu()));
-
-    ui->cbxAuth->addItem("TLS");
-    ui->cbxAuth->addItem("LEAP");
-    ui->cbxAuth->addItem("PWD");
-    ui->cbxAuth->addItem("FAST");
-    ui->cbxAuth->addItem(tr("Tunneled TLS"));//隧道 TLS
-    ui->cbxAuth->addItem(tr("Protected EAP (PEAP)")); //受保护的 EAP
-    ui->cbxAuth->setCurrentIndex(0);
-    connect(ui->cbxAuth,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogAuth()));
-
-    ui->cbxCA->addItem(tr("None")); //无
-    ui->cbxCA->addItem(tr("Choose from file")); //从文件选择...
-    ui->cbxCA->setCurrentIndex(0);
-
-    ui->cbxUserCertify->addItem(tr("None")); //无
-    ui->cbxUserCertify->addItem(tr("Choose from file")); //从文件选择...
-    ui->cbxUserCertify->setCurrentIndex(0);
-
-    ui->cbxUserPriKey->addItem(tr("None")); //无
-    ui->cbxUserPriKey->addItem(tr("Choose from file")); //从文件选择...
-    ui->cbxUserPriKey->setCurrentIndex(0);
-
-    ui->btnConnect->setEnabled(false);
-
-    ui->lbCaPwd->setEnabled(false);
-    ui->leCaPwd->setEnabled(false);
-
-    ui->lbUserCertifyPwd->setEnabled(false);
-    ui->leUserCertifyPwd->setEnabled(false);
-
-    ui->lbUserPriKey->setEnabled(false);
-    ui->cbxUserPriKey->setEnabled(false);
-
-    ui->lbUserKeyPwd->setEnabled(false);
-    ui->leUserKeyPwd->setEnabled(false);
-
-    this->setFixedSize(432,705);
-
-    this->mw = mainWindow;
-}
-
-DlgHideWifiEapTls::~DlgHideWifiEapTls()
-{
-    delete ui;
-}
-
-void DlgHideWifiEapTls::mousePressEvent(QMouseEvent *event){
-    if(event->button() == Qt::LeftButton){
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-}
-void DlgHideWifiEapTls::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-}
-void DlgHideWifiEapTls::mouseMoveEvent(QMouseEvent *event){
-    if(this->isPress){
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-}
-
-//切换到其他Wi-Fi安全类型
-void DlgHideWifiEapTls::changeDialogSecu()
-{
-    if(ui->cbxSecurity->currentIndex()==0){
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0, mw);
-        connHidWifi->show();
-        connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0);
-        connHidWifiWpa->show();
-        connect(connHidWifiWpa, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        qDebug()<<"it's not need to change dialog";
-        //if (WepOrWpa == 0) {
-        //    ui->cbxSecurity->setCurrentIndex(6);
-        //    WepOrWpa = 1;
-        //}
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(0);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(1);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiLeap *connHidWifiLeap = new DlgHideWifiLeap();
-        connHidWifiLeap->show();
-    } else {
-        if (WepOrWpa == 1) {
-            ui->cbxSecurity->setCurrentIndex(5);
-            WepOrWpa = 0;
-        }
-    }
-}
-
-//同一 Wi-Fi安全类型的Authentication变换
-void DlgHideWifiEapTls::changeDialogAuth()
-{
-    if(ui->cbxAuth->currentIndex()==0){
-        qDebug()<<"it's not need to change dialog";
-    } else if(ui->cbxAuth->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapLeap *connHidWifiEapLeap = new DlgHideWifiEapLeap(WepOrWpa);
-        connHidWifiEapLeap->show();
-    } else if(ui->cbxAuth->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapPwd *connHidWifiEapPwd = new DlgHideWifiEapPwd(WepOrWpa);
-        connHidWifiEapPwd->show();
-    } else if(ui->cbxAuth->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapFast *connHidWifiEapFast = new DlgHideWifiEapFast(WepOrWpa);
-        connHidWifiEapFast->show();
-    } else if(ui->cbxAuth->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapTTLS *connHidWifiEapTTls = new DlgHideWifiEapTTLS(WepOrWpa);
-        connHidWifiEapTTls->show();
-    } else {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(WepOrWpa, 0, mw);
-        connHidWifiEapPeap->show();
-    }
-}
-
-//同一 Wi-Fi安全类型的窗口变换
-void DlgHideWifiEapTls::changeWindow(){
-    if (ui->cbxConn->currentIndex() == 0){
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0, mw);
-        connHidWifi->show();
-        connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    }else if (ui->cbxConn->currentIndex() >= 1){
-        QString tmpPath = "/tmp/kylin-nm-connshow-" + QDir::home().dirName();
-        QString currStr = "nmcli connection show '" + ui->cbxConn->currentText() + "' >" + tmpPath;
-
-        int status = system(currStr.toUtf8().data());
-        qDebug()<<"executed cmd="<<currStr<<". res="<<status;
-
-        QFile file(tmpPath);
-        if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-            qDebug()<<"Can't open the file!";
-        }
-        QString txt = file.readAll();
-        file.close();
-        if (txt.indexOf("802-11-wireless-security.key-mgmt:") != -1){
-            QApplication::setQuitOnLastWindowClosed(false);
-            this->hide();
-            DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(ui->cbxConn->currentIndex(), mw);
-            connHidWifiWpa->show();
-            connect(connHidWifiWpa, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-        } else {
-            QApplication::setQuitOnLastWindowClosed(false);
-            this->hide();
-            DlgHideWifi *connHidWifi = new DlgHideWifi(ui->cbxConn->currentIndex(), mw);
-            connHidWifi->show();
-            connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-        }
-    }
-}
-
-void DlgHideWifiEapTls::on_cbxCA_currentIndexChanged(const QString &arg1)
-{
-    if (ui->cbxCA->currentIndex() == 0){
-        ui->leCaPwd->setText("");
-        ui->lbCaPwd->setEnabled(false);
-        ui->leCaPwd->setEnabled(false);
-    }else{
-        ui->leCaPwd->setText("");
-        ui->lbCaPwd->setEnabled(true);
-        ui->leCaPwd->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapTls::on_cbxUserCertify_currentIndexChanged(const QString &arg1)
-{
-    if (ui->cbxUserCertify->currentIndex() == 0){
-        ui->leUserCertifyPwd->setText("");
-        ui->lbUserCertifyPwd->setEnabled(false);
-        ui->leUserCertifyPwd->setEnabled(false);
-
-        ui->lbUserPriKey->setEnabled(false);
-        ui->cbxUserPriKey->setEnabled(false);
-        ui->cbxUserPriKey->setCurrentIndex(0);
-
-        ui->leUserKeyPwd->setText("");
-        ui->lbUserKeyPwd->setEnabled(false);
-        ui->leUserKeyPwd->setEnabled(false);
-    }else{
-        ui->leUserCertifyPwd->setText("");
-        ui->lbUserCertifyPwd->setEnabled(true);
-        ui->leUserCertifyPwd->setEnabled(true);
-
-        ui->lbUserPriKey->setEnabled(true);
-        ui->cbxUserPriKey->setEnabled(true);
-        ui->cbxUserPriKey->setCurrentIndex(0);
-
-        ui->leUserKeyPwd->setText("");
-        ui->lbUserKeyPwd->setEnabled(false);
-        ui->leUserKeyPwd->setEnabled(false);
-    }
-}
-
-void DlgHideWifiEapTls::on_cbxUserPriKey_currentIndexChanged(const QString &arg1)
-{
-    if (ui->cbxUserPriKey->currentIndex() == 0){
-        ui->leUserKeyPwd->setText("");
-        ui->lbUserKeyPwd->setEnabled(false);
-        ui->leUserKeyPwd->setEnabled(false);
-    }else{
-        ui->leUserKeyPwd->setText("");
-        ui->lbUserKeyPwd->setEnabled(true);
-        ui->leUserKeyPwd->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapTls::on_btnCancel_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapTls::on_btnConnect_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapTls::on_checkBoxCA_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->cbxCA->setCurrentIndex(0);
-        ui->lbCA->setEnabled(true);
-        ui->cbxCA->setEnabled(true);
-    } else {
-        ui->cbxCA->setCurrentIndex(0);
-        ui->lbCA->setEnabled(false);
-        ui->cbxCA->setEnabled(false);
-    }
-}
-
-void DlgHideWifiEapTls::on_checkBoxPwd_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->leCaPwd->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->leCaPwd->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-void DlgHideWifiEapTls::on_checkBoxPwdSec_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->leUserCertifyPwd->setEchoMode(QLineEdit::Password);
-        ui->leUserKeyPwd->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->leUserCertifyPwd->setEchoMode(QLineEdit::Normal);
-        ui->leUserKeyPwd->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-void DlgHideWifiEapTls::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leIdentity->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->cbxCA->currentIndex() == 0){
-            if (ui->cbxUserCertify->currentIndex() == 0){
-                ui->btnConnect->setEnabled(true);
-            }else {
-                if (ui->leUserCertifyPwd->text() == ""){
-                    ui->btnConnect->setEnabled(false);
-                } else {
-                    if (ui->cbxUserPriKey->currentIndex() == 0){
-                        ui->btnConnect->setEnabled(true);
-                    }else if (ui->leUserKeyPwd->text() == ""){
-                        ui->btnConnect->setEnabled(false);
-                    } else{
-                        ui->btnConnect->setEnabled(true);
-                    }
-                }
-            }
-        } else {
-            if (ui->leCaPwd->text() == ""){
-                ui->btnConnect->setEnabled(false);
-            } else {
-                if (ui->cbxUserCertify->currentIndex() == 0){
-                    ui->btnConnect->setEnabled(true);
-                }else {
-                    if (ui->leUserCertifyPwd->text() == ""){
-                        ui->btnConnect->setEnabled(false);
-                    } else {
-                        if (ui->cbxUserPriKey->currentIndex() == 0){
-                            ui->btnConnect->setEnabled(true);
-                        }else if (ui->leUserKeyPwd->text() == ""){
-                            ui->btnConnect->setEnabled(false);
-                        } else{
-                            ui->btnConnect->setEnabled(true);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-void DlgHideWifiEapTls::on_leIdentity_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leIdentity->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->cbxCA->currentIndex() == 0){
-            if (ui->cbxUserCertify->currentIndex() == 0){
-                ui->btnConnect->setEnabled(true);
-            }else {
-                if (ui->leUserCertifyPwd->text() == ""){
-                    ui->btnConnect->setEnabled(false);
-                } else {
-                    if (ui->cbxUserPriKey->currentIndex() == 0){
-                        ui->btnConnect->setEnabled(true);
-                    }else if (ui->leUserKeyPwd->text() == ""){
-                        ui->btnConnect->setEnabled(false);
-                    } else{
-                        ui->btnConnect->setEnabled(true);
-                    }
-                }
-            }
-        } else {
-            if (ui->leCaPwd->text() == ""){
-                ui->btnConnect->setEnabled(false);
-            } else {
-                if (ui->cbxUserCertify->currentIndex() == 0){
-                    ui->btnConnect->setEnabled(true);
-                }else {
-                    if (ui->leUserCertifyPwd->text() == ""){
-                        ui->btnConnect->setEnabled(false);
-                    } else {
-                        if (ui->cbxUserPriKey->currentIndex() == 0){
-                            ui->btnConnect->setEnabled(true);
-                        }else if (ui->leUserKeyPwd->text() == ""){
-                            ui->btnConnect->setEnabled(false);
-                        } else{
-                            ui->btnConnect->setEnabled(true);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-void DlgHideWifiEapTls::on_leDomain_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leIdentity->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->cbxCA->currentIndex() == 0){
-            if (ui->cbxUserCertify->currentIndex() == 0){
-                ui->btnConnect->setEnabled(true);
-            }else {
-                if (ui->leUserCertifyPwd->text() == ""){
-                    ui->btnConnect->setEnabled(false);
-                } else {
-                    if (ui->cbxUserPriKey->currentIndex() == 0){
-                        ui->btnConnect->setEnabled(true);
-                    }else if (ui->leUserKeyPwd->text() == ""){
-                        ui->btnConnect->setEnabled(false);
-                    } else{
-                        ui->btnConnect->setEnabled(true);
-                    }
-                }
-            }
-        } else {
-            if (ui->leCaPwd->text() == ""){
-                ui->btnConnect->setEnabled(false);
-            } else {
-                if (ui->cbxUserCertify->currentIndex() == 0){
-                    ui->btnConnect->setEnabled(true);
-                }else {
-                    if (ui->leUserCertifyPwd->text() == ""){
-                        ui->btnConnect->setEnabled(false);
-                    } else {
-                        if (ui->cbxUserPriKey->currentIndex() == 0){
-                            ui->btnConnect->setEnabled(true);
-                        }else if (ui->leUserKeyPwd->text() == ""){
-                            ui->btnConnect->setEnabled(false);
-                        } else{
-                            ui->btnConnect->setEnabled(true);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-void DlgHideWifiEapTls::on_leCaPwd_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leIdentity->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if(ui->leCaPwd->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->cbxUserCertify->currentIndex() == 0){
-            ui->btnConnect->setEnabled(true);
-        }else {
-            if (ui->leUserCertifyPwd->text() == ""){
-                ui->btnConnect->setEnabled(false);
-            } else {
-                if (ui->cbxUserPriKey->currentIndex() == 0){
-                    ui->btnConnect->setEnabled(true);
-                }else if (ui->leUserKeyPwd->text() == ""){
-                    ui->btnConnect->setEnabled(false);
-                } else{
-                    ui->btnConnect->setEnabled(true);
-                }
-            }
-        }
-    }
-}
-
-void DlgHideWifiEapTls::on_leUserCertifyPwd_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leIdentity->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->cbxCA->currentIndex() == 0){
-            if (ui->leUserCertifyPwd->text() == ""){
-                ui->btnConnect->setEnabled(false);
-            }else{
-                if (ui->cbxUserPriKey->currentIndex() == 0){
-                    ui->btnConnect->setEnabled(true);
-                }else if (ui->leUserKeyPwd->text() == ""){
-                    ui->btnConnect->setEnabled(false);
-                } else{
-                    ui->btnConnect->setEnabled(true);
-                }
-            }
-        } else {
-            if (ui->leCaPwd->text() == ""){
-                ui->btnConnect->setEnabled(false);
-            }else{
-                if (ui->leUserCertifyPwd->text() == ""){
-                    ui->btnConnect->setEnabled(false);
-                }else{
-                    if (ui->cbxUserPriKey->currentIndex() == 0){
-                        ui->btnConnect->setEnabled(true);
-                    }else if (ui->leUserKeyPwd->text() == ""){
-                        ui->btnConnect->setEnabled(false);
-                    } else{
-                        ui->btnConnect->setEnabled(true);
-                    }
-                }
-            }
-        }
-    }
-}
-
-void DlgHideWifiEapTls::on_leUserKeyPwd_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leIdentity->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        if (ui->cbxCA->currentIndex() == 0){
-            if (ui->leUserCertifyPwd->text() == ""){
-                ui->btnConnect->setEnabled(false);
-            }else if (ui->leUserKeyPwd->text() == ""){
-                ui->btnConnect->setEnabled(false);
-            } else{
-                ui->btnConnect->setEnabled(true);
-            }
-        } else {
-            if (ui->leCaPwd->text() == ""){
-                ui->btnConnect->setEnabled(false);
-            }else{
-                if (ui->leUserCertifyPwd->text() == ""){
-                    ui->btnConnect->setEnabled(false);
-                }else if (ui->leUserKeyPwd->text() == ""){
-                    ui->btnConnect->setEnabled(false);
-                } else{
-                    ui->btnConnect->setEnabled(true);
-                }
-            }
-        }
-    }
-}
-
-void DlgHideWifiEapTls::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifieaptls.h b/src/frontend/wireless-security/dlghidewifieaptls.h
deleted file mode 100644
index 9d5a0053..00000000
--- a/src/frontend/wireless-security/dlghidewifieaptls.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFISECTLS_H
-#define DLGCONNHIDWIFISECTLS_H
-
-#include <QDialog>
-#include <QMouseEvent>
-
-class OldMainWindow;
-
-namespace Ui {
-class DlgHideWifiEapTls;
-}
-
-class DlgHideWifiEapTls : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DlgHideWifiEapTls(int type, int beUsed, OldMainWindow *mw = 0, QWidget *parent = 0);
-    ~DlgHideWifiEapTls();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialogSecu();
-    void changeDialogAuth();
-    void changeWindow();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_checkBoxCA_stateChanged(int arg1);
-
-    void on_checkBoxPwd_stateChanged(int arg1);
-
-    void on_checkBoxPwdSec_stateChanged(int arg1);
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-    void on_leIdentity_textEdited(const QString &arg1);
-
-    void on_leDomain_textEdited(const QString &arg1);
-
-    void on_leCaPwd_textEdited(const QString &arg1);
-
-    void on_leUserCertifyPwd_textEdited(const QString &arg1);
-
-    void on_leUserKeyPwd_textEdited(const QString &arg1);
-
-    void on_cbxCA_currentIndexChanged(const QString &arg1);
-
-    void on_cbxUserCertify_currentIndexChanged(const QString &arg1);
-
-    void on_cbxUserPriKey_currentIndexChanged(const QString &arg1);
-
-private:
-    Ui::DlgHideWifiEapTls *ui;
-    int WepOrWpa = 0;//0 WEP;1WPA
-    int isUsed;//=0 current wifi not used before; >=1 used
-    OldMainWindow *mw;
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss, checkBoxCAQss;
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-};
-
-#endif // DLGCONNHIDWIFISECTLS_H
diff --git a/src/frontend/wireless-security/dlghidewifieaptls.ui b/src/frontend/wireless-security/dlghidewifieaptls.ui
deleted file mode 100644
index 9bdd03a3..00000000
--- a/src/frontend/wireless-security/dlghidewifieaptls.ui
+++ /dev/null
@@ -1,617 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifiEapTls</class>
- <widget class="QDialog" name="DlgHideWifiEapTls">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>705</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden WLAN Network</string>
-  </property>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>185</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>145</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leUserCertifyPwd">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>505</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leCaPwd">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>385</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxPwd">
-   <property name="geometry">
-    <rect>
-     <x>357</x>
-     <y>397</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>80</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>150</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbDomain">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>310</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbCA">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>350</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxUserCertify">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>465</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbIdentity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>270</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserCertifyPwd">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>510</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>660</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserKeyPwd">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>590</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxCA">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>345</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserPriKey">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>550</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbCaPwd">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>390</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leDomain">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>305</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxPwdSec">
-   <property name="geometry">
-    <rect>
-     <x>357</x>
-     <y>597</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leIdentity">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>265</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leUserKeyPwd">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>585</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserCertify">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>470</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>230</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxAuth">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>225</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>660</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxCA">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>425</y>
-     <width>200</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>75</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxUserPriKey">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>545</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>190</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>705</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>30</y>
-     <width>140</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>125</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>640</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>leUserCertifyPwd</zorder>
-  <zorder>leCaPwd</zorder>
-  <zorder>checkBoxPwd</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>lbDomain</zorder>
-  <zorder>lbCA</zorder>
-  <zorder>cbxUserCertify</zorder>
-  <zorder>lbIdentity</zorder>
-  <zorder>lbUserCertifyPwd</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>lbUserKeyPwd</zorder>
-  <zorder>cbxCA</zorder>
-  <zorder>lbUserPriKey</zorder>
-  <zorder>lbCaPwd</zorder>
-  <zorder>leDomain</zorder>
-  <zorder>leIdentity</zorder>
-  <zorder>leUserKeyPwd</zorder>
-  <zorder>lbUserCertify</zorder>
-  <zorder>lbAuth</zorder>
-  <zorder>cbxAuth</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>checkBoxCA</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>cbxUserPriKey</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>checkBoxPwdSec</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/dlghidewifieapttls.cpp b/src/frontend/wireless-security/dlghidewifieapttls.cpp
deleted file mode 100644
index ccc45f05..00000000
--- a/src/frontend/wireless-security/dlghidewifieapttls.cpp
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "dlghidewifieapttls.h"
-#include "ui_dlghidewifieapttls.h"
-#include "kylinheadfile.h"
-#include "kylin-dbus-interface.h"
-
-DlgHideWifiEapTTLS::DlgHideWifiEapTTLS(int type, QWidget *parent) :
-    WepOrWpa(type),
-    QDialog(parent),
-    ui(new Ui::DlgHideWifiEapTTLS)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    MyQss objQss;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{border:0px;font-size:20px;color:rgba(255,255,255,0.97);background-color:transparent;}");
-    ui->lbConn->setStyleSheet(objQss.labelQss);
-    ui->lbNetName->setStyleSheet(objQss.labelQss);
-    ui->lbSecurity->setStyleSheet(objQss.labelQss);
-    ui->lbAuth->setStyleSheet(objQss.labelQss);
-    ui->lbAnonyId->setStyleSheet(objQss.labelQss);
-    ui->lbDomain->setStyleSheet(objQss.labelQss);
-    ui->lbCA->setStyleSheet(objQss.labelQss);
-    ui->lbCaPwd->setStyleSheet(objQss.labelQss);
-    ui->lbInnerAuth->setStyleSheet(objQss.labelQss);
-    ui->lbUserName->setStyleSheet(objQss.labelQss);
-    ui->lbPassword->setStyleSheet(objQss.labelQss);
-
-    ui->cbxConn->setStyleSheet(objQss.cbxQss);
-    ui->cbxConn->setView(new  QListView());
-    ui->leNetName->setStyleSheet(objQss.leQss);
-    ui->cbxSecurity->setStyleSheet(objQss.cbxQss);
-    ui->cbxSecurity->setView(new  QListView());
-    ui->cbxAuth->setStyleSheet(objQss.cbxQss);
-    ui->cbxAuth->setView(new  QListView());
-    ui->leAnonyId->setStyleSheet(objQss.leQss);
-    ui->leDomain->setStyleSheet(objQss.leQss);
-    ui->cbxCA->setStyleSheet(objQss.cbxQss);
-    ui->cbxCA->setView(new  QListView());
-    ui->leCaPwd->setStyleSheet(objQss.leQss);
-    ui->checkBoxPwd->setStyleSheet(objQss.checkBoxQss);
-    ui->checkBoxCA->setStyleSheet(objQss.checkBoxCAQss);
-    ui->cbxInnerAuth->setStyleSheet(objQss.cbxQss);
-    ui->cbxInnerAuth->setView(new  QListView());
-    ui->leUserName->setStyleSheet(objQss.leQss);
-    ui->lePassword->setStyleSheet(objQss.leQss);
-    ui->checkBoxPwdSec->setStyleSheet(objQss.checkBoxQss);
-
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-    ui->checkBoxCA->setFocusPolicy(Qt::NoFocus);
-
-
-    ui->lbLeftupTitle->setText(tr("Add hidden WLAN")); //加入隐藏WLAN
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("Network name")); //网络名称:
-    ui->lbSecurity->setText(tr("WLAN security")); //Wi-Fi安全性:
-    ui->lbAuth->setText(tr("Authentication")); //认证:
-    ui->lbAnonyId->setText(tr("Anonymous identity")); //匿名身份:
-    ui->lbDomain->setText(tr("Domain")); //域名:
-    ui->lbCA->setText(tr("CA certificate")); //CA 证书:
-    ui->lbCaPwd->setText(tr("CA certificate password")); //CA 证书密码:
-    ui->checkBoxCA->setText(tr("No CA certificate is required")); //不需要CA证书
-    ui->lbInnerAuth->setText(tr("Inner authentication")); //内部认证:
-    ui->lbUserName->setText(tr("Username")); //用户名:
-    ui->lbPassword->setText(tr("Password")); //密码:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-
-    ui->cbxConn->addItem(tr("C_reate…")); //新建...
-    int status = system("nmcli connection show>/tmp/kylin-nm-connshow");
-    qDebug()<<"executed cmd=nmcli connection show>/tmp/kylin-nm-connshow. res="<<status;
-    QFile file("/tmp/kylin-nm-connshow");
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-        qDebug()<<"Can't open the file!";
-    }
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-    foreach (QString line, txtLine) {
-        if(line.indexOf("wifi") != -1){
-            QStringList subLine = line.split(" ");
-            ui->cbxConn->addItem(subLine[0]);
-        }
-    }
-    ui->cbxConn->setCurrentIndex(0);
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    ui->cbxSecurity->addItem("LEAP");
-    ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    if (WepOrWpa == 0) {
-        ui->cbxSecurity->setCurrentIndex(5);
-    } else if (WepOrWpa == 1) {
-        ui->cbxSecurity->setCurrentIndex(6);
-    }
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogSecu()));
-
-    ui->cbxAuth->addItem("TLS");
-    ui->cbxAuth->addItem("LEAP");
-    ui->cbxAuth->addItem("PWD");
-    ui->cbxAuth->addItem("FAST");
-    ui->cbxAuth->addItem(tr("Tunneled TLS"));//隧道 TLS
-    ui->cbxAuth->addItem(tr("Protected EAP (PEAP)")); //受保护的 EAP
-    ui->cbxAuth->setCurrentIndex(4);
-    connect(ui->cbxAuth,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialogAuth()));
-
-    ui->cbxCA->addItem(tr("None")); //无
-    ui->cbxCA->addItem(tr("Choose from file")); //从文件选择...
-    ui->cbxCA->setCurrentIndex(0);
-
-    ui->cbxInnerAuth->addItem("PAP");
-    ui->cbxInnerAuth->addItem("MSCHAP");
-    ui->cbxInnerAuth->addItem("MSCHAPv2");
-    ui->cbxInnerAuth->addItem("MSCHAPv2(no EAP)");
-    ui->cbxInnerAuth->addItem("CHAP");
-    ui->cbxInnerAuth->addItem("MDS");
-    ui->cbxInnerAuth->addItem("GTC");
-    ui->cbxInnerAuth->setCurrentIndex(0);
-
-    ui->btnConnect->setEnabled(false);
-
-    this->setFixedSize(432,665);
-}
-
-DlgHideWifiEapTTLS::~DlgHideWifiEapTTLS()
-{
-    delete ui;
-}
-
-void DlgHideWifiEapTTLS::mousePressEvent(QMouseEvent *event){
-    if(event->button() == Qt::LeftButton){
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-}
-void DlgHideWifiEapTTLS::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-}
-void DlgHideWifiEapTTLS::mouseMoveEvent(QMouseEvent *event){
-    if(this->isPress){
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-}
-
-void DlgHideWifiEapTTLS::changeDialogSecu()
-{
-    if(ui->cbxSecurity->currentIndex()==0){
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0);
-        connHidWifi->show();
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0);
-        connHidWifiWpa->show();
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(0);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(1);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiLeap *connHidWifiLeap = new DlgHideWifiLeap();
-        connHidWifiLeap->show();
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        if (WepOrWpa == 1) {
-            ui->cbxSecurity->setCurrentIndex(5);
-            WepOrWpa = 0;
-        }
-    } else {
-        if (WepOrWpa == 0){
-            ui->cbxSecurity->setCurrentIndex(6);
-            WepOrWpa = 1;
-        }
-    }
-}
-
-void DlgHideWifiEapTTLS::changeDialogAuth()
-{
-    if(ui->cbxAuth->currentIndex()==0){
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapTls *connHidWifiEapTls = new DlgHideWifiEapTls(WepOrWpa);
-        //connHidWifiEapTls->show();
-    } else if(ui->cbxAuth->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapLeap *connHidWifiEapLeap = new DlgHideWifiEapLeap(WepOrWpa);
-        connHidWifiEapLeap->show();
-    } else if(ui->cbxAuth->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapPwd *connHidWifiEapPwd = new DlgHideWifiEapPwd(WepOrWpa);
-        connHidWifiEapPwd->show();
-    } else if(ui->cbxAuth->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapFast *connHidWifiEapFast = new DlgHideWifiEapFast(WepOrWpa);
-        connHidWifiEapFast->show();
-    } else if(ui->cbxAuth->currentIndex()==4) {
-        qDebug()<<"it's not need to change dialog";
-    } else {
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(WepOrWpa);
-        //connHidWifiEapPeap->show();
-    }
-}
-
-void DlgHideWifiEapTTLS::on_cbxCA_currentIndexChanged(const QString &arg1)
-{
-    if (ui->cbxCA->currentIndex() == 0){
-        ui->leCaPwd->setText("");
-        ui->lbCaPwd->setEnabled(false);
-        ui->leCaPwd->setEnabled(false);
-    } else {
-        ui->leCaPwd->setText("");
-        ui->lbCaPwd->setEnabled(true);
-        ui->leCaPwd->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapTTLS::on_btnCancel_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapTTLS::on_btnConnect_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiEapTTLS::on_checkBoxPwd_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->leCaPwd->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->leCaPwd->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-void DlgHideWifiEapTTLS::on_checkBoxCA_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->cbxCA->setCurrentIndex(0);
-        ui->leCaPwd->setText("");
-        ui->lbCA->setEnabled(true);
-        ui->cbxCA->setEnabled(true);
-    } else {
-        ui->cbxCA->setCurrentIndex(0);
-        ui->leCaPwd->setText("");
-        ui->lbCA->setEnabled(false);
-        ui->cbxCA->setEnabled(false);
-    }
-}
-
-void DlgHideWifiEapTTLS::on_checkBoxPwdSec_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->lePassword->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->lePassword->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-void DlgHideWifiEapTTLS::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else{
-        if (ui->cbxCA->currentIndex() == 0){
-            ui->btnConnect->setEnabled(true);
-        }else if(ui->leCaPwd->text() == ""){
-            ui->btnConnect->setEnabled(false);
-        }else{
-            ui->btnConnect->setEnabled(true);
-        }
-    }
-}
-
-void DlgHideWifiEapTTLS::on_leAnonyId_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else{
-        if (ui->cbxCA->currentIndex() == 0){
-            ui->btnConnect->setEnabled(true);
-        }else if(ui->leCaPwd->text() == ""){
-            ui->btnConnect->setEnabled(false);
-        }else{
-            ui->btnConnect->setEnabled(true);
-        }
-    }
-}
-
-void DlgHideWifiEapTTLS::on_leDomain_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else{
-        if (ui->cbxCA->currentIndex() == 0){
-            ui->btnConnect->setEnabled(true);
-        }else if(ui->leCaPwd->text() == ""){
-            ui->btnConnect->setEnabled(false);
-        }else{
-            ui->btnConnect->setEnabled(true);
-        }
-    }
-}
-
-void DlgHideWifiEapTTLS::on_leCaPwd_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leCaPwd->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else{
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiEapTTLS::on_leUserName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else{
-        if (ui->cbxCA->currentIndex() == 0){
-            ui->btnConnect->setEnabled(true);
-        }else if(ui->leCaPwd->text() == ""){
-            ui->btnConnect->setEnabled(false);
-        }else{
-            ui->btnConnect->setEnabled(true);
-        }
-    }
-}
-
-void DlgHideWifiEapTTLS::on_lePwd_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leAnonyId->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leDomain->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    }else{
-        if (ui->cbxCA->currentIndex() == 0){
-            ui->btnConnect->setEnabled(true);
-        }else if(ui->leCaPwd->text() == ""){
-            ui->btnConnect->setEnabled(false);
-        }else{
-            ui->btnConnect->setEnabled(true);
-        }
-    }
-}
-
-void DlgHideWifiEapTTLS::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifieapttls.h b/src/frontend/wireless-security/dlghidewifieapttls.h
deleted file mode 100644
index d347cc89..00000000
--- a/src/frontend/wireless-security/dlghidewifieapttls.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFISECTUNNELTLS_H
-#define DLGCONNHIDWIFISECTUNNELTLS_H
-
-#include <QDialog>
-#include <QMouseEvent>
-
-namespace Ui {
-class DlgHideWifiEapTTLS;
-}
-
-class DlgHideWifiEapTTLS : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DlgHideWifiEapTTLS(int type, QWidget *parent = 0);
-    ~DlgHideWifiEapTTLS();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialogSecu();
-    void changeDialogAuth();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_cbxCA_currentIndexChanged(const QString &arg1);
-
-    void on_checkBoxPwd_stateChanged(int arg1);
-
-    void on_checkBoxCA_stateChanged(int arg1);
-
-    void on_checkBoxPwdSec_stateChanged(int arg1);
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-    void on_leAnonyId_textEdited(const QString &arg1);
-
-    void on_leDomain_textEdited(const QString &arg1);
-
-    void on_leCaPwd_textEdited(const QString &arg1);
-
-    void on_leUserName_textEdited(const QString &arg1);
-
-    void on_lePwd_textEdited(const QString &arg1);
-
-private:
-    Ui::DlgHideWifiEapTTLS *ui;
-    int WepOrWpa = 0;//0 WEP;1WPA
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss, checkBoxCAQss;
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-};
-
-#endif // DLGCONNHIDWIFISECTUNNELTLS_H
diff --git a/src/frontend/wireless-security/dlghidewifieapttls.ui b/src/frontend/wireless-security/dlghidewifieapttls.ui
deleted file mode 100644
index 04cc1d2d..00000000
--- a/src/frontend/wireless-security/dlghidewifieapttls.ui
+++ /dev/null
@@ -1,579 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifiEapTTLS</class>
- <widget class="QDialog" name="DlgHideWifiEapTTLS">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>665</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden Wi-Fi Network</string>
-  </property>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>75</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leCaPwd">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>385</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>145</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>620</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="lePassword">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>545</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>620</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbDomain">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>310</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxPwdSec">
-   <property name="geometry">
-    <rect>
-     <x>357</x>
-     <y>557</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>510</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>190</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>185</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxCA">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>345</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxInnerAuth">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>465</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leUserName">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>505</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Normal</enum>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbCA">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>350</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxAuth">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>225</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAnonyId">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>270</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>150</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxCA">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>425</y>
-     <width>200</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbInnerAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>470</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leDomain">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>305</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>230</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>80</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbCaPwd">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>390</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbPassword">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>550</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxPwd">
-   <property name="geometry">
-    <rect>
-     <x>357</x>
-     <y>397</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leAnonyId">
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>265</y>
-     <width>200</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>665</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>30</y>
-     <width>140</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>125</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>600</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>leCaPwd</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>lePassword</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>lbDomain</zorder>
-  <zorder>checkBoxPwdSec</zorder>
-  <zorder>lbUserName</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>cbxCA</zorder>
-  <zorder>cbxInnerAuth</zorder>
-  <zorder>leUserName</zorder>
-  <zorder>lbCA</zorder>
-  <zorder>cbxAuth</zorder>
-  <zorder>lbAnonyId</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>checkBoxCA</zorder>
-  <zorder>lbInnerAuth</zorder>
-  <zorder>leDomain</zorder>
-  <zorder>lbAuth</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>lbCaPwd</zorder>
-  <zorder>lbPassword</zorder>
-  <zorder>checkBoxPwd</zorder>
-  <zorder>leAnonyId</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/dlghidewifileap.cpp b/src/frontend/wireless-security/dlghidewifileap.cpp
deleted file mode 100644
index 97601dc8..00000000
--- a/src/frontend/wireless-security/dlghidewifileap.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "ui_dlghidewifileap.h"
-#include "kylinheadfile.h"
-#include "kylin-dbus-interface.h"
-
-DlgHideWifiLeap::DlgHideWifiLeap(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::DlgHideWifiLeap)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    MyQss objQss;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{border:0px;font-size:20px;color:rgba(255,255,255,0.97);background-color:transparent;}");
-    ui->lbConn->setStyleSheet(objQss.labelQss);
-    ui->lbNetName->setStyleSheet(objQss.labelQss);
-    ui->lbSecurity->setStyleSheet(objQss.labelQss);
-    ui->lbUserName->setStyleSheet(objQss.labelQss);
-    ui->lbPassword->setStyleSheet(objQss.labelQss);
-
-    ui->cbxConn->setStyleSheet(objQss.cbxQss);
-    ui->cbxConn->setView(new  QListView());
-    ui->leNetName->setStyleSheet(objQss.leQss);
-    ui->leUserName->setStyleSheet(objQss.leQss);
-    ui->lePassword->setStyleSheet(objQss.leQss);
-    ui->cbxSecurity->setStyleSheet(objQss.cbxQss);
-    ui->cbxSecurity->setView(new  QListView());
-    ui->checkBoxPwd->setStyleSheet(objQss.checkBoxQss);
-
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-
-    ui->lbLeftupTitle->setText(tr("Add hidden Wi-Fi")); //加入隐藏Wi-Fi
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("Network name")); //网络名称:
-    ui->lbSecurity->setText(tr("Wi-Fi security")); //Wi-Fi安全性:
-    ui->lbUserName->setText(tr("Username")); //用户名:
-    ui->lbPassword->setText(tr("Password")); //密码:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-
-    ui->cbxConn->addItem(tr("C_reate…")); //新建...
-    int status = system("nmcli connection show>/tmp/kylin-nm-connshow");
-    qDebug()<<"executed cmd=nmcli connection show>/tmp/kylin-nm-connshow. res="<<status;
-    QFile file("/tmp/kylin-nm-connshow");
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-        qDebug()<<"Can't open the file!";
-    }
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-    foreach (QString line, txtLine) {
-        if(line.indexOf("wifi") != -1){
-            QStringList subLine = line.split(" ");
-            ui->cbxConn->addItem(subLine[0]);
-        }
-    }
-    ui->cbxConn->setCurrentIndex(0);
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    ui->cbxSecurity->addItem("LEAP");
-    ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    ui->cbxSecurity->setCurrentIndex(4);
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialog()));
-
-    ui->btnConnect->setEnabled(false);
-
-    this->setFixedSize(432,434);
-}
-
-DlgHideWifiLeap::~DlgHideWifiLeap()
-{
-    delete ui;
-}
-
-void DlgHideWifiLeap::mousePressEvent(QMouseEvent *event){
-    if(event->button() == Qt::LeftButton){
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-}
-void DlgHideWifiLeap::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-}
-void DlgHideWifiLeap::mouseMoveEvent(QMouseEvent *event){
-    if(this->isPress){
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-}
-
-//切换到其他Wi-Fi安全类型
-void DlgHideWifiLeap::changeDialog()
-{
-    if(ui->cbxSecurity->currentIndex()==0){
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0);
-        connHidWifi->show();
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0);
-        connHidWifiWpa->show();
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(0);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(1);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        qDebug()<<"it's not need to change dialog";
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapTls *connHidWifiEapTls = new DlgHideWifiEapTls(0);
-        //connHidWifiEapTls->show();
-    } else {
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapTls *connHidWifiEapTls = new DlgHideWifiEapTls(1);
-        //connHidWifiEapTls->show();
-    }
-}
-
-void DlgHideWifiLeap::on_btnCancel_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiLeap::on_btnConnect_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiLeap::on_checkBoxPwd_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->lePassword ->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->lePassword->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-void DlgHideWifiLeap::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "" || ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leNetName->text() == "" || ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == "" || ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiLeap::on_leUserName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiLeap::on_lePassword_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->leUserName->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else if (ui->lePassword->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiLeap::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifileap.h b/src/frontend/wireless-security/dlghidewifileap.h
deleted file mode 100644
index 55b61732..00000000
--- a/src/frontend/wireless-security/dlghidewifileap.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFILEAP_H
-#define DLGCONNHIDWIFILEAP_H
-
-#include <QDialog>
-#include <QMouseEvent>
-
-namespace Ui {
-class DlgHideWifiLeap;
-}
-
-class DlgHideWifiLeap : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DlgHideWifiLeap(QWidget *parent = 0);
-    ~DlgHideWifiLeap();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialog();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_checkBoxPwd_stateChanged(int arg1);
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-    void on_leUserName_textEdited(const QString &arg1);
-
-    void on_lePassword_textEdited(const QString &arg1);
-
-private:
-    Ui::DlgHideWifiLeap *ui;
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss;
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-};
-
-#endif // DLGCONNHIDWIFILEAP_H
diff --git a/src/frontend/wireless-security/dlghidewifileap.ui b/src/frontend/wireless-security/dlghidewifileap.ui
deleted file mode 100644
index 865b4e09..00000000
--- a/src/frontend/wireless-security/dlghidewifileap.ui
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifiLeap</class>
- <widget class="QDialog" name="DlgHideWifiLeap">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>434</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden Wi-Fi Network</string>
-  </property>
-  <widget class="QLineEdit" name="leUserName">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>264</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>219</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>390</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>84</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="layoutDirection">
-    <enum>Qt::LeftToRight</enum>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>79</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbUserName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>270</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxPwd">
-   <property name="geometry">
-    <rect>
-     <x>332</x>
-     <y>321</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbPassword">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>315</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>180</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>225</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>390</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="lePassword">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>309</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>174</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>434</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>32</y>
-     <width>140</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>134</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>364</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>leUserName</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>lbUserName</zorder>
-  <zorder>lbPassword</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>lePassword</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>checkBoxPwd</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/dlghidewifiwep.cpp b/src/frontend/wireless-security/dlghidewifiwep.cpp
deleted file mode 100644
index 4b2b0423..00000000
--- a/src/frontend/wireless-security/dlghidewifiwep.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "ui_dlghidewifiwep.h"
-#include "kylinheadfile.h"
-#include "kylin-dbus-interface.h"
-
-DlgHideWifiWep::DlgHideWifiWep(int type, QWidget *parent) :
-    WepPwdOrCode(type),
-    QDialog(parent),
-    ui(new Ui::DlgHideWifiWep)
-{
-    ui->setupUi(this);
-
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    this->setStyleSheet("QWidget{border-radius:6px;background-color:rgba(19,19,20,0.7);border:1px solid rgba(255, 255, 255, 0.05);}");
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    MyQss objQss;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{border:0px;font-size:20px;color:rgba(255,255,255,0.97);background-color:transparent;}");
-    ui->lbConn->setStyleSheet(objQss.labelQss);
-    ui->lbNetName->setStyleSheet(objQss.labelQss);
-    ui->lbSecurity->setStyleSheet(objQss.labelQss);
-    ui->lbKey->setStyleSheet(objQss.labelQss);
-    ui->lbWEPindex->setStyleSheet(objQss.labelQss);
-    ui->lbAuth->setStyleSheet(objQss.labelQss);
-
-    ui->cbxConn->setStyleSheet(objQss.cbxQss);
-    ui->cbxConn->setView(new  QListView());
-    ui->leNetName->setStyleSheet(objQss.leQss);
-    ui->leKey->setStyleSheet(objQss.leQss);
-    ui->checkBoxPwd->setStyleSheet(objQss.checkBoxQss);
-    ui->cbxSecurity->setStyleSheet(objQss.cbxQss);
-    ui->cbxSecurity->setView(new  QListView());
-    ui->cbxWEPindex->setStyleSheet(objQss.cbxQss);
-    ui->cbxWEPindex->setView(new  QListView());
-    ui->cbxAuth->setStyleSheet(objQss.cbxQss);
-    ui->cbxAuth->setView(new  QListView());
-
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-
-    ui->lbLeftupTitle->setText(tr("Add hidden Wi-Fi")); //加入隐藏Wi-Fi
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("Network name")); //网络名称:
-    ui->lbSecurity->setText(tr("Wi-Fi security")); //Wi-Fi 安全性:
-    ui->lbKey->setText(tr("Key")); //密钥:
-    ui->lbWEPindex->setText(tr("WEP index")); //WEP 检索:
-    ui->lbAuth->setText(tr("Authentication")); //认证:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-
-    ui->cbxConn->addItem(tr("C_reate…")); //新建...
-    int status = system("nmcli connection show>/tmp/kylin-nm-connshow");
-    qDebug()<<"executed cmd=nmcli connection show>/tmp/kylin-nm-connshow. res="<<status;
-    QFile file("/tmp/kylin-nm-connshow");
-    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-        qDebug()<<"Can't open the file!";
-    }
-    QString txt = file.readAll();
-    QStringList txtLine = txt.split("\n");
-    file.close();
-    foreach (QString line, txtLine) {
-        if(line.indexOf("wifi") != -1){
-            QStringList subLine = line.split(" ");
-            ui->cbxConn->addItem(subLine[0]);
-        }
-    }
-    ui->cbxConn->setCurrentIndex(0);
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    ui->cbxSecurity->addItem("LEAP");
-    ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    if (WepPwdOrCode == 0) {
-        ui->cbxSecurity->setCurrentIndex(2);
-    } else if (WepPwdOrCode == 1) {
-        ui->cbxSecurity->setCurrentIndex(3);
-    }
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialog()));
-
-    ui->cbxWEPindex->addItem(tr("1(default)")); //1(默认)
-    ui->cbxWEPindex->addItem("2");
-    ui->cbxWEPindex->addItem("3");
-    ui->cbxWEPindex->addItem("4");
-    ui->cbxWEPindex->setCurrentIndex(0);
-
-    ui->cbxAuth->addItem(tr("Open System")); //开放式系统
-    ui->cbxAuth->addItem(tr("Shared Key")); //共享密钥
-    ui->cbxAuth->setCurrentIndex(0);
-
-    ui->btnConnect->setEnabled(false);
-
-    this->setFixedSize(432,493);
-}
-
-DlgHideWifiWep::~DlgHideWifiWep()
-{
-    delete ui;
-}
-
-void DlgHideWifiWep::mousePressEvent(QMouseEvent *event){
-    if(event->button() == Qt::LeftButton){
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-}
-void DlgHideWifiWep::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-}
-void DlgHideWifiWep::mouseMoveEvent(QMouseEvent *event){
-    if(this->isPress){
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-}
-
-//切换到其他Wi-Fi安全类型
-void DlgHideWifiWep::changeDialog()
-{
-    if(ui->cbxSecurity->currentIndex()==0){
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0);
-        connHidWifi->show();
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0);
-        connHidWifiWpa->show();
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        if (WepPwdOrCode == 1) {
-            ui->cbxSecurity->setCurrentIndex(2);
-            WepPwdOrCode = 0;
-        }
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        if (WepPwdOrCode == 0) {
-            ui->cbxSecurity->setCurrentIndex(3);
-            WepPwdOrCode = 1;
-        }
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiLeap *connHidWifiLeap = new DlgHideWifiLeap();
-        connHidWifiLeap->show();
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapTls *connHidWifiEapTls = new DlgHideWifiEapTls(0);
-        //connHidWifiEapTls->show();
-    } else {
-        //QApplication::setQuitOnLastWindowClosed(false);
-        //this->hide();
-        //DlgHideWifiEapTls *connHidWifiEapTls = new DlgHideWifiEapTls(1);
-        //connHidWifiEapTls->show();
-    }
-}
-
-void DlgHideWifiWep::on_btnCancel_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiWep::on_btnConnect_clicked()
-{
-    this->close();
-}
-
-void DlgHideWifiWep::on_checkBoxPwd_stateChanged(int arg1)
-{
-    if (arg1 == 0) {
-        ui->leKey->setEchoMode(QLineEdit::Password);
-    } else {
-        ui->leKey->setEchoMode(QLineEdit::Normal);
-    }
-}
-
-void DlgHideWifiWep::on_leKey_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "" || ui->leKey->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiWep::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "" || ui->leKey->text() == ""){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiWep::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifiwep.h b/src/frontend/wireless-security/dlghidewifiwep.h
deleted file mode 100644
index 72eb226b..00000000
--- a/src/frontend/wireless-security/dlghidewifiwep.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFIWEP_H
-#define DLGCONNHIDWIFIWEP_H
-
-#include <QDialog>
-#include <QMouseEvent>
-
-namespace Ui {
-class DlgHideWifiWep;
-}
-
-class DlgHideWifiWep : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DlgHideWifiWep(int type, QWidget *parent = 0);
-    ~DlgHideWifiWep();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialog();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_checkBoxPwd_stateChanged(int arg1);
-
-    void on_leKey_textEdited(const QString &arg1);
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-private:
-    Ui::DlgHideWifiWep *ui;
-    int WepPwdOrCode = 0; //0 WEP password;1 WEP Code Sentence
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss;
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-};
-
-#endif // DLGCONNHIDWIFIWEP_H
diff --git a/src/frontend/wireless-security/dlghidewifiwep.ui b/src/frontend/wireless-security/dlghidewifiwep.ui
deleted file mode 100644
index 903df1ce..00000000
--- a/src/frontend/wireless-security/dlghidewifiwep.ui
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifiWep</class>
- <widget class="QDialog" name="DlgHideWifiWep">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>493</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden Wi-Fi Network</string>
-  </property>
-  <widget class="QLabel" name="lbKey">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>266</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbWEPindex">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>311</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbAuth">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>356</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>215</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>440</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxAuth">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>350</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>80</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="layoutDirection">
-    <enum>Qt::LeftToRight</enum>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxWEPindex">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>305</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>440</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxPwd">
-   <property name="geometry">
-    <rect>
-     <x>332</x>
-     <y>272</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>176</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leKey">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>260</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>170</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>221</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>75</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>493</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>30</y>
-     <width>140</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>140</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>410</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>leKey</zorder>
-  <zorder>lbKey</zorder>
-  <zorder>lbWEPindex</zorder>
-  <zorder>lbAuth</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>cbxAuth</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>cbxWEPindex</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>checkBoxPwd</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/dlghidewifiwpa.cpp b/src/frontend/wireless-security/dlghidewifiwpa.cpp
deleted file mode 100644
index 59b69129..00000000
--- a/src/frontend/wireless-security/dlghidewifiwpa.cpp
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-
-#include "dlghidewifiwpa.h"
-#include "ui_dlghidewifiwpa.h"
-#include "kylinheadfile.h"
-#include "backthread.h"
-#include "mainwindow.h"
-#include "wpawifidialog.h"
-
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <QDir>
-#include <QtConcurrent>
-#include <QFuture>
-
-DlgHideWifiWpa::DlgHideWifiWpa(int type, OldMainWindow *mainWindow, QWidget *parent) :
-    isUsed(type),
-    QDialog(parent),
-    ui(new Ui::DlgHideWifiWpa)
-{
-    ui->setupUi(this);
-    this->setAttribute(Qt::WA_DeleteOnClose);
-    this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    this->setWindowIcon(QIcon::fromTheme("kylin-network", QIcon(":/res/x/setup.png")) );
-    //需要添加 void paintEvent(QPaintEvent *event) 函数
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    MyQss objQss;
-
-    ui->lbBoder->setStyleSheet("QLabel{border-radius:6px;background-color:rgba(19,19,20,0.95);border:1px solid rgba(255, 255, 255, 0.05);}");
-    ui->lbBoder->hide();
-    ui->lbLeftupTitle->setStyleSheet("QLabel{font-size:20px;}");
-
-    ui->checkBoxPwd->setStyleSheet(objQss.checkBoxQss);
-
-    ui->lineUp->setStyleSheet(objQss.lineQss);
-    ui->lineDown->setStyleSheet(objQss.lineQss);
-    ui->btnCancel->setFocusPolicy(Qt::NoFocus);
-    ui->checkBoxPwd->setFocusPolicy(Qt::NoFocus);
-
-
-    ui->lbLeftupTitle->setText(tr("Add Hidden Wi-Fi")); //加入隐藏Wi-Fi
-    ui->lbConn->setText(tr("Connection")); //连接设置:
-    ui->lbNetName->setText(tr("Wi-Fi name")); //网络名称:
-    ui->lbSecurity->setText(tr("Wi-Fi security")); //Wi-Fi 安全性:
-    ui->lbPassword->setText(tr("Password")); //密码:
-    ui->btnCancel->setText(tr("Cancel")); //取消
-    ui->btnConnect->setText(tr("Connect")); //连接
-    ui->btnCancel->setStyleSheet(objQss.btnOffQss);
-    ui->btnConnect->setStyleSheet(objQss.btnOffQss);
-
-    ui->cbxConn->addItem(tr("C_reate…")); //新建...
-    KylinDBus mkylindbus;
-    QStringList wifiList = mkylindbus.getWifiSsidList();
-    foreach (QString strWifiSsid, wifiList) {
-        ui->cbxConn->addItem(strWifiSsid);
-    }
-    ui->cbxConn->setCurrentIndex(0);
-    connect(ui->cbxConn,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeWindow()));
-
-    ui->cbxSecurity->addItem(tr("None")); //无
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    ui->cbxSecurity->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    //ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    //ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    //ui->cbxSecurity->addItem("LEAP");
-    //ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    ui->cbxSecurity->setCurrentIndex(1);
-    connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialog()));
-
-    if (isUsed == 0) {
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->cbxConn->setCurrentIndex(isUsed);
-        ui->leNetName->setText(ui->cbxConn->currentText());
-        ui->leNetName->setEnabled(false);
-        ui->lbNetName->setEnabled(false);
-        ui->lbSecurity->setEnabled(false);
-        ui->cbxSecurity->setEnabled(false);
-        ui->lbPassword->setEnabled(false);
-        ui->lePassword->setText("<Hidden>");
-        ui->lePassword->setEnabled(false);
-        ui->btnConnect->setEnabled(true);
-        ui->checkBoxPwd->setEnabled(false);
-    }
-
-    ui->leNetName->setContextMenuPolicy(Qt::NoContextMenu);//禁止LineEdit的右键菜单
-    ui->lePassword->setContextMenuPolicy(Qt::NoContextMenu);
-
-    this->setFixedSize(432,397);
-
-    this->mw = mainWindow;
-}
-
-DlgHideWifiWpa::~DlgHideWifiWpa()
-{
-    delete ui;
-}
-
-void DlgHideWifiWpa::mousePressEvent(QMouseEvent *event){
-    if(event->button() == Qt::LeftButton){
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-    return QDialog::mousePressEvent(event);
-}
-void DlgHideWifiWpa::mouseReleaseEvent(QMouseEvent *event){
-    this->isPress = false;
-    return QDialog::mouseReleaseEvent(event);
-}
-void DlgHideWifiWpa::mouseMoveEvent(QMouseEvent *event){
-    if(this->isPress){
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-    return QDialog::mouseMoveEvent(event);
-}
-
-//切换到其他Wi-Fi安全类型
-void DlgHideWifiWpa::changeDialog()
-{
-    if (ui->cbxSecurity->currentIndex()==0) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->close();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0,mw);
-        connHidWifi->show();
-        connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    } else if(ui->cbxSecurity->currentIndex()==1) {
-        qDebug()<<"it's not need to change dialog";
-    } else if(ui->cbxSecurity->currentIndex()==2) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->close();
-        WpaWifiDialog * wpadlg = new WpaWifiDialog(mw, mw, "");
-        QPoint pos = QCursor::pos();
-        QRect primaryGeometry;
-        for (QScreen *screen : qApp->screens()) {
-            if (screen->geometry().contains(pos)) {
-                primaryGeometry = screen->geometry();
-            }
-        }
-        if (primaryGeometry.isEmpty()) {
-            primaryGeometry = qApp->primaryScreen()->geometry();
-        }
-        wpadlg->move(primaryGeometry.width() / 2 - wpadlg->width() / 2, primaryGeometry.height() / 2 - wpadlg->height() / 2);
-        wpadlg->show();
-        connect(wpadlg, &WpaWifiDialog::conn_done, this, [ = ]() {
-            QString txt(tr("Conn Wifi Success"));
-            mw->objKyDBus->showDesktopNotify(txt);
-            mw->on_btnWifiList_clicked();
-        });
-        connect(wpadlg, &WpaWifiDialog::conn_failed, this, [ = ]() {
-            QString txt(tr("Confirm your Wi-Fi password or usable of wireless card"));
-            mw->objKyDBus->showDesktopNotify(txt);
-            mw->on_btnWifiList_clicked();
-        });
-//        DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, 0, mw);
-//        connHidWifiEapPeap->show();
-    } else if(ui->cbxSecurity->currentIndex()==3) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(0);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==4) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiWep *connHidWifiWep = new DlgHideWifiWep(1);
-        connHidWifiWep->show();
-    } else if(ui->cbxSecurity->currentIndex()==5) {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiLeap *connHidWifiLeap = new DlgHideWifiLeap();
-        connHidWifiLeap->show();
-    } else {
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(0, 0, mw);
-        connHidWifiEapPeap->show();
-    }
-}
-
-//同一 Wi-Fi安全类型的窗口变换
-void DlgHideWifiWpa::changeWindow()
-{
-    if (ui->cbxConn->currentIndex() == 0){
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->hide();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0, mw);
-        connHidWifi->show();
-        connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    }else if (ui->cbxConn->currentIndex() >= 1){
-        QString tmpPath = "/tmp/kylin-nm-connshow-" + QDir::home().dirName();
-        QString currStr = "nmcli connection show '" + ui->cbxConn->currentText() + "' > " + tmpPath;
-
-        int status = system(currStr.toUtf8().data());
-        qDebug()<<"executed cmd="<<currStr<<". res="<<status;
-        QFile file(tmpPath);
-        if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-            qDebug()<<"Can't open the file!";
-        }
-        QString txt = file.readAll();
-        file.close();
-        if (txt.indexOf("802-11-wireless-security.key-mgmt:") != -1){
-            if (txt.indexOf("wpa-psk") != -1) {
-                isUsed = ui->cbxConn->currentIndex();
-                ui->lbNetName->setEnabled(false);
-                ui->leNetName->setText(ui->cbxConn->currentText());
-                ui->leNetName->setEnabled(false);
-                ui->lbSecurity->setEnabled(false);
-                ui->cbxSecurity->setEnabled(false);
-                ui->lePassword->setText("<Hidden>");
-                ui->lbPassword->setEnabled(false);
-                ui->lePassword->setEnabled(false);
-                ui->btnConnect->setEnabled(true);
-            }
-            if (txt.indexOf("wpa-eap") != -1) {
-                QApplication::setQuitOnLastWindowClosed(false);
-                this->hide();
-//                DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, ui->cbxConn->currentIndex(), mw);
-//                connHidWifiEapPeap->show();
-                WpaWifiDialog * wpadlg = new WpaWifiDialog(mw, mw, ui->cbxConn->currentText());
-                QPoint pos = QCursor::pos();
-                QRect primaryGeometry;
-                for (QScreen *screen : qApp->screens()) {
-                    if (screen->geometry().contains(pos)) {
-                        primaryGeometry = screen->geometry();
-                    }
-                }
-                if (primaryGeometry.isEmpty()) {
-                    primaryGeometry = qApp->primaryScreen()->geometry();
-                }
-                wpadlg->move(primaryGeometry.width() / 2 - wpadlg->width() / 2, primaryGeometry.height() / 2 - wpadlg->height() / 2);
-                wpadlg->show();
-                connect(wpadlg, &WpaWifiDialog::conn_done, this, [ = ]() {
-                    QString txt(tr("Conn Wifi Success"));
-                    mw->objKyDBus->showDesktopNotify(txt);
-                    mw->on_btnWifiList_clicked();
-                });
-                connect(wpadlg, &WpaWifiDialog::conn_failed, this, [ = ]() {
-                    QString txt(tr("Confirm your Wi-Fi password or usable of wireless card"));
-                    mw->objKyDBus->showDesktopNotify(txt);
-                    mw->on_btnWifiList_clicked();
-                });
-            }
-        }else {
-            QApplication::setQuitOnLastWindowClosed(false);
-            this->hide();
-            DlgHideWifi *connHidWifi = new DlgHideWifi(ui->cbxConn->currentIndex(), mw);
-            connHidWifi->show();
-            connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-        }
-    }
-}
-
-void DlgHideWifiWpa::on_btnCancel_clicked()
-{
-    //this->close();
-    this->hide();
-}
-
-void DlgHideWifiWpa::on_btnConnect_clicked()
-{
-    mw->is_stop_check_net_state = 1;
-    mw->is_connect_hide_wifi = 1;
-
-    QThread *t = new QThread();
-    connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
-    connect(this, SIGNAL(stopSignal()), t, SLOT(quit()));
-
-    QString wifiName = ui->leNetName->text();
-    QString wifiPassword = ui->lePassword->text();
-
-    strWifiname = wifiName;
-    strWifiPassword = wifiPassword;
-    BackThread *bt = new BackThread();
-    if (isUsed == 0) {
-        bt->moveToThread(t);
-        connect(t, SIGNAL(started()), this, SLOT(slotStartConnectHiddenWifi()));
-        connect(this, SIGNAL(sigConnHiddenWifi(QString, QString)), bt, SLOT(execConnHiddenWifiWPA(QString,QString)));
-        connect(bt, SIGNAL(connDone(int)), mw, SLOT(connWifiDone(int)));
-        connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-    } else {
-        bt->moveToThread(t);
-        connect(t, SIGNAL(started()), this, SLOT(slotStartConnectRememberedHiddenWifi()));
-        connect(this, SIGNAL(sigConnRememberedHiddenWifi(QString)), bt, SLOT(execConnRememberedHiddenWifi(QString)));
-        connect(bt, SIGNAL(connDone(int)), mw, SLOT(connWifiDone(int)));
-        connect(bt, SIGNAL(btFinish()), t, SLOT(quit()));
-    }
-    t->start();
-//    this->close();
-    this->hide();
-}
-
-//void DlgHideWifiWpa::finishedProcess(int state) {
-//    wlist = shellOutput.split("\n");
-//    bool is_hidden  = true;
-//    foreach (QString wifi, wlist) {
-//        if (wifi.trimmed() == ui->leNetName->text()) {
-//            is_hidden = false;
-//        }
-//    }
-//    if (! is_hidden) {
-//        BackThread *bt = new BackThread();
-//        bt->execConnWifi(ui->leNetName->text());
-//        QTimer::singleShot(4*1000, this, SLOT(emitSignal() ));
-//    } else {
-//        //已保存的wifi没有在wifi列表找到（隐藏wifi保存后也会出现在wifi列表），则当前区域无法连接此wifi
-//        QString txt(tr("Selected Wifi has not been scanned."));
-//        mw->objKyDBus->showDesktopNotify(txt);
-//        emit this->stopSignal();
-//        emit reSetWifiList();
-//    }
-//    shellProcess->deleteLater();
-//}
-
-//切换密码明文
-void DlgHideWifiWpa::on_checkBoxPwd_clicked()
-{
-    if (ui->lePassword->echoMode() == QLineEdit::Password) {
-        ui->checkBoxPwd->setChecked(true);
-        ui->lePassword->setEchoMode(QLineEdit::Normal);
-    } else {
-        ui->checkBoxPwd->setChecked(false);
-        ui->lePassword->setEchoMode(QLineEdit::Password);
-    }
-}
-
-//void DlgHideWifiWpa::on_checkBoxPwd_released()
-//{
-//    ui->checkBoxPwd->setChecked(false);
-//    ui->lePassword->setEchoMode(QLineEdit::Password);
-//}
-
-void DlgHideWifiWpa::on_leNetName_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "" || ui->lePassword->text().size() < 6){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-
-    if (ui->leNetName->text().size() > 32) {
-        QString cutStr = ui->leNetName->text().mid(0,32);
-        ui->leNetName->setText(cutStr);
-    }
-}
-
-void DlgHideWifiWpa::on_lePassword_textEdited(const QString &arg1)
-{
-    if (ui->leNetName->text() == "" || ui->lePassword->text().size() < 6){
-        ui->btnConnect->setEnabled(false);
-    } else {
-        ui->btnConnect->setEnabled(true);
-    }
-}
-
-void DlgHideWifiWpa::slotStartConnectHiddenWifi()
-{
-    mw->startLoading();
-    emit sigConnHiddenWifi(ui->leNetName->text(), ui->lePassword->text());
-}
-
-void DlgHideWifiWpa::slotStartConnectRememberedHiddenWifi()
-{
-    mw->startLoading();
-    emit sigConnRememberedHiddenWifi(ui->leNetName->text());
-}
-
-void DlgHideWifiWpa::on_execSecConn()
-{
-    QString str = "nmcli device wifi connect '" + strWifiname + "' password '" + strWifiPassword + "'";
-    int status = system(str.toUtf8().data());
-    qDebug()<<"executed cmd="<<str<<". res="<<status;
-    qDebug() << "debug: 准备等待7秒";
-    QTimer::singleShot(7*1000, this, SLOT(emitSignal() ));
-}
-
-void DlgHideWifiWpa::emitSignal()
-{
-    emit this->stopSignal();
-    QFuture < void > future =  QtConcurrent::run([=](){
-        int xx = 1;
-        int nn = 0;
-        do {
-            BackThread *bt = new BackThread();
-            IFace *iface = bt->execGetIface();
-
-            sleep(1);
-            nn += 1;
-            if (nn == 8) {
-                xx = 0;
-            } else {
-                if (iface->wstate != 2) {
-                    qDebug() << "debug: 发出信号";
-                    emit reSetWifiList();
-                    mw->stopLoading();
-                    xx = 0;
-                }
-            }
-
-            delete iface;
-            bt->deleteLater();
-        } while(xx == 1);
-    });
-}
-
-void DlgHideWifiWpa::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
diff --git a/src/frontend/wireless-security/dlghidewifiwpa.h b/src/frontend/wireless-security/dlghidewifiwpa.h
deleted file mode 100644
index 05f55a32..00000000
--- a/src/frontend/wireless-security/dlghidewifiwpa.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef DLGCONNHIDWIFIWPA_H
-#define DLGCONNHIDWIFIWPA_H
-
-#include <QDialog>
-#include <QMouseEvent>
-#include <QThread>
-#include <QProcess>
-
-class OldMainWindow;
-
-namespace Ui {
-class DlgHideWifiWpa;
-}
-
-class DlgHideWifiWpa : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit DlgHideWifiWpa(int type, OldMainWindow *mw = 0, QWidget *parent = 0);
-    ~DlgHideWifiWpa();
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-public slots:
-    void changeDialog();
-    void changeWindow();
-    void emitSignal();
-    void on_execSecConn();
-    void slotStartConnectHiddenWifi();
-    void slotStartConnectRememberedHiddenWifi();
-
-private slots:
-    void on_btnCancel_clicked();
-
-    void on_btnConnect_clicked();
-
-    void on_leNetName_textEdited(const QString &arg1);
-
-    void on_lePassword_textEdited(const QString &arg1);
-
-//    void finishedProcess(int res);
-
-    void on_checkBoxPwd_clicked();
-
-//    void on_checkBoxPwd_released();
-
-signals:
-    void reSetWifiList();
-    void stopSignal();
-    void stopSignalAgain();
-    void sigConnHiddenWifi(QString wifiName, QString wifiPasswd);
-    void sigConnRememberedHiddenWifi(QString wifiName);
-
-private:
-    Ui::DlgHideWifiWpa *ui;
-    int isUsed;//=0 current wifi not used before; >=1 used
-    OldMainWindow *mw;
-    QString strWifiname;
-    QString strWifiPassword;
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-
-//    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss;
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-
-    QString shellOutput = "";
-    QStringList wlist;
-    QProcess * shellProcess;
-};
-
-#endif // DLGCONNHIDWIFIWPA_H
diff --git a/src/frontend/wireless-security/dlghidewifiwpa.ui b/src/frontend/wireless-security/dlghidewifiwpa.ui
deleted file mode 100644
index 2fc0deb2..00000000
--- a/src/frontend/wireless-security/dlghidewifiwpa.ui
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgHideWifiWpa</class>
- <widget class="QDialog" name="DlgHideWifiWpa">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>397</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Connect to Hidden Wi-Fi Network</string>
-  </property>
-  <widget class="QLabel" name="lbNetName">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>221</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbSecurity">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>176</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnCancel">
-   <property name="geometry">
-    <rect>
-     <x>215</x>
-     <y>350</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxConn">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>75</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="checkBoxPwd">
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>270</y>
-     <width>18</width>
-     <height>9</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbPassword">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>266</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="cbxSecurity">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>170</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="lePassword">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>261</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="btnConnect">
-   <property name="geometry">
-    <rect>
-     <x>315</x>
-     <y>350</y>
-     <width>90</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbConn">
-   <property name="geometry">
-    <rect>
-     <x>76</x>
-     <y>80</y>
-     <width>90</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="layoutDirection">
-    <enum>Qt::LeftToRight</enum>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="leNetName">
-   <property name="geometry">
-    <rect>
-     <x>175</x>
-     <y>215</y>
-     <width>182</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbBoder">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>432</width>
-     <height>397</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="QLabel" name="lbLeftupTitle">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>30</y>
-     <width>240</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-  <widget class="Line" name="lineUp">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>140</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="lineDown">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>320</y>
-     <width>412</width>
-     <height>1</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <zorder>lbBoder</zorder>
-  <zorder>lePassword</zorder>
-  <zorder>lbNetName</zorder>
-  <zorder>lbSecurity</zorder>
-  <zorder>btnCancel</zorder>
-  <zorder>cbxConn</zorder>
-  <zorder>checkBoxPwd</zorder>
-  <zorder>lbPassword</zorder>
-  <zorder>cbxSecurity</zorder>
-  <zorder>btnConnect</zorder>
-  <zorder>lbConn</zorder>
-  <zorder>leNetName</zorder>
-  <zorder>lbLeftupTitle</zorder>
-  <zorder>lineUp</zorder>
-  <zorder>lineDown</zorder>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/frontend/wireless-security/kylinheadfile.cpp b/src/frontend/wireless-security/kylinheadfile.cpp
deleted file mode 100644
index 3312fbe8..00000000
--- a/src/frontend/wireless-security/kylinheadfile.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#include "kylinheadfile.h"
-
-MyQss::MyQss()
-{
-    labelQss = "QLabel{border:0px;color:rgba(255,255,255,0.97);background-color:transparent;}";
-    cbxQss = "QComboBox{padding-left:20px;font-size:13px;color:rgba(255,255,255,0.91);"
-                        "border:1px solid rgba(255, 255, 255, 0.05);border-radius:4px;background:rgba(255,255,255,0.08);}"
-             "QComboBox::drop-down{border:0px;width:30px;}"
-             "QComboBox::down-arrow{image:url(:/res/g/down_arrow.png);}"
-             "QComboBox QAbstractItemView {margin:0px 0px 0px 0px;padding: 0px 0px;border-radius:0px;background-color:#48484C;outline:0px;}"
-             "QComboBox QAbstractItemView::item{padding-left:17px;border-radius:0px;font-size:13px;color:rgba(255,255,255,0.91);height: 32px;background-color:#48484C;outline:0px;}"
-             "QComboBox QAbstractItemView::item:hover{padding-left:17px;border-radius:0px;font-size:13px;color:rgba(255,255,255,0.91);background-color:#3D6BE5;outline:0px;}";
-    leQss = "QLineEdit{padding-left:20px;color:rgba(255,255,255,0.97);background:rgba(255,255,255,0.08);}";
-    checkBoxQss = "QCheckBox {border:none;background:transparent;}"
-                  "QCheckBox::indicator {width: 18px; height: 9px;}"
-                  "QCheckBox::indicator:checked {image: url(:/res/h/show-pwd.png);}"
-                  "QCheckBox::indicator:unchecked {image: url(:/res/h/hide-pwd.png);}";
-    checkBoxCAQss = "QCheckBox{boder:none;color:rgba(255,255,255,0.97);background-color:transparent;}";
-    btnCancelQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
-                   "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}"
-                   "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}";
-    btnConnQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}"
-                 "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                 "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}";
-    lineQss = "background:rgba(156,156,156,0.1);";
-
-    btnOffQss = "QPushButton[on=false]{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:grey;font-size:14px;}"
-                "QPushButton[on=true]{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
-                "QPushButton[on=true]:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                "QPushButton[on=true]:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);";
-}
diff --git a/src/frontend/wireless-security/kylinheadfile.h b/src/frontend/wireless-security/kylinheadfile.h
deleted file mode 100644
index b1ec4a15..00000000
--- a/src/frontend/wireless-security/kylinheadfile.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-
-#ifndef KYLINHEADFILE_H
-#define KYLINHEADFILE_H
-
-#include "dlghidewifi.h"
-#include "dlghidewifileap.h"
-#include "dlghidewifieapfast.h"
-#include "dlghidewifieapleap.h"
-#include "dlghidewifieappeap.h"
-#include "dlghidewifieappwd.h"
-#include "dlghidewifieaptls.h"
-#include "dlghidewifieapttls.h"
-#include "dlghidewifiwep.h"
-#include "dlghidewifiwpa.h"
-
-#include <QDebug>
-#include <QFile>
-#include <QPainter>
-#include <QPainterPath>
-#include <QListView>
-#include <QString>
-#include <KWindowEffects>
-
-class MyQss
-{
-public:
-    MyQss();
-
-    QString labelQss, cbxQss, leQss, btnConnQss, btnCancelQss, lineQss, checkBoxQss, checkBoxCAQss, btnOffQss;
-
-};
-
-#endif // KYLINHEADFILE_H
diff --git a/src/frontend/wireless-security/wireless-security.pri b/src/frontend/wireless-security/wireless-security.pri
deleted file mode 100644
index 97e665bf..00000000
--- a/src/frontend/wireless-security/wireless-security.pri
+++ /dev/null
@@ -1,40 +0,0 @@
-INCLUDEPATH += $$PWD
-
-FORMS += \
-    $$PWD/dlghidewifi.ui \
-    $$PWD/dlghidewifieapfast.ui \
-    $$PWD/dlghidewifieapleap.ui \
-    $$PWD/dlghidewifieappeap.ui \
-    $$PWD/dlghidewifieappwd.ui \
-    $$PWD/dlghidewifieaptls.ui \
-    $$PWD/dlghidewifieapttls.ui \
-    $$PWD/dlghidewifileap.ui \
-    $$PWD/dlghidewifiwep.ui \
-    $$PWD/dlghidewifiwpa.ui
-
-HEADERS += \
-    $$PWD/dlghidewifi.h \
-    $$PWD/dlghidewifieapfast.h \
-    $$PWD/dlghidewifieapleap.h \
-    $$PWD/dlghidewifieappeap.h \
-    $$PWD/dlghidewifieappwd.h \
-    $$PWD/dlghidewifieaptls.h \
-    $$PWD/dlghidewifieapttls.h \
-    $$PWD/dlghidewifileap.h \
-    $$PWD/dlghidewifiwep.h \
-    $$PWD/dlghidewifiwpa.h \
-    $$PWD/kylinheadfile.h
-
-SOURCES += \
-    $$PWD/dlghidewifi.cpp \
-    $$PWD/dlghidewifieapfast.cpp \
-    $$PWD/dlghidewifieapleap.cpp \
-    $$PWD/dlghidewifieappeap.cpp \
-    $$PWD/dlghidewifieappwd.cpp \
-    $$PWD/dlghidewifieaptls.cpp \
-    $$PWD/dlghidewifieapttls.cpp \
-    $$PWD/dlghidewifileap.cpp \
-    $$PWD/dlghidewifiwep.cpp \
-    $$PWD/dlghidewifiwpa.cpp \
-    $$PWD/kylinheadfile.cpp
-
diff --git a/src/frontend/wpawifidialog.cpp b/src/frontend/wpawifidialog.cpp
deleted file mode 100644
index a8599913..00000000
--- a/src/frontend/wpawifidialog.cpp
+++ /dev/null
@@ -1,1154 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-#include "wpawifidialog.h"
-#include "ui_wpawifidialog.h"
-#include "kylin-network-interface.h"
-#include "utils.h"
-#include "mainwindow.h"
-#include "wireless-security/kylinheadfile.h"
-
-#include <KWindowEffects>
-#include <QFile>
-#include <QStringListModel>
-#include <QCompleter>
-#include <QDateTime>
-#include <QIODevice>
-#include <QFileDialog>
-
-const QString CONFIG_FILE    = "/tmp/wpaconf.ini";
-const int ITEAM_FIXED_HEIGHT = 42;
-
-UpConnThread::UpConnThread(const QString& user, const QString& pwd)
-{
-    m_user = user;
-    m_pwd = pwd;
-}
-
-UpConnThread::~UpConnThread() {
-}
-
-void UpConnThread::run() {
-    QString cmdStr = 0;
-    QFile::remove(QString("/tmp/%1.txt").arg(conn_name).toUtf8());
-    QFile *passwdFile = new QFile(QString("/tmp/%1.txt").arg(conn_name));
-    if (passwdFile->open(QIODevice::ReadWrite)) {
-        passwdFile->write(QString("802-1x.identity:%1\n802-1x.password:%2").arg(m_user).arg(m_pwd).toUtf8());
-        passwdFile->close();
-        cmdStr = "nmcli connection up '" + this->conn_name + "' passwd-file /tmp/" + conn_name + ".txt";
-    } else {
-        cmdStr = "nmcli connection up '" + this->conn_name + "'";
-    }
-    qDebug()<<"Trying to connect wifi. ssid="<<this->conn_name;
-    qDebug()<<"qDebug: 激活连接: \n"<<
-              "qDebug: " + cmdStr;
-    int res = Utils::m_system(cmdStr.toUtf8().data());
-    emit connRes(res);
-}
-
-WpaWifiDialog::WpaWifiDialog(QWidget *parent, OldMainWindow *mainWindow, QString conname) :
-    QDialog(parent),
-    ui(new Ui::WpaWifiDialog)
-{
-    ui->setupUi(this);
-    this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    this->setAttribute(Qt::WA_DeleteOnClose);
-    this->setWindowIcon(QIcon::fromTheme("kylin-network", QIcon(":/res/x/setup.png")));
-//    this->setAttribute(Qt::WA_DeleteOnClose);
-
-    connectionName = conname;
-    m_wifiConfig = new WifiConfig;
-    m_wifiConfig->connectName = conname;
-//    configPath = getenv("HOME") + CONFIG_FILE;
-
-    QPainterPath path;
-    auto rect = this->rect();
-    rect.adjust(1, 1, -1, -1);
-    path.addRoundedRect(rect, 6, 6);
-    setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
-    KWindowEffects::enableBlurBehind(this->winId(), true, QRegion(path.toFillPolygon().toPolygon()));
-
-    initUI();
-    initCAConfigUI();
-    initUserConfig4TLSUI();
-
-    mainLyt->setSpacing(8);
-    mainLyt->setContentsMargins(8, 16, 8, 16);
-    mainWidget->setLayout(mainLyt);
-
-    initCombox();
-    initConnect();
-
-    eapTypeChange();
-    this->mw = mainWindow;
-    checkConnectBtnIsEnabled();
-}
-
-WpaWifiDialog::WpaWifiDialog(QWidget *parent, OldMainWindow *mw, WifiConfig *wifiConfig)
-{
-    if (wifiConfig) {
-        m_wifiConfig = wifiConfig;
-    } else {
-        m_wifiConfig = new WifiConfig;
-    }
-    connectionName = wifiConfig->connectName;
-    WpaWifiDialog(parent, mw, connectionName);
-}
-
-WpaWifiDialog::~WpaWifiDialog()
-{
-    if (m_wifiConfig != nullptr) {
-        delete m_wifiConfig;
-    }
-
-    /*清理父类为空的QFrame对象*/
-    for(QObject *obj : m_frameList) {
-        if (obj != nullptr && obj->parent() == nullptr)
-        {
-            obj->deleteLater();
-        }
-    }
-
-    delete ui;
-}
-
-void WpaWifiDialog::initUI() {
-    mainWidget = new QWidget(this);
-    mainLyt = new QVBoxLayout(mainWidget);
-    mainWidget->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_PEAP);
-    this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_PEAP);
-
-    titleFrame = new QFrame(mainWidget); //标题栏
-    titleFrame->setFixedHeight(48);
-    titleLyt = new QHBoxLayout(titleFrame);
-    titleLabel = new QLabel(titleFrame);
-    titleLabel->setText(tr("Connect WLAN"));
-    titleLyt->addWidget(titleLabel);
-    titleLyt->addStretch();
-    titleFrame->setLayout(titleLyt);
-
-    nameFrame = new QFrame(mainWidget); //网络名称
-    nameFrame->setFixedHeight(48);
-    nameLyt = new QHBoxLayout(nameFrame);
-    nameLyt->setContentsMargins(24, 0, 24, 0);
-    nameLabel = new QLabel(nameFrame);
-    nameEditor = new QLineEdit(nameFrame);
-    nameEditor->setFixedHeight(48);
-    nameLabel->setFixedWidth(100);
-    nameLabel->setText(tr("Name"));
-    nameEditor->setText(connectionName);
-    if (connectionName == "") {
-        //添加隐藏wifi时
-        nameEditor->setEnabled(true);//允许编辑wifi名
-    } else {
-        //连接现有wifi时
-        nameEditor->setEnabled(false);//暂时不允许编辑wifi名
-    }
-    nameLyt->addWidget(nameLabel);
-    nameLyt->addWidget(nameEditor);
-    nameFrame->setLayout(nameLyt);
-
-    securityFrame = new QFrame(mainWidget); //网络安全性
-    securityFrame->setFixedHeight(48);
-    securityLyt = new QHBoxLayout(securityFrame);
-    securityLyt->setContentsMargins(24, 0, 24, 0);
-    securityLabel = new QLabel(securityFrame);
-    securityCombox = new QComboBox(securityFrame);
-    securityCombox->setFixedHeight(48);
-    securityLabel->setFixedWidth(100);
-    securityLabel->setText(tr("Security"));
-    securityLyt->addWidget(securityLabel);
-    securityLyt->addWidget(securityCombox);
-    securityFrame->setLayout(securityLyt);
-
-    hLine = new QFrame(mainWidget); //分割线
-    hLine->setFrameShape(QFrame::Shape::HLine);
-    hLine->setLineWidth(0);
-    hLine->setFixedHeight(1);
-    hLine->setStyleSheet("QFrame{background-color: palette(base);}");
-
-    eapFrame = new QFrame(mainWidget); //EAP方法
-    eapFrame->setFixedHeight(48);
-    eapLyt = new QHBoxLayout(eapFrame);
-    eapLyt->setContentsMargins(24, 0, 24, 0);
-    eapLabel = new QLabel(eapFrame);
-    eapCombox = new QComboBox(eapFrame);
-    eapCombox->setFixedHeight(48);
-    eapLabel->setFixedWidth(100);
-    eapLabel->setText(tr("EAP type"));
-    eapLyt->addWidget(eapLabel);
-    eapLyt->addWidget(eapCombox);
-    eapFrame->setLayout(eapLyt);
-
-    /*以下为动态变更的地方*/
-    innerFrame = new QFrame(); //阶段2身份认证
-    innerFrame->setFixedHeight(48);
-    innerLyt = new QHBoxLayout(innerFrame);
-    innerLyt->setContentsMargins(24, 0, 24, 0);
-    innerLabel = new QLabel(innerFrame);
-    innerCombox = new QComboBox(innerFrame);
-    innerCombox->setFixedHeight(ITEAM_FIXED_HEIGHT);
-    innerLabel->setFixedWidth(100);
-    innerLabel->setText(tr("Inner auth"));
-    innerLyt->addWidget(innerLabel);
-    innerLyt->addWidget(innerCombox);
-    innerFrame->setLayout(innerLyt);
-
-    userFrame = new QFrame(); //用户名
-    userFrame->setFixedHeight(48);
-    userLyt = new QHBoxLayout(userFrame);
-    userLyt->setContentsMargins(24, 0, 24, 0);
-    userLabel = new QLabel(userFrame);
-    userEditor = new QLineEdit(userFrame);
-    userEditor->setFixedHeight(ITEAM_FIXED_HEIGHT);
-    userLabel->setFixedWidth(100);
-    userLabel->setText(tr("Username"));
-    userLyt->addWidget(userLabel);
-    userLyt->addWidget(userEditor);
-    userFrame->setLayout(userLyt);
-
-    pwdFrame = new QFrame(); //密码
-    pwdFrame->setFixedHeight(72);
-    pwdLyt = new QVBoxLayout(pwdFrame);
-    pwdLyt->setContentsMargins(0, 0, 0, 0);
-    pwdLyt->setSpacing(0);
-    pwdEditFrame = new QFrame(); //输入密码
-    pwdEditFrame->setFixedHeight(48);
-    pwdEditLyt = new QHBoxLayout(pwdEditFrame);
-    pwdEditLyt->setContentsMargins(24, 0, 24, 0);
-    pwdLabel = new QLabel(pwdEditFrame);
-    pwdEditor = new QLineEdit(pwdEditFrame);
-    pwdEditor->setEchoMode(QLineEdit::Password);
-    pwdLabel->setText(tr("Password"));
-    pwdLabel->setFixedWidth(100);
-    pwdEditor->setFixedHeight(ITEAM_FIXED_HEIGHT);
-    pwdEditLyt->addWidget(pwdLabel);
-    pwdEditLyt->addWidget(pwdEditor);
-    pwdEditFrame->setLayout(pwdEditLyt);
-    pwdShowFrame = new QFrame(); //显示密码
-    pwdShowFrame->setFixedHeight(24);
-    pwdShowLyt = new QHBoxLayout(pwdShowFrame);
-    pwdShowLyt->setContentsMargins(130, 0, 0, 0);
-    pwdShowBtn = new QCheckBox(pwdShowFrame);
-    pwdShowLabel = new QLabel(pwdShowFrame);
-    pwdShowLabel->setFixedWidth(120);
-    pwdShowBtn->setFixedSize(16, 16);
-    pwdShowBtn->setStyleSheet("background-color:rgb(61,61,65);");
-    pwdShowLabel->setText(tr("Show password"));
-    pwdShowLyt->addWidget(pwdShowBtn);
-    pwdShowLyt->addWidget(pwdShowLabel);
-    pwdShowLyt->addStretch();
-    pwdShowFrame->setLayout(pwdShowLyt);
-    askPwdFrame = new QFrame(pwdFrame); //每次询问密码
-    askPwdFrame->setFixedHeight(24);
-    askPwdLyt = new QHBoxLayout(askPwdFrame);
-    askPwdLyt->setContentsMargins(130, 0, 0, 0);
-    askPwdBtn = new QCheckBox(askPwdFrame);
-    askPwdBtn->setStyleSheet("background-color:rgb(61,61,65);");
-    askPwdlabel = new QLabel(askPwdFrame);
-//    askPwdlabel->setFixedWidth(120);
-    askPwdBtn->setFixedSize(16, 16);
-    askPwdlabel->setText(tr("Ask pwd each query"));
-    askPwdLyt->addWidget(askPwdBtn);
-    askPwdLyt->addWidget(askPwdlabel);
-    askPwdLyt->addStretch();
-    askPwdFrame->setLayout(askPwdLyt);
-
-    pwdLyt->addWidget(pwdEditFrame);
-    pwdLyt->addWidget(pwdShowFrame);
-    pwdLyt->addWidget(askPwdFrame);
-    pwdFrame->setLayout(pwdLyt);
-
-    buttonFrame = new QFrame(); //按钮
-    buttonLyt = new QHBoxLayout(buttonFrame);
-    cancelBtn = new QPushButton(buttonFrame); //取消
-    connectBtn = new QPushButton(buttonFrame); //连接
-    connectBtn->setEnabled(false);
-    cancelBtn->setFixedSize(72, 36);
-    connectBtn->setFixedSize(72, 36);
-    cancelBtn->setText(tr("Cancel"));
-    connectBtn->setText(tr("Connect"));
-    buttonLyt->addStretch();
-    buttonLyt->addWidget(cancelBtn);
-    buttonLyt->addWidget(connectBtn);
-    buttonFrame->setLayout(buttonLyt);
-
-    QString btnOffQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
-                        "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                        "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);";
-    cancelBtn->setStyleSheet(btnOffQss);
-    connectBtn->setStyleSheet(btnOffQss);
-
-    nameEditor->setContextMenuPolicy(Qt::NoContextMenu); //禁止LineEdit的右键菜单
-    userEditor->setContextMenuPolicy(Qt::NoContextMenu);
-    pwdEditor->setContextMenuPolicy(Qt::NoContextMenu);
-
-    m_frameList.append(titleFrame);
-    m_frameList.append(nameFrame);
-    m_frameList.append(securityFrame);
-    m_frameList.append(eapFrame);
-    m_frameList.append(innerFrame);
-    m_frameList.append(userFrame);
-    m_frameList.append(pwdFrame);
-    m_frameList.append(buttonFrame);
-}
-
-void WpaWifiDialog::initCombox() {
-    //wifi安全性
-    //securityCombox->addItem(tr("WPA & WPA2"));
-    securityCombox->addItem(tr("None")); //无
-    securityCombox->addItem(tr("WPA and WPA2 Personal")); //WPA 及 WPA2 个人
-    securityCombox->addItem(tr("WPA and WPA2 Enterprise")); //WPA 及 WPA2 企业
-    //ui->cbxSecurity->addItem(tr("WEP 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
-    //ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
-    //ui->cbxSecurity->addItem("LEAP");
-    //ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
-    securityCombox->setCurrentIndex(2);
-    connect(securityCombox,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialog()));
-
-//    securityCombox->setEnabled(false);
-    //EAP方法
-    QStringList eapStringList;
-    /*eapStringList<< "PEAP" << "FAST" << "MD5" << "PWD" << "SIM" << "TLS" << "TTLS";*/
-    /*eapStringList<< "PEAP";*/
-//    eapStringList << "TLS" << "PEAP" << "PWD" << "FAST" << "TTLS" << "LEAP";
-    //暂时隐藏尚未完成的功能
-    eapStringList << "TLS" << "PEAP";
-    for (int i = 0; i < eapStringList.length(); i++) {
-        eapCombox->addItem(eapStringList.at(i), QString(eapStringList.at(i)).toLower());
-    }
-    connect(eapCombox, SIGNAL(currentIndexChanged(int)), this, SLOT(eapTypeChange()));
-
-    //阶段2认证方式
-    QStringList innerStringList;
-    //innerStringList<< "MSCHAPv2" << "MSCHAP" << "MD5" << "CHAP" << "OTP" << "GTC" << "PAP" << "TLS";
-    innerStringList<< "MSCHAPv2";
-    for (int i = 0; i < innerStringList.length(); i++) {
-        innerCombox->addItem(innerStringList.at(i), QString(innerStringList.at(i)).toLower());
-    }
-    if (connectionName == "") {
-        askPwdBtn->setChecked(true);
-        return;
-    }
-//    //读配置文件
-    wifi_info = getWifiInfo(connectionName);
-//    qDebug() << wifi_info << wifi_info.length();
-    if (wifi_info.length() < 4) {
-        askPwdBtn->setChecked(true);
-        has_config = false;
-    } else {
-        has_config = true;
-        //读配置信息
-        eapCombox->setCurrentIndex(eapCombox->findData(wifi_info.at(0)));
-        innerCombox->setCurrentIndex(innerCombox->findData(wifi_info.at(1)));
-        getPwdFlag();
-        if (pwd_flag == 2) {
-            askPwdBtn->setChecked(true);
-            for (int i = 2; i < wifi_info.length() - 1; i++) {
-                user_list << wifi_info.at(i);
-            }
-        } else {
-            askPwdBtn->setChecked(false);
-            pwdEditor->setText(wifi_info.at(wifi_info.length() - 1));
-            this->connectBtn->setEnabled(true);
-            for (int i = 2; i < wifi_info.length() - 1; i++) {
-                user_list << wifi_info.at(i);
-            }
-        }
-//        askPwdBtn->setChecked(wifi_info.at(wifi_info.length() - 1) == "true");
-        userEditor->setText(user_list.at(user_list.length() - 1));
-        QCompleter *completer = new QCompleter(userEditor);
-        QStringListModel * listModel = new QStringListModel(user_list, userEditor);
-        completer->setCaseSensitivity(Qt::CaseInsensitive);
-        completer->setModel(listModel);
-        userEditor->setCompleter(completer);
-    }
-
-    /*选择CA证书路径*/
-    m_CAComboBox->addItem(tr("None"), QString(tr("None"))); //无
-    m_CAComboBox->addItem(tr("Choose from file..."), QString(tr("Choose from file..."))); //从文件中选择...
-    m_CAComboBox->setCurrentIndex(0);
-    connect(m_CAComboBox, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged), this, [=] (const QString &str) {
-        if (str.contains("Choose from file...") || str.contains("从文件选择..."))
-        {
-            QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a CA certificate"), "recent:///",
-                                                            tr("CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)"));
-            if (!fileName.isNull()) {
-                m_wifiConfig->caCert = fileName;
-                QStringList nameList = fileName.split("/");
-                m_CAComboBox->setItemText(0, nameList.back());
-                m_CAComboBox->setCurrentIndex(0);
-            } else {
-                m_CAComboBox->setItemText(0, tr("None"));
-                m_CAComboBox->setCurrentIndex(0);
-            }
-        } else {
-            qWarning() << "Choose file is null or unvalible";
-        }
-        checkConnectBtnIsEnabled();
-    });
-
-    m_UserCertificateComboBox->addItem(tr("None"), QString(tr("None"))); //无
-    m_UserCertificateComboBox->addItem(tr("Choose from file..."), QString(tr("Choose from file..."))); //从文件中选择...
-    m_UserCertificateComboBox->setCurrentIndex(0);
-    connect(m_UserCertificateComboBox, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged), this, [=] (const QString &str) {
-        if (str.contains("Choose from file...") || str.contains("从文件选择..."))
-        {
-            QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a CA certificate"), "recent:///",
-                                                            tr("CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)"));
-            if (!fileName.isNull()) {
-                m_wifiConfig->clientCert = fileName;
-                QStringList nameList = fileName.split("/");
-                m_UserCertificateComboBox->setItemText(0, nameList.back());
-                m_UserCertificateComboBox->setCurrentIndex(0);
-            } else {
-                m_UserCertificateComboBox->setItemText(0, tr("None"));
-                m_UserCertificateComboBox->setCurrentIndex(0);
-            }
-        } else {
-            qWarning() << "Choose file is null or unvalible";
-        }
-        checkConnectBtnIsEnabled();
-    });
-
-    m_UserPrivateKeyComboBox->addItem(tr("None"), QString(tr("None"))); //无
-    m_UserPrivateKeyComboBox->addItem(tr("Choose from file..."), QString(tr("Choose from file..."))); //从文件中选择...
-    m_UserPrivateKeyComboBox->setCurrentIndex(0);
-    connect(m_UserPrivateKeyComboBox, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged), this, [=] (const QString &str) {
-        if (str.contains("Choose from file...") || str.contains("从文件选择..."))
-        {
-            QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a CA certificate"), "recent:///",
-                                                            tr("CA Files (*.pem *.der *.p12 *.crt *.key *.cer *.pfx)"));
-            if (!fileName.isNull()) {
-                m_wifiConfig->privateKey = fileName;
-                QStringList nameList = fileName.split("/");
-                m_UserPrivateKeyComboBox->setItemText(0, nameList.back());
-                m_UserPrivateKeyComboBox->setCurrentIndex(0);
-            } else {
-                m_UserPrivateKeyComboBox->setItemText(0, tr("None"));
-                m_UserPrivateKeyComboBox->setCurrentIndex(0);
-            }
-        } else {
-            qWarning() << "Choose file is null or unvalible";
-        }
-        checkConnectBtnIsEnabled();
-    });
-}
-
-void WpaWifiDialog::changeDialog()
-{
-    if (securityCombox->currentIndex() == 0) {
-        //无安全性
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->close();
-        DlgHideWifi *connHidWifi = new DlgHideWifi(0,mw);
-        connHidWifi->show();
-        connect(connHidWifi, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    }
-
-    if (securityCombox->currentIndex() == 1) {
-        //WPA 及 WPA2 个人
-        QApplication::setQuitOnLastWindowClosed(false);
-        this->close();
-        DlgHideWifiWpa *connHidWifiWpa = new DlgHideWifiWpa(0, mw);
-        connHidWifiWpa->show();
-        connect(connHidWifiWpa, SIGNAL(reSetWifiList() ), mw, SLOT(on_btnWifiList_clicked()) );
-    }
-}
-
-/**
- * @brief WpaWifiDialog::getPwdFlag 获取是否每次询问密码
- * @return
- */
-void WpaWifiDialog::getPwdFlag() {
-    QProcess * process = new QProcess(this);
-    QString ssid = nameEditor->text();
-    process->start(QString("nmcli -f 802-1x.password-flags connection show '%1'").arg(ssid));
-    connect(process, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), this, [ = ]() {
-        process->deleteLater();
-    });
-    connect(process, &QProcess::readyReadStandardOutput, this, [ = ]() {
-        QString str = process->readAllStandardOutput();
-        pwd_flag = str.mid(str.lastIndexOf(" ") - 1, 1).toInt();
-    });
-    process->waitForFinished();
-}
-
-/**
- * @brief WpaWifiDialog::setPwdFlag 设置是否每次询问密码
- * @param flag 0不询问， 2询问
- * @return
- */
-bool WpaWifiDialog::setPwdFlag(const int & flag) {
-    QProcess * process = new QProcess;
-    QString ssid = nameEditor->text();
-    process->start(QString("nmcli connection modify '%1' 802-1x.password-flags %2").arg(ssid).arg(QString::number(flag)));
-    connect(process, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), this, [ = ]() {
-        process->deleteLater();
-    });
-    process->waitForFinished();
-    return true;
-}
-
-void WpaWifiDialog::initConnect() {
-    //取消按钮
-    connect(cancelBtn, &QPushButton::clicked, this, [ = ]() {
-        this->close();
-    });
-    //连接按钮
-    connect(connectBtn, &QPushButton::clicked, this, &WpaWifiDialog::slot_on_connectBtn_clicked);
-    //显示密码
-    connect(pwdShowBtn, &QCheckBox::clicked, this, [ = ]() {
-        if (pwdEditor->echoMode() == QLineEdit::Password) {
-            pwdShowBtn->setChecked(true);
-            pwdEditor->setEchoMode(QLineEdit::Normal);
-            m_pwd4PrivateKeyPWDEditor->setEchoMode(QLineEdit::Normal);
-        } else {
-            pwdShowBtn->setChecked(false);
-            pwdEditor->setEchoMode(QLineEdit::Password);
-            m_pwd4PrivateKeyPWDEditor->setEchoMode(QLineEdit::Password);
-        }
-    });
-//    connect(pwdShowBtn, &QCheckBox::released, this, [ = ]() {
-//        pwdShowBtn->setChecked(false);
-//        pwdEditor->setEchoMode(QLineEdit::Password);
-//        m_pwd4PrivateKeyPWDEditor->setEchoMode(QLineEdit::Password);
-//    });
-    connect(pwdEditor, &QLineEdit::textChanged, this, &WpaWifiDialog::slot_line_edit_changed);
-    connect(userEditor, &QLineEdit::textChanged, this, &WpaWifiDialog::slot_line_edit_changed);
-    connect(nameEditor, &QLineEdit::textChanged, this, &WpaWifiDialog::slot_line_edit_changed);
-
-    connect(m_isCANeededShowBtn, &QCheckBox::clicked, this, [=]() {
-        if (m_isCANeededShowBtn->isChecked()) {
-            m_CAComboBox->setDisabled(true);
-            if (m_wifiConfig) {
-                m_wifiConfig->caCert = nullptr;
-            }
-        } else {
-            m_CAComboBox->setDisabled(false);
-        }
-        checkConnectBtnIsEnabled();
-    });
-
-    connect(m_identityEditor, &QLineEdit::textChanged, this, [=]() {
-        m_wifiConfig->identity = m_identityEditor->text();
-        checkConnectBtnIsEnabled();
-    });
-
-    connect(m_pwd4PrivateKeyPWDEditor, &QLineEdit::textChanged, this, [=]() {
-       checkConnectBtnIsEnabled();
-    });
-}
-
-void WpaWifiDialog::slot_line_edit_changed() {
-    if (pwdEditor->text().length() >= 1 && userEditor->text().length() >= 1) {
-        connectBtn->setEnabled(true);
-    } else {
-        connectBtn->setEnabled(false);
-    }
-
-    if (nameEditor->text().size() > 32) {
-        QString cutStr = nameEditor->text().mid(0,32);
-        nameEditor->setText(cutStr);
-    }
-}
-
-void WpaWifiDialog::slot_on_connectBtn_clicked() {
-    qDebug()<<"Clicked on connect Btn!";
-    //this->mw->is_stop_check_net_state = 1;
-    //this->mw->setTrayLoading(true);
-    //写/tmp/wpaconfig.ini配置文件
-    if (eapCombox->currentIndex() == EapType::TTLS) {
-        //Todo
-    }
-
-    if (has_config) {
-        appendWifiUser(nameEditor->text(), userEditor->text());
-    } else {
-        appendWifiInfo(nameEditor->text(), eapCombox->currentData().toString(), innerCombox->currentData().toString(), userEditor->text(), askPwdBtn->isChecked());
-        has_config = true;
-    }
-//    QString cmdStr = "nmcli connection modify " + nameEditor->text() + " 802-1x.password " + pwdEditor->text();
-    QString cmdStr = "nmcli connection modify '" +  nameEditor->text() + "' ipv4.method auto";
-    int res = Utils::m_system(cmdStr.toUtf8().data());
-    if (res == 0) {
-        //有配置文件，需要判断一下当前配置文件wifi安全性是不是wpa-eap，若不是，需要把原配置文件删除，重新配置
-        QProcess * process = new QProcess(this);
-        process->start(QString("nmcli -f 802-11-wireless-security.key-mgmt connection show %1").arg(nameEditor->text()));
-        connect(process, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), this, [ = ]() {
-            process->deleteLater();
-        });
-        connect(process, &QProcess::readyReadStandardOutput, this, [ = ]() {
-            QString str = process->readAllStandardOutput();
-            key_mgmt = str.mid(str.lastIndexOf(" ") + 1, str.length() - str.lastIndexOf(" ") - 2);
-        });
-        process->waitForFinished();
-        if (QString::compare(key_mgmt, "wpa-eap")) {
-            //原配置文件不是企业wifi，删掉重新创建
-            QString cmdStr = "nmcli connection delete " +  nameEditor->text();
-            Utils::m_system(cmdStr.toUtf8().data());
-            goto next;
-        }
-        process->waitForFinished();
-        //有网络配置文件，接下来修改网络配置，然后激活连接
-        QString cmdStr_1;
-
-        if (eapCombox->currentIndex() == EapType::TLS) {
-            qDebug() << "nmcli connection modify '" + m_wifiConfig->connectName + "' 802-1x.eap " + eapCombox->currentData().toString()+ " 802-1x.ca-cert "
-                        + (m_wifiConfig->caCert.isEmpty() ? "''" : m_wifiConfig->caCert) + " 802-1x.identity " + m_wifiConfig->identity + " 802-1x.client-cert " + m_wifiConfig->clientCert
-                        + " 802-1x.private-key " + m_wifiConfig->privateKey + " 802-1x.private-key-password " + m_pwd4PrivateKeyPWDEditor->text();
-            cmdStr_1 = "nmcli connection modify '" + m_wifiConfig->connectName + "' 802-1x.eap " + eapCombox->currentData().toString()+ " 802-1x.ca-cert "
-                    + m_wifiConfig->caCert + " 802-1x.identity " + m_wifiConfig->identity + " 802-1x.client-cert " + m_wifiConfig->clientCert
-                    + " 802-1x.private-key " + m_wifiConfig->privateKey + " 802-1x.private-key-password " + m_pwd4PrivateKeyPWDEditor->text();
-        }
-        if (eapCombox->currentIndex() == EapType::PEAP) {
-            qDebug()<<"qDebug: 有配置文件，修改配置后激活:"<<"\n"<<
-                      "qDebug: nmcli connection modify '" + nameEditor->text() + "' 802-1x.eap " + eapCombox->currentData().toString() + " 802-1x.phase2-auth "
-                      + innerCombox->currentData().toString() + " 802-1x.identity " + userEditor->text() + " 802-1x.password " + pwdEditor->text();
-            cmdStr_1 = "nmcli connection modify '" + nameEditor->text() + "' 802-1x.eap " + eapCombox->currentData().toString()+ " 802-1x.phase2-auth "
-                    + innerCombox->currentData().toString() + " 802-1x.identity " + userEditor->text() + " 802-1x.password " + pwdEditor->text();
-        }
-
-        Utils::m_system(cmdStr_1.toUtf8().data());
-        if (askPwdBtn->isChecked() && eapCombox->currentIndex() == EapType::PEAP) setPwdFlag(2);
-        else setPwdFlag(0);
-        //激活连接
-        activateConnection();
-    } else {
-    next:
-        //无网络配置文件，需要新创建
-        //获取网卡名称
-        KylinDBus mkylindbus;
-        QString wifi_card_name= mkylindbus.dbusWiFiCardName;
-        qDebug()<<"qDebug: 无配置文件，使用如下配置新建配置文件:"<<"\n"<<
-                  "qDebug: con-name & ssid: "<<nameEditor->text()<<"\n"<<
-                  "qDebug: wifi card name(ifname): "<<wifi_card_name<<"\n"<<
-                  "qDebug: 802-1x.eap: "<<eapCombox->currentData().toString()<<"\n"<<
-                  "qDebug: 802-1x.phase2-auth: "<<innerCombox->currentData().toString()<<"\n"<<
-                  "qDebug: 802-1x.identity: "<<userEditor->text()<<"\n"<<
-                  "qDebug: 802-1x.password: "<<pwdEditor->text();
-        QString create_cmd;
-        if (eapCombox->currentIndex() == EapType::TLS) {
-            create_cmd = "nmcli connection add con-name '" + nameEditor->text() + "' ifname "
-                    + wifi_card_name + " ipv4.method auto type wifi ssid " + nameEditor->text()
-                    + " 802-1x.eap " + eapCombox->currentData().toString()+ " 802-1x.ca-cert "
-                    + (m_wifiConfig->caCert.isEmpty() ? "''" : m_wifiConfig->caCert) + " 802-1x.identity " + m_wifiConfig->identity
-                    + " 802-1x.client-cert " + m_wifiConfig->clientCert
-                    + " 802-1x.private-key " + m_wifiConfig->privateKey
-                    + " 802-1x.private-key-password " + m_pwd4PrivateKeyPWDEditor->text() +
-                    " wifi-sec.key-mgmt wpa-eap autoconnect yes";
-            qDebug() << create_cmd;
-        }
-
-        if (eapCombox->currentIndex() == EapType::PEAP) {
-            create_cmd = "nmcli connection add con-name '" + nameEditor->text() + "' ifname "
-                    + wifi_card_name + " ipv4.method auto type wifi ssid " + nameEditor->text()
-                    + " 802-1x.eap " + eapCombox->currentData().toString() + " 802-1x.phase2-auth "
-                    + innerCombox->currentData().toString() + " 802-1x.identity "
-                    + userEditor->text() + " 802-1x.password " + pwdEditor->text() +
-                    " wifi-sec.key-mgmt wpa-eap autoconnect no";
-        }
-//        qDebug() << create_cmd;
-        int res = Utils::m_system(create_cmd.toUtf8().data());
-        if (res == 0) {
-            qDebug() << "qDebug: created a wifi config successfully in function slot_on_connectBtn_clicked";
-            if (askPwdBtn->isChecked() && eapCombox->currentIndex() == EapType::PEAP) setPwdFlag(2);
-            else setPwdFlag(0);
-            //创建成功，激活连接
-            activateConnection();
-        } else {
-            qDebug() << "qDebug: create wpa wifi config file failed in function slot_on_connectBtn_clicked";
-        }
-    }
-}
-
-void WpaWifiDialog::setEditorEnable(bool is_checking) {
-    securityCombox->setEnabled(is_checking);
-    eapCombox->setEnabled(is_checking);
-    innerCombox->setEnabled(is_checking);
-    userEditor->setEnabled(is_checking);
-    pwdEditor->setEnabled(is_checking);
-    pwdShowBtn->setEnabled(is_checking);
-    pwdShowLabel->setEnabled(is_checking);
-    askPwdBtn->setEnabled(is_checking);
-    askPwdlabel->setEnabled(is_checking);
-    cancelBtn->setEnabled(is_checking);
-    connectBtn->setEnabled(is_checking);
-
-    m_identityEditor->setEnabled(is_checking);
-    m_anonymousIdentityEditor->setEnabled(is_checking);
-    m_domainEditor->setEnabled(is_checking);
-    m_CAComboBox->setEnabled(is_checking);
-    m_isCANeededShowBtn->setEnabled(is_checking);
-    m_UserCertificateComboBox->setEnabled(is_checking);
-    m_UserPrivateKeyComboBox->setEnabled(is_checking);
-    m_pwd4PrivateKeyPWDEditor->setEnabled(is_checking);
-}
-
-void WpaWifiDialog::activateConnection() {
-    if (this->mw->is_stop_check_net_state == 1) {
-//        conn_failed();
-        return;
-    }
-    UpConnThread * upThread = new UpConnThread(userEditor->text(), pwdEditor->text());
-    upThread->conn_name = nameEditor->text();
-    //超时计时器
-    QTimer * timeout = new QTimer(this);
-    connect(upThread, &UpConnThread::started, this, [ = ]() {
-        //线程开始，开始校验密码，此时弹窗的连接按钮被禁用，所有输入框禁用
-        setEditorEnable(false);
-        QObject::connect(timeout, &QTimer::timeout, this, [ = ](){
-            //连接超时
-            timeout->stop();
-            timeout->deleteLater();
-            QString cmdStr_2 = "nmcli connection down '" + nameEditor->text() + "'";
-            Utils::m_system(cmdStr_2.toUtf8().data());
-            this->mw->is_stop_check_net_state = 0;
-            this->mw->setTrayLoading(false);
-            qDebug() << "qDebug: activate time out in function activateConnection";
-            qDebug() << "qDebug: 连接超时（30秒超时时间）";
-        });
-        //设置超时时间
-        timeout->start(30 * 1000);
-    });
-    connect(upThread, &UpConnThread::connRes, this, [ = ](int res) {
-        //qDebug()<<"qDebug: Connect result is: "<<res;
-        if (res != 0) {
-            //连接错误或连接超时
-            setEditorEnable(true);
-            emit conn_failed();
-            this->mw->is_stop_check_net_state = 0;
-            this->mw->setTrayLoading(false);
-        } else {
-            //连接成功
-            timeout->stop();
-            timeout->deleteLater();
-            upThread->quit();
-            upThread->wait();
-            upThread->deleteLater();
-            emit conn_done();
-            this->mw->is_stop_check_net_state = 0;
-            this->mw->setTrayLoading(false);
-            qDebug() << "qDebug: activated wpa security wifi successfully";
-            this->close();
-        }
-    });
-    upThread->start();
-    this->mw->is_stop_check_net_state = 1;
-    this->mw->setTrayLoading(true);
-}
-
-QStringList WpaWifiDialog::getWifiInfo(QString wifiName) {
-    //返回名为wifiName的企业wifi的配置信息，包括eap,inner和用户列表
-    QStringList wlist;
-    QFile file(CONFIG_FILE);
-    if(!file.exists()) {
-        return wlist;
-    }
-    QSharedPointer<QSettings>  autoSettings = QSharedPointer<QSettings>(new QSettings(CONFIG_FILE, QSettings::IniFormat));
-    autoSettings.get()->beginGroup(wifiName);
-    wlist << autoSettings.get()->value("eap").toString();
-    wlist << autoSettings.get()->value("inner").toString();
-    autoSettings.get()->beginReadArray(wifiName);
-    for (int i = 0; ; i++) {
-        autoSettings.get()->setArrayIndex(i);
-        if (autoSettings.get()->value("user").toString().isEmpty()) {
-            break;
-        }
-        wlist << autoSettings.get()->value("user").toString();
-    }
-    autoSettings.get()->endArray();
-    wlist << autoSettings.get()->value("pwd").toString();
-    autoSettings.get()->endGroup();
-    return wlist;
-}
-
-bool WpaWifiDialog::appendWifiInfo(QString name, QString eap, QString inner, QString user, bool ask) {
-    //向配置文件添加名为name的wifi配置，包括eap,inner和它的第一个用户
-    QSharedPointer<QSettings>  autoSettings = QSharedPointer<QSettings>(new QSettings(CONFIG_FILE, QSettings::IniFormat));
-    autoSettings.get()->beginGroup(name);
-    autoSettings.get()->setValue("eap", eap);
-    autoSettings.get()->setValue("inner", inner);
-    //以数组形式写入用户名
-    autoSettings.get()->beginWriteArray(name);
-    autoSettings.get()->setArrayIndex(0);
-    autoSettings.get()->setValue("user", user);
-    user_list << user;
-    autoSettings.get()->endArray();
-//    autoSettings.get()->setValue("askpwd", ask);
-    autoSettings.get()->setValue("pwd", this->pwdEditor->text());
-    return true;
-}
-
-bool WpaWifiDialog::appendWifiUser(QString name, QString user) {
-    //向名为name的wifi用户列表添加名为user的用户名
-    QSharedPointer<QSettings>  autoSettings = QSharedPointer<QSettings>(new QSettings(CONFIG_FILE, QSettings::IniFormat));
-//    autoSettings.get()->beginWriteArray(name);
-//    autoSettings.get()->setArrayIndex(0);
-    //读到用户名列表长度并在队尾添加一个用户名
-    autoSettings.get()->beginGroup(name);
-    autoSettings.get()->setValue("eap", eapCombox->currentData().toString());
-    autoSettings.get()->setValue("inner", innerCombox->currentData().toString());
-//    autoSettings.get()->setValue("askpwd", askPwdBtn->isChecked());
-    autoSettings.get()->setValue("pwd", this->pwdEditor->text());
-    if (user_list.contains(user)) {
-        autoSettings.get()->endGroup();
-        return true;
-    }
-    autoSettings.get()->beginReadArray(name);
-    int size = 1;
-    while (size) {
-        autoSettings.get()->setArrayIndex(size);
-        if (autoSettings.get()->value("user").toString().isEmpty()) {
-            autoSettings.get()->setValue("user", user);
-            user_list << user;
-            break;
-        }
-        size ++;
-    }
-//    autoSettings.get()->beginWriteArray(name);
-//    autoSettings.get()->setArrayIndex(size + 1);
-//    autoSettings.get()->setValue("user", user);
-    autoSettings.get()->endArray();
-    autoSettings.get()->endGroup();
-    return true;
-}
-
-void WpaWifiDialog::mousePressEvent(QMouseEvent *event)
-{
-    if (event->button() == Qt::LeftButton) {
-        this->isPress = true;
-        this->winPos = this->pos();
-        this->dragPos = event->globalPos();
-        event->accept();
-    }
-    return QDialog::mousePressEvent(event);
-}
-void WpaWifiDialog::mouseReleaseEvent(QMouseEvent *event)
-{
-    this->isPress = false;
-}
-void WpaWifiDialog::mouseMoveEvent(QMouseEvent *event)
-{
-    if (this->isPress) {
-        this->move(this->winPos - (this->dragPos - event->globalPos()));
-        event->accept();
-    }
-    return QDialog::mouseMoveEvent(event);
-}
-
-void WpaWifiDialog::keyPressEvent(QKeyEvent *event)
-{
-    //return QDialog::keyPressEvent(event);
-}
-
-void WpaWifiDialog::paintEvent(QPaintEvent *event)
-{
-    KylinDBus mkylindbus;
-    double trans = mkylindbus.getTransparentData();
-
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-    QRect rect = this->rect();
-    p.setRenderHint(QPainter::Antialiasing);  // 反锯齿;
-    p.setBrush(opt.palette.color(QPalette::Base));
-    p.setOpacity(trans);
-    p.setPen(Qt::NoPen);
-    p.drawRoundedRect(rect, 6, 6);
-    QWidget::paintEvent(event);
-}
-
-void WpaWifiDialog::eapTypeChange()
-{
-    deleteAllItemOfLayout(mainLyt);
-    mainLyt->addWidget(titleFrame);
-    mainLyt->addWidget(nameFrame);
-    mainLyt->addWidget(securityFrame);
-    mainLyt->addWidget(hLine);
-    mainLyt->addWidget(eapFrame);
-
-    // << "TLS" << "LEAP" << "PWD" << "FAST" << "TTLS" << "PEAP";
-    switch (eapCombox->currentIndex()) {
-    case EapType::TLS:
-        mainLyt->addWidget(m_identityFrame);
-        mainLyt->addWidget(m_domainFrame);
-        mainLyt->addWidget(m_CAFrame);
-        mainLyt->addWidget(m_isCANeededFrame);
-        mainLyt->addWidget(m_UserCertificateFrame);
-        mainLyt->addWidget(m_UserPrivateKeyFrame);
-        mainLyt->addWidget(m_pwd4PrivateKeyPWDFrame);
-        mainWidget->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_TLP);
-        this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_TLP);
-        break;
-    case EapType::LEAP:
-        // Todo
-        mainWidget->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_ELSE);
-        this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_ELSE);
-        break;
-    case EapType::PWD:
-        // Todo
-        mainWidget->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_ELSE);
-        this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_ELSE);
-        break;
-    case EapType::FAST:
-        // Todo
-        mainWidget->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_ELSE);
-        this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_ELSE);
-        break;
-    case EapType::TTLS:
-        // Todo
-        /*
-        mainLyt->addWidget(m_anonymousIdentityFrame);
-        mainLyt->addWidget(m_domainFrame);
-        mainLyt->addWidget(m_CAFrame);
-        mainLyt->addWidget(m_isCANeededFrame);
-        mainLyt->addWidget(innerFrame);
-        mainLyt->addWidget(userFrame);
-        mainLyt->addWidget(pwdFrame);
-        */
-        mainWidget->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_ELSE);
-        this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_ELSE);
-        break;
-    case EapType::PEAP:
-        // 需要抽离的
-        mainLyt->addWidget(innerFrame);
-        mainLyt->addWidget(userFrame);
-        mainLyt->addWidget(pwdFrame);
-        mainWidget->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_PEAP);
-        this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_PEAP);
-        break;
-    default: // TLS
-        mainLyt->addWidget(m_identityFrame);
-        mainLyt->addWidget(m_domainFrame);
-        mainLyt->addWidget(m_CAFrame);
-        mainLyt->addWidget(m_UserCertificateFrame);
-        mainLyt->addWidget(m_UserPrivateKeyFrame);
-        mainLyt->addWidget(m_pwd4PrivateKeyPWDFrame);
-        mainWidget->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_TLP);
-        this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT_TLP);
-        break;
-    }
-
-    mainLyt->addWidget(pwdShowFrame);
-    mainLyt->addWidget(buttonFrame);
-    repaint();
-}
-
-void WpaWifiDialog::initCAConfigUI()
-{
-    /*身份 identity*/
-    m_identityFrame  = new QFrame(nullptr);
-    m_identityLyt    = new QHBoxLayout(m_identityFrame);
-    m_identityLabel  = new QLabel(m_identityFrame);
-    m_identityEditor = new QLineEdit(m_identityFrame);
-
-    m_identityLabel->setText(tr("Identity"));
-    m_identityLyt->addWidget(m_identityLabel);
-    m_identityLyt->setContentsMargins(24, 0, 24, 0);
-    m_identityLyt->addWidget(m_identityEditor);
-    m_identityFrame->setFixedHeight(48);
-    m_identityLabel->setFixedWidth(100);
-    m_identityEditor->setFixedHeight(ITEAM_FIXED_HEIGHT);
-    m_identityFrame->setLayout(m_identityLyt);
-    m_frameList.append(m_identityFrame);
-
-    /*匿名身份 anonymous identity*/
-    m_anonymousIdentityFrame  = new QFrame(nullptr);
-    m_anonymousIdentityLyt    = new QHBoxLayout(m_anonymousIdentityFrame);
-    m_anonymousIdentityLabel  = new QLabel(m_anonymousIdentityFrame);
-    m_anonymousIdentityEditor = new QLineEdit(m_anonymousIdentityFrame);
-
-    m_anonymousIdentityLabel->setText(tr("Anonymous Identity"));
-    m_anonymousIdentityLabel->setFixedWidth(100);
-    m_anonymousIdentityLyt->setContentsMargins(24, 0, 24, 0);
-    m_anonymousIdentityLyt->addWidget(m_anonymousIdentityLabel);
-    m_anonymousIdentityLyt->addWidget(m_anonymousIdentityEditor);
-    m_anonymousIdentityFrame->setFixedHeight(48);
-    m_anonymousIdentityEditor->setFixedHeight(ITEAM_FIXED_HEIGHT);
-    m_anonymousIdentityFrame->setLayout(m_anonymousIdentityLyt);
-    m_frameList.append(m_anonymousIdentityFrame);
-
-    /*域 domain*/
-    m_domainFrame  = new QFrame(nullptr);
-    m_domainLyt    = new QHBoxLayout(m_domainFrame);
-    m_domainLabel  = new QLabel(m_domainFrame);
-    m_domainEditor = new QLineEdit(m_domainFrame);
-
-    m_domainLabel->setText(tr("Domain"));
-    m_domainLabel->setFixedWidth(100);
-    m_domainLyt->setContentsMargins(24, 0, 24, 0);
-    m_domainLyt->addWidget(m_domainLabel);
-    m_domainLyt->addWidget(m_domainEditor);
-    m_domainFrame->setFixedHeight(48);
-    m_domainEditor->setFixedHeight(ITEAM_FIXED_HEIGHT);
-    m_domainFrame->setLayout(m_anonymousIdentityLyt);
-    m_frameList.append(m_domainFrame);
-
-    /*CA证书 certificate*/
-    m_CAFrame    = new QFrame(nullptr);
-    m_CALyt      = new QHBoxLayout(m_CAFrame);
-    m_CALabel    = new QLabel(m_CAFrame);
-    m_CAComboBox = new QComboBox(m_CAFrame);
-
-    m_CALabel->setText(tr("CA certificate"));
-    m_CALabel->setFixedWidth(100);
-    m_CALyt->setContentsMargins(24, 0, 24, 0);
-    m_CALyt->addWidget(m_CALabel);
-    m_CALyt->addWidget(m_CAComboBox);// 默认为(无)、QFileDialog
-    m_CAFrame->setFixedHeight(48);
-    m_CAComboBox->setFixedHeight(ITEAM_FIXED_HEIGHT);
-    m_CAFrame->setLayout(m_CALyt);
-    m_frameList.append(m_CAFrame);
-
-    /*不需要CA证书?  no need for CA certificate*/
-    m_isCANeededFrame     = new QFrame(nullptr);
-    m_isCANeededShowLyt   = new QHBoxLayout(m_isCANeededFrame);
-    m_isCANeededShowBtn   = new QCheckBox(m_isCANeededFrame);
-    m_isCANeededShowLabel = new QLabel(m_isCANeededFrame);
-
-    m_isCANeededShowLabel->setText(tr("no need for CA certificate"));
-    m_isCANeededShowLabel->setFixedWidth(200);
-    m_isCANeededShowLyt->setContentsMargins(24, 0, 24, 0);
-    m_isCANeededShowLyt->addWidget(m_isCANeededShowBtn);
-    m_isCANeededShowLyt->addWidget(m_isCANeededShowLabel);// tr("no need for CA certificate")
-    m_isCANeededShowBtn->setFixedSize(16, 16);
-    m_isCANeededShowBtn->setStyleSheet("background-color:rgb(61,61,65);");
-    m_isCANeededFrame->setFixedHeight(24);
-    m_isCANeededFrame->setLayout(m_isCANeededShowLyt);
-    m_frameList.append(m_isCANeededFrame);
-}
-
-void WpaWifiDialog::initUserConfig4TLSUI()
-{
-    /*用户证书 user certificate*/
-    m_UserCertificateFrame    = new QFrame(nullptr);
-    m_UserCertificateLyt      = new QHBoxLayout(m_UserCertificateFrame);
-    m_UserCertificateLabel    = new QLabel(m_UserCertificateFrame);
-    m_UserCertificateComboBox = new QComboBox(m_UserCertificateFrame);// 默认为(无)、QFileDialog
-
-    m_UserCertificateLabel->setText(tr("User Certificate"));
-    m_UserCertificateLabel->setFixedWidth(100);
-    m_UserCertificateLyt->addWidget(m_UserCertificateLabel);
-    m_UserCertificateLyt->addWidget(m_UserCertificateComboBox);// 默认为(无)、QFileDialog
-    m_UserCertificateLyt->setContentsMargins(24, 0, 24, 0);
-    m_UserCertificateFrame->setFixedHeight(48);
-    m_UserCertificateFrame->setLayout(m_UserCertificateLyt);
-    m_UserCertificateComboBox->setFixedHeight(ITEAM_FIXED_HEIGHT);
-
-    /*用户私钥 user private key*/
-    m_UserPrivateKeyFrame    = new QFrame(nullptr);
-    m_UserPrivateKeyLyt      = new QHBoxLayout(m_UserPrivateKeyFrame);
-    m_UserPrivateKeyLabel    = new QLabel(m_UserPrivateKeyFrame);
-    m_UserPrivateKeyComboBox = new QComboBox(m_UserPrivateKeyFrame);// 默认为(无)、QFileDialog
-
-    m_UserPrivateKeyLabel->setText(tr("User Private Key"));
-    m_UserPrivateKeyLabel->setFixedWidth(100);
-    m_UserPrivateKeyComboBox->setFixedHeight(ITEAM_FIXED_HEIGHT);
-    m_UserPrivateKeyLyt->addWidget(m_UserPrivateKeyLabel);
-    m_UserPrivateKeyLyt->addWidget(m_UserPrivateKeyComboBox);// 默认为(无)、QFileDialog
-    m_UserPrivateKeyLyt->setContentsMargins(24, 0, 24, 0);
-    m_UserPrivateKeyFrame->setFixedHeight(48);
-    m_UserPrivateKeyFrame->setLayout(m_UserPrivateKeyLyt);
-
-    /*私钥密码 password for private key*/
-    m_pwd4PrivateKeyPWDFrame  = new QFrame(nullptr);
-    m_pwd4PrivateKeyPWDLyt    = new QHBoxLayout(m_pwd4PrivateKeyPWDFrame);
-    m_pwd4PrivateKeyPWDLabel  = new QLabel(m_pwd4PrivateKeyPWDFrame);
-    m_pwd4PrivateKeyPWDEditor = new QLineEdit(m_pwd4PrivateKeyPWDFrame);
-
-    m_pwd4PrivateKeyPWDLabel->setText(tr("User Private Key password"));
-    m_pwd4PrivateKeyPWDLabel->setFixedWidth(100);
-    m_pwd4PrivateKeyPWDEditor->setEchoMode(QLineEdit::Password);
-    m_pwd4PrivateKeyPWDEditor->setFixedHeight(ITEAM_FIXED_HEIGHT);
-    m_pwd4PrivateKeyPWDLyt->addWidget(m_pwd4PrivateKeyPWDLabel);
-    m_pwd4PrivateKeyPWDLyt->addWidget(m_pwd4PrivateKeyPWDEditor);
-    m_pwd4PrivateKeyPWDLyt->setContentsMargins(24, 0, 24, 0);
-    m_pwd4PrivateKeyPWDFrame->setFixedHeight(48);
-    m_pwd4PrivateKeyPWDFrame->setLayout(m_pwd4PrivateKeyPWDLyt);
-}
-
-/**
- * @brief WpaWifiDialog::deleteAllItemOfLayout
- * @param layout
- * 清空布局中的所有控件
- */
-void WpaWifiDialog::deleteAllItemOfLayout(QLayout *layout)
-{
-    qDebug() << "WpaWifiDialog::deleteAllItemOfLayout";
-    QLayoutItem *child;
-    while ((child = layout->takeAt(0)) != nullptr) {
-        if (child->widget()) {
-            child->widget()->setParent(nullptr);
-        } else if (child->layout()) {
-            deleteAllItemOfLayout(child->layout());
-        }
-        delete child;
-    }
-}
-
-void WpaWifiDialog::checkConnectBtnIsEnabled()
-{
-    // << "TLS" << "LEAP" << "PWD" << "FAST" << "TTLS" << "PEAP";
-    if(m_wifiConfig == nullptr || m_wifiConfig->connectName.isEmpty()) {
-        qWarning() << "WpaWifiDialog::checkConnectBtnIsEnabled no wifi config";
-        return;
-    }
-
-    switch (eapCombox->currentIndex()) {
-    case EapType::TLS:
-        if (m_wifiConfig->identity.isEmpty() || (m_wifiConfig->caCert.isEmpty() && !m_isCANeededShowBtn->isChecked()) || m_wifiConfig->clientCert.isEmpty()
-                || m_wifiConfig->privateKey.isEmpty() || (m_pwd4PrivateKeyPWDEditor->text().length() <= 0)) {
-            connectBtn->setEnabled(false);
-        } else {
-            connectBtn->setEnabled(true);
-        }
-        break;
-    case EapType::LEAP:
-        // Todo
-        break;
-    case EapType::PWD:
-        // Todo
-        break;
-    case EapType::FAST:
-        // Todo
-        break;
-    case EapType::TTLS:
-        if (m_wifiConfig->anonymousIdentity.isEmpty() || (m_wifiConfig->caCert.isEmpty() && !m_isCANeededShowBtn->isChecked())
-                || pwdEditor->text().length() <= 0 || userEditor->text().length() <= 0) {
-            connectBtn->setEnabled(false);
-        } else {
-            connectBtn->setEnabled(true);
-        }
-        break;
-    case EapType::PEAP:
-        if (pwdEditor->text().length() >= 1 && userEditor->text().length() >= 1) {
-            connectBtn->setEnabled(true);
-        } else {
-            connectBtn->setEnabled(false);
-        }
-        break;
-    default:
-        connectBtn->setEnabled(false);
-        break;
-    }
-
-    return;
-}
diff --git a/src/frontend/wpawifidialog.h b/src/frontend/wpawifidialog.h
deleted file mode 100644
index 51b8d0c6..00000000
--- a/src/frontend/wpawifidialog.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/&gt;.
- *
- */
-#ifndef WPAWIFIDIALOG_H
-#define WPAWIFIDIALOG_H
-
-#include <QDialog>
-#include <QWidget>
-#include <QComboBox>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QCheckBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QFrame>
-#include <QLabel>
-#include <QMouseEvent>
-#include <QPoint>
-#include <QThread>
-#include <QSettings>
-#include <QSharedPointer>
-#include <QTableView>
-#include <QListView>
-#include <QModelIndex>
-#include <QList>
-
-#define WINDOW_WIDTH 360
-#define WINDOW_HEIGHT_PEAP 540
-#define WINDOW_HEIGHT_TLP 670
-#define WINDOW_HEIGHT_ELSE 360
-
-class OldMainWindow;
-
-typedef QList<QObject*> QObjectList;
-
-namespace Ui {
-class WpaWifiDialog;
-}
-
-class UpConnThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    explicit UpConnThread(const QString &, const QString &);
-    ~UpConnThread();
-
-public:
-    void run();
-    QString conn_name = 0;
-    QString m_user = 0;
-    QString m_pwd = 0;
-
-Q_SIGNALS:
-    void connRes(int respond);
-};
-
-/**
- * @brief The wifiProperty struct
- * 目前只写了802-1x,企业wifi的配置，可增加通用属性配置
- */
-struct WifiConfig
-{
-    QString connectName;
-
-    /*802-1x属性*/
-    QString eap;
-    QString identity;
-    QString anonymousIdentity;
-    QString caCert;//ca证书配置路径
-    QString clientCert;//用户证书配置路径
-    QString privateKey;//用户私钥配置路径
-};
-
-class WpaWifiDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit WpaWifiDialog(QWidget *parent = nullptr, OldMainWindow *mw = 0, QString conname = 0);
-    explicit WpaWifiDialog(QWidget *parent = nullptr, OldMainWindow *mw = 0, WifiConfig *wifiConfig = nullptr);
-    ~WpaWifiDialog();
-
-private:
-    Ui::WpaWifiDialog *ui;
-    void initUI(); //初始化UI界面
-    void initCombox(); //初始化所有下拉框
-    void initConnect(); //初始化连接
-    void getPwdFlag(); //获取是否每次询问密码
-    bool setPwdFlag(const int&); //设置是否每次询问密码
-
-    /*初始化CA证书的配置界面*/
-    void initCAConfigUI();
-
-    /*初始化用户证书、私钥和密码的配置界面*/
-    void initUserConfig4TLSUI();
-
-    /*清空布局 delete all item of layout*/
-    void deleteAllItemOfLayout(QLayout *layout);
-
-protected:
-    void paintEvent(QPaintEvent *event);
-
-private:
-    int pwd_flag = 2; //是否每次询问密码，0保存密码，2询问，默认不保存密码
-
-    QString connectionName;
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-    void keyPressEvent(QKeyEvent *event);
-
-    bool isPress;
-    QPoint winPos;
-    QPoint dragPos;
-
-    QStringList wifi_info;
-    bool has_config;
-    QStringList user_list;
-    QString key_mgmt = "wpa-eap";
-
-    OldMainWindow *mw;
-    QObjectList m_frameList;
-
-    void setEditorEnable(bool is_checking); //设置是否禁用输入
-    void activateConnection();
-    QStringList getWifiInfo(QString wifiName);
-    bool appendWifiInfo(QString name, QString eap, QString inner, QString user, bool ask);
-    bool appendWifiUser(QString name, QString user);
-
-private:
-    QWidget * mainWidget = nullptr;
-    QVBoxLayout * mainLyt = nullptr; //弹窗整体布局
-
-    QFrame * titleFrame = nullptr; //标题栏
-    QHBoxLayout * titleLyt = nullptr;
-    QLabel * titleLabel = nullptr;
-
-    QFrame * nameFrame = nullptr; //网络名称
-    QHBoxLayout * nameLyt = nullptr;
-    QLabel * nameLabel = nullptr;
-    QLineEdit * nameEditor = nullptr;
-
-    QFrame * securityFrame = nullptr; //网络安全性
-    QHBoxLayout * securityLyt = nullptr;
-    QLabel * securityLabel = nullptr;
-    QComboBox * securityCombox = nullptr;
-
-    QFrame * hLine = nullptr; //分割线
-
-    QFrame * eapFrame = nullptr; //EAP方法
-    QHBoxLayout * eapLyt = nullptr;
-    QLabel * eapLabel = nullptr;
-    QComboBox * eapCombox = nullptr;
-
-    QFrame * innerFrame = nullptr; //阶段2身份认证
-    QHBoxLayout * innerLyt = nullptr;
-    QLabel * innerLabel = nullptr;
-    QComboBox * innerCombox = nullptr;
-
-    QFrame * userFrame = nullptr; //用户名
-    QHBoxLayout * userLyt = nullptr;
-    QLabel * userLabel = nullptr;
-    QLineEdit * userEditor = nullptr;
-
-    QFrame * pwdFrame = nullptr; //密码
-    QVBoxLayout * pwdLyt = nullptr;
-    QFrame * pwdEditFrame = nullptr; //输入密码
-    QHBoxLayout * pwdEditLyt = nullptr;
-    QLabel * pwdLabel = nullptr;
-    QLineEdit * pwdEditor = nullptr;
-    QFrame * pwdShowFrame = nullptr; //显示密码
-    QHBoxLayout * pwdShowLyt = nullptr;
-    QCheckBox * pwdShowBtn = nullptr;
-    QLabel * pwdShowLabel = nullptr;
-    QFrame * askPwdFrame = nullptr; //每次询问密码
-    QHBoxLayout * askPwdLyt = nullptr;
-    QCheckBox * askPwdBtn = nullptr;
-    QLabel * askPwdlabel = nullptr;
-
-    QFrame * buttonFrame = nullptr; //按钮
-    QHBoxLayout * buttonLyt = nullptr;
-    QPushButton * cancelBtn = nullptr; //取消
-    QPushButton * connectBtn = nullptr; //连接
-
-    /**************** 802-1x layout *****************
-      认证 EAP方法 TTS    QLabel QComboBox
-      身份               QLabel QLineEdit
-      域                 QLabel QLineEdit
-      CA证书             QLabel QComboBox V
-                                         无
-                                         请选择文件路径
-      显示密码           QCheckBox
-      不需要CA证书       QCheckBox
-
-      用户证书           QComboBox
-      用户私钥           QComboBox
-      用户私钥密码        QLineEdit
-      显示密码           QCheckBox
-      **/
-    enum EapType {
-        TLS = 0,
-        PEAP,
-        PWD,
-        FAST,
-        TTLS,
-        LEAP
-    };
-
-    WifiConfig    *m_wifiConfig              = nullptr;
-
-    /*身份 identity*/
-    QFrame        *m_identityFrame           = nullptr;
-    QHBoxLayout   *m_identityLyt             = nullptr;
-    QLabel        *m_identityLabel           = nullptr;
-    QLineEdit     *m_identityEditor          = nullptr;
-
-    /*匿名身份 anonymous identity*/
-    QFrame        *m_anonymousIdentityFrame  = nullptr;
-    QHBoxLayout   *m_anonymousIdentityLyt    = nullptr;
-    QLabel        *m_anonymousIdentityLabel  = nullptr;
-    QLineEdit     *m_anonymousIdentityEditor = nullptr;
-
-    /*域 domain*/
-    QFrame        *m_domainFrame             = nullptr;
-    QHBoxLayout   *m_domainLyt               = nullptr;
-    QLabel        *m_domainLabel             = nullptr;
-    QLineEdit     *m_domainEditor            = nullptr;
-
-    /*CA证书 certificate*/
-    QFrame        *m_CAFrame                 = nullptr;
-    QHBoxLayout   *m_CALyt                   = nullptr;
-    QLabel        *m_CALabel                 = nullptr;
-    QComboBox     *m_CAComboBox              = nullptr;// 默认为(无)、QFileDialog
-
-    /*不需要CA证书  no need for CA certificate*/
-    QFrame        *m_isCANeededFrame         = nullptr;
-    QHBoxLayout   *m_isCANeededShowLyt       = nullptr;
-    QCheckBox     *m_isCANeededShowBtn       = nullptr;
-    QLabel        *m_isCANeededShowLabel     = nullptr;
-
-    /*用户证书 user certificate*/
-    QFrame        *m_UserCertificateFrame    = nullptr;
-    QHBoxLayout   *m_UserCertificateLyt      = nullptr;
-    QLabel        *m_UserCertificateLabel    = nullptr;
-    QComboBox     *m_UserCertificateComboBox = nullptr;// 默认为(无)、QFileDialog
-
-    /*用户私钥 user private key*/
-    QFrame        *m_UserPrivateKeyFrame     = nullptr;
-    QHBoxLayout   *m_UserPrivateKeyLyt       = nullptr;
-    QLabel        *m_UserPrivateKeyLabel     = nullptr;
-    QComboBox     *m_UserPrivateKeyComboBox  = nullptr;// 默认为(无)、QFileDialog
-
-    /*私钥密码 password for private key*/
-    QFrame        *m_pwd4PrivateKeyPWDFrame     = nullptr;
-    QHBoxLayout   *m_pwd4PrivateKeyPWDLyt       = nullptr;
-    QLabel        *m_pwd4PrivateKeyPWDLabel     = nullptr;
-    QLineEdit     *m_pwd4PrivateKeyPWDEditor    = nullptr;// 未添加用户私钥时，该编辑栏不可用
-Q_SIGNALS:
-    void conn_done();
-    void conn_failed();
-
-private slots:
-    void slot_on_connectBtn_clicked();
-    void slot_line_edit_changed();
-    void changeDialog();
-    void eapTypeChange();//
-    void checkConnectBtnIsEnabled();
-};
-
-#endif // WPAWIFIDIALOG_H
diff --git a/src/frontend/wpawifidialog.ui b/src/frontend/wpawifidialog.ui
deleted file mode 100644
index f164a9e7..00000000
--- a/src/frontend/wpawifidialog.ui
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>WpaWifiDialog</class>
- <widget class="QDialog" name="WpaWifiDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>360</width>
-    <height>660</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>360</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>360</width>
-    <height>680</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/main.cpp b/src/main.cpp
index e97b2b9a..cac828c9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,10 +17,7 @@
  */
 
 //#include "mainwindow.h"
-#include "new-mainwindow.h" //ZJP_TODO 载入新的主窗口
-#include "ksimplenm.h"
-#include "kylin-network-interface.h"
-#include "wireless-security/dlghidewifi.h"
+#include "mainwindow.h"
 #include "dbusadaptor.h"
 #include <QTranslator>
 #include <QLocale>