Implement separate comboBoxes for sorting and grouping.

cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp

@@ -9,11 +9,12 @@
 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                      DeckListModel *_deckListModel,
                                                      QString _zoneName,
+                                                     QString _activeGroupCriteria,
                                                      QString _activeSortCriteria,
                                                      int bannerOpacity,
                                                      int subBannerOpacity)
-    : QWidget(parent), deckListModel(_deckListModel), zoneName(_zoneName), activeSortCriteria(_activeSortCriteria),
+    : QWidget(parent), deckListModel(_deckListModel), zoneName(_zoneName), activeGroupCriteria(_activeGroupCriteria),
-      bannerOpacity(bannerOpacity), subBannerOpacity(subBannerOpacity)
+      activeSortCriteria(_activeSortCriteria), bannerOpacity(bannerOpacity), subBannerOpacity(subBannerOpacity)
 {
     layout = new QVBoxLayout(this);
     setLayout(layout);
@@ -61,7 +62,7 @@ void DeckCardZoneDisplayWidget::addCardGroupIfItDoesNotExist()
     QList<OverlappedCardGroupDisplayWidget *> cardGroupsDisplayWidgets =
         cardGroupContainer->findChildren<OverlappedCardGroupDisplayWidget *>();
 
-    QList<QString> cardGroups = getSortCriteriaValueList();
+    QList<QString> cardGroups = getGroupCriteriaValueList();
 
     for (QString cardGroup : cardGroups) {
         bool found = false;
@@ -72,11 +73,13 @@ void DeckCardZoneDisplayWidget::addCardGroupIfItDoesNotExist()
         }
 
         if (!found) {
-            OverlappedCardGroupDisplayWidget *display_widget = new OverlappedCardGroupDisplayWidget(
+            OverlappedCardGroupDisplayWidget *display_widget = new OverlappedCardGroupDisplayWidget(cardGroupContainer, deckListModel, zoneName, cardGroup,
-                this, deckListModel, zoneName, cardGroup, activeSortCriteria, subBannerOpacity);
+                                                     activeGroupCriteria, activeSortCriteria, subBannerOpacity);
             connect(display_widget, SIGNAL(cardClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this,
                     SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)));
             connect(display_widget, SIGNAL(cardHovered(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr)));
+            connect(this, &DeckCardZoneDisplayWidget::activeSortCriteriaChanged, display_widget,
+                    &OverlappedCardGroupDisplayWidget::onActiveSortCriteriaChanged);
             cardGroupLayout->addWidget(display_widget);
         }
     }
@@ -85,37 +88,59 @@ void DeckCardZoneDisplayWidget::addCardGroupIfItDoesNotExist()
 void DeckCardZoneDisplayWidget::deleteCardGroupIfItDoesNotExist()
 {
     QList<OverlappedCardGroupDisplayWidget *> cardGroupsDisplayWidgets =
-        cardGroupLayout->findChildren<OverlappedCardGroupDisplayWidget *>();
+        cardGroupContainer->findChildren<OverlappedCardGroupDisplayWidget *>();
+
+    QList<QString> validGroups = getGroupCriteriaValueList();
+
+    qDebug() << "DeckCardZoneDisplayWidget: Checking for obsolete card groups.";
+    qDebug() << "Valid groups (should remain):" << validGroups;
+
     for (OverlappedCardGroupDisplayWidget *cardGroupDisplayWidget : cardGroupsDisplayWidgets) {
-        bool found = false;
+        qDebug() << "Checking group:" << cardGroupDisplayWidget->cardGroupCategory;
-        for (QString cardGroup : getSortCriteriaValueList()) {
+
-            if (cardGroupDisplayWidget->cardGroupCategory == cardGroup) {
+        if (!validGroups.contains(cardGroupDisplayWidget->cardGroupCategory)) {
-                found = true;
+            qDebug() << "Deleting group:" << cardGroupDisplayWidget->cardGroupCategory;
+            cardGroupLayout->removeWidget(cardGroupDisplayWidget);
+            cardGroupDisplayWidget->deleteLater(); // Properly delete the widget after the event loop cycles
+        } else {
+            qDebug() << "Keeping group:" << cardGroupDisplayWidget->cardGroupCategory;
         }
     }
 
-        if (!found) {
+    qDebug() << "Finished checking for obsolete card groups.";
-            cardGroupLayout->removeWidget(cardGroupDisplayWidget);
+}
-        }
+
-    }
+void DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged(QString _activeGroupCriteria)
+{
+    activeGroupCriteria = _activeGroupCriteria;
+    qDebug() << "DeckCardZoneDisplayWidget says: We group by " << activeGroupCriteria << " and display cards";
+    displayCards();
 }
 
 void DeckCardZoneDisplayWidget::onActiveSortCriteriaChanged(QString _activeSortCriteria)
 {
     activeSortCriteria = _activeSortCriteria;
+    qDebug() << "DeckCardZoneDisplayWidget says: we sort by" << activeSortCriteria << " and emit a signal";
+    emit activeSortCriteriaChanged(activeSortCriteria);
 }
 
-QList<QString> DeckCardZoneDisplayWidget::getSortCriteriaValueList()
+QList<QString> DeckCardZoneDisplayWidget::getGroupCriteriaValueList()
 {
-    QList<QString> sortCriteriaValues;
+    QList<QString> groupCriteriaValues;
 
     QList<CardInfoPtr> *cardsInZone = deckListModel->getCardsAsCardInfoPtrsForZone(zoneName);
 
     for (CardInfoPtr cardInZone : *cardsInZone) {
-        sortCriteriaValues.append(cardInZone->getProperty(activeSortCriteria));
+        groupCriteriaValues.append(cardInZone->getProperty(activeGroupCriteria));
     }
 
-    sortCriteriaValues.removeDuplicates();
+    groupCriteriaValues.removeDuplicates();
-    sortCriteriaValues.sort();
+    groupCriteriaValues.sort();
-    return sortCriteriaValues;
+
+    qDebug() << "These are the group by criteria values";
+    for (QString groupCriteria : groupCriteriaValues) {
+        qDebug() << groupCriteria;
+    }
+
+    return groupCriteriaValues;
 }

cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h

@@ -18,6 +18,7 @@ public:
     DeckCardZoneDisplayWidget(QWidget *parent,
                               DeckListModel *deckListModel,
                               QString zoneName,
+                              QString activeGroupCriteria,
                               QString activeSortCriteria,
                               int bannerOpacity,
                               int subBannerOpacity);
@@ -32,14 +33,17 @@ public slots:
     void displayCards();
     void addCardGroupIfItDoesNotExist();
     void deleteCardGroupIfItDoesNotExist();
+    void onActiveGroupCriteriaChanged(QString activeGroupCriteria);
     void onActiveSortCriteriaChanged(QString activeSortCriteria);
-    QList<QString> getSortCriteriaValueList();
+    QList<QString> getGroupCriteriaValueList();
 
 signals:
     void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card, QString zoneName);
     void cardHovered(CardInfoPtr card);
+    void activeSortCriteriaChanged(QString activeSortCriteria);
 
 private:
+    QString activeGroupCriteria;
     QString activeSortCriteria;
     QVBoxLayout *layout;
     BannerWidget *banner;

cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.cpp

@@ -11,10 +11,11 @@ OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *pare
                                                                    DeckListModel *_deckListModel,
                                                                    QString _zoneName,
                                                                    QString _cardGroupCategory,
+                                                                   QString _activeGroupCriteria,
                                                                    QString _activeSortCriteria,
                                                                    int bannerOpacity)
     : QWidget(parent), deckListModel(_deckListModel), zoneName(_zoneName), cardGroupCategory(_cardGroupCategory),
-      activeSortCriteria(_activeSortCriteria)
+      activeGroupCriteria(_activeGroupCriteria), activeSortCriteria(_activeSortCriteria)
 {
     layout = new QVBoxLayout(this);
     setLayout(layout);
@@ -52,6 +53,7 @@ void OverlappedCardGroupDisplayWidget::updateCardDisplays()
         widgetMap[widget->getInfo()->getName()].append(widget);
     }
 
+    // Remove excess widgets
     for (auto it = widgetMap.begin(); it != widgetMap.end(); ++it) {
         QString name = it.key();
         QList<CardInfoPictureWithTextOverlayWidget *> &widgets = it.value();
@@ -59,34 +61,45 @@ void OverlappedCardGroupDisplayWidget::updateCardDisplays()
         int neededCount = requiredCounts.value(name, 0);
         while (widgets.size() > neededCount) {
             CardInfoPictureWithTextOverlayWidget *widgetToRemove = widgets.takeLast();
-            overlapWidget->removeWidget(widgetToRemove);
+            overlapWidget->layout()->removeWidget(widgetToRemove); // Remove from layout
             delete widgetToRemove;
         }
     }
 
-    for (auto it = requiredCounts.begin(); it != requiredCounts.end(); ++it) {
+    // Add missing widgets and reorder existing ones
-        QString name = it.key();
+    QList<CardInfoPictureWithTextOverlayWidget *> sortedWidgets;
-        int missingCount = it.value() - widgetMap[name].size();
+    for (const CardInfoPtr &card : cardsInZone) {
+        QString name = card->getName();
 
-        for (int i = 0; i < missingCount; ++i) {
+        if (!widgetMap[name].isEmpty()) {
+            // Use existing widget
+            CardInfoPictureWithTextOverlayWidget *widget = widgetMap[name].takeFirst();
+            sortedWidgets.append(widget);
+        } else {
+            // Create new widget if needed
             auto *display = new CardInfoPictureWithTextOverlayWidget(overlapWidget, true);
-
+            display->setCard(card);
-            auto cardIt = std::find_if(cardsInZone.begin(), cardsInZone.end(),
-                                       [&](const CardInfoPtr &c) { return c->getName() == name; });
-
-            if (cardIt != cardsInZone.end()) {
-                display->setCard(*cardIt);
-            }
 
             connect(display, &CardInfoPictureWithTextOverlayWidget::imageClicked, this,
                     &OverlappedCardGroupDisplayWidget::onClick);
             connect(display, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this,
                     &OverlappedCardGroupDisplayWidget::onHover);
 
+            sortedWidgets.append(display);
             overlapWidget->addWidget(display);
         }
     }
 
+    // **Reorder Widgets in Layout**
+    for (CardInfoPictureWithTextOverlayWidget *widget : sortedWidgets) {
+        overlapWidget->removeWidget(widget);
+        overlapWidget->addWidget(widget);
+    }
+
+    for (CardInfoPictureWithTextOverlayWidget *widget : sortedWidgets) {
+        widget->raise();
+    }
+
     overlapWidget->adjustMaxColumnsAndRows();
 }
 
@@ -101,7 +114,7 @@ QList<CardInfoPtr> OverlappedCardGroupDisplayWidget::getCardsMatchingGroup(QList
     for (int i = 0; i < cardsToSort->size(); ++i) {
         CardInfoPtr info = cardsToSort->at(i);
         if (info) {
-            if (info->getProperty(activeSortCriteria) == cardGroupCategory) {
+            if (info->getProperty(activeGroupCriteria) == cardGroupCategory) {
                 activeList.append(info);
             }
         } else {
@@ -120,6 +133,15 @@ void OverlappedCardGroupDisplayWidget::sortCardList(QList<CardInfoPtr> *cardsToS
     std::sort(cardsToSort->begin(), cardsToSort->end(), comparator);
 }
 
+void OverlappedCardGroupDisplayWidget::onActiveSortCriteriaChanged(QString _activeSortCriteria)
+{
+    if (activeSortCriteria != _activeSortCriteria) {
+        activeSortCriteria = _activeSortCriteria;
+        qDebug() << "OverlappedCardGroupDisplayWidget changed the sort criteria to " << activeSortCriteria;
+        updateCardDisplays(); // Refresh display with new sorting
+    }
+}
+
 void OverlappedCardGroupDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card)
 {
     emit cardClicked(event, card);

cockatrice/src/client/ui/widgets/cards/overlapped_card_group_display_widget.h

@@ -20,6 +20,7 @@ public:
                                      DeckListModel *deckListModel,
                                      QString zoneName,
                                      QString cardGroupCategory,
+                                     QString activeGroupCriteria,
                                      QString activeSortCriteria,
                                      int bannerOpacity);
 
@@ -29,6 +30,7 @@ public:
     DeckListModel *deckListModel;
     QString zoneName;
     QString cardGroupCategory;
+    QString activeGroupCriteria;
     QString activeSortCriteria;
 
 public slots:
@@ -36,6 +38,7 @@ public slots:
     void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
     void onHover(CardInfoPtr card);
     void updateCardDisplays();
+    void onActiveSortCriteriaChanged(QString activeSortCriteria);
 
 signals:
     void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);

cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp

@@ -27,12 +27,23 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_
     mainLayout = new QVBoxLayout();
     this->setLayout(mainLayout);
 
-    sortByComboBox = new QComboBox();
+    groupByComboBox = new QComboBox();
-    QStringList sortProperties;
+    QStringList groupProperties;
-    sortProperties << "maintype"
+    groupProperties << "maintype"
                     << "colors"
                     << "cmc"
                     << "name";
+    groupByComboBox->addItems(groupProperties);
+    connect(groupByComboBox, QOverload<const QString &>::of(&QComboBox::currentTextChanged), this,
+            &VisualDeckEditorWidget::actChangeActiveGroupCriteria);
+    actChangeActiveGroupCriteria();
+
+    sortByComboBox = new QComboBox();
+    QStringList sortProperties;
+    sortProperties << "name"
+                   << "cmc"
+                   << "colors"
+                   << "maintype";
     sortByComboBox->addItems(sortProperties);
     connect(sortByComboBox, QOverload<const QString &>::of(&QComboBox::currentTextChanged), this,
             &VisualDeckEditorWidget::actChangeActiveSortCriteria);
@@ -56,6 +67,7 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_
 
     overlapControlWidget = new OverlapControlWidget(80, 1, 1, Qt::Vertical, this);
 
+    mainLayout->addWidget(groupByComboBox);
     mainLayout->addWidget(sortByComboBox);
     mainLayout->addWidget(scrollArea);
     mainLayout->addWidget(overlapControlWidget);
@@ -80,13 +92,15 @@ void VisualDeckEditorWidget::addZoneIfDoesNotExist()
         }
 
         if (!found) {
-            DeckCardZoneDisplayWidget *zoneDisplayWidget =
+            DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
-                new DeckCardZoneDisplayWidget(zoneContainer, deckListModel, zone, activeSortCriteria, 20, 10);
+                zoneContainer, deckListModel, zone, activeGroupCriteria, activeSortCriteria, 20, 10);
             connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
             connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this,
                     &VisualDeckEditorWidget::onCardClick);
             connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget,
                     &DeckCardZoneDisplayWidget::onActiveSortCriteriaChanged);
+            connect(this, &VisualDeckEditorWidget::activeGroupCriteriaChanged, zoneDisplayWidget,
+                    &DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged);
             zoneContainerLayout->addWidget(zoneDisplayWidget);
         }
     }
@@ -117,9 +131,17 @@ void VisualDeckEditorWidget::resizeEvent(QResizeEvent *event)
     zoneContainer->setMaximumWidth(scrollArea->viewport()->width());
 }
 
+void VisualDeckEditorWidget::actChangeActiveGroupCriteria()
+{
+    activeGroupCriteria = groupByComboBox->currentText();
+    qDebug() << "VDE says we group by " << activeGroupCriteria;
+    emit activeGroupCriteriaChanged(activeGroupCriteria);
+}
+
 void VisualDeckEditorWidget::actChangeActiveSortCriteria()
 {
     activeSortCriteria = sortByComboBox->currentText();
+    qDebug() << "VDE says we sort by " << activeSortCriteria;
     emit activeSortCriteriaChanged(activeSortCriteria);
 }
 

cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h

@@ -28,19 +28,23 @@ public slots:
 
 signals:
     void activeCardChanged(CardInfoPtr activeCard);
+    void activeGroupCriteriaChanged(QString activeGroupCriteria);
     void activeSortCriteriaChanged(QString activeSortCriteria);
     void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
 
 protected slots:
     void onHover(CardInfoPtr hoveredCard);
     void onCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
+    void actChangeActiveGroupCriteria();
     void actChangeActiveSortCriteria();
 
 private:
     DeckListModel *deckListModel;
     QVBoxLayout *mainLayout;
+    QComboBox *groupByComboBox;
+    QString activeGroupCriteria = "maintype";
     QComboBox *sortByComboBox;
-    QString activeSortCriteria = "maintype";
+    QString activeSortCriteria = "name";
     QScrollArea *scrollArea;
     QWidget *zoneContainer;
     QVBoxLayout *zoneContainerLayout;