change the QLineEdit style of password box;set the position of kylin-nm window when display according to position of taskbar

This commit is contained in:
chenlelin 2020-02-25 18:06:53 +08:00
parent 71ac3bef8a
commit 4e87b0fea3
19 changed files with 190 additions and 152 deletions

View File

@ -1,24 +0,0 @@
QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 9
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
QMAKE_CXX.INCDIRS = \
/usr/include/c++/9 \
/usr/include/x86_64-linux-gnu/c++/9 \
/usr/include/c++/9/backward \
/usr/lib/gcc/x86_64-linux-gnu/9/include \
/usr/local/include \
/usr/lib/gcc/x86_64-linux-gnu/9/include-fixed \
/usr/include/x86_64-linux-gnu \
/usr/include
QMAKE_CXX.LIBDIRS = \
/usr/lib/gcc/x86_64-linux-gnu/9 \
/usr/lib/x86_64-linux-gnu \
/usr/lib \
/lib/x86_64-linux-gnu \
/lib

View File

@ -1 +0,0 @@
./man/kylin-nm.1

View File

@ -1 +0,0 @@
258394723b9ee23bd6dc115b28785ad9ad9994c1

View File

@ -1,13 +0,0 @@
Package: kylin-nm-dbgsym
Package-Type: ddeb
Source: kylin-nm
Version: 1.0.4-1
Auto-Built-Package: debug-symbols
Architecture: amd64
Maintainer: Kylin Team <team+kylin@tracker.debian.org>
Installed-Size: 2450
Depends: kylin-nm (= 1.0.4-1)
Section: debug
Priority: optional
Description: debug symbols for kylin-nm
Build-Ids: 258394723b9ee23bd6dc115b28785ad9ad9994c1

View File

@ -1 +0,0 @@
9af83152b2bccb5ccca02c6c09b65c78 usr/lib/debug/.build-id/25/8394723b9ee23bd6dc115b28785ad9ad9994c1.debug

View File

@ -1 +0,0 @@
kylin-nm

View File

@ -1 +0,0 @@
kylin-nm

3
debian/files vendored
View File

@ -1,3 +0,0 @@
kylin-nm-dbgsym_1.0.4-1_amd64.ddeb debug optional automatic=yes
kylin-nm_1.0.4-1_amd64.buildinfo utils optional
kylin-nm_1.0.4-1_amd64.deb utils optional

View File

@ -1,3 +0,0 @@
shlibs:Depends=libc6 (>= 2.7), libgcc1 (>= 1:3.0), libqt5core5a (>= 5.12.2), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.7.0) | libqt5gui5-gles (>= 5.7.0), libqt5widgets5 (>= 5.2.0), libstdc++6 (>= 5)
misc:Depends=
misc:Pre-Depends=

View File

@ -283,12 +283,28 @@ void KylinDBus::getActWifiMac(QString netName)
const QDBusArgument &dbusArg = reply.arguments().at( 0 ).value<QDBusArgument>();
QMap<QString,QMap<QString,QVariant>> map;
dbusArg >> map;
if (map.values().at(0).values().size() >= 5){
if(map.values().at(2).values().at(0).toString() == netName){
dbusWifiMac = map.values().at(0).values().at(3).toString();
for(QString key : map.keys() ){
QMap<QString,QVariant> innerMap = map.value(key);
if (key == "connection"){
for (QString inner_key : innerMap.keys()){
if (inner_key == "id"){
if (netName == innerMap.value(inner_key).toString()){
for (QString subkey : map.keys()){
QMap<QString,QVariant> subMap = map.value(subkey);
if (subkey == "802-11-wireless"){
dbusWifiMac = subMap.value("seen-bssids").toString();
}
} //end for (QString subkey : map.keys())
}
}
}
}
}
}
} // end foreach (QDBusObjectPath objNet, m_objNets)
}
int KylinDBus::getAccessPointsNumber()

View File

@ -289,29 +289,30 @@ void MainWindow::createTrayIcon()
trayIcon->setToolTip(QString(tr("kylin-nm")));
trayIconMenu = new QMenu(this);
trayIconMenu->addSeparator();
trayIconMenu->setStyleSheet("QMenu {height: 88px;width: 250px;"
"background-color: rgba(19,19,20,0.95);"
trayIconMenu->setAttribute(Qt::WA_TranslucentBackground);//设置窗口背景透明
trayIconMenu->setStyleSheet("QMenu {background-color: rgba(19,19,20,0.95);"
"border:1px solid rgba(255, 255, 255, 0.05);"
"padding: 6px 0px;"
"padding: 6px 1px;"
"border-radius: 6px;}"
"QMenu::item {font-size: 14px;color: #ffffff;"
"height: 36px;width: 250px;}"
"QMenu::separator{height:1px;background-color:rgba(19,19,20,0);margin-top:1px;margin-bottom:2px;}");
"height: 36px;width: 248px;}"
"QMenu::separator{height:1px;background-color:rgba(19,19,20,0);"
"margin-top:1px;margin-bottom:2px;}");
mShowWindow = new QWidgetAction(trayIconMenu);
mAdvConf = new QWidgetAction(trayIconMenu);
wid = new QWidget();
wid_new = new QWidget();
widShowWindow = new QWidget();
widAdvConf = new QWidget();
mShowWindow->setDefaultWidget(wid);
mAdvConf->setDefaultWidget(wid_new);
mShowWindow->setDefaultWidget(widShowWindow);
mAdvConf->setDefaultWidget(widAdvConf);
init_widget_action(wid, "", tr("Show MainWindow"));
init_widget_action(wid_new, ":/res/x/setup.png", tr("Advanced"));
init_widget_action(widShowWindow, "", tr("Show MainWindow"));
init_widget_action(widAdvConf, ":/res/x/setup.png", tr("Advanced"));
trayIconMenu->addAction(mShowWindow);
trayIconMenu->addSeparator();
trayIconMenu->addAction(mAdvConf);
trayIcon->setContextMenu(trayIconMenu);
@ -394,18 +395,40 @@ void MainWindow::handleIconClicked()
QRect availableGeometry = qApp->primaryScreen()->availableGeometry();
QRect screenGeometry = qApp->primaryScreen()->geometry();
QDesktopWidget* pDesktopWidget = QApplication::desktop();
// int nScreenCount = QApplication::desktop()->screenCount();
// QRect deskRect = pDesktopWidget->availableGeometry();//可用区域
QRect screenRect = pDesktopWidget->screenGeometry();//屏幕区域
//QDesktopWidget* pDesktopWidget = QApplication::desktop();
//int nScreenCount = QApplication::desktop()->screenCount();
//QRect deskRect = pDesktopWidget->availableGeometry();//可用区域
//QRect screenRect = pDesktopWidget->screenGeometry();//屏幕区域
// qDebug()<<"screenRect.x(): "<<screenRect.x()<<" screenRect.height(): "<<screenRect.height();
// qDebug()<<"availableGeometry.y(): "<<availableGeometry.y()<<" availableGeometry.height(): "<<availableGeometry.height();
if (screenRect.height() != availableGeometry.height()) {
this->move(availableGeometry.x() + availableGeometry.width() - this->width(), availableGeometry.height() - this->height());
}else {
this->move(availableGeometry.x() + availableGeometry.width() - this->width(), availableGeometry.height() - this->height() - 40);
//qDebug()<<" ";
//qDebug()<<"trayIcon:"<<trayIcon->geometry();
//qDebug()<<"screenGeometry: "<<screenGeometry;
//qDebug()<<"availableGeometry: "<<availableGeometry;
if (screenGeometry.width() == availableGeometry.width()){
if (trayIcon->geometry().y() > availableGeometry.height()/2){
//任务栏在下侧
if (screenGeometry.height() != availableGeometry.height()) {
this->move(availableGeometry.x() + availableGeometry.width() - this->width(), availableGeometry.height() - this->height());
}else {
this->move(availableGeometry.x() + availableGeometry.width() - this->width(), availableGeometry.height() - this->height() - 40);
}
}else{
//任务栏在上侧
this->move(availableGeometry.x() + availableGeometry.width() - this->width(), screenGeometry.height() - availableGeometry.height());
}
}
if (screenGeometry.height() == availableGeometry.height()){
if (trayIcon->geometry().x() > availableGeometry.width()/2){
//任务栏在右侧
this->move(availableGeometry.x() + availableGeometry.width() - this->width(), screenGeometry.height() - this->height());
} else {
//任务栏在左侧
this->move(screenGeometry.width() - availableGeometry.width(), screenGeometry.height() - this->height());
}
}
// QPoint pos = QCursor::pos();
// QRect primaryGeometry;

View File

@ -159,8 +159,8 @@ private:
QMenu *trayIconMenu;
QWidgetAction *mShowWindow;
QWidgetAction *mAdvConf;
QWidget *wid;
QWidget *wid_new;
QWidget *widShowWindow;
QWidget *widAdvConf;
QString lname, wname; // 以太网卡和无线网卡名称

View File

@ -34,12 +34,12 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
ui->btnConnPWD->setText(tr("Connect"));//"连接"
ui->btnDisConn->setText(tr("Disconnect"));//"断开连接"
ui->btnHideConn->setText(tr("Connect"));//"连接"
ui->lePassword->setText(tr(""));//"连接"
ui->lePassword->setText(tr("Input Password..."));//"输入密码..."
ui->lbConned->setAlignment(Qt::AlignLeft);
ui->lbLoadUp->setAlignment(Qt::AlignLeft);
ui->lbLoadDown->setAlignment(Qt::AlignLeft);
ui->lePassword->setEchoMode(QLineEdit::Password);
ui->lePassword->setEchoMode(QLineEdit::Normal);
ui->btnConnPWD->setEnabled(false);
ui->lbInfo->setStyleSheet("QLabel{font-size:14px;color:rgba(255,255,255,0.57);}");
@ -90,6 +90,7 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
ui->lbInfo->hide();
ui->lePassword->hide();
ui->checkBoxPwd->hide();
ui->checkBoxPwd->setChecked(true);
ui->btnConnSub->hide();
ui->btnConn->hide();
ui->btnDisConn->hide();
@ -112,6 +113,8 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
ui->wbg->installEventFilter(this); //安装事件过滤器
ui->btnConn->setAttribute(Qt::WA_Hover,true);//开启悬停事件
ui->btnConn->installEventFilter(this); //安装事件过滤器
ui->lePassword->setAttribute(Qt::WA_Hover,true);//开启悬停事件
ui->lePassword->installEventFilter(this);
connect(ui->lePassword, SIGNAL(returnPressed()), this, SLOT(on_btnConnPWD_clicked()));
ui->btnConn->setShortcut(Qt::Key_Return);//将字母区回车键与登录按钮绑定在一起
@ -157,6 +160,15 @@ bool OneConnForm::eventFilter(QObject *obj, QEvent *event)
}
}
if(obj == ui->lePassword){
if(event->type() == QEvent::MouseButtonPress){
qDebug() << "hello world";
this->setLePassword();
}else{
return false;
}
}
return QWidget::eventFilter(obj,event);
}
@ -172,6 +184,16 @@ void OneConnForm::setAct(bool isAct){
isActive = isAct;
}
void OneConnForm::setLePassword()
{
qDebug()<<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
if(ui->lePassword->text() == "Input Password..." || ui->lePassword->text() == "输入密码..."){
ui->lePassword->setText(tr(""));
ui->lePassword->setEchoMode(QLineEdit::Password);
ui->checkBoxPwd->setChecked(false);
}
}
//点击窗口最上面的item时
void OneConnForm::setTopItem(bool isSelected){
if(isSelected){
@ -233,11 +255,11 @@ void OneConnForm::setSelected(bool isSelected, bool isCurrName){
this->isSelected = true;
}else{
resize(422, 60);
ui->lePassword->setText(tr(""));
ui->lePassword->setText(tr("Input Password..."));//"输入密码..."
ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);border-radius:4px;"
"background:rgba(0,0,0,0.2);color:rgba(255,255,255,0.35);font-size:14px;}");
ui->lePassword->setEchoMode(QLineEdit::Password);
ui->checkBoxPwd->setChecked(false);
ui->lePassword->setEchoMode(QLineEdit::Normal);
ui->checkBoxPwd->setChecked(true);
ui->line->show();
ui->wbg->show();
@ -374,6 +396,7 @@ void OneConnForm::setSignal(QString lv, QString secu){
void OneConnForm::setWifiInfo(QString str1, QString str2, QString str3)
{
if (str1 == "--" || str1 == ""){ str1 = tr("None"); };
QString str = "Wi-Fi安全性" + str1 + "\n信号强度:" + str2 + "%\n物理地址(MAC)" + str3;
ui->lbInfo->setText(str);
}
@ -489,6 +512,10 @@ void OneConnForm::on_lePassword_textEdited(const QString &arg1)
"QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}"
"QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}");
ui->btnConnPWD->setEnabled(false);
if (ui->lePassword->text().size() == 0){
ui->lePassword->setStyleSheet("QLineEdit{border:1px solid rgba(61,107,229,1);border-radius:4px;"
"background:rgba(0,0,0,0.2);color:rgba(255,255,255,0.35);font-size:14px;}");
}
} else {
ui->btnConnPWD->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}"
"QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"

View File

@ -61,6 +61,8 @@ public:
void setConnedString(bool showLable, QString str, QString str1);
void setLePassword();
QString wifiName;
bool isSelected;
bool isActive;

View File

@ -1253,56 +1253,56 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="907"/>
<location filename="../mainwindow.cpp" line="1037"/>
<location filename="../mainwindow.cpp" line="1402"/>
<location filename="../mainwindow.cpp" line="1466"/>
<location filename="../mainwindow.cpp" line="2039"/>
<location filename="../mainwindow.cpp" line="2102"/>
<location filename="../mainwindow.cpp" line="2152"/>
<location filename="../mainwindow.cpp" line="908"/>
<location filename="../mainwindow.cpp" line="1038"/>
<location filename="../mainwindow.cpp" line="1403"/>
<location filename="../mainwindow.cpp" line="1467"/>
<location filename="../mainwindow.cpp" line="2040"/>
<location filename="../mainwindow.cpp" line="2103"/>
<location filename="../mainwindow.cpp" line="2153"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="909"/>
<location filename="../mainwindow.cpp" line="952"/>
<location filename="../mainwindow.cpp" line="910"/>
<location filename="../mainwindow.cpp" line="953"/>
<location filename="../mainwindow.cpp" line="1040"/>
<location filename="../mainwindow.cpp" line="1099"/>
<location filename="../mainwindow.cpp" line="1221"/>
<location filename="../mainwindow.cpp" line="1404"/>
<location filename="../mainwindow.cpp" line="1469"/>
<location filename="../mainwindow.cpp" line="2041"/>
<location filename="../mainwindow.cpp" line="2104"/>
<location filename="../mainwindow.cpp" line="2154"/>
<location filename="../mainwindow.cpp" line="954"/>
<location filename="../mainwindow.cpp" line="1041"/>
<location filename="../mainwindow.cpp" line="1100"/>
<location filename="../mainwindow.cpp" line="1222"/>
<location filename="../mainwindow.cpp" line="1405"/>
<location filename="../mainwindow.cpp" line="1470"/>
<location filename="../mainwindow.cpp" line="2042"/>
<location filename="../mainwindow.cpp" line="2105"/>
<location filename="../mainwindow.cpp" line="2155"/>
<source>Disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="68"/>
<location filename="../mainwindow.cpp" line="881"/>
<location filename="../mainwindow.cpp" line="1388"/>
<location filename="../mainwindow.cpp" line="2025"/>
<location filename="../mainwindow.cpp" line="882"/>
<location filename="../mainwindow.cpp" line="1389"/>
<location filename="../mainwindow.cpp" line="2026"/>
<source>Ethernet Networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="939"/>
<location filename="../mainwindow.cpp" line="1082"/>
<location filename="../mainwindow.cpp" line="940"/>
<location filename="../mainwindow.cpp" line="1083"/>
<source>Connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="85"/>
<location filename="../mainwindow.cpp" line="1000"/>
<location filename="../mainwindow.cpp" line="1442"/>
<location filename="../mainwindow.cpp" line="1001"/>
<location filename="../mainwindow.cpp" line="1443"/>
<source>Wifi Networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="93"/>
<location filename="../mainwindow.cpp" line="1008"/>
<location filename="../mainwindow.cpp" line="1450"/>
<location filename="../mainwindow.cpp" line="1009"/>
<location filename="../mainwindow.cpp" line="1451"/>
<source>Add Hide Network</source>
<translation type="unfinished"></translation>
</message>
@ -1312,32 +1312,32 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1298"/>
<location filename="../mainwindow.cpp" line="1299"/>
<source>keep wired network switch is on before turning on wireless switch</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1318"/>
<location filename="../mainwindow.cpp" line="1319"/>
<source>please insert the wireless network adapter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1372"/>
<location filename="../mainwindow.cpp" line="1373"/>
<source>Abnormal connection exist, program will delete it</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1540"/>
<location filename="../mainwindow.cpp" line="1541"/>
<source>Conn Ethernet Success</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1551"/>
<location filename="../mainwindow.cpp" line="1552"/>
<source>Conn Ethernet Fail</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1671"/>
<location filename="../mainwindow.cpp" line="1672"/>
<source>Conn Wifi Success</source>
<translation type="unfinished"></translation>
</message>
@ -1363,17 +1363,28 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="300"/>
<location filename="../oneconnform.cpp" line="37"/>
<location filename="../oneconnform.cpp" line="258"/>
<source>Input Password...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="322"/>
<source>Connect to Hidden Wi-Fi Network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="310"/>
<location filename="../oneconnform.cpp" line="332"/>
<source>Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="528"/>
<location filename="../oneconnform.cpp" line="399"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="555"/>
<source>Conn Wifi Failed</source>
<translation type="unfinished"></translation>
</message>

Binary file not shown.

View File

@ -1274,56 +1274,56 @@
<translation></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="907"/>
<location filename="../mainwindow.cpp" line="1037"/>
<location filename="../mainwindow.cpp" line="1402"/>
<location filename="../mainwindow.cpp" line="1466"/>
<location filename="../mainwindow.cpp" line="2039"/>
<location filename="../mainwindow.cpp" line="2102"/>
<location filename="../mainwindow.cpp" line="2152"/>
<location filename="../mainwindow.cpp" line="908"/>
<location filename="../mainwindow.cpp" line="1038"/>
<location filename="../mainwindow.cpp" line="1403"/>
<location filename="../mainwindow.cpp" line="1467"/>
<location filename="../mainwindow.cpp" line="2040"/>
<location filename="../mainwindow.cpp" line="2103"/>
<location filename="../mainwindow.cpp" line="2153"/>
<source>Not connected</source>
<translation></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="909"/>
<location filename="../mainwindow.cpp" line="952"/>
<location filename="../mainwindow.cpp" line="910"/>
<location filename="../mainwindow.cpp" line="953"/>
<location filename="../mainwindow.cpp" line="1040"/>
<location filename="../mainwindow.cpp" line="1099"/>
<location filename="../mainwindow.cpp" line="1221"/>
<location filename="../mainwindow.cpp" line="1404"/>
<location filename="../mainwindow.cpp" line="1469"/>
<location filename="../mainwindow.cpp" line="2041"/>
<location filename="../mainwindow.cpp" line="2104"/>
<location filename="../mainwindow.cpp" line="2154"/>
<location filename="../mainwindow.cpp" line="954"/>
<location filename="../mainwindow.cpp" line="1041"/>
<location filename="../mainwindow.cpp" line="1100"/>
<location filename="../mainwindow.cpp" line="1222"/>
<location filename="../mainwindow.cpp" line="1405"/>
<location filename="../mainwindow.cpp" line="1470"/>
<location filename="../mainwindow.cpp" line="2042"/>
<location filename="../mainwindow.cpp" line="2105"/>
<location filename="../mainwindow.cpp" line="2155"/>
<source>Disconnected</source>
<translation></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="68"/>
<location filename="../mainwindow.cpp" line="881"/>
<location filename="../mainwindow.cpp" line="1388"/>
<location filename="../mainwindow.cpp" line="2025"/>
<location filename="../mainwindow.cpp" line="882"/>
<location filename="../mainwindow.cpp" line="1389"/>
<location filename="../mainwindow.cpp" line="2026"/>
<source>Ethernet Networks</source>
<translation>线</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="93"/>
<location filename="../mainwindow.cpp" line="1008"/>
<location filename="../mainwindow.cpp" line="1450"/>
<location filename="../mainwindow.cpp" line="1009"/>
<location filename="../mainwindow.cpp" line="1451"/>
<source>Add Hide Network</source>
<translation></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="939"/>
<location filename="../mainwindow.cpp" line="1082"/>
<location filename="../mainwindow.cpp" line="940"/>
<location filename="../mainwindow.cpp" line="1083"/>
<source>Connected</source>
<translation></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="85"/>
<location filename="../mainwindow.cpp" line="1000"/>
<location filename="../mainwindow.cpp" line="1442"/>
<location filename="../mainwindow.cpp" line="1001"/>
<location filename="../mainwindow.cpp" line="1443"/>
<source>Wifi Networks</source>
<translation>线</translation>
</message>
@ -1332,17 +1332,17 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1298"/>
<location filename="../mainwindow.cpp" line="1299"/>
<source>keep wired network switch is on before turning on wireless switch</source>
<translation>线线</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1318"/>
<location filename="../mainwindow.cpp" line="1319"/>
<source>please insert the wireless network adapter</source>
<translation>线</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1372"/>
<location filename="../mainwindow.cpp" line="1373"/>
<source>Abnormal connection exist, program will delete it</source>
<translation></translation>
</message>
@ -1355,17 +1355,17 @@
<translation type="vanished"> Wi-Fi列表</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1540"/>
<location filename="../mainwindow.cpp" line="1541"/>
<source>Conn Ethernet Success</source>
<translation>线</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1551"/>
<location filename="../mainwindow.cpp" line="1552"/>
<source>Conn Ethernet Fail</source>
<translation>线</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1671"/>
<location filename="../mainwindow.cpp" line="1672"/>
<source>Conn Wifi Success</source>
<translation>线</translation>
</message>
@ -1399,11 +1399,13 @@
<translation></translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="37"/>
<location filename="../oneconnform.cpp" line="258"/>
<source>Input Password...</source>
<translation type="obsolete">...</translation>
<translation type="unfinished">...</translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="300"/>
<location filename="../oneconnform.cpp" line="322"/>
<source>Connect to Hidden Wi-Fi Network</source>
<translation> Wi-Fi </translation>
</message>
@ -1416,12 +1418,17 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="310"/>
<location filename="../oneconnform.cpp" line="332"/>
<source>Rate</source>
<translation></translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="528"/>
<location filename="../oneconnform.cpp" line="399"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../oneconnform.cpp" line="555"/>
<source>Conn Wifi Failed</source>
<translation>线</translation>
</message>