mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.1.2' into develop

Browse source
This commit is contained in:
Janek Bevendorff 2017-02-17 04:03:12 +01:00
commit e0e6f2b8e9
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
70 changed files with 7701 additions and 723 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/gui/ChangeMasterKeyWidget.cpp
View file

@ -139,3 +139,8 @@ void ChangeMasterKeyWidget::reject()
{
Q_EMIT editFinished(false);
}
void ChangeMasterKeyWidget::setCancelEnabled(bool enabled)
{
m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(enabled);
}