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

Select new entry after cloning

Browse source 
Also fixes re-selecting entries during a search refresh
This commit is contained in:
Akinori MUSHA 2023-02-06 04:37:26 +09:00 • committed by Jonathan White
parent b4be71d967
commit cc35bf2096
7 changed files with 59 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/gui/CloneDialog.cpp
View file

@ -18,8 +18,6 @@
#include "CloneDialog.h" #include "CloneDialog.h"
#include "ui_CloneDialog.h" #include "ui_CloneDialog.h"
#include "config-keepassx.h"
CloneDialog::CloneDialog(DatabaseWidget* parent, Database* db, Entry* entry) CloneDialog::CloneDialog(DatabaseWidget* parent, Database* db, Entry* entry)
: QDialog(parent) : QDialog(parent)
, m_ui(new Ui::CloneDialog()) , m_ui(new Ui::CloneDialog())
@ -29,8 +27,9 @@ CloneDialog::CloneDialog(DatabaseWidget* parent, Database* db, Entry* entry)
m_parent = parent; m_parent = parent;
m_ui->setupUi(this); m_ui->setupUi(this);
this->setFixedSize(this->sizeHint());
window()->layout()->setSizeConstraint(QLayout::SetFixedSize);
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close())); connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
@ -54,10 +53,10 @@ void CloneDialog::cloneEntry()
flags |= Entry::CloneIncludeHistory; flags |= Entry::CloneIncludeHistory;
} }
Entry* entry = m_entry->clone(flags); auto entry = m_entry->clone(flags);
entry->setGroup(m_entry->group()); entry->setGroup(m_entry->group());
m_parent->refreshSearch(); emit entryCloned(entry);
close(); close();
} }

3
src/gui/CloneDialog.h
View file

@ -34,6 +34,9 @@ public:
explicit CloneDialog(DatabaseWidget* parent = nullptr, Database* db = nullptr, Entry* entry = nullptr); explicit CloneDialog(DatabaseWidget* parent = nullptr, Database* db = nullptr, Entry* entry = nullptr);
~CloneDialog() override; ~CloneDialog() override;
signals:
void entryCloned(Entry* clone);
private: private:
QScopedPointer<Ui::CloneDialog> m_ui; QScopedPointer<Ui::CloneDialog> m_ui;

66
src/gui/CloneDialog.ui
View file

@ -6,54 +6,56 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>347</width> <width>319</width>
<height>136</height> <height>132</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Clone Entry Options</string> <string>Clone Entry Options</string>
</property> </property>
<property name="modal">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <widget class="QCheckBox" name="titleClone">
<item> <property name="text">
<widget class="QCheckBox" name="titleClone"> <string>Append ' - Clone' to title</string>
<property name="text"> </property>
<string>Append ' - Clone' to title</string> <property name="checked">
</property> <bool>true</bool>
<property name="checked"> </property>
<bool>true</bool> </widget>
</property> </item>
</widget> <item>
</item> <widget class="QCheckBox" name="referencesClone">
<item> <property name="text">
<widget class="QCheckBox" name="referencesClone"> <string>Replace username and password with references</string>
<property name="text"> </property>
<string>Replace username and password with references</string> </widget>
</property> </item>
</widget> <item>
</item> <widget class="QCheckBox" name="historyClone">
<item> <property name="text">
<widget class="QCheckBox" name="historyClone"> <string>Copy history</string>
<property name="text"> </property>
<string>Copy history</string> <property name="checked">
</property> <bool>true</bool>
<property name="checked"> </property>
<bool>true</bool> </widget>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>6</height>
</size> </size>
</property> </property>
</spacer> </spacer>

8
src/gui/DatabaseWidget.cpp
View file

@ -447,6 +447,11 @@ void DatabaseWidget::cloneEntry()
} }
auto cloneDialog = new CloneDialog(this, m_db.data(), currentEntry); auto cloneDialog = new CloneDialog(this, m_db.data(), currentEntry);
connect(cloneDialog, &CloneDialog::entryCloned, this, [this](auto entry) {
refreshSearch();
m_entryView->setCurrentEntry(entry);
});
cloneDialog->show(); cloneDialog->show();
} }
@ -1399,7 +1404,10 @@ void DatabaseWidget::performUnlockDatabase(const QString& password, const QStrin
void DatabaseWidget::refreshSearch() void DatabaseWidget::refreshSearch()
{ {
if (isSearchActive()) { if (isSearchActive()) {
auto selectedEntry = m_entryView->currentEntry();
search(m_lastSearchText); search(m_lastSearchText);
// Re-select the previous entry if it is still in the search
m_entryView->setCurrentEntry(selectedEntry);
} }
} }

6
src/gui/entry/EntryModel.cpp
View file

@ -50,8 +50,10 @@ Entry* EntryModel::entryFromIndex(const QModelIndex& index) const
QModelIndex EntryModel::indexFromEntry(Entry* entry) const QModelIndex EntryModel::indexFromEntry(Entry* entry) const
{ {
int row = m_entries.indexOf(entry); int row = m_entries.indexOf(entry);
Q_ASSERT(row != -1); if (row >= 0) {
return index(row, 1); return index(row, 1);
}
return {};
} }
void EntryModel::setGroup(Group* group) void EntryModel::setGroup(Group* group)

7
src/gui/entry/EntryView.cpp
View file

@ -279,8 +279,11 @@ int EntryView::numberOfSelectedEntries()
void EntryView::setCurrentEntry(Entry* entry) void EntryView::setCurrentEntry(Entry* entry)
{ {
selectionModel()->setCurrentIndex(m_sortModel->mapFromSource(m_model->indexFromEntry(entry)), auto index = m_model->indexFromEntry(entry);
QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); if (index.isValid()) {
selectionModel()->setCurrentIndex(m_sortModel->mapFromSource(index),
QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
}
} }
Entry* EntryView::entryFromIndex(const QModelIndex& index) Entry* EntryView::entryFromIndex(const QModelIndex& index)

1
tests/gui/TestGui.cpp
View file

@ -1230,6 +1230,7 @@ void TestGui::testCloneEntry()
Entry* entryClone = entryView->entryFromIndex(entryView->model()->index(1, 1)); Entry* entryClone = entryView->entryFromIndex(entryView->model()->index(1, 1));
QVERIFY(entryOrg->uuid() != entryClone->uuid()); QVERIFY(entryOrg->uuid() != entryClone->uuid());
QCOMPARE(entryClone->title(), entryOrg->title() + QString(" - Clone")); QCOMPARE(entryClone->title(), entryOrg->title() + QString(" - Clone"));
QVERIFY(m_dbWidget->currentSelectedEntry()->uuid() == entryClone->uuid());
} }
void TestGui::testEntryPlaceholders() void TestGui::testEntryPlaceholders()