mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-01-07 05:28:17 -05:00
d612cad09a
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.
82 lines
2.1 KiB
C++
82 lines
2.1 KiB
C++
/*
|
|
* Copyright (C) 2011 Felix Geyer <debfx@fobos.de>
|
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 or (at your option)
|
|
* version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef KEEPASSX_DATABASEOPENWIDGET_H
|
|
#define KEEPASSX_DATABASEOPENWIDGET_H
|
|
|
|
#include <QScopedPointer>
|
|
|
|
#include "gui/DialogyWidget.h"
|
|
#include "keys/CompositeKey.h"
|
|
|
|
class Database;
|
|
class QFile;
|
|
|
|
namespace Ui
|
|
{
|
|
class DatabaseOpenWidget;
|
|
}
|
|
|
|
class DatabaseOpenWidget : public DialogyWidget
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit DatabaseOpenWidget(QWidget* parent = nullptr);
|
|
~DatabaseOpenWidget();
|
|
void load(const QString& filename);
|
|
void clearForms();
|
|
void enterKey(const QString& pw, const QString& keyFile);
|
|
QSharedPointer<Database> database();
|
|
|
|
public slots:
|
|
void pollYubikey();
|
|
|
|
signals:
|
|
void dialogFinished(bool accepted);
|
|
|
|
protected:
|
|
void showEvent(QShowEvent* event) override;
|
|
void hideEvent(QHideEvent* event) override;
|
|
QSharedPointer<CompositeKey> databaseKey();
|
|
|
|
protected slots:
|
|
virtual void openDatabase();
|
|
void reject();
|
|
|
|
private slots:
|
|
void activatePassword();
|
|
void activateKeyFile();
|
|
void activateChallengeResponse();
|
|
void browseKeyFile();
|
|
void yubikeyDetected(int slot, bool blocking);
|
|
void yubikeyDetectComplete();
|
|
void noYubikeyFound();
|
|
|
|
protected:
|
|
const QScopedPointer<Ui::DatabaseOpenWidget> m_ui;
|
|
QSharedPointer<Database> m_db;
|
|
QString m_filename;
|
|
|
|
private:
|
|
bool m_yubiKeyBeingPolled = false;
|
|
Q_DISABLE_COPY(DatabaseOpenWidget)
|
|
};
|
|
|
|
#endif // KEEPASSX_DATABASEOPENWIDGET_H
|