Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-01-07 11:35:44 -05:00
Code Issues Projects Releases Packages Wiki Activity

Disable merge when database is locked

Browse source
This commit is contained in:
Jonathan White 2018-05-18 17:06:28 -04:00
parent 0a155d89a3
commit 2eb3159f8a
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/gui/DatabaseTabWidget.cpp
View file

@ -198,11 +198,14 @@ void DatabaseTabWidget::importCsv()
void DatabaseTabWidget::mergeDatabase()
{
QString filter = QString("%1 (*.kdbx);;%2 (*)").arg(tr("KeePass 2 Database"), tr("All files"));
const QString fileName = fileDialog()->getOpenFileName(this, tr("Merge database"), QString(),
filter);
if (!fileName.isEmpty()) {
mergeDatabase(fileName);
auto dbWidget = currentDatabaseWidget();
if (dbWidget && dbWidget->currentMode() != DatabaseWidget::LockedMode) {
QString filter = QString("%1 (*.kdbx);;%2 (*)").arg(tr("KeePass 2 Database"), tr("All files"));
const QString fileName = fileDialog()->getOpenFileName(this, tr("Merge database"), QString(),
filter);
if (!fileName.isEmpty()) {
mergeDatabase(fileName);
}
}
}

1
src/gui/MainWindow.cpp
View file

@ -647,7 +647,6 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
m_ui->actionDatabaseOpen->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->actionDatabaseMerge->setEnabled(inDatabaseTabWidget);
m_ui->actionRepairDatabase->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases());