forked from keepassxreboot/keepassxc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor DatabaseOpenWidget/Dialog and Auto-Type Database unlocking.
This patch removes redundant lock widget members of the DatabaseWidget and consolidates all unlocking functionality into a single DatabaseOpenWidget (with the exception of KeePass1OpenWidget). Distinction between different unlock actions is now done via a dedicated Intent enum class instead of using individual widgets. Further, the DatabaseUnlockDialog has been generalized so that it is usable for unlock intents other than just Auto-Type and is now also used for merging databases which is less confusing to the user. The KeePassXC main window is no longer a parent of the DatabaseUnlockDialog and has the Qt::ForeignWindow flag set, which should cause fewer issues with Auto-Type trying to type into KeePassXC after unlock instead of the intended target window. In addition, its instance has been moved into the DatabaseTabWidget class so that it is no longer bound to individual DatabaseWidgets, potentially allowing for database selection during Auto-Type. The actual selection has not yet been implemented, but Auto-Type has been adjusted to use the currently selected tab instead of the first one as an intermediary improvement.
- Loading branch information
Showing
13 changed files
with
290 additions
and
294 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Copyright (C) 2018 KeePassXC Team <[email protected]> | ||
| * | ||
| * 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/>. | ||
| */ | ||
|
|
||
| #include "DatabaseOpenDialog.h" | ||
| #include "DatabaseOpenWidget.h" | ||
| #include "DatabaseWidget.h" | ||
| #include "core/Database.h" | ||
|
|
||
| DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent) | ||
| : QDialog(parent) | ||
| , m_view(new DatabaseOpenWidget(this)) | ||
| { | ||
| setWindowTitle(tr("Unlock Database - KeePassXC")); | ||
| setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint | Qt::ForeignWindow); | ||
| connect(m_view, SIGNAL(dialogFinished(bool)), this, SLOT(complete(bool))); | ||
| } | ||
|
|
||
| void DatabaseOpenDialog::setFilePath(const QString& filePath) | ||
| { | ||
| m_view->load(filePath); | ||
| } | ||
|
|
||
| /** | ||
| * Set target DatabaseWidget to which signals are connected. | ||
| * | ||
| * @param dbWidget database widget | ||
| */ | ||
| void DatabaseOpenDialog::setTargetDatabaseWidget(DatabaseWidget* dbWidget) | ||
| { | ||
| if (m_dbWidget) { | ||
| disconnect(this, nullptr, m_dbWidget, nullptr); | ||
| } | ||
| m_dbWidget = dbWidget; | ||
| connect(this, SIGNAL(dialogFinished(bool)), dbWidget, SLOT(unlockDatabase(bool))); | ||
| } | ||
|
|
||
| void DatabaseOpenDialog::setIntent(DatabaseOpenDialog::Intent intent) | ||
| { | ||
| m_intent = intent; | ||
| } | ||
|
|
||
| DatabaseOpenDialog::Intent DatabaseOpenDialog::intent() const | ||
| { | ||
| return m_intent; | ||
| } | ||
|
|
||
| void DatabaseOpenDialog::clearForms() | ||
| { | ||
| m_view->clearForms(); | ||
| m_db.reset(); | ||
| m_intent = Intent::None; | ||
| if (m_dbWidget) { | ||
| disconnect(this, nullptr, m_dbWidget, nullptr); | ||
| m_dbWidget = nullptr; | ||
| } | ||
| } | ||
|
|
||
| QSharedPointer<Database> DatabaseOpenDialog::database() | ||
| { | ||
| return m_db; | ||
| } | ||
|
|
||
| void DatabaseOpenDialog::complete(bool accepted) | ||
| { | ||
| // save DB, since DatabaseOpenWidget will reset its data after accept() is called | ||
| m_db = m_view->database(); | ||
|
|
||
| if (accepted) { | ||
| accept(); | ||
| } else { | ||
| reject(); | ||
| } | ||
| emit dialogFinished(accepted); | ||
| clearForms(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * Copyright (C) 2016 KeePassXC Team <[email protected]> | ||
| * Copyright (C) 2018 KeePassXC Team <[email protected]> | ||
| * | ||
| * 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 | ||
|
|
@@ -18,32 +18,47 @@ | |
| #ifndef KEEPASSX_AUTOTYPEUNLOCKDIALOG_H | ||
| #define KEEPASSX_AUTOTYPEUNLOCKDIALOG_H | ||
|
|
||
| #include <QDialog> | ||
|
|
||
| //#include <gui/DatabaseTabWidget.h> | ||
|
|
||
| #include "core/Global.h" | ||
|
|
||
| class UnlockDatabaseWidget; | ||
| #include <QDialog> | ||
| #include <QPointer> | ||
| #include <QSharedPointer> | ||
|
|
||
| class Database; | ||
| class DatabaseWidget; | ||
| class DatabaseOpenWidget; | ||
|
|
||
| class UnlockDatabaseDialog : public QDialog | ||
| class DatabaseOpenDialog : public QDialog | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| explicit UnlockDatabaseDialog(QWidget* parent = nullptr); | ||
| enum class Intent | ||
| { | ||
| None, | ||
| AutoType, | ||
| Merge | ||
| }; | ||
|
|
||
| explicit DatabaseOpenDialog(QWidget* parent = nullptr); | ||
| void setFilePath(const QString& filePath); | ||
| void clearForms(); | ||
| void setTargetDatabaseWidget(DatabaseWidget* dbWidget); | ||
| void setIntent(Intent intent); | ||
| Intent intent() const; | ||
| QSharedPointer<Database> database(); | ||
| void clearForms(); | ||
|
|
||
| signals: | ||
| void unlockDone(bool); | ||
| void dialogFinished(bool); | ||
|
|
||
| public slots: | ||
| void complete(bool r); | ||
| void complete(bool accepted); | ||
|
|
||
| private: | ||
| UnlockDatabaseWidget* const m_view; | ||
| QPointer<DatabaseOpenWidget> m_view; | ||
| QSharedPointer<Database> m_db; | ||
| QPointer<DatabaseWidget> m_dbWidget; | ||
| Intent m_intent = Intent::None; | ||
| }; | ||
|
|
||
| #endif // KEEPASSX_AUTOTYPEUNLOCKDIALOG_H | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.