Minor refactors, added group sort tests with numbers

keepassxreboot · Jun 18, 2019 · 28dd53e · 28dd53e
1 parent d3cc57f
commit 28dd53e
Show file tree

Hide file tree

Showing 12 changed files with 145 additions and 91 deletions.
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
@@ -521,6 +521,11 @@ QStringList Group::hierarchy() const
     return hierarchy;
 }
 
+bool Group::hasChildren() const
+{
+    return !children().isEmpty();
+}
+
 Database* Group::database()
 {
     return m_db;
@@ -1074,21 +1079,21 @@ void Group::applyGroupIconTo(Entry* entry)
     }
 }
 
-void Group::sortChildrenRecursively(bool desc)
+void Group::sortChildrenRecursively(bool reverse)
 {
     std::sort(m_children.begin(), m_children.end(),
-        [desc](const Group* childGroup1, const Group* childGroup2) -> bool
+        [reverse](const Group* childGroup1, const Group* childGroup2) -> bool
         {
             QString name1 = childGroup1->name();
             QString name2 = childGroup2->name();
-            return desc ?
+            return reverse ?
                 name1.compare(name2, Qt::CaseInsensitive) > 0 :
                 name1.compare(name2, Qt::CaseInsensitive) < 0;
         });
 
     for (int i = 0; i < m_children.count(); i++)
     {
-        m_children[i]->sortChildrenRecursively(desc);
+        m_children[i]->sortChildrenRecursively(reverse);
     }
 
     emit groupModified();

diff --git a/src/core/Group.h b/src/core/Group.h
@@ -144,6 +144,7 @@ class Group : public QObject
     const Group* parentGroup() const;
     void setParent(Group* parent, int index = -1);
     QStringList hierarchy() const;
+    bool hasChildren() const;
 
     Database* database();
     const Database* database() const;
@@ -169,7 +170,7 @@ class Group : public QObject
 
     void applyGroupIconTo(Entry* entry);
 
-    void sortChildrenRecursively(bool desc = false);
+    void sortChildrenRecursively(bool reverse = false);
 
 signals:
     void groupDataChanged(Group* group);

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
@@ -1450,12 +1450,6 @@ bool DatabaseWidget::isGroupSelected() const
     return m_groupView->currentGroup();
 }
 
-bool DatabaseWidget::currentGroupHasChildren() const
-{
-    Group* currentGrp = m_groupView->currentGroup();
-    return currentGrp && !currentGrp->children().isEmpty();
-}
-
 bool DatabaseWidget::currentEntryHasFocus()
 {
     return m_entryView->numberOfSelectedEntries() > 0 && m_entryView->hasFocus();

diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
@@ -91,7 +91,6 @@ class DatabaseWidget : public QStackedWidget
     Group* currentGroup() const;
     bool canDeleteCurrentGroup() const;
     bool isGroupSelected() const;
-    bool currentGroupHasChildren() const;
     bool isRecycleBinSelected() const;
     int numberOfSelectedEntries() const;
 

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -380,8 +380,8 @@ MainWindow::MainWindow()
     m_actionMultiplexer.connect(m_ui->actionGroupEdit, SIGNAL(triggered()), SLOT(switchToGroupEdit()));
     m_actionMultiplexer.connect(m_ui->actionGroupDelete, SIGNAL(triggered()), SLOT(deleteGroup()));
     m_actionMultiplexer.connect(m_ui->actionGroupEmptyRecycleBin, SIGNAL(triggered()), SLOT(emptyRecycleBin()));
-    m_actionMultiplexer.connect(m_ui->actionGroupSortAZ, SIGNAL(triggered()), SLOT(sortGroupsAsc()));
-    m_actionMultiplexer.connect(m_ui->actionGroupSortZA, SIGNAL(triggered()), SLOT(sortGroupsDesc()));
+    m_actionMultiplexer.connect(m_ui->actionGroupSortAsc, SIGNAL(triggered()), SLOT(sortGroupsAsc()));
+    m_actionMultiplexer.connect(m_ui->actionGroupSortDesc, SIGNAL(triggered()), SLOT(sortGroupsDesc()));
 
     connect(m_ui->actionSettings, SIGNAL(toggled(bool)), SLOT(switchToSettings(bool)));
     connect(m_ui->actionPasswordGenerator, SIGNAL(toggled(bool)), SLOT(switchToPasswordGen(bool)));
@@ -572,7 +572,7 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
             bool singleEntrySelected = dbWidget->numberOfSelectedEntries() == 1 && hasFocus;
             bool entriesSelected = dbWidget->numberOfSelectedEntries() > 0 && hasFocus;
             bool groupSelected = dbWidget->isGroupSelected();
-            bool currentGroupHasChildren = dbWidget->currentGroupHasChildren();
+            bool currentGroupHasChildren = dbWidget->currentGroup()->hasChildren();
             bool recycleBinSelected = dbWidget->isRecycleBinSelected();
 
             m_ui->actionEntryNew->setEnabled(true);
@@ -595,8 +595,8 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
             m_ui->actionGroupNew->setEnabled(groupSelected);
             m_ui->actionGroupEdit->setEnabled(groupSelected);
             m_ui->actionGroupDelete->setEnabled(groupSelected && dbWidget->canDeleteCurrentGroup());
-            m_ui->actionGroupSortAZ->setEnabled(groupSelected && currentGroupHasChildren);
-            m_ui->actionGroupSortZA->setEnabled(groupSelected && currentGroupHasChildren);
+            m_ui->actionGroupSortAsc->setEnabled(groupSelected && currentGroupHasChildren);
+            m_ui->actionGroupSortDesc->setEnabled(groupSelected && currentGroupHasChildren);
             m_ui->actionGroupEmptyRecycleBin->setVisible(recycleBinSelected);
             m_ui->actionGroupEmptyRecycleBin->setEnabled(recycleBinSelected);
             m_ui->actionChangeMasterKey->setEnabled(true);

diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
@@ -282,8 +282,8 @@
     <addaction name="actionGroupDelete"/>
     <addaction name="actionGroupEmptyRecycleBin"/>
     <addaction name="separator"/>
-    <addaction name="actionGroupSortAZ"/>
-    <addaction name="actionGroupSortZA"/>
+    <addaction name="actionGroupSortAsc"/>
+    <addaction name="actionGroupSortDesc"/>
    </widget>
    <widget class="QMenu" name="menuTools">
     <property name="title">
@@ -455,15 +455,15 @@
     <string>&amp;Delete group</string>
    </property>
   </action>
-  <action name="actionGroupSortAZ">
+  <action name="actionGroupSortAsc">
    <property name="enabled">
     <bool>false</bool>
    </property>
    <property name="text">
     <string>Sort &amp;A-Z</string>
    </property>
   </action>
-  <action name="actionGroupSortZA">
+  <action name="actionGroupSortDesc">
    <property name="enabled">
     <bool>false</bool>
    </property>

diff --git a/src/gui/group/GroupModel.cpp b/src/gui/group/GroupModel.cpp
@@ -411,17 +411,17 @@ void GroupModel::groupMoved()
     endMoveRows();
 }
 
-void GroupModel::sortChildren(Group* parent, bool desc)
+void GroupModel::sortChildren(Group* rootGroup, bool reverse)
 {
     emit layoutAboutToBeChanged();
 
     QList<QModelIndex> oldIndexes;
-    collectIndexesRecursively(oldIndexes, parent->children());
+    collectIndexesRecursively(oldIndexes, rootGroup->children());
 
-    parent->sortChildrenRecursively(desc);
+    rootGroup->sortChildrenRecursively(reverse);
 
     QList<QModelIndex> newIndexes;
-    collectIndexesRecursively(newIndexes, parent->children());
+    collectIndexesRecursively(newIndexes, rootGroup->children());
 
     for (int i = 0; i < oldIndexes.count(); i++) {
         changePersistentIndex(oldIndexes[i], newIndexes[i]);
@@ -432,8 +432,7 @@ void GroupModel::sortChildren(Group* parent, bool desc)
 
 void GroupModel::collectIndexesRecursively(QList<QModelIndex>& indexes, QList<Group*> groups)
 {
-    for (int i = 0; i < groups.count(); i++) {
-        Group* group = groups[i];
+    for (auto group : groups) {
         indexes.append(index(group));
         collectIndexesRecursively(indexes, group->children());
     }

diff --git a/src/gui/group/GroupModel.h b/src/gui/group/GroupModel.h
@@ -45,7 +45,7 @@ class GroupModel : public QAbstractItemModel
     dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
     QStringList mimeTypes() const override;
     QMimeData* mimeData(const QModelIndexList& indexes) const override;
-    void sortChildren(Group* parent, bool desc = false);
+    void sortChildren(Group* rootGroup, bool reverse = false);
 
 private:
     QModelIndex parent(Group* group) const;

diff --git a/src/gui/group/GroupView.cpp b/src/gui/group/GroupView.cpp
@@ -115,10 +115,10 @@ void GroupView::expandGroup(Group* group, bool expand)
     setExpanded(index, expand);
 }
 
-void GroupView::sortGroups(bool desc) {
-    Group* currentGrp = currentGroup();
-    if (currentGrp) {
-        m_model->sortChildren(currentGrp, desc);
+void GroupView::sortGroups(bool reverse) {
+    Group* group = currentGroup();
+    if (group) {
+        m_model->sortChildren(group, reverse);
     }
 }
 

diff --git a/src/gui/group/GroupView.h b/src/gui/group/GroupView.h
@@ -35,7 +35,7 @@ class GroupView : public QTreeView
     Group* currentGroup();
     void setCurrentGroup(Group* group);
     void expandGroup(Group* group, bool expand = true);
-    void sortGroups(bool desc = false);
+    void sortGroups(bool reverse = false);
 
 signals:
     void groupSelectionChanged(Group* group);