Merge branch 'develop' into feature/yubikey

This commit is contained in:
Janek Bevendorff 2017-03-01 23:37:52 +01:00
commit 7eb7dbe0be
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
11 changed files with 69 additions and 40 deletions

View file

@ -166,7 +166,7 @@ void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw,
msgBox.setIcon(QMessageBox::Question);
msgBox.addButton(QMessageBox::Yes);
msgBox.addButton(QMessageBox::No);
auto readOnlyButton = msgBox.addButton(tr("Open read-only"), QMessageBox::AcceptRole);
auto readOnlyButton = msgBox.addButton(tr("Open read-only"), QMessageBox::NoRole);
msgBox.setDefaultButton(readOnlyButton);
msgBox.setEscapeButton(QMessageBox::No);
auto result = msgBox.exec();