mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-06 22:17:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move the code to open database files from DatabaseTabWidget to DatabaseOpenDialog.

Browse source
This commit is contained in:
Felix Geyer 2012-04-05 19:03:55 +02:00
parent 9d1838a0fe
commit 8fc68045f6
4 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/gui/DatabaseTabWidget.cpp
View file

@ -86,7 +86,7 @@ void DatabaseTabWidget::openDatabase(const QString& fileName)
void DatabaseTabWidget::openDatabaseDialog()
{
m_curKeyDialog = new DatabaseOpenDialog(m_curDbStruct.fileName, m_window);
m_curKeyDialog = new DatabaseOpenDialog(m_curDbStruct.file, m_curDbStruct.fileName, m_window);
connect(m_curKeyDialog, SIGNAL(accepted()), SLOT(openDatabaseRead()));
connect(m_curKeyDialog, SIGNAL(rejected()), SLOT(openDatabaseCleanup()));
m_curKeyDialog->setModal(true);
@ -95,19 +95,14 @@ void DatabaseTabWidget::openDatabaseDialog()
void DatabaseTabWidget::openDatabaseRead()
{
m_curDbStruct.file->reset();
Database* db = m_reader.readDatabase(m_curDbStruct.file, m_curKeyDialog->key());
Database* db = m_curKeyDialog->database();
delete m_curKeyDialog;
m_curKeyDialog = 0;
if (!db) {
openDatabaseDialog();
}
else {
m_curDbStruct.dbWidget = new DatabaseWidget(db, this);
insertDatabase(db, m_curDbStruct);
m_curDbStruct = DatabaseManagerStruct();
}
m_curDbStruct.dbWidget = new DatabaseWidget(db, this);
insertDatabase(db, m_curDbStruct);
m_curDbStruct = DatabaseManagerStruct();
}
void DatabaseTabWidget::openDatabaseCleanup()