mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-03-11 08:54:48 +00:00
c0ea6f65f9
* Add Entry::calculateDifference() This new function contains the logic that was previously in EntryHistoryModel::calculateHistoryModifications(). It allows the re-use to display the differences in case of a merge. * Introduce Database Merge Confirmation Dialog Adds a dialog allowing a user to review the changes of a merge operation. This dialog displays the changes and allows the user to abort the merge without modifying the database. Fixes #1152 * Added dry run option to Merger * Changed behavior when actual merge differs from dry run to just output a warning to console * Fixed KeeShare conflicting with merge operations in the middle of a merge --------- Co-authored-by: Jonathan White <support@dmapps.us>
83 lines
2.3 KiB
C++
83 lines
2.3 KiB
C++
/*
|
|
* Copyright (C) 2025 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_MERGEDIALOG_H
|
|
#define KEEPASSX_MERGEDIALOG_H
|
|
|
|
#include "core/Merger.h"
|
|
|
|
#include <QDialog>
|
|
#include <QMenu>
|
|
|
|
namespace Ui
|
|
{
|
|
class MergeDialog;
|
|
}
|
|
|
|
class Database;
|
|
|
|
class MergeDialog : public QDialog
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
/**
|
|
* Merge source into copy of target and display changes.
|
|
* On user confirmation, merge source into target.
|
|
*/
|
|
explicit MergeDialog(QSharedPointer<Database> source, QSharedPointer<Database> target, QWidget* parent = nullptr);
|
|
/**
|
|
* Display given changes.
|
|
*/
|
|
explicit MergeDialog(const Merger::ChangeList& changes, QWidget* parent = nullptr);
|
|
~MergeDialog() override;
|
|
|
|
signals:
|
|
// Signal will be emitted when a normal merge operation has been performed.
|
|
void databaseMerged(bool databaseChanged);
|
|
|
|
private slots:
|
|
void performMerge();
|
|
void cancelMerge();
|
|
|
|
private:
|
|
enum class MergeDialogColumns
|
|
{
|
|
Group,
|
|
Title,
|
|
Uuid,
|
|
Type,
|
|
Details
|
|
};
|
|
static QVector<MergeDialogColumns> columns();
|
|
static int columnIndex(MergeDialogColumns column);
|
|
static QString columnName(MergeDialogColumns column);
|
|
static QString cellValue(const Merger::Change& change, MergeDialogColumns column);
|
|
static bool isColumnHiddenByDefault(MergeDialogColumns column);
|
|
|
|
void setupChangeTable();
|
|
void updateChangeTable();
|
|
|
|
QScopedPointer<Ui::MergeDialog> m_ui;
|
|
QScopedPointer<QMenu> m_headerContextMenu;
|
|
|
|
Merger::ChangeList m_changes;
|
|
QSharedPointer<Database> m_sourceDatabase;
|
|
QSharedPointer<Database> m_targetDatabase;
|
|
};
|
|
|
|
#endif // KEEPASSX_MERGEDIALOG_H
|