fix set sorting (#6630)

cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp

@@ -20,8 +20,6 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_set/card_sets_model.h>
 
-#define SORT_RESET -1
-
 WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 {
     setOrderIsSorted = false;
@@ -97,7 +95,6 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     view->setDropIndicatorShown(true);
     view->setDragDropMode(QAbstractItemView::InternalMove);
 
-    view->sortByColumn(SetsModel::SortKeyCol, Qt::AscendingOrder);
     view->setColumnHidden(SetsModel::SortKeyCol, true);
     view->setColumnHidden(SetsModel::IsKnownCol, true);
     view->setColumnHidden(SetsModel::PriorityCol, true);
@@ -196,10 +193,10 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     auto headerState = SettingsCache::instance().layouts().getSetsDialogHeaderState();
     if (!headerState.isEmpty()) {
         view->header()->restoreState(headerState);
-        view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
     } else {
         view->header()->resizeSections(QHeaderView::ResizeToContents);
     }
+    resetSort();
     connect(view->header(), &QHeaderView::geometriesChanged, this, &WndSets::saveHeaderState);
 }
 
@@ -239,6 +236,13 @@ void WndSets::rebuildMainLayout(int actionToTake)
     }
 }
 
+void WndSets::resetSort()
+{
+    view->sortByColumn(SetsModel::SortKeyCol, Qt::AscendingOrder);
+    sortIndex = -1;
+    sortWarning->setVisible(false);
+}
+
 void WndSets::includeRebalancedCardsChanged(bool _includeRebalancedCards)
 {
     includeRebalancedCards = _includeRebalancedCards;
@@ -260,9 +264,9 @@ void WndSets::actRestore()
 
 void WndSets::actRestoreOriginalOrder()
 {
-    view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
     model->restoreOriginalOrder();
-    sortWarning->setVisible(false);
+    view->selectionModel()->reset();
+    resetSort();
 }
 
 void WndSets::actDisableResetButton(const QString &filterString)
@@ -288,11 +292,12 @@ void WndSets::actSort(int index)
             sortIndex = index;
             sortWarning->setVisible(true);
         } else {
-            view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
-            sortIndex = -1;
-            sortWarning->setVisible(false);
+            resetSort();
         }
     }
+    if (!view->selectionModel()->selection().empty()) {
+        view->scrollTo(view->selectionModel()->selectedRows().first());
+    }
 }
 
 void WndSets::actIgnoreWarning()
@@ -301,23 +306,18 @@ void WndSets::actIgnoreWarning()
         return;
     }
     model->sort(sortIndex, sortOrder);
-    view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
-    sortIndex = -1;
-    sortWarning->setVisible(false);
+    resetSort();
 }
 
 void WndSets::actDisableSortButtons(int index)
 {
-    if (index != SORT_RESET) {
+    if (index != SetsModel::SortKeyCol) {
         view->setDragEnabled(false);
         setOrderIsSorted = true;
     } else {
         setOrderIsSorted = false;
         view->setDragEnabled(true);
     }
-    if (!view->selectionModel()->selection().empty()) {
-        view->scrollTo(view->selectionModel()->selectedRows().first());
-    }
     actToggleButtons(view->selectionModel()->selection(), QItemSelection());
 }
 

cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h

@@ -45,9 +45,6 @@ private:
     QHBoxLayout *filterBox;
     int sortIndex;
     Qt::SortOrder sortOrder;
-    void closeEvent(QCloseEvent *ev) override;
-    void saveHeaderState();
-    void rebuildMainLayout(int actionToTake);
     bool setOrderIsSorted;
     bool includeRebalancedCards;
     enum
@@ -56,6 +53,11 @@ private:
         SOME_SETS_SELECTED
     };
 
+    void closeEvent(QCloseEvent *ev) override;
+    void saveHeaderState();
+    void rebuildMainLayout(int actionToTake);
+    void resetSort();
+
 public:
     explicit WndSets(QWidget *parent = nullptr);
     ~WndSets() override;

libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp

@@ -45,7 +45,7 @@ QVariant SetsModel::data(const QModelIndex &index, int role) const
 
     switch (index.column()) {
         case SortKeyCol:
-            return QString("%1").arg(set->getSortKey(), 8, 10, QChar('0'));
+            return QString("%1").arg(index.row(), 8, 10, QChar('0'));
         case IsKnownCol:
             return set->getIsKnown();
         case SetTypeCol: