Merge branch 'release/2.1.2' into develop

2017-02-17 04:03:12 +01:00
parent 79bd1f8121 ebdb10e7f9
commit e0e6f2b8e9
70 changed files with 7701 additions and 723 deletions
--- a/src/gui/ChangeMasterKeyWidget.cpp
+++ b/src/gui/ChangeMasterKeyWidget.cpp
@@ -139,3 +139,8 @@ void ChangeMasterKeyWidget::reject()
 {
    Q_EMIT editFinished(false);
 }
+
+void ChangeMasterKeyWidget::setCancelEnabled(bool enabled)
+{
+    m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(enabled);
+}