diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4ef4293d..95151000 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -42,11 +42,17 @@ MainWindow::MainWindow(QWidget *parent) :
//this->setWindowOpacity(0.95);
this->setAttribute(Qt::WA_TranslucentBackground);//设置窗口背景透明
- this->setWindowFlags(Qt::FramelessWindowHint); //设置无边框窗口
//this->setStyleSheet("QWidget{border-top-left-radius:6px;border-top-right-radius:6px;}");
this->setStyleSheet("QWidget{border:none;border-radius:6px;}");
+ this->setStyleSheet("QToolTip{background:rgba(26,26,26,0.95);"
+ "font: 14px;"
+ "color:rgba(255,255,255,1);"
+ "border-radius: 2px;"
+ "border:1px solid rgba(255,255,255,0.45);"
+ "padding: 0px 5px;"
+ "outline:none;}");
- ui->centralWidget->setStyleSheet("#centralWidget{border:1px solid rgba(255, 255, 255, 0.05);border-radius:6px;background:rgba(19,19,20,0.97);}");
+ ui->centralWidget->setStyleSheet("#centralWidget{border:1px solid rgba(255,255,255,0.05);border-radius:6px;background:rgba(19,19,20,0.97);}");
lname = "-1";
wname = "-1";
@@ -166,25 +172,21 @@ MainWindow::MainWindow(QWidget *parent) :
"QScrollBar::add-line:vertical{border:0px solid;height:0px}"
"QScrollBar::down-arrow:vertical{height:0px;}");
- ui->btnNetList->setStyleSheet("QPushButton{border:none;}");
ui->btnNetList->setFocusPolicy(Qt::NoFocus);
QString txtEthernet(tr("Ethernet"));
- ui->btnNetList->setToolTip(" " + txtEthernet + " ");
+ ui->btnNetList->setToolTip(txtEthernet);
ui->lbNetListBG->setStyleSheet(btnOffQss);
ui->lbNetListImg->setStyleSheet("QLabel{background-image:url(:/res/x/net-list-bg.svg);}");
- ui->btnWifiList->setStyleSheet("QPushButton{border:none;}");
ui->btnWifiList->setFocusPolicy(Qt::NoFocus);
QString txtWifi(tr("Wifi"));
- ui->btnWifiList->setToolTip(" " + txtWifi + " ");
+ ui->btnWifiList->setToolTip(txtWifi);
ui->lbWifiListBG->setStyleSheet(btnOffQss);
ui->lbWifiListImg->setStyleSheet("QLabel{background-image:url(:/res/x/wifi-list-bg.svg);}");
- ui->btnNet->setStyleSheet("QPushButton{border:none;}");
ui->btnNet->hide();
ui->lbBtnNetBG->hide();
- ui->btnWifi->setStyleSheet("QPushButton{border:none;}");
ui->btnWifi->setFocusPolicy(Qt::NoFocus);
ui->lbBtnWifiBall->setStyleSheet("QLabel{min-width: 16px; min-height: 16px;max-width:16px; max-height: 16px;"
"border-radius: 8px; border:1px solid white;background:white;}");
@@ -194,7 +196,7 @@ MainWindow::MainWindow(QWidget *parent) :
"QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}");
ui->btnHotspot->setFocusPolicy(Qt::NoFocus);
QString txtHotSpot(tr("HotSpot"));
- ui->btnHotspot->setToolTip(" " + txtHotSpot + " ");
+ ui->btnHotspot->setToolTip(txtHotSpot);
ui->btnHotspot->hide();
ui->lbHotImg->hide();
ui->lbHotImg->setStyleSheet("QLabel{background-image:url(:/res/x/hot-spot-off.svg);}");
@@ -206,7 +208,7 @@ MainWindow::MainWindow(QWidget *parent) :
"QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}");
ui->btnFlyMode->setFocusPolicy(Qt::NoFocus);
QString txtFlyMode(tr("FlyMode"));
- ui->btnFlyMode->setToolTip(" " + txtFlyMode + " ");
+ ui->btnFlyMode->setToolTip(txtFlyMode);
ui->btnFlyMode->hide();
ui->lbFlyImg->hide();
ui->lbFlyImg->setStyleSheet("QLabel{background-image:url(:/res/x/fly-mode-off.svg);}");
@@ -218,7 +220,7 @@ MainWindow::MainWindow(QWidget *parent) :
"QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}");
ui->btnAdvConf->setFocusPolicy(Qt::NoFocus);
QString txtAdvanced(tr("Advanced"));
- ui->btnAdvConf->setToolTip(" " + txtAdvanced + " ");
+ ui->btnAdvConf->setToolTip(txtAdvanced);
ui->lbBtnConfImg->setStyleSheet("QLabel{background-image:url(:/res/x/setup.png);}");
ui->lbBtnConfBG->hide();
ui->lbBtnConfBG->setStyleSheet(btnOffQss);
diff --git a/oneconnform.cpp b/oneconnform.cpp
index aaf2ff3b..9617e2f0 100644
--- a/oneconnform.cpp
+++ b/oneconnform.cpp
@@ -29,6 +29,13 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
{
ui->setupUi(this);
+ this->setStyleSheet("QToolTip{background:rgba(26,26,26,0.95);"
+ "font: 14px;"
+ "color:rgba(255,255,255,1);"
+ "border-radius: 2px;"
+ "border:1px solid rgba(255,255,255,0.45);"
+ "outline:none;}");
+
ui->btnConnSub->setText(tr("Connect"));//"设置"
ui->btnConn->setText(tr("Connect"));//"连接"
ui->btnConnPWD->setText(tr("Connect"));//"连接"
@@ -111,9 +118,9 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
ui->wbg->setAttribute(Qt::WA_Hover,true);//开启悬停事件
ui->wbg->installEventFilter(this); //安装事件过滤器
- ui->btnConn->setAttribute(Qt::WA_Hover,true);//开启悬停事件
- ui->btnConn->installEventFilter(this); //安装事件过滤器
- ui->lePassword->setAttribute(Qt::WA_Hover,true);//开启悬停事件
+ 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()));
@@ -162,7 +169,6 @@ bool OneConnForm::eventFilter(QObject *obj, QEvent *event)
if(obj == ui->lePassword){
if(event->type() == QEvent::MouseButtonPress){
- qDebug() << "hello world";
this->setLePassword();
}else{
return false;
@@ -186,7 +192,6 @@ void OneConnForm::setAct(bool isAct){
void OneConnForm::setLePassword()
{
- qDebug()<<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
if(ui->lePassword->text() == "Input Password..." || ui->lePassword->text() == "输入密码..."){
ui->lePassword->setText(tr(""));
ui->lePassword->setEchoMode(QLineEdit::Password);
@@ -330,7 +335,8 @@ QString OneConnForm::getName()
void OneConnForm::setRate(QString rate){
QString txt(tr("Rate"));//"速率"
- this->setToolTip(" " + txt + ": " + rate + " ");
+ //this->setToolTip(" " + txt + ": " + rate + " ");
+ //this->setToolTip(txt + ":" + rate);
QString rateStr = rate.split(" ").at(0);
int rateNum = rateStr.toInt();
}
diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm
index d88e2b61..f2a1d1e1 100644
Binary files a/translations/kylin-nm_zh_CN.qm and b/translations/kylin-nm_zh_CN.qm differ
diff --git a/translations/kylin-nm_zh_CN.ts b/translations/kylin-nm_zh_CN.ts
index c0ed309c..e66640a8 100644
--- a/translations/kylin-nm_zh_CN.ts
+++ b/translations/kylin-nm_zh_CN.ts
@@ -1234,7 +1234,7 @@
- 高级设置
+ 网络配置