Merge pull request #61 from mammonsama666/zjp-debuild

feat(Freq label): Adjust ui style.
This commit is contained in:
chenlelin 2020-12-22 16:36:19 +08:00 committed by GitHub
commit 7eed4204dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View File

@ -140,11 +140,16 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
lbFreq = new QLabel(ui->lbName);
lbFreq->setAlignment(Qt::AlignCenter);
lbFreq->setEnabled(false);
lbFreq->setStyleSheet("QLabel{border: 1px solid rgba(0, 0, 0, 0.5); background: transparent; color: rgba(0, 0, 0, 0.5); border-radius: 4px; font-size: 12px;}");
lbFreq->setFixedHeight(14);
lbFreq->setStyleSheet("QLabel{border: 1px solid rgba(165, 165, 165, 1);"
"background: transparent; color: rgba(0, 0, 0, 0.5);"
"border-radius: 3px; font-size: 10px;"
"color: rgba(165, 165, 165, 1)}");
lbFreq->setContentsMargins(2, 0, 2, 0);
lbFreq->hide();
lbNameText = new QLabel(ui->lbName);
lbNameLyt->setContentsMargins(0, 0, 0, 0);
lbNameLyt->setSpacing(4);
lbNameLyt->setSpacing(8);
lbNameLyt->addWidget(lbNameText);
lbNameLyt->addWidget(lbFreq);
lbNameLyt->addStretch();

View File

@ -413,7 +413,7 @@ void WpaWifiDialog::activateConnection() {
qDebug() << "qDebug: 连接超时12秒超时时间";
});
//设置超时时间
timeout->start(20 * 1000);
timeout->start(30 * 1000);
});
connect(upThread, &UpConnThread::connRes, this, [ = ](int res) {
qDebug()<<"qDebug: Connect result is: "<<res;