jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
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() void DatabaseTabWidget::mergeDatabase()
{ {
QString filter = QString("%1 (*.kdbx);;%2 (*)").arg(tr("KeePass 2 Database"), tr("All files")); auto dbWidget = currentDatabaseWidget();
const QString fileName = fileDialog()->getOpenFileName(this, tr("Merge database"), QString(), if (dbWidget && dbWidget->currentMode() != DatabaseWidget::LockedMode) {
filter); QString filter = QString("%1 (*.kdbx);;%2 (*)").arg(tr("KeePass 2 Database"), tr("All files"));
if (!fileName.isEmpty()) { const QString fileName = fileDialog()->getOpenFileName(this, tr("Merge database"), QString(),
mergeDatabase(fileName); 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->actionDatabaseOpen->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->actionDatabaseMerge->setEnabled(inDatabaseTabWidget);
m_ui->actionRepairDatabase->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->actionRepairDatabase->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases()); m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases());