mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-04-04 21:17:43 +03:00
Refactor Database and Database widgets (#2491)
The Database, DatabaseWidget, and DatabaseTabWidget classes share many responsibilities in inconsistent ways resulting in impenetrable and unmaintainable code and a diverse set of bugs and architecture restrictions. This patch reworks the architecture, responsibilities of, and dependencies between these classes. The core changes are: * Move loading and saving logic from widgets into the Database class * Get rid of the DatabaseManagerStruct and move all the information contained in it into the Database * Let database objects keep track of modifications and dirty/clean state instead of handing this to external widgets * Move GUI interactions for loading and saving from the DatabaseTabWidget into the DatabaseWidget (resolves #2494 as a side-effect) * Heavily clean up DatabaseTabWidget and degrade it to a slightly glorified QTabWidget * Use QSharedPointers for all Database objects * Remove the modifiedImmediate signal and replace it with a markAsModified() method * Implement proper tabName() method instead of reading back titles from GUI widgets (resolves #1389 and its duplicates #2146 #855) * Fix unwanted AES-KDF downgrade if database uses Argon2 and has CustomData * Improve code This patch is also the first major step towards solving issues #476 and #2322.
This commit is contained in:
Janek Bevendorff
GitHub
parent
917c4cc18b
commit
d612cad09a
115 changed files with 2116 additions and 2165 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||
* Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
|
||||
* Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -32,6 +32,7 @@
|
|||
#include <QSplitter>
|
||||
|
||||
#include "autotype/AutoType.h"
|
||||
#include "core/Database.h"
|
||||
#include "core/Config.h"
|
||||
#include "core/EntrySearcher.h"
|
||||
#include "core/FilePath.h"
|
||||
|
|
@ -40,6 +41,7 @@
|
|||
#include "core/Metadata.h"
|
||||
#include "core/Tools.h"
|
||||
#include "format/KeePass2Reader.h"
|
||||
#include "gui/FileDialog.h"
|
||||
#include "gui/Clipboard.h"
|
||||
#include "gui/CloneDialog.h"
|
||||
#include "gui/DatabaseOpenWidget.h"
|
||||
|
|
@ -68,131 +70,127 @@
|
|||
#include "sshagent/SSHAgent.h"
|
||||
#endif
|
||||
|
||||
DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
|
||||
DatabaseWidget::DatabaseWidget(QSharedPointer<Database> db, QWidget* parent)
|
||||
: QStackedWidget(parent)
|
||||
, m_db(db)
|
||||
, m_newGroup(nullptr)
|
||||
, m_newEntry(nullptr)
|
||||
, m_newParent(nullptr)
|
||||
{
|
||||
m_mainWidget = new QWidget(this);
|
||||
, m_db(std::move(db))
|
||||
|
||||
m_messageWidget = new MessageWidget(this);
|
||||
, m_mainWidget(new QWidget(this))
|
||||
, m_mainSplitter(new QSplitter(m_mainWidget))
|
||||
, m_messageWidget(new MessageWidget(this))
|
||||
, m_previewView(new EntryPreviewWidget(this))
|
||||
, m_previewSplitter(new QSplitter(m_mainWidget))
|
||||
, m_searchingLabel(new QLabel(this))
|
||||
, m_csvImportWizard(new CsvImportWizard(this))
|
||||
, m_editEntryWidget(new EditEntryWidget(this))
|
||||
, m_editGroupWidget(new EditGroupWidget(this))
|
||||
, m_historyEditEntryWidget(new EditEntryWidget(this))
|
||||
, m_databaseSettingDialog(new DatabaseSettingsDialog(this))
|
||||
, m_databaseOpenWidget(new DatabaseOpenWidget(this))
|
||||
, m_databaseOpenMergeWidget(new DatabaseOpenWidget(this))
|
||||
, m_keepass1OpenWidget(new KeePass1OpenWidget(this))
|
||||
, m_unlockDatabaseWidget(new UnlockDatabaseWidget(this))
|
||||
, m_unlockDatabaseDialog(new UnlockDatabaseDialog(this))
|
||||
, m_groupView(new GroupView(m_db.data(), m_mainSplitter))
|
||||
, m_entryView(nullptr)
|
||||
|
||||
, m_newGroup()
|
||||
, m_newEntry()
|
||||
, m_newParent()
|
||||
{
|
||||
m_messageWidget->setHidden(true);
|
||||
|
||||
auto* mainLayout = new QVBoxLayout();
|
||||
QLayout* layout = new QHBoxLayout();
|
||||
mainLayout->addWidget(m_messageWidget);
|
||||
mainLayout->addLayout(layout);
|
||||
m_mainSplitter = new QSplitter(m_mainWidget);
|
||||
auto* hbox = new QHBoxLayout();
|
||||
mainLayout->addLayout(hbox);
|
||||
hbox->addWidget(m_mainSplitter);
|
||||
m_mainWidget->setLayout(mainLayout);
|
||||
|
||||
auto* rightHandSideWidget = new QWidget(m_mainSplitter);
|
||||
auto* vbox = new QVBoxLayout();
|
||||
vbox->setMargin(0);
|
||||
vbox->addWidget(m_searchingLabel);
|
||||
vbox->addWidget(m_previewSplitter);
|
||||
rightHandSideWidget->setLayout(vbox);
|
||||
m_entryView = new EntryView(rightHandSideWidget);
|
||||
|
||||
m_mainSplitter->setChildrenCollapsible(false);
|
||||
m_previewSplitter = new QSplitter(m_mainWidget);
|
||||
m_mainSplitter->addWidget(m_groupView);
|
||||
m_mainSplitter->addWidget(rightHandSideWidget);
|
||||
m_mainSplitter->setStretchFactor(0, 30);
|
||||
m_mainSplitter->setStretchFactor(1, 70);
|
||||
|
||||
m_previewSplitter->setOrientation(Qt::Vertical);
|
||||
m_previewSplitter->setChildrenCollapsible(true);
|
||||
|
||||
QWidget* rightHandSideWidget = new QWidget(m_mainSplitter);
|
||||
|
||||
m_groupView = new GroupView(db, m_mainSplitter);
|
||||
m_groupView->setObjectName("groupView");
|
||||
m_groupView->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
connect(m_groupView, SIGNAL(customContextMenuRequested(QPoint)), SLOT(emitGroupContextMenuRequested(QPoint)));
|
||||
|
||||
m_entryView = new EntryView(rightHandSideWidget);
|
||||
m_entryView->setObjectName("entryView");
|
||||
m_entryView->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
m_entryView->displayGroup(db->rootGroup());
|
||||
m_entryView->displayGroup(m_db->rootGroup());
|
||||
connect(m_entryView, SIGNAL(customContextMenuRequested(QPoint)), SLOT(emitEntryContextMenuRequested(QPoint)));
|
||||
|
||||
// Add a notification for when we are searching
|
||||
m_searchingLabel = new QLabel();
|
||||
m_searchingLabel->setText(tr("Searching..."));
|
||||
m_searchingLabel->setAlignment(Qt::AlignCenter);
|
||||
m_searchingLabel->setStyleSheet("color: rgb(0, 0, 0);"
|
||||
"background-color: rgb(255, 253, 160);"
|
||||
"border: 2px solid rgb(190, 190, 190);"
|
||||
"border-radius: 5px;");
|
||||
"border-radius: 2px;");
|
||||
m_searchingLabel->setVisible(false);
|
||||
|
||||
m_previewView = new EntryPreviewWidget(this);
|
||||
m_previewView->hide();
|
||||
connect(this, SIGNAL(pressedGroup(Group*)), m_previewView, SLOT(setGroup(Group*)));
|
||||
connect(this, SIGNAL(currentModeChanged(DatabaseWidget::Mode)),
|
||||
m_previewView, SLOT(setDatabaseMode(DatabaseWidget::Mode)));
|
||||
connect(m_previewView, SIGNAL(errorOccurred(QString)), this, SLOT(showErrorMessage(QString)));
|
||||
|
||||
auto* vLayout = new QVBoxLayout(rightHandSideWidget);
|
||||
vLayout->setMargin(0);
|
||||
vLayout->addWidget(m_searchingLabel);
|
||||
vLayout->addWidget(m_previewSplitter);
|
||||
|
||||
m_previewSplitter->addWidget(m_entryView);
|
||||
m_previewSplitter->addWidget(m_previewView);
|
||||
|
||||
m_previewSplitter->setStretchFactor(0, 100);
|
||||
m_previewSplitter->setStretchFactor(1, 0);
|
||||
m_previewSplitter->setSizes({1, 1});
|
||||
|
||||
m_searchingLabel->setVisible(false);
|
||||
|
||||
rightHandSideWidget->setLayout(vLayout);
|
||||
|
||||
m_mainSplitter->addWidget(m_groupView);
|
||||
m_mainSplitter->addWidget(rightHandSideWidget);
|
||||
|
||||
m_mainSplitter->setStretchFactor(0, 30);
|
||||
m_mainSplitter->setStretchFactor(1, 70);
|
||||
|
||||
layout->addWidget(m_mainSplitter);
|
||||
m_mainWidget->setLayout(mainLayout);
|
||||
|
||||
m_editEntryWidget = new EditEntryWidget();
|
||||
m_editEntryWidget->setObjectName("editEntryWidget");
|
||||
m_historyEditEntryWidget = new EditEntryWidget();
|
||||
m_editGroupWidget = new EditGroupWidget();
|
||||
m_editGroupWidget->setObjectName("editGroupWidget");
|
||||
m_csvImportWizard = new CsvImportWizard();
|
||||
m_csvImportWizard->setObjectName("csvImportWizard");
|
||||
m_databaseSettingDialog = new DatabaseSettingsDialog();
|
||||
m_databaseSettingDialog->setObjectName("databaseSettingsDialog");
|
||||
m_databaseOpenWidget = new DatabaseOpenWidget();
|
||||
m_databaseOpenWidget->setObjectName("databaseOpenWidget");
|
||||
m_databaseOpenMergeWidget = new DatabaseOpenWidget();
|
||||
m_databaseOpenMergeWidget->setObjectName("databaseOpenMergeWidget");
|
||||
m_keepass1OpenWidget = new KeePass1OpenWidget();
|
||||
m_keepass1OpenWidget->setObjectName("keepass1OpenWidget");
|
||||
m_unlockDatabaseWidget = new UnlockDatabaseWidget();
|
||||
m_unlockDatabaseWidget->setObjectName("unlockDatabaseWidget");
|
||||
m_unlockDatabaseDialog = new UnlockDatabaseDialog();
|
||||
m_unlockDatabaseDialog->setObjectName("unlockDatabaseDialog");
|
||||
addWidget(m_mainWidget);
|
||||
addWidget(m_editEntryWidget);
|
||||
addWidget(m_editGroupWidget);
|
||||
addWidget(m_databaseSettingDialog);
|
||||
addWidget(m_historyEditEntryWidget);
|
||||
addWidget(m_databaseOpenWidget);
|
||||
addWidget(m_csvImportWizard);
|
||||
addWidget(m_databaseOpenMergeWidget);
|
||||
addWidget(m_keepass1OpenWidget);
|
||||
addWidget(m_unlockDatabaseWidget);
|
||||
|
||||
addChildWidget(m_mainWidget);
|
||||
addChildWidget(m_editEntryWidget);
|
||||
addChildWidget(m_editGroupWidget);
|
||||
addChildWidget(m_databaseSettingDialog);
|
||||
addChildWidget(m_historyEditEntryWidget);
|
||||
addChildWidget(m_databaseOpenWidget);
|
||||
addChildWidget(m_csvImportWizard);
|
||||
addChildWidget(m_databaseOpenMergeWidget);
|
||||
addChildWidget(m_keepass1OpenWidget);
|
||||
addChildWidget(m_unlockDatabaseWidget);
|
||||
|
||||
connect(m_mainSplitter, SIGNAL(splitterMoved(int,int)), SIGNAL(mainSplitterSizesChanged()));
|
||||
connect(m_previewSplitter, SIGNAL(splitterMoved(int,int)), SIGNAL(previewSplitterSizesChanged()));
|
||||
connect(this, SIGNAL(pressedEntry(Entry*)), m_previewView, SLOT(setEntry(Entry*)));
|
||||
connect(this, SIGNAL(pressedGroup(Group*)), m_previewView, SLOT(setGroup(Group*)));
|
||||
connect(this, SIGNAL(currentModeChanged(DatabaseWidget::Mode)), m_previewView, SLOT(setDatabaseMode(DatabaseWidget::Mode)));
|
||||
connect(m_previewView, SIGNAL(errorOccurred(QString)), this, SLOT(showErrorMessage(QString)));
|
||||
connect(m_entryView, SIGNAL(viewStateChanged()), SIGNAL(entryViewStateChanged()));
|
||||
connect(m_groupView, SIGNAL(groupChanged(Group*)), this, SLOT(onGroupChanged(Group*)));
|
||||
connect(m_groupView, SIGNAL(groupChanged(Group*)), SIGNAL(groupChanged()));
|
||||
connect(m_entryView,
|
||||
SIGNAL(entryActivated(Entry*,EntryModel::ModelColumn)),
|
||||
SLOT(entryActivationSignalReceived(Entry*,EntryModel::ModelColumn)));
|
||||
connect(m_entryView, SIGNAL(entrySelectionChanged()), SLOT(emitEntrySelectionChanged()));
|
||||
connect(m_entryView, SIGNAL(entryActivated(Entry*,EntryModel::ModelColumn)),
|
||||
SLOT(entryActivationSignalReceived(Entry*,EntryModel::ModelColumn)));
|
||||
connect(m_entryView, SIGNAL(entrySelectionChanged()), SIGNAL(entrySelectionChanged()));
|
||||
connect(m_editEntryWidget, SIGNAL(editFinished(bool)), SLOT(switchToView(bool)));
|
||||
connect(m_editEntryWidget, SIGNAL(historyEntryActivated(Entry*)), SLOT(switchToHistoryView(Entry*)));
|
||||
connect(m_historyEditEntryWidget, SIGNAL(editFinished(bool)), SLOT(switchBackToEntryEdit()));
|
||||
connect(m_editGroupWidget, SIGNAL(editFinished(bool)), SLOT(switchToView(bool)));
|
||||
connect(m_databaseSettingDialog, SIGNAL(editFinished(bool)), SLOT(switchToView(bool)));
|
||||
connect(m_databaseOpenWidget, SIGNAL(editFinished(bool)), SLOT(openDatabase(bool)));
|
||||
connect(m_databaseOpenMergeWidget, SIGNAL(editFinished(bool)), SLOT(mergeDatabase(bool)));
|
||||
connect(m_keepass1OpenWidget, SIGNAL(editFinished(bool)), SLOT(openDatabase(bool)));
|
||||
connect(m_databaseOpenWidget, SIGNAL(dialogFinished(bool)), SLOT(loadDatabase(bool)));
|
||||
connect(m_databaseOpenMergeWidget, SIGNAL(dialogFinished(bool)), SLOT(mergeDatabase(bool)));
|
||||
connect(m_keepass1OpenWidget, SIGNAL(dialogFinished(bool)), SLOT(loadDatabase(bool)));
|
||||
connect(m_csvImportWizard, SIGNAL(importFinished(bool)), SLOT(csvImportFinished(bool)));
|
||||
connect(m_unlockDatabaseWidget, SIGNAL(editFinished(bool)), SLOT(unlockDatabase(bool)));
|
||||
connect(m_unlockDatabaseWidget, SIGNAL(dialogFinished(bool)), SLOT(unlockDatabase(bool)));
|
||||
connect(m_unlockDatabaseDialog, SIGNAL(unlockDone(bool)), SLOT(unlockDatabase(bool)));
|
||||
connect(&m_fileWatcher, SIGNAL(fileChanged(QString)), this, SLOT(onWatchedFileChanged()));
|
||||
connect(&m_fileWatchTimer, SIGNAL(timeout()), this, SLOT(reloadDatabaseFile()));
|
||||
|
|
@ -203,7 +201,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
|
|||
connect(m_groupView, SIGNAL(groupChanged(Group*)), SLOT(emitPressedGroup(Group*)));
|
||||
connect(m_editEntryWidget, SIGNAL(editFinished(bool)), SLOT(emitEntrySelectionChanged()));
|
||||
|
||||
m_databaseModified = false;
|
||||
connectDatabaseSignals();
|
||||
|
||||
m_fileWatchTimer.setSingleShot(true);
|
||||
m_fileWatchUnblockTimer.setSingleShot(true);
|
||||
|
|
@ -225,29 +223,44 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
|
|||
setCurrentWidget(m_mainWidget);
|
||||
}
|
||||
|
||||
DatabaseWidget::DatabaseWidget(const QString& filePath, QWidget* parent)
|
||||
: DatabaseWidget(QSharedPointer<Database>::create(filePath), parent)
|
||||
{
|
||||
}
|
||||
|
||||
DatabaseWidget::~DatabaseWidget()
|
||||
{
|
||||
delete m_EntrySearcher;
|
||||
}
|
||||
|
||||
QSharedPointer<Database> DatabaseWidget::database() const
|
||||
{
|
||||
return m_db;
|
||||
}
|
||||
|
||||
DatabaseWidget::Mode DatabaseWidget::currentMode() const
|
||||
{
|
||||
if (currentWidget() == nullptr) {
|
||||
return DatabaseWidget::None;
|
||||
return DatabaseWidget::Mode::None;
|
||||
} else if (currentWidget() == m_csvImportWizard) {
|
||||
return DatabaseWidget::ImportMode;
|
||||
return DatabaseWidget::Mode::ImportMode;
|
||||
} else if (currentWidget() == m_mainWidget) {
|
||||
return DatabaseWidget::ViewMode;
|
||||
return DatabaseWidget::Mode::ViewMode;
|
||||
} else if (currentWidget() == m_unlockDatabaseWidget || currentWidget() == m_databaseOpenWidget) {
|
||||
return DatabaseWidget::LockedMode;
|
||||
return DatabaseWidget::Mode::LockedMode;
|
||||
} else {
|
||||
return DatabaseWidget::EditMode;
|
||||
return DatabaseWidget::Mode::EditMode;
|
||||
}
|
||||
}
|
||||
|
||||
bool DatabaseWidget::isInEditMode() const
|
||||
bool DatabaseWidget::isLocked() const
|
||||
{
|
||||
return currentMode() == DatabaseWidget::EditMode;
|
||||
return currentMode() == Mode::LockedMode;
|
||||
}
|
||||
|
||||
bool DatabaseWidget::isSearchActive() const
|
||||
{
|
||||
return m_entryView->inSearchMode();
|
||||
}
|
||||
|
||||
bool DatabaseWidget::isEditWidgetModified() const
|
||||
|
|
@ -341,11 +354,6 @@ void DatabaseWidget::emitCurrentModeChanged()
|
|||
emit currentModeChanged(currentMode());
|
||||
}
|
||||
|
||||
Database* DatabaseWidget::database()
|
||||
{
|
||||
return m_db;
|
||||
}
|
||||
|
||||
void DatabaseWidget::createEntry()
|
||||
{
|
||||
Q_ASSERT(m_groupView->currentGroup());
|
||||
|
|
@ -355,7 +363,7 @@ void DatabaseWidget::createEntry()
|
|||
|
||||
m_newEntry = new Entry();
|
||||
|
||||
if (isInSearchMode()) {
|
||||
if (isSearchActive()) {
|
||||
m_newEntry->setTitle(getCurrentSearch());
|
||||
endSearch();
|
||||
}
|
||||
|
|
@ -383,13 +391,15 @@ void DatabaseWidget::setIconFromParent()
|
|||
}
|
||||
}
|
||||
|
||||
void DatabaseWidget::replaceDatabase(Database* db)
|
||||
void DatabaseWidget::replaceDatabase(QSharedPointer<Database> db)
|
||||
{
|
||||
Database* oldDb = m_db;
|
||||
m_db = db;
|
||||
// TODO: instead of increasing the ref count temporarily, there should be a clean
|
||||
// break from the old database. Without this crashes occur due to the change
|
||||
// signals triggering dangling pointers.
|
||||
auto oldDb = m_db;
|
||||
m_db = std::move(db);
|
||||
connectDatabaseSignals();
|
||||
m_groupView->changeDatabase(m_db);
|
||||
emit databaseChanged(m_db, m_databaseModified);
|
||||
delete oldDb;
|
||||
}
|
||||
|
||||
void DatabaseWidget::cloneEntry()
|
||||
|
|
@ -400,7 +410,7 @@ void DatabaseWidget::cloneEntry()
|
|||
return;
|
||||
}
|
||||
|
||||
auto cloneDialog = new CloneDialog(this, m_db, currentEntry);
|
||||
auto cloneDialog = new CloneDialog(this, m_db.data(), currentEntry);
|
||||
cloneDialog->show();
|
||||
}
|
||||
|
||||
|
|
@ -660,8 +670,8 @@ void DatabaseWidget::deleteGroup()
|
|||
|
||||
auto* recycleBin = m_db->metadata()->recycleBin();
|
||||
bool inRecycleBin = recycleBin && recycleBin->findGroupByUuid(currentGroup->uuid());
|
||||
bool isRecycleBin = (currentGroup == m_db->metadata()->recycleBin());
|
||||
bool isRecycleBinSubgroup = currentGroup->findGroupByUuid(m_db->metadata()->recycleBin()->uuid());
|
||||
bool isRecycleBin = recycleBin && (currentGroup == recycleBin);
|
||||
bool isRecycleBinSubgroup = recycleBin && currentGroup->findGroupByUuid(recycleBin->uuid());
|
||||
if (inRecycleBin || isRecycleBin || isRecycleBinSubgroup || !m_db->metadata()->recycleBinEnabled()) {
|
||||
QMessageBox::StandardButton result = MessageBox::question(
|
||||
this,
|
||||
|
|
@ -676,40 +686,14 @@ void DatabaseWidget::deleteGroup()
|
|||
}
|
||||
}
|
||||
|
||||
int DatabaseWidget::addWidget(QWidget* w)
|
||||
int DatabaseWidget::addChildWidget(QWidget* w)
|
||||
{
|
||||
w->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
|
||||
|
||||
int index = QStackedWidget::addWidget(w);
|
||||
|
||||
adjustSize();
|
||||
|
||||
return index;
|
||||
}
|
||||
|
||||
void DatabaseWidget::setCurrentIndex(int index)
|
||||
{
|
||||
// use setCurrentWidget() instead
|
||||
// index is not reliable
|
||||
Q_UNUSED(index);
|
||||
Q_ASSERT(false);
|
||||
}
|
||||
|
||||
void DatabaseWidget::setCurrentWidget(QWidget* widget)
|
||||
{
|
||||
if (currentWidget()) {
|
||||
currentWidget()->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
|
||||
}
|
||||
|
||||
QStackedWidget::setCurrentWidget(widget);
|
||||
|
||||
if (currentWidget()) {
|
||||
currentWidget()->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
}
|
||||
|
||||
adjustSize();
|
||||
}
|
||||
|
||||
void DatabaseWidget::csvImportFinished(bool accepted)
|
||||
{
|
||||
if (!accepted) {
|
||||
|
|
@ -788,24 +772,32 @@ void DatabaseWidget::switchToGroupEdit(Group* group, bool create)
|
|||
setCurrentWidget(m_editGroupWidget);
|
||||
}
|
||||
|
||||
void DatabaseWidget::openDatabase(bool accepted)
|
||||
void DatabaseWidget::connectDatabaseSignals()
|
||||
{
|
||||
if (accepted) {
|
||||
replaceDatabase(static_cast<DatabaseOpenWidget*>(sender())->database());
|
||||
setCurrentWidget(m_mainWidget);
|
||||
emit unlockedDatabase();
|
||||
// relayed Database events
|
||||
connect(m_db.data(), SIGNAL(filePathChanged(QString,QString)),
|
||||
this, SIGNAL(databaseFilePathChanged(QString,QString)));
|
||||
connect(m_db.data(), SIGNAL(databaseModified()), this, SIGNAL(databaseModified()));
|
||||
connect(m_db.data(), SIGNAL(databaseSaved()), this, SIGNAL(databaseSaved()));
|
||||
}
|
||||
|
||||
// We won't need those anymore and KeePass1OpenWidget closes
|
||||
// the file in its dtor.
|
||||
delete m_databaseOpenWidget;
|
||||
m_databaseOpenWidget = nullptr;
|
||||
delete m_keepass1OpenWidget;
|
||||
m_keepass1OpenWidget = nullptr;
|
||||
m_fileWatcher.addPath(m_filePath);
|
||||
void DatabaseWidget::loadDatabase(bool accepted)
|
||||
{
|
||||
auto* openWidget = qobject_cast<DatabaseOpenWidget*>(sender());
|
||||
Q_ASSERT(openWidget);
|
||||
if (!openWidget) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (accepted) {
|
||||
replaceDatabase(openWidget->database());
|
||||
setCurrentWidget(m_mainWidget);
|
||||
m_fileWatcher.addPath(m_db->filePath());
|
||||
emit databaseUnlocked();
|
||||
} else {
|
||||
m_fileWatcher.removePath(m_filePath);
|
||||
m_fileWatcher.removePath(m_db->filePath());
|
||||
if (m_databaseOpenWidget->database()) {
|
||||
delete m_databaseOpenWidget->database();
|
||||
m_databaseOpenWidget->database().reset();
|
||||
}
|
||||
emit closeRequest();
|
||||
}
|
||||
|
|
@ -815,18 +807,18 @@ void DatabaseWidget::mergeDatabase(bool accepted)
|
|||
{
|
||||
if (accepted) {
|
||||
if (!m_db) {
|
||||
m_messageWidget->showMessage(tr("No current database."), MessageWidget::Error);
|
||||
showMessage(tr("No current database."), MessageWidget::Error);
|
||||
return;
|
||||
}
|
||||
|
||||
Database* srcDb = static_cast<DatabaseOpenWidget*>(sender())->database();
|
||||
auto srcDb = qobject_cast<DatabaseOpenWidget*>(sender())->database();
|
||||
|
||||
if (!srcDb) {
|
||||
m_messageWidget->showMessage(tr("No source database, nothing to do."), MessageWidget::Error);
|
||||
showMessage(tr("No source database, nothing to do."), MessageWidget::Error);
|
||||
return;
|
||||
}
|
||||
|
||||
Merger merger(srcDb, m_db);
|
||||
Merger merger(srcDb.data(), m_db.data());
|
||||
merger.merge();
|
||||
}
|
||||
|
||||
|
|
@ -842,7 +834,7 @@ void DatabaseWidget::unlockDatabase(bool accepted)
|
|||
return;
|
||||
}
|
||||
|
||||
Database* db = nullptr;
|
||||
auto db = QSharedPointer<Database>::create();
|
||||
if (sender() == m_unlockDatabaseDialog) {
|
||||
db = m_unlockDatabaseDialog->database();
|
||||
} else if (sender() == m_unlockDatabaseWidget) {
|
||||
|
|
@ -850,6 +842,9 @@ void DatabaseWidget::unlockDatabase(bool accepted)
|
|||
}
|
||||
|
||||
replaceDatabase(db);
|
||||
if (db->isReadOnly()) {
|
||||
showMessage(tr("File opened in read only mode."), MessageWidget::Warning, false, -1);
|
||||
}
|
||||
|
||||
restoreGroupEntryFocus(m_groupBeforeLock, m_entryBeforeLock);
|
||||
m_groupBeforeLock = QUuid();
|
||||
|
|
@ -857,10 +852,10 @@ void DatabaseWidget::unlockDatabase(bool accepted)
|
|||
|
||||
setCurrentWidget(m_mainWidget);
|
||||
m_unlockDatabaseWidget->clearForms();
|
||||
emit unlockedDatabase();
|
||||
emit databaseUnlocked();
|
||||
|
||||
if (sender() == m_unlockDatabaseDialog) {
|
||||
QList<Database*> dbList;
|
||||
QList<QSharedPointer<Database>> dbList;
|
||||
dbList.append(m_db);
|
||||
autoType()->performGlobalAutoType(dbList);
|
||||
}
|
||||
|
|
@ -946,6 +941,11 @@ void DatabaseWidget::switchToDatabaseSettings()
|
|||
setCurrentWidget(m_databaseSettingDialog);
|
||||
}
|
||||
|
||||
void DatabaseWidget::switchToOpenDatabase()
|
||||
{
|
||||
switchToOpenDatabase(m_db->filePath());
|
||||
}
|
||||
|
||||
void DatabaseWidget::switchToOpenDatabase(const QString& filePath)
|
||||
{
|
||||
updateFilePath(filePath);
|
||||
|
|
@ -957,22 +957,10 @@ void DatabaseWidget::switchToOpenDatabase(const QString& filePath)
|
|||
setCurrentWidget(m_unlockDatabaseWidget);
|
||||
}
|
||||
}
|
||||
|
||||
void DatabaseWidget::switchToOpenDatabase(const QString& filePath, const QString& password, const QString& keyFile)
|
||||
{
|
||||
updateFilePath(filePath);
|
||||
switchToOpenDatabase(filePath);
|
||||
if (m_databaseOpenWidget) {
|
||||
m_databaseOpenWidget->enterKey(password, keyFile);
|
||||
} else if (m_unlockDatabaseWidget) {
|
||||
m_unlockDatabaseWidget->enterKey(password, keyFile);
|
||||
}
|
||||
}
|
||||
|
||||
void DatabaseWidget::switchToCsvImport(const QString& filePath)
|
||||
{
|
||||
setCurrentWidget(m_csvImportWizard);
|
||||
m_csvImportWizard->load(filePath, m_db);
|
||||
m_csvImportWizard->load(filePath, m_db.data());
|
||||
}
|
||||
|
||||
void DatabaseWidget::switchToOpenMergeDatabase(const QString& filePath)
|
||||
|
|
@ -995,19 +983,9 @@ void DatabaseWidget::switchToImportKeepass1(const QString& filePath)
|
|||
setCurrentWidget(m_keepass1OpenWidget);
|
||||
}
|
||||
|
||||
void DatabaseWidget::databaseModified()
|
||||
{
|
||||
m_databaseModified = true;
|
||||
}
|
||||
|
||||
void DatabaseWidget::databaseSaved()
|
||||
{
|
||||
m_databaseModified = false;
|
||||
}
|
||||
|
||||
void DatabaseWidget::refreshSearch()
|
||||
{
|
||||
if (isInSearchMode()) {
|
||||
if (isSearchActive()) {
|
||||
search(m_lastSearchText);
|
||||
}
|
||||
}
|
||||
|
|
@ -1054,10 +1032,10 @@ void DatabaseWidget::setSearchLimitGroup(bool state)
|
|||
|
||||
void DatabaseWidget::onGroupChanged(Group* group)
|
||||
{
|
||||
if (isInSearchMode() && m_searchLimitGroup) {
|
||||
// Perform new search if we are limiting search to the current group
|
||||
// Intercept group changes if in search mode
|
||||
if (isSearchActive()) {
|
||||
search(m_lastSearchText);
|
||||
} else if (isInSearchMode()) {
|
||||
} else if (isSearchActive()) {
|
||||
// Otherwise cancel search
|
||||
emit clearSearch();
|
||||
} else {
|
||||
|
|
@ -1072,7 +1050,7 @@ QString DatabaseWidget::getCurrentSearch()
|
|||
|
||||
void DatabaseWidget::endSearch()
|
||||
{
|
||||
if (isInSearchMode()) {
|
||||
if (isSearchActive()) {
|
||||
emit listModeAboutToActivate();
|
||||
|
||||
// Show the normal entry view of the current group
|
||||
|
|
@ -1117,30 +1095,74 @@ void DatabaseWidget::emitPressedGroup(Group* currentGroup)
|
|||
emit pressedGroup(currentGroup);
|
||||
}
|
||||
|
||||
bool DatabaseWidget::dbHasKey() const
|
||||
{
|
||||
return m_db->hasKey();
|
||||
}
|
||||
|
||||
bool DatabaseWidget::canDeleteCurrentGroup() const
|
||||
{
|
||||
bool isRootGroup = m_db->rootGroup() == m_groupView->currentGroup();
|
||||
return !isRootGroup;
|
||||
}
|
||||
|
||||
bool DatabaseWidget::isInSearchMode() const
|
||||
{
|
||||
return m_entryView->inSearchMode();
|
||||
}
|
||||
|
||||
Group* DatabaseWidget::currentGroup() const
|
||||
{
|
||||
return m_groupView->currentGroup();
|
||||
}
|
||||
|
||||
void DatabaseWidget::lock()
|
||||
void DatabaseWidget::closeEvent(QCloseEvent* event)
|
||||
{
|
||||
Q_ASSERT(currentMode() != DatabaseWidget::LockedMode);
|
||||
if (!isLocked() && !lock()) {
|
||||
event->ignore();
|
||||
return;
|
||||
}
|
||||
|
||||
event->accept();
|
||||
}
|
||||
|
||||
void DatabaseWidget::showEvent(QShowEvent* event)
|
||||
{
|
||||
if (!m_db->isInitialized() || isLocked()) {
|
||||
switchToOpenDatabase();
|
||||
}
|
||||
|
||||
event->accept();
|
||||
}
|
||||
|
||||
bool DatabaseWidget::lock()
|
||||
{
|
||||
if (isLocked()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
clipboard()->clearCopiedText();
|
||||
|
||||
if (currentMode() == DatabaseWidget::Mode::EditMode) {
|
||||
auto result = MessageBox::question(this, tr("Lock Database?"),
|
||||
tr("You are editing an entry. Discard changes and lock anyway?"),
|
||||
QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel);
|
||||
if (result == QMessageBox::Cancel) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_db->isModified()) {
|
||||
if (config()->get("AutoSaveOnExit").toBool()) {
|
||||
if (!m_db->save(nullptr, false, false)) {
|
||||
return false;
|
||||
}
|
||||
} else if (isLocked()) {
|
||||
QString msg;
|
||||
if (!m_db->metadata()->name().toHtmlEscaped().isEmpty()) {
|
||||
msg = tr("\"%1\" was modified.\nSave changes?").arg(m_db->metadata()->name().toHtmlEscaped());
|
||||
} else {
|
||||
msg = tr("Database was modified.\nSave changes?");
|
||||
}
|
||||
auto result = MessageBox::question(this, tr("Save changes?"), msg,
|
||||
QMessageBox::Yes | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Yes);
|
||||
if (result == QMessageBox::Yes && !m_db->save(nullptr, false, false)) {
|
||||
return false;
|
||||
} else if (result == QMessageBox::Cancel) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (m_groupView->currentGroup()) {
|
||||
m_groupBeforeLock = m_groupView->currentGroup()->uuid();
|
||||
|
|
@ -1154,21 +1176,24 @@ void DatabaseWidget::lock()
|
|||
|
||||
endSearch();
|
||||
clearAllWidgets();
|
||||
m_unlockDatabaseWidget->load(m_filePath);
|
||||
m_unlockDatabaseWidget->load(m_db->filePath());
|
||||
setCurrentWidget(m_unlockDatabaseWidget);
|
||||
Database* newDb = new Database();
|
||||
newDb->metadata()->setName(m_db->metadata()->name());
|
||||
|
||||
auto newDb = QSharedPointer<Database>::create(m_db->filePath());
|
||||
replaceDatabase(newDb);
|
||||
emit lockedDatabase();
|
||||
|
||||
emit databaseLocked();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void DatabaseWidget::updateFilePath(const QString& filePath)
|
||||
{
|
||||
if (!m_filePath.isEmpty()) {
|
||||
m_fileWatcher.removePath(m_filePath);
|
||||
if (!m_db->filePath().isEmpty()) {
|
||||
m_fileWatcher.removePath(m_db->filePath());
|
||||
}
|
||||
|
||||
#if defined(Q_OS_LINUX)
|
||||
#ifdef Q_OS_LINUX
|
||||
struct statfs statfsBuf;
|
||||
bool forcePolling = false;
|
||||
const auto NFS_SUPER_MAGIC = 0x6969;
|
||||
|
|
@ -1184,7 +1209,6 @@ void DatabaseWidget::updateFilePath(const QString& filePath)
|
|||
#endif
|
||||
|
||||
m_fileWatcher.addPath(filePath);
|
||||
m_filePath = filePath;
|
||||
m_db->setFilePath(filePath);
|
||||
}
|
||||
|
||||
|
|
@ -1201,7 +1225,7 @@ void DatabaseWidget::blockAutoReload(bool block)
|
|||
void DatabaseWidget::unblockAutoReload()
|
||||
{
|
||||
m_ignoreAutoReload = false;
|
||||
updateFilePath(m_filePath);
|
||||
updateFilePath(m_db->filePath());
|
||||
}
|
||||
|
||||
void DatabaseWidget::onWatchedFileChanged()
|
||||
|
|
@ -1217,86 +1241,69 @@ void DatabaseWidget::onWatchedFileChanged()
|
|||
|
||||
void DatabaseWidget::reloadDatabaseFile()
|
||||
{
|
||||
if (!m_db || currentMode() == DatabaseWidget::LockedMode) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (currentMode() == DatabaseWidget::LockedMode) {
|
||||
if (!m_db || isLocked()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!config()->get("AutoReloadOnChange").toBool()) {
|
||||
// Ask if we want to reload the db
|
||||
QMessageBox::StandardButton mb =
|
||||
MessageBox::question(this,
|
||||
tr("File has changed"),
|
||||
tr("The database file has changed. Do you want to load the changes?"),
|
||||
QMessageBox::Yes | QMessageBox::No);
|
||||
auto result = MessageBox::question(this,
|
||||
tr("File has changed"),
|
||||
tr("The database file has changed. Do you want to load the changes?"),
|
||||
QMessageBox::Yes | QMessageBox::No);
|
||||
|
||||
if (mb == QMessageBox::No) {
|
||||
if (result == QMessageBox::No) {
|
||||
// Notify everyone the database does not match the file
|
||||
m_db->markAsModified();
|
||||
m_databaseModified = true;
|
||||
// Rewatch the database file
|
||||
m_fileWatcher.addPath(m_filePath);
|
||||
m_fileWatcher.addPath(m_db->filePath());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
KeePass2Reader reader;
|
||||
QFile file(m_filePath);
|
||||
if (file.open(QIODevice::ReadOnly)) {
|
||||
Database* db = reader.readDatabase(&file, database()->key());
|
||||
if (db != nullptr) {
|
||||
if (m_databaseModified) {
|
||||
// Ask if we want to merge changes into new database
|
||||
QMessageBox::StandardButton mb =
|
||||
MessageBox::question(this,
|
||||
tr("Merge Request"),
|
||||
tr("The database file has changed and you have unsaved changes.\n"
|
||||
"Do you want to merge your changes?"),
|
||||
QMessageBox::Yes | QMessageBox::No);
|
||||
QString error;
|
||||
auto db = QSharedPointer<Database>::create(m_db->filePath());
|
||||
if (db->open(database()->key(), &error, true)) {
|
||||
if (m_db->isModified()) {
|
||||
// Ask if we want to merge changes into new database
|
||||
auto result = MessageBox::question(this,
|
||||
tr("Merge Request"),
|
||||
tr("The database file has changed and you have unsaved changes.\nDo you want to merge your changes?"),
|
||||
QMessageBox::Yes | QMessageBox::No);
|
||||
|
||||
if (mb == QMessageBox::Yes) {
|
||||
// Merge the old database into the new one
|
||||
m_db->setEmitModified(false);
|
||||
Merger merger(m_db, db);
|
||||
merger.merge();
|
||||
} else {
|
||||
// Since we are accepting the new file as-is, internally mark as unmodified
|
||||
// TODO: when saving is moved out of DatabaseTabWidget, this should be replaced
|
||||
m_databaseModified = false;
|
||||
}
|
||||
if (result == QMessageBox::Yes) {
|
||||
// Merge the old database into the new one
|
||||
Merger merger(m_db.data(), db.data());
|
||||
merger.merge();
|
||||
}
|
||||
|
||||
QUuid groupBeforeReload;
|
||||
if (m_groupView && m_groupView->currentGroup()) {
|
||||
groupBeforeReload = m_groupView->currentGroup()->uuid();
|
||||
} else {
|
||||
groupBeforeReload = m_db->rootGroup()->uuid();
|
||||
}
|
||||
|
||||
QUuid entryBeforeReload;
|
||||
if (m_entryView && m_entryView->currentEntry()) {
|
||||
entryBeforeReload = m_entryView->currentEntry()->uuid();
|
||||
}
|
||||
|
||||
replaceDatabase(db);
|
||||
restoreGroupEntryFocus(groupBeforeReload, entryBeforeReload);
|
||||
}
|
||||
|
||||
QUuid groupBeforeReload;
|
||||
if (m_groupView && m_groupView->currentGroup()) {
|
||||
groupBeforeReload = m_groupView->currentGroup()->uuid();
|
||||
} else {
|
||||
groupBeforeReload = m_db->rootGroup()->uuid();
|
||||
}
|
||||
|
||||
QUuid entryBeforeReload;
|
||||
if (m_entryView && m_entryView->currentEntry()) {
|
||||
entryBeforeReload = m_entryView->currentEntry()->uuid();
|
||||
}
|
||||
|
||||
bool isReadOnly = m_db->isReadOnly();
|
||||
replaceDatabase(db);
|
||||
m_db->setReadOnly(isReadOnly);
|
||||
restoreGroupEntryFocus(groupBeforeReload, entryBeforeReload);
|
||||
} else {
|
||||
m_messageWidget->showMessage(
|
||||
tr("Could not open the new database file while attempting to autoreload this database.")
|
||||
.append("\n")
|
||||
.append(file.errorString()),
|
||||
showMessage(
|
||||
tr("Could not open the new database file while attempting to autoreload.\nError: %1").arg(error),
|
||||
MessageWidget::Error);
|
||||
// HACK: Directly calling the database's signal
|
||||
// Mark db as modified since existing data may differ from file or file was deleted
|
||||
m_db->markAsModified();
|
||||
}
|
||||
|
||||
// Rewatch the database file
|
||||
m_fileWatcher.addPath(m_filePath);
|
||||
m_fileWatcher.addPath(m_db->filePath());
|
||||
}
|
||||
|
||||
int DatabaseWidget::numberOfSelectedEntries() const
|
||||
|
|
@ -1319,7 +1326,7 @@ QStringList DatabaseWidget::customEntryAttributes() const
|
|||
*/
|
||||
void DatabaseWidget::restoreGroupEntryFocus(const QUuid& groupUuid, const QUuid& entryUuid)
|
||||
{
|
||||
auto group = m_db->resolveGroup(groupUuid);
|
||||
auto group = m_db->rootGroup()->findGroupByUuid(groupUuid);
|
||||
if (group) {
|
||||
m_groupView->setCurrentGroup(group);
|
||||
auto entry = group->findEntryByUuid(entryUuid);
|
||||
|
|
@ -1409,10 +1416,10 @@ EntryView* DatabaseWidget::entryView()
|
|||
return m_entryView;
|
||||
}
|
||||
|
||||
void DatabaseWidget::showUnlockDialog()
|
||||
void DatabaseWidget::prepareUnlock()
|
||||
{
|
||||
m_unlockDatabaseDialog->clearForms();
|
||||
m_unlockDatabaseDialog->setFilePath(m_filePath);
|
||||
m_unlockDatabaseDialog->setFilePath(m_db->filePath());
|
||||
|
||||
#if defined(Q_OS_MACOS)
|
||||
autoType()->raiseWindow();
|
||||
|
|
@ -1423,15 +1430,101 @@ void DatabaseWidget::showUnlockDialog()
|
|||
m_unlockDatabaseDialog->activateWindow();
|
||||
}
|
||||
|
||||
void DatabaseWidget::closeUnlockDialog()
|
||||
/**
|
||||
* Save the database to disk.
|
||||
*
|
||||
* This method will try to save several times in case of failure and
|
||||
* ask to disable safe saves if it is unable to save after the third attempt.
|
||||
* Set `attempt` to -1 to disable this behavior.
|
||||
*
|
||||
* @param attempt current save attempt or -1 to disable attempts
|
||||
* @return true on success
|
||||
*/
|
||||
bool DatabaseWidget::save(int attempt)
|
||||
{
|
||||
m_unlockDatabaseDialog->close();
|
||||
// Never allow saving a locked database; it causes corruption
|
||||
Q_ASSERT(!isLocked());
|
||||
// Release build interlock
|
||||
if (isLocked()) {
|
||||
// We return true since a save is not required
|
||||
return true;
|
||||
}
|
||||
|
||||
if (m_db->isReadOnly() || m_db->filePath().isEmpty()) {
|
||||
return saveAs();
|
||||
}
|
||||
|
||||
blockAutoReload(true);
|
||||
// TODO: Make this async, but lock out the database widget to prevent re-entrance
|
||||
bool useAtomicSaves = config()->get("UseAtomicSaves", true).toBool();
|
||||
QString errorMessage;
|
||||
bool ok = m_db->save(&errorMessage, useAtomicSaves, config()->get("BackupBeforeSave").toBool());
|
||||
blockAutoReload(false);
|
||||
|
||||
if (ok) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (attempt >= 0 && attempt <= 2) {
|
||||
return save(attempt + 1);
|
||||
}
|
||||
|
||||
if (attempt > 2 && useAtomicSaves) {
|
||||
// Saving failed 3 times, issue a warning and attempt to resolve
|
||||
auto choice = MessageBox::question(this,
|
||||
tr("Disable safe saves?"),
|
||||
tr("KeePassXC has failed to save the database multiple times. "
|
||||
"This is likely caused by file sync services holding a lock on "
|
||||
"the save file.\nDisable safe saves and try again?"),
|
||||
QMessageBox::Yes | QMessageBox::No,
|
||||
QMessageBox::Yes);
|
||||
if (choice == QMessageBox::Yes) {
|
||||
config()->set("UseAtomicSaves", false);
|
||||
return save(attempt + 1);
|
||||
}
|
||||
}
|
||||
|
||||
showMessage(tr("Writing the database failed.\n%1").arg(errorMessage), MessageWidget::Error);
|
||||
return false;
|
||||
}
|
||||
|
||||
void DatabaseWidget::showMessage(const QString& text,
|
||||
MessageWidget::MessageType type,
|
||||
bool showClosebutton,
|
||||
int autoHideTimeout)
|
||||
/**
|
||||
* Save database under a new user-selected filename.
|
||||
*
|
||||
* @return true on success
|
||||
*/
|
||||
bool DatabaseWidget::saveAs()
|
||||
{
|
||||
while (true) {
|
||||
QString oldFilePath = m_db->filePath();
|
||||
if (!QFileInfo(oldFilePath).exists()) {
|
||||
oldFilePath = QDir::toNativeSeparators(config()->get("LastDir", QDir::homePath()).toString()
|
||||
+ "/" + tr("Passwords").append(".kdbx"));
|
||||
}
|
||||
QString newFilePath = fileDialog()->getSaveFileName(
|
||||
this, tr("Save database as"), oldFilePath,
|
||||
tr("KeePass 2 Database").append(" (*.kdbx)"), nullptr, nullptr, "kdbx");
|
||||
|
||||
if (!newFilePath.isEmpty()) {
|
||||
// Ensure we don't recurse back into this function
|
||||
m_db->setReadOnly(false);
|
||||
m_db->setFilePath(newFilePath);
|
||||
|
||||
if (!save(-1)) {
|
||||
// Failed to save, try again
|
||||
continue;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// Canceled file selection
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void DatabaseWidget::showMessage(const QString& text, MessageWidget::MessageType type,
|
||||
bool showClosebutton, int autoHideTimeout)
|
||||
{
|
||||
m_messageWidget->setCloseButtonVisible(showClosebutton);
|
||||
m_messageWidget->showMessage(text, type, autoHideTimeout);
|
||||
|
|
@ -1454,26 +1547,6 @@ bool DatabaseWidget::isRecycleBinSelected() const
|
|||
return m_groupView->currentGroup() && m_groupView->currentGroup() == m_db->metadata()->recycleBin();
|
||||
}
|
||||
|
||||
QString DatabaseWidget::getDatabaseName() const
|
||||
{
|
||||
return m_databaseName;
|
||||
}
|
||||
|
||||
void DatabaseWidget::setDatabaseName(const QString& databaseName)
|
||||
{
|
||||
m_databaseName = databaseName;
|
||||
}
|
||||
|
||||
QString DatabaseWidget::getDatabaseFileName() const
|
||||
{
|
||||
return m_databaseFileName;
|
||||
}
|
||||
|
||||
void DatabaseWidget::setDatabaseFileName(const QString& databaseFileName)
|
||||
{
|
||||
m_databaseFileName = databaseFileName;
|
||||
}
|
||||
|
||||
void DatabaseWidget::emptyRecycleBin()
|
||||
{
|
||||
if (!isRecycleBinSelected()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue