Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-26 16:25:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Clear database open dialog before and after merging a database (#958)

Browse source
This commit is contained in:
Jonathan White 2017-09-23 11:43:29 -04:00 • committed by louib
parent daef0a358c
commit df3051038e
5 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/gui/DatabaseOpenWidget.cpp
View file

@ -119,6 +119,18 @@ void DatabaseOpenWidget::load(const QString& filename)
m_ui->editPassword->setFocus(); m_ui->editPassword->setFocus();
} }
void DatabaseOpenWidget::clearForms()
{
m_ui->editPassword->clear();
m_ui->comboKeyFile->clear();
m_ui->checkPassword->setChecked(false);
m_ui->checkKeyFile->setChecked(false);
m_ui->checkChallengeResponse->setChecked(false);
m_ui->buttonTogglePassword->setChecked(false);
m_db = nullptr;
}
Database* DatabaseOpenWidget::database() Database* DatabaseOpenWidget::database()
{ {
return m_db; return m_db;

1
src/gui/DatabaseOpenWidget.h
View file

@ -39,6 +39,7 @@ public:
explicit DatabaseOpenWidget(QWidget* parent = nullptr); explicit DatabaseOpenWidget(QWidget* parent = nullptr);
~DatabaseOpenWidget(); ~DatabaseOpenWidget();
void load(const QString& filename); void load(const QString& filename);
void clearForms();
void enterKey(const QString& pw, const QString& keyFile); void enterKey(const QString& pw, const QString& keyFile);
Database* database(); Database* database();

2
src/gui/DatabaseWidget.cpp
View file

@ -813,6 +813,7 @@ void DatabaseWidget::mergeDatabase(bool accepted)
m_db->merge(srcDb); m_db->merge(srcDb);
} }
m_databaseOpenMergeWidget->clearForms();
setCurrentWidget(m_mainWidget); setCurrentWidget(m_mainWidget);
emit databaseMerged(m_db); emit databaseMerged(m_db);
} }
@ -918,6 +919,7 @@ void DatabaseWidget::switchToImportCsv(const QString& fileName)
void DatabaseWidget::switchToOpenMergeDatabase(const QString& fileName) void DatabaseWidget::switchToOpenMergeDatabase(const QString& fileName)
{ {
m_databaseOpenMergeWidget->clearForms();
m_databaseOpenMergeWidget->load(fileName); m_databaseOpenMergeWidget->load(fileName);
setCurrentWidget(m_databaseOpenMergeWidget); setCurrentWidget(m_databaseOpenMergeWidget);
} }

11
src/gui/UnlockDatabaseWidget.cpp
View file

@ -26,14 +26,3 @@ UnlockDatabaseWidget::UnlockDatabaseWidget(QWidget* parent)
{ {
m_ui->labelHeadline->setText(tr("Unlock database")); m_ui->labelHeadline->setText(tr("Unlock database"));
} }
void UnlockDatabaseWidget::clearForms()
{
m_ui->editPassword->clear();
m_ui->comboKeyFile->clear();
m_ui->checkPassword->setChecked(false);
m_ui->checkKeyFile->setChecked(false);
m_ui->checkChallengeResponse->setChecked(false);
m_ui->buttonTogglePassword->setChecked(false);
m_db = nullptr;
}

1
src/gui/UnlockDatabaseWidget.h
View file

@ -26,7 +26,6 @@ class UnlockDatabaseWidget : public DatabaseOpenWidget
public: public:
explicit UnlockDatabaseWidget(QWidget* parent = nullptr); explicit UnlockDatabaseWidget(QWidget* parent = nullptr);
void clearForms();
}; };
#endif // KEEPASSX_UNLOCKDATABASEWIDGET_H #endif // KEEPASSX_UNLOCKDATABASEWIDGET_H