openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ukui/kylin-nm

This commit is contained in:
chenlelin 2021-02-20 19:58:32 +08:00
parent cccbac8ad1 1936417ccc
commit f0f5f42c82
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/oneconnform.cpp
View File

@ -134,7 +134,8 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
ui->btnInfo->installEventFilter(this); ui->btnInfo->installEventFilter(this);
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);//将字母区回车键与连接按钮绑定在一起
ui->btnConnSub->setShortcut(Qt::Key_Return);//点击连接按钮触发回车键
this->waitTimer = new QTimer(this); this->waitTimer = new QTimer(this);
connect(waitTimer, SIGNAL(timeout()), this, SLOT(waitAnimStep())); connect(waitTimer, SIGNAL(timeout()), this, SLOT(waitAnimStep()));
@ -190,7 +191,7 @@ bool OneConnForm::eventFilter(QObject *obj, QEvent *event)
} else if (obj == this) { } else if (obj == this) {
if(event->type() == QEvent::HoverEnter) { if(event->type() == QEvent::HoverEnter) {
if (!this->isTopItem) { if (!this->isTopItem) {
if (!this->isSelected) { if (!this->isSelected && mw->currSelNetName.isEmpty()) {
ui->btnConn->show(); ui->btnConn->show();
ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(156,156,156,0.1);}"); ui->wbg->setStyleSheet("#wbg{border-radius:4px;background-color:rgba(156,156,156,0.1);}");
ui->wbg->show(); ui->wbg->show();

5
src/onelancform.cpp
View File

@ -95,6 +95,9 @@ OneLancForm::OneLancForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
connect(mw, SIGNAL(waitLanStop()), this, SLOT(stopWaiting())); connect(mw, SIGNAL(waitLanStop()), this, SLOT(stopWaiting()));
ui->btnConn->setShortcut(Qt::Key_Return);//将字母区回车键与连接按钮绑定在一起
ui->btnConnSub->setShortcut(Qt::Key_Return);//点击连接按钮触发回车键
srand((unsigned)time(NULL)); srand((unsigned)time(NULL));
} }
@ -128,7 +131,7 @@ bool OneLancForm::eventFilter(QObject *obj, QEvent *event)
} else if (obj == this) { } else if (obj == this) {
if (event->type() == QEvent::HoverEnter) { if (event->type() == QEvent::HoverEnter) {
if (!this->isTopItem) { if (!this->isTopItem) {
if (!this->isSelected) { if (!this->isSelected && mw->currSelNetName.isEmpty()) {
ui->btnConn->show(); ui->btnConn->show();
ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(156,156,156,0.1);}"); ui->wbg_2->setStyleSheet("#wbg_2{border-radius:4px;background-color:rgba(156,156,156,0.1);}");
ui->wbg_2->show(); ui->wbg_2->show();