change the method to get size and position of task bar

This commit is contained in:
chenlelin 2020-03-31 17:17:49 +08:00
parent da243ac100
commit ec3d232fb6
25 changed files with 542 additions and 325 deletions

View File

@ -10,6 +10,6 @@
# BUILD KYLIN-NM # BUILD KYLIN-NM
down the source sode down the source sode
install depend packages(writed in the cntrol files in the debian directory) install dependency packages(see cntrol files in the debian directory)
execute debuild command in the root directory of project execute debuild command in the root directory of project
execute sudo dpkg -i packagename.deb to install execute sudo dpkg -i packagename.deb to install

View File

@ -55,6 +55,7 @@ SOURCES += \
src/loadingdiv.cpp \ src/loadingdiv.cpp \
src/main.cpp \ src/main.cpp \
src/mainwindow.cpp \ src/mainwindow.cpp \
src/notifysend.cpp \
src/oneconnform.cpp \ src/oneconnform.cpp \
src/onelancform.cpp \ src/onelancform.cpp \
src/utils.cpp \ src/utils.cpp \
@ -80,6 +81,7 @@ HEADERS += \
src/kylin-network-interface.h \ src/kylin-network-interface.h \
src/loadingdiv.h \ src/loadingdiv.h \
src/mainwindow.h \ src/mainwindow.h \
src/notifysend.h \
src/oneconnform.h \ src/oneconnform.h \
src/onelancform.h \ src/onelancform.h \
src/utils.h \ src/utils.h \
@ -99,6 +101,7 @@ HEADERS += \
FORMS += \ FORMS += \
src/confform.ui \ src/confform.ui \
src/mainwindow.ui \ src/mainwindow.ui \
src/notifysend.ui \
src/oneconnform.ui \ src/oneconnform.ui \
src/onelancform.ui \ src/onelancform.ui \
wireless-security/dlgconnhidwifi.ui \ wireless-security/dlgconnhidwifi.ui \

View File

@ -75,5 +75,7 @@
<file>res/s/conning-a/7.png</file> <file>res/s/conning-a/7.png</file>
<file>res/s/conning-a/8.png</file> <file>res/s/conning-a/8.png</file>
<file>qss/style.qss</file> <file>qss/style.qss</file>
<file>res/g/close_black.png</file>
<file>res/g/close_white.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
res/g/close_black.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

BIN
res/g/close_white.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 B

View File

@ -243,11 +243,6 @@ void BackThread::execConnWifiPWD(QString connName, QString password){
qDebug()<<"debug: in function execConnWifiPWD, wireless net state is: "<<QString::number(execGetIface()->wstate); qDebug()<<"debug: in function execConnWifiPWD, wireless net state is: "<<QString::number(execGetIface()->wstate);
syslog(LOG_DEBUG, "In function execConnWifiPWD, wireless net state is: %d", execGetIface()->wstate); syslog(LOG_DEBUG, "In function execConnWifiPWD, wireless net state is: %d", execGetIface()->wstate);
}else{ }else{
QString txt(tr("Confirm your Wi-Fi password"));
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800";
int status1 = system(cmd.toUtf8().data());
if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");}
emit connDone(1); emit connDone(1);
} }

View File

@ -126,6 +126,8 @@ ConfForm::ConfForm(QWidget *parent) :
ui->btnOk->setFocusPolicy(Qt::NoFocus); ui->btnOk->setFocusPolicy(Qt::NoFocus);
ui->btnCreate->setFocusPolicy(Qt::NoFocus); ui->btnCreate->setFocusPolicy(Qt::NoFocus);
//m_notify = new NotifySend(); //显示桌面通知
// IP的正则格式限制 // 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 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");
ui->leAddr->setValidator(new QRegExpValidator(rx, this)); ui->leAddr->setValidator(new QRegExpValidator(rx, this));
@ -138,6 +140,7 @@ ConfForm::ConfForm(QWidget *parent) :
ConfForm::~ConfForm() ConfForm::~ConfForm()
{ {
m_notify->deleteLater();
delete ui; delete ui;
} }
@ -211,6 +214,7 @@ void ConfForm::on_btnCreate_clicked()
this->on_btnOk_clicked(); this->on_btnOk_clicked();
} else { } else {
QString txt(tr("New network already created")); QString txt(tr("New network already created"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800";
int status1 = system(cmd.toUtf8().data()); int status1 = system(cmd.toUtf8().data());
if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");} if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");}
@ -248,6 +252,7 @@ void ConfForm::on_btnOk_clicked()
} }
QString txt(tr("New network settings already finished")); QString txt(tr("New network settings already finished"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800";
int status1 = system(cmd.toUtf8().data()); int status1 = system(cmd.toUtf8().data());
if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");} if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");}
@ -263,6 +268,7 @@ void ConfForm::on_btnOk_clicked()
// if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection up' in function 'on_btnOk_clicked' failed");} // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection up' in function 'on_btnOk_clicked' failed");}
QString txt(tr("New settings already effective")); QString txt(tr("New settings already effective"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800";
int status1 = system(cmd.toUtf8().data()); int status1 = system(cmd.toUtf8().data());
if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'on_btnOk_clicked' failed");} if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'on_btnOk_clicked' failed");}

View File

@ -19,6 +19,8 @@
#ifndef CONFFORM_H #ifndef CONFFORM_H
#define CONFFORM_H #define CONFFORM_H
#include "notifysend.h"
#include <QWidget> #include <QWidget>
#include <QMouseEvent> #include <QMouseEvent>
#include <QDebug> #include <QDebug>
@ -40,6 +42,8 @@ public:
void setProp(QString connName, QString v4method, QString addr, QString mask, QString gateway, QString dns, bool isActConf); void setProp(QString connName, QString v4method, QString addr, QString mask, QString gateway, QString dns, bool isActConf);
NotifySend *m_notify = nullptr;
public slots: public slots:
void cbTypeChanged(int index); void cbTypeChanged(int index);

View File

@ -33,7 +33,8 @@ KylinDBus::KylinDBus(MainWindow *mainWindow, QObject *parent) :QObject(parent)
getPhysicalCarrierState(0); //初始化获取网线插入状态 getPhysicalCarrierState(0); //初始化获取网线插入状态
getLanHwAddressState(); //获取有线网Mac地址 getLanHwAddressState(); //获取有线网Mac地址
getWiredCardName(); getWiredCardName();
getWifiSwitchState(); initTaskbarGsetting(); //初始化taskbar的GSetting方法
getWifiSwitchState(); //初始化wifi开关GSetting通信方法
QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"), QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
QString("/org/freedesktop/NetworkManager"), QString("/org/freedesktop/NetworkManager"),
@ -55,10 +56,14 @@ KylinDBus::KylinDBus(MainWindow *mainWindow, QObject *parent) :QObject(parent)
QString("org.freedesktop.NetworkManager.Settings"), QString("org.freedesktop.NetworkManager.Settings"),
QString("ConnectionRemoved"), this, SLOT(onConnectionRemoved(QDBusObjectPath) ) ); QString("ConnectionRemoved"), this, SLOT(onConnectionRemoved(QDBusObjectPath) ) );
QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"), if (wirelessPath.path() != ""){
QString(wiredPath.path()), QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
QString("org.freedesktop.NetworkManager.Device.Wired"), QString(wiredPath.path()),
QString("PropertiesChanged"), this, SLOT(onLanPropertyChanged(QVariantMap) ) ); 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 (wirelessPath.path() != ""){ if (wirelessPath.path() != ""){
QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"), QDBusConnection::systemBus().connect(QString("org.freedesktop.NetworkManager"),
@ -71,6 +76,8 @@ KylinDBus::KylinDBus(MainWindow *mainWindow, QObject *parent) :QObject(parent)
QString("org.freedesktop.NetworkManager.Device.Wireless"), QString("org.freedesktop.NetworkManager.Device.Wireless"),
QString("AccessPointAdded"), this, SLOT(onAccessPointAdded(QDBusObjectPath) ) ); QString("AccessPointAdded"), this, SLOT(onAccessPointAdded(QDBusObjectPath) ) );
getWirelessCardName();//获取无线网卡名称 getWirelessCardName();//获取无线网卡名称
} else {
qDebug()<<"Can not find wireless device object path when using dbus.";
} }
time = new QTimer(this); time = new QTimer(this);
@ -80,6 +87,10 @@ KylinDBus::KylinDBus(MainWindow *mainWindow, QObject *parent) :QObject(parent)
QObject::connect(this, SIGNAL(updateWiredList(int)), mw, SLOT(onBtnNetListClicked(int))); QObject::connect(this, SIGNAL(updateWiredList(int)), mw, SLOT(onBtnNetListClicked(int)));
} }
///////////////////////////////////////////////////////////////////////////////
//下方使用Dbus 进程通信方法
void KylinDBus::getObjectPath() void KylinDBus::getObjectPath()
{ {
QDBusInterface m_interface( "org.freedesktop.NetworkManager", QDBusInterface m_interface( "org.freedesktop.NetworkManager",
@ -88,6 +99,10 @@ void KylinDBus::getObjectPath()
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusReply<QList<QDBusObjectPath>> obj_reply = m_interface.call("GetAllDevices"); 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(); QList<QDBusObjectPath> obj_paths = obj_reply.value();
foreach (QDBusObjectPath obj_path, obj_paths){ foreach (QDBusObjectPath obj_path, obj_paths){
@ -97,6 +112,10 @@ void KylinDBus::getObjectPath()
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusReply<QString> reply = interface.call("Introspect"); 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){ if(reply.value().indexOf("org.freedesktop.NetworkManager.Device.Wired") != -1){
wiredPath = obj_path; wiredPath = obj_path;
} else if (reply.value().indexOf("org.freedesktop.NetworkManager.Device.Wireless") != -1){ } else if (reply.value().indexOf("org.freedesktop.NetworkManager.Device.Wireless") != -1){
@ -115,16 +134,20 @@ void KylinDBus::getPhysicalCarrierState(int n)
QDBusReply<QVariant> reply = interface.call("Get", "org.freedesktop.NetworkManager.Device.Wired", "Carrier"); QDBusReply<QVariant> reply = interface.call("Get", "org.freedesktop.NetworkManager.Device.Wired", "Carrier");
if (reply.value().toString() == "true"){ try{
isWiredCableOn = true; if (reply.value().toString() == "true"){
} else if (reply.value().toString() == "false"){ isWiredCableOn = true;
isWiredCableOn = false; if (n == 1){ this->mw->onPhysicalCarrierChanged(isWiredCableOn);}
} else { } else if (reply.value().toString() == "false"){
isWiredCableOn = false;
if (n == 1){ this->mw->onPhysicalCarrierChanged(isWiredCableOn);}
} else {
throw -1;
}
}catch(...){
syslog(LOG_ERR, "Error occurred when get the property 'Carrier' of Wired"); syslog(LOG_ERR, "Error occurred when get the property 'Carrier' of Wired");
qDebug()<<"Error occurred when get the property 'Carrier' of Wired"; qDebug()<<"Error occurred when get the property 'Carrier' of Wired";
} }
if (n == 1){ this->mw->onPhysicalCarrierChanged(isWiredCableOn);}
} }
void KylinDBus::getLanHwAddressState() void KylinDBus::getLanHwAddressState()
@ -135,7 +158,11 @@ void KylinDBus::getLanHwAddressState()
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusReply<QVariant> lanReply = lanInterface.call("Get", "org.freedesktop.NetworkManager.Device.Wired", "HwAddress"); QDBusReply<QVariant> lanReply = lanInterface.call("Get", "org.freedesktop.NetworkManager.Device.Wired", "HwAddress");
dbusLanMac = lanReply.value().toString(); if (!lanReply.isValid()) {
qDebug()<<"can not get the attribute 'HwAddress' in func getLanHwAddressState()";
} else {
dbusLanMac = lanReply.value().toString();
}
} }
void KylinDBus::getWiredCardName() void KylinDBus::getWiredCardName()
@ -146,7 +173,11 @@ void KylinDBus::getWiredCardName()
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusReply<QVariant> lanReply = lanInterface.call("Get", "org.freedesktop.NetworkManager.Device", "Interface"); QDBusReply<QVariant> lanReply = lanInterface.call("Get", "org.freedesktop.NetworkManager.Device", "Interface");
dbusLanCardName = lanReply.value().toString(); if (!lanReply.isValid()) {
qDebug()<<"can not get the attribute 'Interface' in func getWiredCardName()";
} else {
dbusLanCardName = lanReply.value().toString();
}
} }
void KylinDBus::getWirelessCardName() void KylinDBus::getWirelessCardName()
@ -157,7 +188,11 @@ void KylinDBus::getWirelessCardName()
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusReply<QVariant> lanReply = lanInterface.call("Get", "org.freedesktop.NetworkManager.Device", "Interface"); QDBusReply<QVariant> lanReply = lanInterface.call("Get", "org.freedesktop.NetworkManager.Device", "Interface");
dbusWiFiCardName = lanReply.value().toString(); if (!lanReply.isValid()) {
qDebug()<<"can not get the attribute 'Interface' in func getWirelessCardName()";
} else {
dbusWiFiCardName = lanReply.value().toString();
}
} }
void KylinDBus::getLanIp(QString netName) void KylinDBus::getLanIp(QString netName)
@ -442,26 +477,26 @@ void KylinDBus::onAccessPointAdded(QDBusObjectPath objPath)
//qDebug()<<"debug: &&&&&&&&&&&&&"<<objPath.path(); //qDebug()<<"debug: &&&&&&&&&&&&&"<<objPath.path();
} }
int KylinDBus::getTaskbarPos(QString str) ///////////////////////////////////////////////////////////////////////////////
{ //下方使用Gsetting 进程通信方法
QDBusInterface interface( "com.ukui.panel.desktop",
"/",
"com.ukui.panel.desktop",
QDBusConnection::sessionBus() );
QDBusReply<int> reply = interface.call("GetPanelPosition", str); void KylinDBus::initTaskbarGsetting()
return reply; {
if(QGSettings::isSchemaInstalled("org.ukui.panel.settings")) {
m_tastbar_gsettings = new QGSettings("org.ukui.panel.settings");
}
} }
int KylinDBus::getTaskbarHeight(QString str) int KylinDBus::getTaskbarHeight()
{ {
QDBusInterface interface( "com.ukui.panel.desktop", int h = m_tastbar_gsettings->get("panelsize").toInt();
"/", return h;
"com.ukui.panel.desktop", }
QDBusConnection::sessionBus() );
QDBusReply<int> reply = interface.call("GetPanelSize", str); int KylinDBus::getTaskbarPos()
return reply; {
int p = m_tastbar_gsettings->get("panelposition").toInt();
return p;
} }
void KylinDBus::getWifiSwitchState() void KylinDBus::getWifiSwitchState()

View File

@ -27,8 +27,10 @@ public:
void getObjectPath(); void getObjectPath();
int getAccessPointsNumber(); int getAccessPointsNumber();
int getLanConnState(); int getLanConnState();
int getTaskbarPos(QString str);
int getTaskbarHeight(QString str); void initTaskbarGsetting();
int getTaskbarHeight();
int getTaskbarPos();
void getWifiSwitchState(); void getWifiSwitchState();
bool getSwitchStatus(QString key); bool getSwitchStatus(QString key);
@ -71,6 +73,7 @@ private:
bool isRunningFunction = false; bool isRunningFunction = false;
QTimer *time = nullptr; QTimer *time = nullptr;
QGSettings *m_tastbar_gsettings = nullptr;
QGSettings *m_gsettings = nullptr; QGSettings *m_gsettings = nullptr;
signals: signals:

View File

@ -87,8 +87,8 @@ MainWindow::MainWindow(QWidget *parent) :
trayIcon->show(); trayIcon->show();
objKyDBus = new KylinDBus(this); objKyDBus = new KylinDBus(this);
objNetSpeed = new NetworkSpeed(); objNetSpeed = new NetworkSpeed();
//m_notify = new NotifySend();
this->confForm = new ConfForm(); this->confForm = new ConfForm();
@ -126,13 +126,22 @@ MainWindow::~MainWindow()
void MainWindow::checkSingle() void MainWindow::checkSingle()
{ {
//int fd = open("/tmp/kylin-nm-lock", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); int fd = 0;
try{
QStringList homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
QString lockPath = homePath.at(0) + "/.config/kylin-nm-lock";
fd = open(lockPath.toUtf8().data(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
QStringList homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation); if (fd < 0) {
QString lockPath = homePath.at(0) + "/.config/kylin-nm-lock"; throw -1;
int fd = open(lockPath.toUtf8().data(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); }
}catch(...){
fd = open("/tmp/kylin-nm-lock", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
if (fd < 0) {
exit(0);
}
}
if (fd < 0) { exit(1); }
if (lockf(fd, F_TLOCK, 0)) { if (lockf(fd, F_TLOCK, 0)) {
syslog(LOG_ERR, "Can't lock single file, kylin-network-manager is already running!"); syslog(LOG_ERR, "Can't lock single file, kylin-network-manager is already running!");
@ -424,8 +433,10 @@ void MainWindow::initNetwork()
mwBandWidth = bt->execChkLanWidth(lname); mwBandWidth = bt->execChkLanWidth(lname);
// 开关状态 // 开关状态
qDebug()<<"lstate ="<<iface->lstate<<" wstate ="<<iface->wstate ; qDebug()<<"state of network: '0' is connection, '1' is disconnection, '2' is net device off";
syslog(LOG_DEBUG, "state of switch: lstate =%d wstate =%d", iface->lstate, iface->wstate); syslog(LOG_DEBUG, "state of network: '0' is connection, '1' is disconnection, '2' is switch off ");
qDebug()<<"current network state: lan state ="<<iface->lstate<<", wifi state ="<<iface->wstate ;
syslog(LOG_DEBUG, "current network state: lan state =%d, wifi state =%d", iface->lstate, iface->wstate);
ui->lbBtnNetBG->setStyleSheet(btnOnQss); ui->lbBtnNetBG->setStyleSheet(btnOnQss);
if(iface->wstate == 0 || iface->wstate == 1){ if(iface->wstate == 0 || iface->wstate == 1){
@ -455,6 +466,7 @@ void MainWindow::initNetwork()
ui->btnNetList->setStyleSheet("QPushButton{border:0px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);}"); 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;}"); ui->btnWifiList->setStyleSheet("QPushButton{border:none;}");
} else { } else {
objKyDBus->setWifiSwitchState(false); //通知控制面板wifi未开启
if(iface->lstate != 2){ if(iface->lstate != 2){
if (iface->lstate == 0) { if (iface->lstate == 0) {
connLanDone(3); connLanDone(3);
@ -692,8 +704,9 @@ void MainWindow::handleIconClicked()
// qDebug()<<"deskDupRect: "<<deskDupRect; // qDebug()<<"deskDupRect: "<<deskDupRect;
// qDebug()<<"screenDupRect: "<<screenDupRect; // qDebug()<<"screenDupRect: "<<screenDupRect;
int n = objKyDBus->getTaskbarPos("position"); int m = objKyDBus->getTaskbarHeight();
int m = objKyDBus->getTaskbarHeight("height"); int n = objKyDBus->getTaskbarPos();
qDebug()<<"aaaaaaaa "<<m<<" "<<n;
int d = 2; //窗口边沿到任务栏距离 int d = 2; //窗口边沿到任务栏距离
if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()){ if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()){
@ -705,18 +718,20 @@ void MainWindow::handleIconClicked()
this->move(availableGeometry.x() + availableGeometry.width() - this->width(), screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m + d); this->move(availableGeometry.x() + availableGeometry.width() - this->width(), screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m + d);
} else if (n == 2){ } else if (n == 2){
//任务栏在左侧 //任务栏在左侧
if (screenGeometry.x() == 0){//主屏在左侧 this->move(m + d, screenMainRect.y() + screenMainRect.height() - this->height());
this->move(screenGeometry.width() - availableGeometry.width() + m + d, screenMainRect.y() + screenMainRect.height() - this->height()); // if (screenGeometry.x() == 0){//主屏在左侧
}else{//主屏在右侧 // this->move(screenGeometry.width() - availableGeometry.width() + m + d, screenMainRect.y() + screenMainRect.height() - this->height());
this->move(screenGeometry.width() - availableGeometry.width() + m + d,screenDupRect.y() + screenDupRect.height() - this->height()); // }else{//主屏在右侧
} // this->move(screenGeometry.width() - availableGeometry.width() + m + d,screenDupRect.y() + screenDupRect.height() - this->height());
// }
} else if (n == 3){ } else if (n == 3){
//任务栏在右侧 //任务栏在右侧
if (screenGeometry.x() == 0){//主屏在左侧 this->move(screenMainRect.width() - this->width() - m - d, screenDupRect.y() + screenDupRect.height() - this->height());
this->move(screenMainRect.width() + screenDupRect.width() - this->width() - m - d, screenDupRect.y() + screenDupRect.height() - this->height()); // if (screenGeometry.x() == 0){//主屏在左侧
}else{//主屏在右侧 // this->move(screenMainRect.width() + screenDupRect.width() - this->width() - m - d, screenDupRect.y() + screenDupRect.height() - this->height());
this->move(availableGeometry.x() + availableGeometry.width() - this->width() - m - d, screenMainRect.y() + screenMainRect.height() - this->height()); // }else{//主屏在右侧
} // this->move(availableGeometry.x() + availableGeometry.width() - this->width() - m - d, screenMainRect.y() + screenMainRect.height() - this->height());
// }
} }
} else if(screenGeometry.width() == availableGeometry.width() ){ } else if(screenGeometry.width() == availableGeometry.width() ){
if (trayIcon->geometry().y() > availableGeometry.height()/2){ if (trayIcon->geometry().y() > availableGeometry.height()/2){
@ -748,8 +763,8 @@ void MainWindow::showTrayIconMenu()
// QRect deskDupRect = desktopWidget->availableGeometry(1);//获取可用桌面大小 // QRect deskDupRect = desktopWidget->availableGeometry(1);//获取可用桌面大小
QRect screenDupRect = desktopWidget->screenGeometry(1);//获取设备屏幕大小 QRect screenDupRect = desktopWidget->screenGeometry(1);//获取设备屏幕大小
int n = objKyDBus->getTaskbarPos("position"); int m = objKyDBus->getTaskbarHeight();
int m = objKyDBus->getTaskbarHeight("height"); int n = objKyDBus->getTaskbarPos();
int d = 2; //窗口边沿到任务栏距离 int d = 2; //窗口边沿到任务栏距离
int s = 80; //窗口边沿到屏幕边沿距离 int s = 80; //窗口边沿到屏幕边沿距离
@ -759,17 +774,19 @@ void MainWindow::showTrayIconMenu()
}else if(n == 1){ //任务栏在上侧 }else if(n == 1){ //任务栏在上侧
trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width(), screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m + d); trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width(), screenMainRect.y() + screenGeometry.height() - availableGeometry.height() + m + d);
} else if (n == 2){ //任务栏在左侧 } else if (n == 2){ //任务栏在左侧
if (screenGeometry.x() == 0){//主屏在左侧 trayIconMenu->move(m + d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s);
trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s); // if (screenGeometry.x() == 0){//主屏在左侧
}else{//主屏在右侧 // trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s);
trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d,screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s); // }else{//主屏在右侧
} // trayIconMenu->move(screenGeometry.width() - availableGeometry.width() + m + d,screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s);
// }
} else if (n == 3){ //任务栏在右侧 } else if (n == 3){ //任务栏在右侧
if (screenGeometry.x() == 0){//主屏在左侧 trayIconMenu->move(screenMainRect.width() - trayIconMenu->width() - m - d, screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s);
trayIconMenu->move(screenMainRect.width() + screenDupRect.width() - trayIconMenu->width() - m - d, screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s); // if (screenGeometry.x() == 0){//主屏在左侧
}else{//主屏在右侧 // trayIconMenu->move(screenMainRect.width() + screenDupRect.width() - trayIconMenu->width() - m - d, screenDupRect.y() + screenDupRect.height() - trayIconMenu->height() - s);
trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width() - m - d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s); // }else{//主屏在右侧
} // trayIconMenu->move(availableGeometry.x() + availableGeometry.width() - trayIconMenu->width() - m - d, screenMainRect.y() + screenMainRect.height() - trayIconMenu->height() - s);
// }
} }
} else if(screenGeometry.width() == availableGeometry.width() ){ } else if(screenGeometry.width() == availableGeometry.width() ){
if (trayIcon->geometry().y() > availableGeometry.height()/2){ //任务栏在下侧 if (trayIcon->geometry().y() > availableGeometry.height()/2){ //任务栏在下侧
@ -1126,8 +1143,8 @@ void MainWindow::onBtnWifiClicked(int flag)
if (is_fly_mode_on == 0){ if (is_fly_mode_on == 0){
on_btnWifiList_clicked(); on_btnWifiList_clicked();
is_stop_check_net_state = 1; is_stop_check_net_state = 1;
objKyDBus->setWifiCardState(true); objKyDBus->setWifiCardState(true);
objKyDBus->setWifiSwitchState(true); objKyDBus->setWifiSwitchState(true);
lbTopWifiList->show(); lbTopWifiList->show();
btnAddNet->show(); btnAddNet->show();
@ -1189,6 +1206,7 @@ void MainWindow::onBtnWifiClicked(int flag)
} }
QString txt(tr("please insert the wireless network adapter")); QString txt(tr("please insert the wireless network adapter"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800";
int status = system(cmd.toUtf8().data()); int status = system(cmd.toUtf8().data());
if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'onBtnWifiClicked' failed");} if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'onBtnWifiClicked' failed");}
@ -1249,9 +1267,10 @@ void MainWindow::onBtnNetListClicked(int flag)
QString line(buf); QString line(buf);
if(line.indexOf("ethernet") != -1){ if(line.indexOf("ethernet") != -1){
QString txt(tr("Abnormal connection exist, program will delete it"));//仍然有连接异常的有线网络,断开异常连接的网络 QString txt(tr("Abnormal connection exist, program will delete it"));//仍然有连接异常的有线网络,断开异常连接的网络
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800";
int status = system(cmd.toUtf8().data()); int status = system(cmd.toUtf8().data());
if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'onBtnNetListClicked' failed");} if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'onBtnNetListClicked' failed");}
is_stop_check_net_state = 1; is_stop_check_net_state = 1;
this->startLoading(); this->startLoading();
@ -2104,6 +2123,7 @@ void MainWindow::activeLanDisconn()
syslog(LOG_DEBUG, "Wired net is disconnected"); syslog(LOG_DEBUG, "Wired net is disconnected");
QString txt(tr("Wired net is disconnected")); QString txt(tr("Wired net is disconnected"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800";
int status1 = system(cmd.toUtf8().data()); int status1 = system(cmd.toUtf8().data());
if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");} if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");}
@ -2131,6 +2151,7 @@ void MainWindow::activeStartLoading()
syslog(LOG_DEBUG, "Wi-Fi is disconnected"); syslog(LOG_DEBUG, "Wi-Fi is disconnected");
QString txt(tr("Wi-Fi is disconnected")); QString txt(tr("Wi-Fi is disconnected"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800";
int status1 = system(cmd.toUtf8().data()); int status1 = system(cmd.toUtf8().data());
if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");} if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");}
@ -2330,9 +2351,13 @@ void MainWindow::on_setNetSpeed()
{ {
if (this->isVisible() && is_stop_check_net_state==0){ if (this->isVisible() && is_stop_check_net_state==0){
if (is_btnWifiList_clicked == 1){ if (is_btnWifiList_clicked == 1){
objNetSpeed->getCurrentDownloadRates(objKyDBus->dbusWiFiCardName.toUtf8().data(), &start_rcv_rates, &start_tx_rates); if ( objNetSpeed->getCurrentDownloadRates(objKyDBus->dbusWiFiCardName.toUtf8().data(), &start_rcv_rates, &start_tx_rates) == -1){
start_rcv_rates = end_rcv_rates;
}
}else if(is_btnNetList_clicked == 1){ }else if(is_btnNetList_clicked == 1){
objNetSpeed->getCurrentDownloadRates(objKyDBus->dbusLanCardName.toUtf8().data(), &start_rcv_rates, &start_tx_rates); if ( objNetSpeed->getCurrentDownloadRates(objKyDBus->dbusLanCardName.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)/800; long int delta_rcv = (start_rcv_rates - end_rcv_rates)/800;
@ -2407,7 +2432,9 @@ void MainWindow::connLanDone(int connFlag)
this->is_wired_line_ready = 1; this->is_wired_line_ready = 1;
this->is_by_click_connect = 1; this->is_by_click_connect = 1;
this->ksnm->execGetLanList(); this->ksnm->execGetLanList();
QString txt(tr("Conn Ethernet Success")); QString txt(tr("Conn Ethernet Success"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800";
int status = system(cmd.toUtf8().data()); int status = system(cmd.toUtf8().data());
if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'connLanDone' failed");} if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'connLanDone' failed");}
@ -2420,10 +2447,10 @@ void MainWindow::connLanDone(int connFlag)
qDebug()<<"without net line connect to computer"; qDebug()<<"without net line connect to computer";
this->is_wired_line_ready = 0; //without net line connect to computer this->is_wired_line_ready = 0; //without net line connect to computer
QString txt(tr("Conn Ethernet Fail")); QString txt(tr("Conn Ethernet Fail"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800";
int status = system(cmd.toUtf8().data()); int status = system(cmd.toUtf8().data());
if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'connLanDone' failed");} if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'connLanDone' failed");}
} }
if(connFlag == 3){ if(connFlag == 3){
@ -2542,6 +2569,7 @@ void MainWindow::connWifiDone(int connFlag)
this->is_by_click_connect = 1; this->is_by_click_connect = 1;
this->ksnm->execGetWifiList(); this->ksnm->execGetWifiList();
QString txt(tr("Conn Wifi Success")); QString txt(tr("Conn Wifi Success"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "' -t 3800";
int status = system(cmd.toUtf8().data()); int status = system(cmd.toUtf8().data());
if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'connWifiDone' failed");} if (status != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'connWifiDone' failed");}
@ -2550,6 +2578,12 @@ void MainWindow::connWifiDone(int connFlag)
//checkIfWifiConnect->start(8000); //checkIfWifiConnect->start(8000);
} else if (connFlag == 1) { } else if (connFlag == 1) {
is_stop_check_net_state = 0; is_stop_check_net_state = 0;
QString txt(tr("Confirm your Wi-Fi password or usable of wireless card"));
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';notify-send '" + txt + "...' -t 3800";
int status1 = system(cmd.toUtf8().data());
if (status1 != 0){ syslog(LOG_ERR, "execute 'notify-send' in function 'execConnWifiPWD' failed");}
} else if (connFlag == 3) { } else if (connFlag == 3) {
syslog(LOG_DEBUG, "Launch kylin-nm, Wi-Fi already connected"); syslog(LOG_DEBUG, "Launch kylin-nm, Wi-Fi already connected");
//syslog(LOG_DEBUG, "Launch kylin-nm, Wi-Fi already connected, will check if Wi-Fi disconnected circularly"); //syslog(LOG_DEBUG, "Launch kylin-nm, Wi-Fi already connected, will check if Wi-Fi disconnected circularly");
@ -2594,7 +2628,7 @@ void MainWindow::on_isWifiConnect()
if (count_loop >= 2){ count_loop = 1;} if (count_loop >= 2){ count_loop = 1;}
} }
} }
\
delete loop_iface; delete loop_iface;
delete loop_bt; delete loop_bt;
} }

View File

@ -25,6 +25,7 @@
#include "kylin-dbus-interface.h" #include "kylin-dbus-interface.h"
#include "kylin-network-interface.h" #include "kylin-network-interface.h"
#include "utils.h" #include "utils.h"
#include "notifysend.h"
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
@ -141,6 +142,7 @@ public:
QString mwBandWidth; QString mwBandWidth;
KylinDBus *objKyDBus = nullptr; KylinDBus *objKyDBus = nullptr;
NetworkSpeed *objNetSpeed = nullptr; NetworkSpeed *objNetSpeed = nullptr;
NotifySend *m_notify = nullptr;
//状态设置,0为假1为真 //状态设置,0为假1为真
int is_update_wifi_list = 0; //是否是update wifi列表而不是load wifi列表 int is_update_wifi_list = 0; //是否是update wifi列表而不是load wifi列表
@ -305,6 +307,7 @@ private slots:
void onBtnAddNetClicked(); void onBtnAddNetClicked();
void onBtnCreateNetClicked(); void onBtnCreateNetClicked();
signals: signals:
void disConnSparedNet(QString type); void disConnSparedNet(QString type);

54
src/notifysend.cpp Normal file
View File

@ -0,0 +1,54 @@
#include "notifysend.h"
#include "ui_notifysend.h"
NotifySend::NotifySend(QWidget *parent) :
QWidget(parent),
ui(new Ui::NotifySend)
{
ui->setupUi(this);
this->setWindowFlags(Qt::FramelessWindowHint | Qt::Popup);
this->setAttribute(Qt::WA_TranslucentBackground);
QPainterPath path;
auto rect = this->rect();
rect.adjust(1, 1, -1, -1);
path.addRoundedRect(rect, 4, 4);
setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon()));
this->setStyleSheet("QWidget{border:none;border-radius:4px;}");
ui->backwidget->setStyleSheet("QWidget{border:1px solid rgba(255, 255, 255, 0.05);border-radius:4px;background:rgba(19,19,20,0.7);}");
ui->lbColor->setStyleSheet("QLabel{border:none;background:rgba(61,107,229,1);}");
ui->leText->setStyleSheet("QLineEdit{border:none;background:transparent;font-size:14px;color:white;font-size:14px;}");
ui->btnClose->setStyleSheet("QPushButton{background-image:url(:/res/g/close_white.png);background-color:transparent;border:none;}");
ui->btnClose->setFocusPolicy(Qt::NoFocus);
QRect availableGeometry = qApp->primaryScreen()->availableGeometry();
int d = 10; //窗口上边沿到屏幕边沿距离
int s = 10; //窗口右边沿到屏幕边沿距离
this->move(availableGeometry.x() + availableGeometry.width() - this->width() - s, availableGeometry.y() + d);
}
NotifySend::~NotifySend()
{
delete ui;
}
void NotifySend::execNotifySend(QString text)
{
ui->leText->setText(text);
this->show();
QTimer::singleShot(4000, this, SLOT(closeNotifyDialog() ));
}
void NotifySend::closeNotifyDialog(){
ui->leText->setText("");
this->hide();
}
void NotifySend::on_btnClose_clicked()
{
this->hide();
}

34
src/notifysend.h Normal file
View File

@ -0,0 +1,34 @@
#ifndef NOTIFYSEND_H
#define NOTIFYSEND_H
#include <QWidget>
#include <QTimer>
#include <QScreen>
namespace Ui {
class NotifySend;
}
class NotifySend : public QWidget
{
Q_OBJECT
public:
explicit NotifySend(QWidget *parent = nullptr);
~NotifySend();
void execNotifySend(QString text);
private:
Ui::NotifySend *ui;
private slots:
void closeNotifyDialog();
void on_btnClose_clicked();
signals:
void timeout();
};
#endif // NOTIFYSEND_H

69
src/notifysend.ui Normal file
View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>NotifySend</class>
<widget class="QWidget" name="NotifySend">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>70</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QLabel" name="lbColor">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>60</width>
<height>70</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
<widget class="QPushButton" name="btnClose">
<property name="geometry">
<rect>
<x>360</x>
<y>20</y>
<width>30</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
<widget class="QLineEdit" name="leText">
<property name="geometry">
<rect>
<x>80</x>
<y>20</y>
<width>260</width>
<height>27</height>
</rect>
</property>
</widget>
<widget class="QWidget" name="backwidget" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>70</height>
</rect>
</property>
</widget>
<zorder>backwidget</zorder>
<zorder>lbColor</zorder>
<zorder>btnClose</zorder>
<zorder>leText</zorder>
</widget>
<resources/>
<connections/>
</ui>

View File

@ -112,6 +112,8 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
ui->btnInfo->setAttribute(Qt::WA_Hover,true); ui->btnInfo->setAttribute(Qt::WA_Hover,true);
ui->btnInfo->installEventFilter(this); ui->btnInfo->installEventFilter(this);
//m_notify = new NotifySend();
connect(ui->lePassword, SIGNAL(returnPressed()), this, SLOT(on_btnConnPWD_clicked())); connect(ui->lePassword, SIGNAL(returnPressed()), this, SLOT(on_btnConnPWD_clicked()));
ui->btnConn->setShortcut(Qt::Key_Return);//将字母区回车键与登录按钮绑定在一起 ui->btnConn->setShortcut(Qt::Key_Return);//将字母区回车键与登录按钮绑定在一起
@ -123,6 +125,7 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
OneConnForm::~OneConnForm() OneConnForm::~OneConnForm()
{ {
m_notify->deleteLater();
delete ui; delete ui;
} }
@ -603,6 +606,7 @@ void OneConnForm::slotConnWifiResult(int connFlag){
// 使用配置文件连接失败,需要删除该配置文件 // 使用配置文件连接失败,需要删除该配置文件
QString txt(tr("Conn Wifi Failed"));//"连接 Wifi 失败" QString txt(tr("Conn Wifi Failed"));//"连接 Wifi 失败"
syslog(LOG_DEBUG, "Try to connect wifi named %s, but failed, will delete it's configuration file", ui->lbName->text().toUtf8().data()); syslog(LOG_DEBUG, "Try to connect wifi named %s, but failed, will delete it's configuration file", ui->lbName->text().toUtf8().data());
//m_notify->execNotifySend(txt);
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection delete '" + ui->lbName->text() + "';notify-send '" + txt + "...' -t 3800"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection delete '" + ui->lbName->text() + "';notify-send '" + txt + "...' -t 3800";
int status = system(cmd.toUtf8().data()); int status = system(cmd.toUtf8().data());
if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection delete' in function 'slotConnWifiResult' failed");} if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection delete' in function 'slotConnWifiResult' failed");}

View File

@ -31,6 +31,7 @@
#include "kylin-network-interface.h" #include "kylin-network-interface.h"
#include "backthread.h" #include "backthread.h"
#include "ksimplenm.h" #include "ksimplenm.h"
#include "notifysend.h"
#define FRAME_SPEED 150 #define FRAME_SPEED 150
#define LIMIT_TIME 30*1000 #define LIMIT_TIME 30*1000
@ -80,6 +81,7 @@ public:
void setLePassword(); void setLePassword();
NotifySend *m_notify = nullptr;
QString wifiName; QString wifiName;
bool isSelected; bool isSelected;
bool isActive; bool isActive;

View File

@ -85,12 +85,14 @@ int NetworkSpeed::getCurrentDownloadRates(char *netname, long *save_rate, long *
char tmp_value[128]; char tmp_value[128];
if((NULL == netname)||(NULL == save_rate)||(NULL == tx_rate)){ if((NULL == netname)||(NULL == save_rate)||(NULL == tx_rate)){
printf("bad param\n"); qDebug()<<"parameter pass to function getCurrentDownloadRates() error";
syslog(LOG_ERR, "parameter pass to function getCurrentDownloadRates() error");
return -1; return -1;
} }
if ( (net_dev_file=fopen("/proc/net/dev", "r")) == NULL ){ //打开文件/pro/net/dev/,从中读取流量数据 if ( (net_dev_file=fopen("/proc/net/dev", "r")) == NULL ){ //打开文件/pro/net/dev/,从中读取流量数据
printf("open file /proc/net/dev/ error!\n"); qDebug()<<"error occured when try to open file /proc/net/dev/";
syslog(LOG_ERR, "error occured when try to open file /proc/net/dev/");
return -1; return -1;
} }
memset(buffer,0,sizeof(buffer)); memset(buffer,0,sizeof(buffer));
@ -99,10 +101,9 @@ int NetworkSpeed::getCurrentDownloadRates(char *netname, long *save_rate, long *
match = strstr(buffer,netname); match = strstr(buffer,netname);
if(NULL == match){ if(NULL == match){
//printf("no eth0 keyword to find!\n"); // qDebug()<<"No eth0 keyword to find!";
continue; continue;
}else{ }else{
//printf("%s\n",buffer);
match = match + strlen(netname) + strlen(":"); //地址偏移到冒号 match = match + strlen(netname) + strlen(":"); //地址偏移到冒号
sscanf(match,"%ld ",save_rate); sscanf(match,"%ld ",save_rate);
memset(tmp_value,0,sizeof(tmp_value)); memset(tmp_value,0,sizeof(tmp_value));
@ -121,7 +122,6 @@ int NetworkSpeed::getCurrentDownloadRates(char *netname, long *save_rate, long *
counter ++; counter ++;
} }
} }
//printf("%s save_rate:%ld tx_rate:%ld\n",netname,*save_rate,*tx_rate);
} }
} }

View File

@ -1,104 +1,96 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.1" language="bo_CN"> <TS version="2.1" language="bo_CN">
<context>
<name>BackThread</name>
<message>
<location filename="../backthread.cpp" line="246"/>
<source>Confirm your Wi-Fi password</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>ConfForm</name> <name>ConfForm</name>
<message> <message>
<location filename="../confform.cpp" line="39"/> <location filename="../src/confform.cpp" line="39"/>
<location filename="../confform.cpp" line="282"/> <location filename="../src/confform.cpp" line="288"/>
<source>edit network</source> <source>edit network</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="52"/> <location filename="../src/confform.cpp" line="52"/>
<source>Network name: </source> <source>Network name: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="53"/> <location filename="../src/confform.cpp" line="53"/>
<source>Method: </source> <source>Method: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="54"/> <location filename="../src/confform.cpp" line="54"/>
<source>Address: </source> <source>Address: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="55"/> <location filename="../src/confform.cpp" line="55"/>
<source>Netmask: </source> <source>Netmask: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="56"/> <location filename="../src/confform.cpp" line="56"/>
<source>Gateway: </source> <source>Gateway: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="57"/> <location filename="../src/confform.cpp" line="57"/>
<source>DNS 1: </source> <source>DNS 1: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="58"/> <location filename="../src/confform.cpp" line="58"/>
<source>DNS 2: </source> <source>DNS 2: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="60"/> <location filename="../src/confform.cpp" line="60"/>
<source>Edit Conn</source> <source>Edit Conn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="61"/> <location filename="../src/confform.cpp" line="61"/>
<source>Auto(DHCP)</source> <source>Auto(DHCP)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="62"/> <location filename="../src/confform.cpp" line="62"/>
<source>Manual</source> <source>Manual</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="72"/> <location filename="../src/confform.cpp" line="72"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="73"/> <location filename="../src/confform.cpp" line="73"/>
<source>Save</source> <source>Save</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="74"/> <location filename="../src/confform.cpp" line="74"/>
<source>Ok</source> <source>Ok</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="213"/> <location filename="../src/confform.cpp" line="216"/>
<source>New network already created</source> <source>New network already created</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="250"/> <location filename="../src/confform.cpp" line="254"/>
<source>New network settings already finished</source> <source>New network settings already finished</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="265"/> <location filename="../src/confform.cpp" line="270"/>
<source>New settings already effective</source> <source>New settings already effective</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="317"/> <location filename="../src/confform.cpp" line="323"/>
<source>add wired network</source> <source>add wired network</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -155,26 +147,6 @@
<source>WPA &amp; WPA2 Personal</source> <source>WPA &amp; WPA2 Personal</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../wireless-security/dlgconnhidwifi.cpp" line="97"/>
<source>WEP 40/128-bit Key (Hex or ASCII)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlgconnhidwifi.cpp" line="98"/>
<source>WEP 128-bit Passphrase</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlgconnhidwifi.cpp" line="100"/>
<source>Dynamic WEP (802.1X)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlgconnhidwifi.cpp" line="101"/>
<source>WPA &amp; WPA2 Enterprise</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DlgConnHidWifiLeap</name> <name>DlgConnHidWifiLeap</name>
@ -1175,26 +1147,6 @@
<source>WPA &amp; WPA2 Personal</source> <source>WPA &amp; WPA2 Personal</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../wireless-security/dlgconnhidwifiwpa.cpp" line="103"/>
<source>WEP 40/128-bit Key (Hex or ASCII)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlgconnhidwifiwpa.cpp" line="104"/>
<source>WEP 128-bit Passphrase</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlgconnhidwifiwpa.cpp" line="106"/>
<source>Dynamic WEP (802.1X)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../wireless-security/dlgconnhidwifiwpa.cpp" line="107"/>
<source>WPA &amp; WPA2 Enterprise</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DlgHotspotCreate</name> <name>DlgHotspotCreate</name>
@ -1247,183 +1199,196 @@
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../mainwindow.ui" line="14"/> <location filename="../src/mainwindow.ui" line="14"/>
<location filename="../mainwindow.cpp" line="558"/> <location filename="../src/mainwindow.cpp" line="576"/>
<source>kylin-nm</source> <source>kylin-nm</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="370"/> <location filename="../src/mainwindow.cpp" line="385"/>
<location filename="../mainwindow.cpp" line="581"/> <location filename="../src/mainwindow.cpp" line="599"/>
<source>Advanced</source> <source>Advanced</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="329"/> <location filename="../src/mainwindow.cpp" line="344"/>
<location filename="../mainwindow.cpp" line="1155"/> <location filename="../src/mainwindow.cpp" line="1229"/>
<source>Ethernet</source> <source>Ethernet</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="335"/> <location filename="../src/mainwindow.cpp" line="350"/>
<location filename="../mainwindow.cpp" line="1250"/> <location filename="../src/mainwindow.cpp" line="1325"/>
<source>Wifi</source> <source>Wifi</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="350"/> <location filename="../src/mainwindow.cpp" line="365"/>
<source>HotSpot</source> <source>HotSpot</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="360"/> <location filename="../src/mainwindow.cpp" line="375"/>
<source>FlyMode</source> <source>FlyMode</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1217"/> <location filename="../src/mainwindow.cpp" line="1292"/>
<location filename="../mainwindow.cpp" line="1274"/> <location filename="../src/mainwindow.cpp" line="1349"/>
<location filename="../mainwindow.cpp" line="1345"/> <location filename="../src/mainwindow.cpp" line="1420"/>
<location filename="../mainwindow.cpp" line="1477"/> <location filename="../src/mainwindow.cpp" line="1552"/>
<location filename="../mainwindow.cpp" line="2131"/> <location filename="../src/mainwindow.cpp" line="2208"/>
<location filename="../mainwindow.cpp" line="2215"/> <location filename="../src/mainwindow.cpp" line="2292"/>
<source>Not connected</source> <source>Not connected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1219"/> <location filename="../src/mainwindow.cpp" line="1294"/>
<location filename="../mainwindow.cpp" line="1277"/> <location filename="../src/mainwindow.cpp" line="1352"/>
<location filename="../mainwindow.cpp" line="1347"/> <location filename="../src/mainwindow.cpp" line="1422"/>
<location filename="../mainwindow.cpp" line="1400"/> <location filename="../src/mainwindow.cpp" line="1475"/>
<location filename="../mainwindow.cpp" line="1401"/> <location filename="../src/mainwindow.cpp" line="1476"/>
<location filename="../mainwindow.cpp" line="1480"/> <location filename="../src/mainwindow.cpp" line="1555"/>
<location filename="../mainwindow.cpp" line="1551"/> <location filename="../src/mainwindow.cpp" line="1626"/>
<location filename="../mainwindow.cpp" line="1685"/> <location filename="../src/mainwindow.cpp" line="1760"/>
<location filename="../mainwindow.cpp" line="2133"/> <location filename="../src/mainwindow.cpp" line="2210"/>
<location filename="../mainwindow.cpp" line="2217"/> <location filename="../src/mainwindow.cpp" line="2294"/>
<source>Disconnected</source> <source>Disconnected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="216"/> <location filename="../src/mainwindow.cpp" line="231"/>
<source>Ethernet Networks</source> <source>Ethernet Networks</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1382"/> <location filename="../src/mainwindow.cpp" line="1457"/>
<location filename="../mainwindow.cpp" line="1528"/> <location filename="../src/mainwindow.cpp" line="1603"/>
<source>Connected</source> <source>Connected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="239"/> <location filename="../src/mainwindow.cpp" line="254"/>
<source>Wifi Networks</source> <source>Wifi Networks</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="225"/> <location filename="../src/mainwindow.cpp" line="240"/>
<source>Create Lan Net</source> <source>Create Lan Net</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="248"/> <location filename="../src/mainwindow.cpp" line="263"/>
<source>Add Hide Network</source> <source>Add Hide Network</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="278"/> <location filename="../src/mainwindow.cpp" line="293"/>
<source>No usable network in the list</source> <source>No usable network in the list</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="580"/> <location filename="../src/mainwindow.cpp" line="598"/>
<source>Show MainWindow</source> <source>Show MainWindow</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1423"/> <location filename="../src/mainwindow.cpp" line="1498"/>
<source>No Other Wired Network Scheme</source> <source>No Other Wired Network Scheme</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1573"/> <location filename="../src/mainwindow.cpp" line="1648"/>
<source>No Other Wireless Network Scheme</source> <source>No Other Wireless Network Scheme</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1130"/> <location filename="../src/mainwindow.cpp" line="2577"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="1203"/>
<source>please insert the wireless network adapter</source> <source>please insert the wireless network adapter</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1190"/> <location filename="../src/mainwindow.cpp" line="1264"/>
<source>Abnormal connection exist, program will delete it</source> <source>Abnormal connection exist, program will delete it</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2045"/> <location filename="../src/mainwindow.cpp" line="2120"/>
<source>Wired net is disconnected</source> <source>Wired net is disconnected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2072"/> <location filename="../src/mainwindow.cpp" line="2148"/>
<source>Wi-Fi is disconnected</source> <source>Wi-Fi is disconnected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2349"/> <location filename="../src/mainwindow.cpp" line="2431"/>
<source>Conn Ethernet Success</source> <source>Conn Ethernet Success</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2361"/> <location filename="../src/mainwindow.cpp" line="2444"/>
<source>Conn Ethernet Fail</source> <source>Conn Ethernet Fail</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2483"/> <location filename="../src/mainwindow.cpp" line="2566"/>
<source>Conn Wifi Success</source> <source>Conn Wifi Success</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>NotifySend</name>
<message>
<location filename="../src/notifysend.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>OneConnForm</name> <name>OneConnForm</name>
<message> <message>
<location filename="../oneconnform.ui" line="14"/> <location filename="../src/oneconnform.ui" line="14"/>
<source>Form</source> <source>Form</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="33"/> <location filename="../src/oneconnform.cpp" line="33"/>
<location filename="../oneconnform.cpp" line="34"/> <location filename="../src/oneconnform.cpp" line="34"/>
<location filename="../oneconnform.cpp" line="35"/> <location filename="../src/oneconnform.cpp" line="35"/>
<location filename="../oneconnform.cpp" line="37"/> <location filename="../src/oneconnform.cpp" line="37"/>
<source>Connect</source> <source>Connect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="36"/> <location filename="../src/oneconnform.cpp" line="36"/>
<source>Disconnect</source> <source>Disconnect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="38"/> <location filename="../src/oneconnform.cpp" line="38"/>
<location filename="../oneconnform.cpp" line="249"/> <location filename="../src/oneconnform.cpp" line="252"/>
<source>Input Password...</source> <source>Input Password...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="315"/> <location filename="../src/oneconnform.cpp" line="318"/>
<source>Connect to Hidden Wi-Fi Network</source> <source>Connect to Hidden Wi-Fi Network</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="391"/> <location filename="../src/oneconnform.cpp" line="394"/>
<source>None</source> <source>None</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="604"/> <location filename="../src/oneconnform.cpp" line="607"/>
<source>Conn Wifi Failed</source> <source>Conn Wifi Failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1431,24 +1396,24 @@
<context> <context>
<name>OneLancForm</name> <name>OneLancForm</name>
<message> <message>
<location filename="../onelancform.ui" line="14"/> <location filename="../src/onelancform.ui" line="14"/>
<source>Form</source> <source>Form</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../onelancform.cpp" line="31"/> <location filename="../src/onelancform.cpp" line="31"/>
<location filename="../onelancform.cpp" line="32"/> <location filename="../src/onelancform.cpp" line="32"/>
<source>Connect</source> <source>Connect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../onelancform.cpp" line="33"/> <location filename="../src/onelancform.cpp" line="33"/>
<source>Disconnect</source> <source>Disconnect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../onelancform.cpp" line="221"/> <location filename="../src/onelancform.cpp" line="221"/>
<location filename="../onelancform.cpp" line="225"/> <location filename="../src/onelancform.cpp" line="225"/>
<source>no configuration</source> <source>no configuration</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

Binary file not shown.

View File

@ -4,91 +4,90 @@
<context> <context>
<name>BackThread</name> <name>BackThread</name>
<message> <message>
<location filename="../backthread.cpp" line="246"/>
<source>Confirm your Wi-Fi password</source> <source>Confirm your Wi-Fi password</source>
<translation>Wi-Fi密码</translation> <translation type="vanished">Wi-Fi密码</translation>
</message> </message>
</context> </context>
<context> <context>
<name>ConfForm</name> <name>ConfForm</name>
<message> <message>
<location filename="../confform.cpp" line="39"/> <location filename="../src/confform.cpp" line="39"/>
<location filename="../confform.cpp" line="282"/> <location filename="../src/confform.cpp" line="288"/>
<source>edit network</source> <source>edit network</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="52"/> <location filename="../src/confform.cpp" line="52"/>
<source>Network name: </source> <source>Network name: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="53"/> <location filename="../src/confform.cpp" line="53"/>
<source>Method: </source> <source>Method: </source>
<translation>IP设置: </translation> <translation>IP设置: </translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="54"/> <location filename="../src/confform.cpp" line="54"/>
<source>Address: </source> <source>Address: </source>
<translation>IP地址: </translation> <translation>IP地址: </translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="55"/> <location filename="../src/confform.cpp" line="55"/>
<source>Netmask: </source> <source>Netmask: </source>
<translation>: </translation> <translation>: </translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="56"/> <location filename="../src/confform.cpp" line="56"/>
<source>Gateway: </source> <source>Gateway: </source>
<translation>: </translation> <translation>: </translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="57"/> <location filename="../src/confform.cpp" line="57"/>
<source>DNS 1: </source> <source>DNS 1: </source>
<translation>DNS: </translation> <translation>DNS: </translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="58"/> <location filename="../src/confform.cpp" line="58"/>
<source>DNS 2: </source> <source>DNS 2: </source>
<translation>DNS: </translation> <translation>DNS: </translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="60"/> <location filename="../src/confform.cpp" line="60"/>
<source>Edit Conn</source> <source>Edit Conn</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="61"/> <location filename="../src/confform.cpp" line="61"/>
<source>Auto(DHCP)</source> <source>Auto(DHCP)</source>
<translation>(DHCP)</translation> <translation>(DHCP)</translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="62"/> <location filename="../src/confform.cpp" line="62"/>
<source>Manual</source> <source>Manual</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="72"/> <location filename="../src/confform.cpp" line="72"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="73"/> <location filename="../src/confform.cpp" line="73"/>
<source>Save</source> <source>Save</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="74"/> <location filename="../src/confform.cpp" line="74"/>
<source>Ok</source> <source>Ok</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="213"/> <location filename="../src/confform.cpp" line="216"/>
<source>New network already created</source> <source>New network already created</source>
<translation type="unfinished">线</translation> <translation type="unfinished">线</translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="250"/> <location filename="../src/confform.cpp" line="254"/>
<source>New network settings already finished</source> <source>New network settings already finished</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -101,12 +100,12 @@
<translation type="obsolete"></translation> <translation type="obsolete"></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="265"/> <location filename="../src/confform.cpp" line="270"/>
<source>New settings already effective</source> <source>New settings already effective</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../confform.cpp" line="317"/> <location filename="../src/confform.cpp" line="323"/>
<source>add wired network</source> <source>add wired network</source>
<translation type="unfinished">线</translation> <translation type="unfinished">线</translation>
</message> </message>
@ -159,24 +158,20 @@
<translation>WPA WPA2 </translation> <translation>WPA WPA2 </translation>
</message> </message>
<message> <message>
<location filename="../wireless-security/dlgconnhidwifi.cpp" line="97"/>
<source>WEP 40/128-bit Key (Hex or ASCII)</source> <source>WEP 40/128-bit Key (Hex or ASCII)</source>
<translation>WEP 40/128 (ASCII)</translation> <translation type="vanished">WEP 40/128 (ASCII)</translation>
</message> </message>
<message> <message>
<location filename="../wireless-security/dlgconnhidwifi.cpp" line="98"/>
<source>WEP 128-bit Passphrase</source> <source>WEP 128-bit Passphrase</source>
<translation>WEP 128 </translation> <translation type="vanished">WEP 128 </translation>
</message> </message>
<message> <message>
<location filename="../wireless-security/dlgconnhidwifi.cpp" line="100"/>
<source>Dynamic WEP (802.1X)</source> <source>Dynamic WEP (802.1X)</source>
<translation> WEP (802.1x)</translation> <translation type="vanished"> WEP (802.1x)</translation>
</message> </message>
<message> <message>
<location filename="../wireless-security/dlgconnhidwifi.cpp" line="101"/>
<source>WPA &amp; WPA2 Enterprise</source> <source>WPA &amp; WPA2 Enterprise</source>
<translation>WPA WPA2 </translation> <translation type="vanished">WPA WPA2 </translation>
</message> </message>
<message> <message>
<location filename="../wireless-security/dlgconnhidwifi.ui" line="14"/> <location filename="../wireless-security/dlgconnhidwifi.ui" line="14"/>
@ -1184,24 +1179,20 @@
<translation type="unfinished">WPA WPA2 </translation> <translation type="unfinished">WPA WPA2 </translation>
</message> </message>
<message> <message>
<location filename="../wireless-security/dlgconnhidwifiwpa.cpp" line="103"/>
<source>WEP 40/128-bit Key (Hex or ASCII)</source> <source>WEP 40/128-bit Key (Hex or ASCII)</source>
<translation type="unfinished">WEP 40/128 (ASCII)</translation> <translation type="obsolete">WEP 40/128 (ASCII)</translation>
</message> </message>
<message> <message>
<location filename="../wireless-security/dlgconnhidwifiwpa.cpp" line="104"/>
<source>WEP 128-bit Passphrase</source> <source>WEP 128-bit Passphrase</source>
<translation type="unfinished">WEP 128 </translation> <translation type="obsolete">WEP 128 </translation>
</message> </message>
<message> <message>
<location filename="../wireless-security/dlgconnhidwifiwpa.cpp" line="106"/>
<source>Dynamic WEP (802.1X)</source> <source>Dynamic WEP (802.1X)</source>
<translation type="unfinished"> WEP (802.1x)</translation> <translation type="obsolete"> WEP (802.1x)</translation>
</message> </message>
<message> <message>
<location filename="../wireless-security/dlgconnhidwifiwpa.cpp" line="107"/>
<source>WPA &amp; WPA2 Enterprise</source> <source>WPA &amp; WPA2 Enterprise</source>
<translation type="unfinished">WPA WPA2 </translation> <translation type="obsolete">WPA WPA2 </translation>
</message> </message>
</context> </context>
<context> <context>
@ -1255,8 +1246,8 @@
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../mainwindow.ui" line="14"/> <location filename="../src/mainwindow.ui" line="14"/>
<location filename="../mainwindow.cpp" line="558"/> <location filename="../src/mainwindow.cpp" line="576"/>
<source>kylin-nm</source> <source>kylin-nm</source>
<translation></translation> <translation></translation>
</message> </message>
@ -1265,14 +1256,14 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="370"/> <location filename="../src/mainwindow.cpp" line="385"/>
<location filename="../mainwindow.cpp" line="581"/> <location filename="../src/mainwindow.cpp" line="599"/>
<source>Advanced</source> <source>Advanced</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="329"/> <location filename="../src/mainwindow.cpp" line="344"/>
<location filename="../mainwindow.cpp" line="1155"/> <location filename="../src/mainwindow.cpp" line="1229"/>
<source>Ethernet</source> <source>Ethernet</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
@ -1281,8 +1272,8 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="335"/> <location filename="../src/mainwindow.cpp" line="350"/>
<location filename="../mainwindow.cpp" line="1250"/> <location filename="../src/mainwindow.cpp" line="1325"/>
<source>Wifi</source> <source>Wifi</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
@ -1295,92 +1286,97 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="350"/> <location filename="../src/mainwindow.cpp" line="365"/>
<source>HotSpot</source> <source>HotSpot</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="360"/> <location filename="../src/mainwindow.cpp" line="375"/>
<source>FlyMode</source> <source>FlyMode</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="580"/> <location filename="../src/mainwindow.cpp" line="598"/>
<source>Show MainWindow</source> <source>Show MainWindow</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1217"/> <location filename="../src/mainwindow.cpp" line="1292"/>
<location filename="../mainwindow.cpp" line="1274"/> <location filename="../src/mainwindow.cpp" line="1349"/>
<location filename="../mainwindow.cpp" line="1345"/> <location filename="../src/mainwindow.cpp" line="1420"/>
<location filename="../mainwindow.cpp" line="1477"/> <location filename="../src/mainwindow.cpp" line="1552"/>
<location filename="../mainwindow.cpp" line="2131"/> <location filename="../src/mainwindow.cpp" line="2208"/>
<location filename="../mainwindow.cpp" line="2215"/> <location filename="../src/mainwindow.cpp" line="2292"/>
<source>Not connected</source> <source>Not connected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1219"/> <location filename="../src/mainwindow.cpp" line="1294"/>
<location filename="../mainwindow.cpp" line="1277"/> <location filename="../src/mainwindow.cpp" line="1352"/>
<location filename="../mainwindow.cpp" line="1347"/> <location filename="../src/mainwindow.cpp" line="1422"/>
<location filename="../mainwindow.cpp" line="1400"/> <location filename="../src/mainwindow.cpp" line="1475"/>
<location filename="../mainwindow.cpp" line="1401"/> <location filename="../src/mainwindow.cpp" line="1476"/>
<location filename="../mainwindow.cpp" line="1480"/> <location filename="../src/mainwindow.cpp" line="1555"/>
<location filename="../mainwindow.cpp" line="1551"/> <location filename="../src/mainwindow.cpp" line="1626"/>
<location filename="../mainwindow.cpp" line="1685"/> <location filename="../src/mainwindow.cpp" line="1760"/>
<location filename="../mainwindow.cpp" line="2133"/> <location filename="../src/mainwindow.cpp" line="2210"/>
<location filename="../mainwindow.cpp" line="2217"/> <location filename="../src/mainwindow.cpp" line="2294"/>
<source>Disconnected</source> <source>Disconnected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1423"/> <location filename="../src/mainwindow.cpp" line="1498"/>
<source>No Other Wired Network Scheme</source> <source>No Other Wired Network Scheme</source>
<translation type="unfinished">线</translation> <translation type="unfinished">线</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1573"/> <location filename="../src/mainwindow.cpp" line="1648"/>
<source>No Other Wireless Network Scheme</source> <source>No Other Wireless Network Scheme</source>
<translation type="unfinished">线</translation> <translation type="unfinished">线</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2045"/> <location filename="../src/mainwindow.cpp" line="2120"/>
<source>Wired net is disconnected</source> <source>Wired net is disconnected</source>
<translation type="unfinished">线</translation> <translation type="unfinished">线</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2072"/> <location filename="../src/mainwindow.cpp" line="2148"/>
<source>Wi-Fi is disconnected</source> <source>Wi-Fi is disconnected</source>
<translation type="unfinished">线</translation> <translation type="unfinished">线</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="216"/> <location filename="../src/mainwindow.cpp" line="2577"/>
<source>Confirm your Wi-Fi password or usable of wireless card</source>
<translation type="unfinished">Wi-Fi密码或无线设备</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="231"/>
<source>Ethernet Networks</source> <source>Ethernet Networks</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="225"/> <location filename="../src/mainwindow.cpp" line="240"/>
<source>Create Lan Net</source> <source>Create Lan Net</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="248"/> <location filename="../src/mainwindow.cpp" line="263"/>
<source>Add Hide Network</source> <source>Add Hide Network</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="278"/> <location filename="../src/mainwindow.cpp" line="293"/>
<source>No usable network in the list</source> <source>No usable network in the list</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1382"/> <location filename="../src/mainwindow.cpp" line="1457"/>
<location filename="../mainwindow.cpp" line="1528"/> <location filename="../src/mainwindow.cpp" line="1603"/>
<source>Connected</source> <source>Connected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="239"/> <location filename="../src/mainwindow.cpp" line="254"/>
<source>Wifi Networks</source> <source>Wifi Networks</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
@ -1393,12 +1389,12 @@
<translation type="vanished">线线</translation> <translation type="vanished">线线</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1130"/> <location filename="../src/mainwindow.cpp" line="1203"/>
<source>please insert the wireless network adapter</source> <source>please insert the wireless network adapter</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="1190"/> <location filename="../src/mainwindow.cpp" line="1264"/>
<source>Abnormal connection exist, program will delete it</source> <source>Abnormal connection exist, program will delete it</source>
<translation></translation> <translation></translation>
</message> </message>
@ -1411,25 +1407,33 @@
<translation type="vanished"> Wi-Fi列表</translation> <translation type="vanished"> Wi-Fi列表</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2349"/> <location filename="../src/mainwindow.cpp" line="2431"/>
<source>Conn Ethernet Success</source> <source>Conn Ethernet Success</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2361"/> <location filename="../src/mainwindow.cpp" line="2444"/>
<source>Conn Ethernet Fail</source> <source>Conn Ethernet Fail</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="2483"/> <location filename="../src/mainwindow.cpp" line="2566"/>
<source>Conn Wifi Success</source> <source>Conn Wifi Success</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
</context> </context>
<context>
<name>NotifySend</name>
<message>
<location filename="../src/notifysend.ui" line="14"/>
<source>Form</source>
<translation type="unfinished">--</translation>
</message>
</context>
<context> <context>
<name>OneConnForm</name> <name>OneConnForm</name>
<message> <message>
<location filename="../oneconnform.ui" line="14"/> <location filename="../src/oneconnform.ui" line="14"/>
<source>Form</source> <source>Form</source>
<translation>--</translation> <translation>--</translation>
</message> </message>
@ -1442,26 +1446,26 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="33"/> <location filename="../src/oneconnform.cpp" line="33"/>
<location filename="../oneconnform.cpp" line="34"/> <location filename="../src/oneconnform.cpp" line="34"/>
<location filename="../oneconnform.cpp" line="35"/> <location filename="../src/oneconnform.cpp" line="35"/>
<location filename="../oneconnform.cpp" line="37"/> <location filename="../src/oneconnform.cpp" line="37"/>
<source>Connect</source> <source>Connect</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="36"/> <location filename="../src/oneconnform.cpp" line="36"/>
<source>Disconnect</source> <source>Disconnect</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="38"/> <location filename="../src/oneconnform.cpp" line="38"/>
<location filename="../oneconnform.cpp" line="249"/> <location filename="../src/oneconnform.cpp" line="252"/>
<source>Input Password...</source> <source>Input Password...</source>
<translation type="unfinished">...</translation> <translation type="unfinished">...</translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="315"/> <location filename="../src/oneconnform.cpp" line="318"/>
<source>Connect to Hidden Wi-Fi Network</source> <source>Connect to Hidden Wi-Fi Network</source>
<translation> Wi-Fi </translation> <translation> Wi-Fi </translation>
</message> </message>
@ -1478,12 +1482,12 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="391"/> <location filename="../src/oneconnform.cpp" line="394"/>
<source>None</source> <source>None</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../oneconnform.cpp" line="604"/> <location filename="../src/oneconnform.cpp" line="607"/>
<source>Conn Wifi Failed</source> <source>Conn Wifi Failed</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
@ -1491,7 +1495,7 @@
<context> <context>
<name>OneLancForm</name> <name>OneLancForm</name>
<message> <message>
<location filename="../onelancform.ui" line="14"/> <location filename="../src/onelancform.ui" line="14"/>
<source>Form</source> <source>Form</source>
<translation>--</translation> <translation>--</translation>
</message> </message>
@ -1500,19 +1504,19 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../onelancform.cpp" line="31"/> <location filename="../src/onelancform.cpp" line="31"/>
<location filename="../onelancform.cpp" line="32"/> <location filename="../src/onelancform.cpp" line="32"/>
<source>Connect</source> <source>Connect</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../onelancform.cpp" line="33"/> <location filename="../src/onelancform.cpp" line="33"/>
<source>Disconnect</source> <source>Disconnect</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../onelancform.cpp" line="221"/> <location filename="../src/onelancform.cpp" line="221"/>
<location filename="../onelancform.cpp" line="225"/> <location filename="../src/onelancform.cpp" line="225"/>
<source>no configuration</source> <source>no configuration</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -94,11 +94,11 @@ DlgConnHidWifi::DlgConnHidWifi(int type, MainWindow *mainWindow, QWidget *parent
ui->cbxSecurity->addItem(tr("None")); //无 ui->cbxSecurity->addItem(tr("None")); //无
ui->cbxSecurity->addItem(tr("WPA & WPA2 Personal")); //WPA 及 WPA2 个人 ui->cbxSecurity->addItem(tr("WPA & 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 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句 // ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
ui->cbxSecurity->addItem("LEAP"); // ui->cbxSecurity->addItem("LEAP");
ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x) // ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
ui->cbxSecurity->addItem(tr("WPA & WPA2 Enterprise")); //WPA 及 WPA2 企业 // ui->cbxSecurity->addItem(tr("WPA & WPA2 Enterprise")); //WPA 及 WPA2 企业
ui->cbxSecurity->setCurrentIndex(0); ui->cbxSecurity->setCurrentIndex(0);
connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialog())); connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialog()));

View File

@ -56,7 +56,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>76</x> <x>76</x>
<y>176</y> <y>221</y>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>
</rect> </rect>
@ -74,7 +74,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>175</x> <x>175</x>
<y>215</y> <y>170</y>
<width>182</width> <width>182</width>
<height>32</height> <height>32</height>
</rect> </rect>
@ -92,7 +92,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>76</x> <x>76</x>
<y>221</y> <y>176</y>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>
</rect> </rect>
@ -110,7 +110,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>175</x> <x>175</x>
<y>170</y> <y>215</y>
<width>182</width> <width>182</width>
<height>32</height> <height>32</height>
</rect> </rect>

View File

@ -100,11 +100,11 @@ DlgConnHidWifiWpa::DlgConnHidWifiWpa(int type, MainWindow *mainWindow, QWidget *
ui->cbxSecurity->addItem(tr("None")); //无 ui->cbxSecurity->addItem(tr("None")); //无
ui->cbxSecurity->addItem(tr("WPA & WPA2 Personal")); //WPA 及 WPA2 个人 ui->cbxSecurity->addItem(tr("WPA & 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 40/128-bit Key (Hex or ASCII)")); //WEP 40/128 位密钥(十六进制或ASCII)
ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句 // ui->cbxSecurity->addItem(tr("WEP 128-bit Passphrase")); //WEP 128 位密码句
ui->cbxSecurity->addItem("LEAP"); // ui->cbxSecurity->addItem("LEAP");
ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x) // ui->cbxSecurity->addItem(tr("Dynamic WEP (802.1X)")); //动态 WEP (802.1x)
ui->cbxSecurity->addItem(tr("WPA & WPA2 Enterprise")); //WPA 及 WPA2 企业 // ui->cbxSecurity->addItem(tr("WPA & WPA2 Enterprise")); //WPA 及 WPA2 企业
ui->cbxSecurity->setCurrentIndex(1); ui->cbxSecurity->setCurrentIndex(1);
connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialog())); connect(ui->cbxSecurity,SIGNAL(currentIndexChanged(QString)),this,SLOT(changeDialog()));

View File

@ -17,7 +17,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>76</x> <x>76</x>
<y>176</y> <y>221</y>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>
</rect> </rect>
@ -35,7 +35,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>76</x> <x>76</x>
<y>221</y> <y>176</y>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>
</rect> </rect>
@ -125,7 +125,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>175</x> <x>175</x>
<y>215</y> <y>170</y>
<width>182</width> <width>182</width>
<height>32</height> <height>32</height>
</rect> </rect>
@ -200,7 +200,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>175</x> <x>175</x>
<y>170</y> <y>215</y>
<width>182</width> <width>182</width>
<height>32</height> <height>32</height>
</rect> </rect>