Merge branch 'master' into develop

This commit is contained in:
Janek Bevendorff 2021-01-12 18:24:59 +01:00
commit 86278311d2
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
47 changed files with 8492 additions and 286 deletions

View file

@ -165,6 +165,7 @@ void DatabaseOpenWidget::clearForms()
m_ui->editPassword->setText("");
m_ui->editPassword->setShowPassword(false);
m_ui->keyFileLineEdit->clear();
m_ui->keyFileLineEdit->setShowPassword(false);
m_ui->checkTouchID->setChecked(false);
m_ui->challengeResponseCombo->clear();
m_db.reset();
@ -380,6 +381,7 @@ void DatabaseOpenWidget::browseKeyFile()
void DatabaseOpenWidget::clearKeyFileText()
{
m_ui->keyFileLineEdit->clear();
m_ui->keyFileLineEdit->setShowPassword(false);
}
void DatabaseOpenWidget::pollHardwareKey()