mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-12-28 08:49:42 -05:00
Merge branch 'pr-95'
https://github.com/keepassx/keepassx/pull/95 Closes #283
This commit is contained in:
commit
5f1b286630
@ -225,9 +225,9 @@ bool DatabaseTabWidget::closeDatabase(Database* db)
|
|||||||
QMessageBox::StandardButton result =
|
QMessageBox::StandardButton result =
|
||||||
MessageBox::question(
|
MessageBox::question(
|
||||||
this, tr("Close?"),
|
this, tr("Close?"),
|
||||||
tr("\"%1\" is in edit mode.\nClose anyway?").arg(dbName),
|
tr("\"%1\" is in edit mode.\nDiscard changes and close anyway?").arg(dbName),
|
||||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
|
QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel);
|
||||||
if (result == QMessageBox::No) {
|
if (result == QMessageBox::Cancel) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -240,7 +240,7 @@ bool DatabaseTabWidget::closeDatabase(Database* db)
|
|||||||
MessageBox::question(
|
MessageBox::question(
|
||||||
this, tr("Save changes?"),
|
this, tr("Save changes?"),
|
||||||
tr("\"%1\" was modified.\nSave changes?").arg(dbName),
|
tr("\"%1\" was modified.\nSave changes?").arg(dbName),
|
||||||
QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Yes);
|
QMessageBox::Yes | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Yes);
|
||||||
if (result == QMessageBox::Yes) {
|
if (result == QMessageBox::Yes) {
|
||||||
saveDatabase(db);
|
saveDatabase(db);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user