Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-22 04:49:42 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/yubikey

Browse source
This commit is contained in:
Janek Bevendorff 2017-02-20 20:24:38 +01:00
commit a27147a75e
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
79 changed files with 8006 additions and 758 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/gui/ChangeMasterKeyWidget.cpp
View file

@ -170,3 +170,8 @@ void ChangeMasterKeyWidget::ykDetected(int slot, bool blocking)
m_ui->challengeResponseCombo->addItem(yk.getName(), QVariant(slot));
m_ui->challengeResponseGroup->setEnabled(true);
}
void ChangeMasterKeyWidget::setCancelEnabled(bool enabled)
{
m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(enabled);
}