Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Place the 'Recycle Bin' at the bottom of the list when groups are sorted. #7004

Merged
merged 11 commits into from
Oct 2, 2021
Merged

Place the 'Recycle Bin' at the bottom of the list when groups are sorted. #7004

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
33dd2c0
Add feature to place recycle bin at bottom when groups are sorted.
pruthig Sep 30, 2021
256d01b
Merge branch 'keepassxreboot:develop' into feature/groups-sort-recycl…
pruthig Oct 1, 2021
5b7d01e
Add feature to place recycle bin at bottom when groups are sorted.
pruthig Sep 30, 2021
4abef64
Corrected a condition to check if Recyclebin is present or not
Oct 1, 2021
e621188
Fixed build error
pruthig Oct 1, 2021
c04642d
Incorporate review comment.
Oct 1, 2021
9eecde6
Merge branch 'develop' into feature/groups-sort-recyclebin-at-end
pruthig Oct 1, 2021
7ee2fd3
Added review comment
Oct 1, 2021
d09c9f3
Merge branch 'feature/groups-sort-recyclebin-at-end' of https://githu…
Oct 1, 2021
9c962db
Ran clang-format
Oct 2, 2021
17e13b0
Merge branch 'keepassxreboot:develop' into feature/groups-sort-recycl…
pruthig Oct 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions src/core/Group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,18 +1155,15 @@ void Group::applyGroupIconToChildEntries()

void Group::sortChildrenRecursively(bool reverse)
{
QList<Group*>::iterator beginIter = m_children.begin();
QList<Group*>::iterator endIter = m_children.end();

// Put recyclebin at end position
if(this->parentGroup() == Q_NULLPTR && m_db->metadata()->recycleBin() != Q_NULLPTR) {
int recyleBinIndex = this->children().indexOf(this->findChildByName("Recycle Bin"));
this->m_children.swap(recyleBinIndex, this->m_children.length()-1);
beginIter = m_children.begin();
endIter = m_children.end()-1;
}

std::sort(beginIter, endIter, [reverse](const Group* childGroup1, const Group* childGroup2) -> bool {
Group* recycleBin = Q_NULLPTR;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use nullptr.

if(database()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing space after if

recycleBin = database()->metadata()->recycleBin();
}
std::sort(m_children.begin(), m_children.end(),
[=](const Group* childGroup1, const Group* childGroup2) -> bool {
if (childGroup1 == recycleBin) {
return false;
}
QString name1 = childGroup1->name();
QString name2 = childGroup2->name();
return reverse ? name1.compare(name2, Qt::CaseInsensitive) > 0
Expand Down