cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp

@@ -1,13 +1,11 @@
 #include "card_group_display_widget.h"
 
-#include "../../../../client/settings/cache_settings.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
 
 #include <QResizeEvent>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h>
-#include <libcockatrice/settings/cards_display_settings.h>
 
 CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,
@@ -32,7 +30,6 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
     layout->addWidget(banner);
 
     CardGroupDisplayWidget::updateCardDisplays();
-    updateCardCount();
 
     connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
     if (selectionModel) {
@@ -41,13 +38,6 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
     }
     connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
     connect(deckListModel, &QAbstractItemModel::dataChanged, this, &CardGroupDisplayWidget::onDataChanged);
-    connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::updateCardCount);
-    connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::updateCardCount);
-    connect(deckListModel, &QAbstractItemModel::dataChanged, this, &CardGroupDisplayWidget::updateCardCount);
-    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::visualDeckEditorShowCardCountsChanged,
-            this, &CardGroupDisplayWidget::updateCardCount);
-
-    cardSizeWidget->enableCtrlScrollResize(this);
 }
 
 // Just here so it can get overwritten in subclasses.
@@ -359,21 +349,3 @@ void CardGroupDisplayWidget::onActiveSortCriteriaChanged(QStringList _activeSort
     clearAllDisplayWidgets();
     updateCardDisplays();
 }
-
-void CardGroupDisplayWidget::updateCardCount()
-{
-    if (!banner || !deckListModel || !trackedIndex.isValid()) {
-        return;
-    }
-
-    QString text = cardGroupCategory;
-    if (SettingsCache::instance().cardsDisplay().getVisualDeckEditorShowCardCounts()) {
-        int total = 0;
-        for (int i = 0; i < deckListModel->rowCount(trackedIndex); ++i) {
-            total +=
-                deckListModel->index(i, DeckListModelColumns::CARD_AMOUNT, trackedIndex).data(Qt::EditRole).toInt();
-        }
-        text += QStringLiteral(" (%1)").arg(total);
-    }
-    banner->setText(text);
-}

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h

@@ -55,7 +55,6 @@ public slots:
     virtual void onCardRemoval(const QModelIndex &parent, int first, int last);
     void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
     void onActiveSortCriteriaChanged(QStringList activeSortCriteria);
-    void updateCardCount();
     void resizeEvent(QResizeEvent *event) override;
 
 signals:

cockatrice/src/interface/widgets/cards/card_size_widget.cpp

@@ -3,9 +3,6 @@
 #include "../printing_selector/printing_selector.h"
 #include "../visual_deck_storage/visual_deck_storage_widget.h"
 
-#include <QScrollArea>
-#include <QWheelEvent>
-
 /**
  * @class CardSizeWidget
  * @brief A widget for adjusting card sizes using a slider.
@@ -61,39 +58,3 @@ QSlider *CardSizeWidget::getSlider() const
 {
     return cardSizeSlider;
 }
-
-void CardSizeWidget::enableCtrlScrollResize(QWidget *host)
-{
-    host->installEventFilter(this);
-
-    const auto scrollAreas = host->findChildren<QScrollArea *>();
-    for (QScrollArea *scrollArea : scrollAreas) {
-        if (QWidget *content = scrollArea->widget()) {
-            content->installEventFilter(this);
-        }
-    }
-}
-
-bool CardSizeWidget::eventFilter(QObject *watched, QEvent *event)
-{
-    if (event->type() == QEvent::Wheel && adjustSliderForWheel(static_cast<QWheelEvent *>(event))) {
-        return true;
-    }
-    return QWidget::eventFilter(watched, event);
-}
-
-bool CardSizeWidget::adjustSliderForWheel(QWheelEvent *event)
-{
-    if (!(event->modifiers() & Qt::ControlModifier)) {
-        return false;
-    }
-
-    const int angleDelta = event->angleDelta().y();
-    if (angleDelta == 0) {
-        return false;
-    }
-
-    const int wheelSteps = angleDelta > 0 ? qMax(1, angleDelta / 120) : qMin(-1, angleDelta / 120);
-    cardSizeSlider->setValue(cardSizeSlider->value() + wheelSteps * CARD_SIZE_WHEEL_STEP);
-    return true;
-}

cockatrice/src/interface/widgets/cards/card_size_widget.h

@@ -17,8 +17,6 @@
 #include <QTimer>
 #include <QWidget>
 
-class QWheelEvent;
-
 class CardSizeWidget : public QWidget
 {
     Q_OBJECT
@@ -27,18 +25,6 @@ public:
     explicit CardSizeWidget(QWidget *parent, FlowWidget *flowWidget = nullptr, int defaultValue = 100);
     [[nodiscard]] QSlider *getSlider() const;
 
-    /**
-     * @brief Resizes the cards when the user Ctrl + scrolls over @p host or any of its descendants.
-     *
-     * Installs this widget as an event filter on the given host widget. If the host contains a
-     * scroll area the filter is also installed on the scroll area's content widget, so the resize
-     * intercepts the wheel event before the scroll area would scroll the view.
-     */
-    void enableCtrlScrollResize(QWidget *host);
-
-protected:
-    bool eventFilter(QObject *watched, QEvent *event) override;
-
 private slots:
     void updateCardSizeSetting(int newValue);
 
@@ -58,10 +44,6 @@ private:
     QSlider *cardSizeSlider;
     QTimer debounceTimer; // Debounce timer
     int pendingValue;     // Stores the latest slider value
-
-    bool adjustSliderForWheel(QWheelEvent *event);
-
-    static constexpr int CARD_SIZE_WHEEL_STEP = 10; ///< Slider step applied per Ctrl + scroll notch.
 };
 
 #endif // CARD_SIZE_WIDGET_H

cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp

@@ -1,10 +1,8 @@
 #include "deck_card_zone_display_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "card_group_display_widgets/flat_card_group_display_widget.h"
 #include "card_group_display_widgets/overlapped_card_group_display_widget.h"
 #include "libcockatrice/card/database/card_database_manager.h"
-#include "libcockatrice/settings/cards_display_settings.h"
 
 #include <QResizeEvent>
 #include <algorithm>
@@ -41,7 +39,6 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
     banner->setBuddy(cardGroupContainer);
 
     displayCards();
-    updateZoneCardCount();
 
     connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition);
     if (selectionModel) {
@@ -49,11 +46,6 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                 &DeckCardZoneDisplayWidget::onSelectionChanged);
     }
     connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::onCategoryRemoval);
-    connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::updateZoneCardCount);
-    connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::updateZoneCardCount);
-    connect(deckListModel, &QAbstractItemModel::dataChanged, this, &DeckCardZoneDisplayWidget::updateZoneCardCount);
-    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::visualDeckEditorShowCardCountsChanged,
-            this, &DeckCardZoneDisplayWidget::updateZoneCardCount);
 }
 
 // =====================================================================================================================
@@ -253,21 +245,3 @@ QList<QString> DeckCardZoneDisplayWidget::getGroupCriteriaValueList()
 
     return groupCriteriaValues;
 }
-
-void DeckCardZoneDisplayWidget::updateZoneCardCount()
-{
-    if (!banner || !deckListModel) {
-        return;
-    }
-
-    QString text = zoneName;
-    if (SettingsCache::instance().cardsDisplay().getVisualDeckEditorShowCardCounts()) {
-        int total = 0;
-        const auto cardNodes = deckListModel->getCardNodesForZone(zoneName);
-        for (const auto *node : cardNodes) {
-            total += node->getNumber();
-        }
-        text += QStringLiteral(" (%1)").arg(total);
-    }
-    banner->setText(text);
-}

cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h

@@ -52,7 +52,6 @@ public slots:
     QList<QString> getGroupCriteriaValueList();
     void onCategoryAddition(const QModelIndex &parent, int first, int last);
     void onCategoryRemoval(const QModelIndex &parent, int first, int last);
-    void updateZoneCardCount();
 
 signals:
     void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName);

cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp

@@ -58,7 +58,6 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
                                         SettingsCache::instance().cardsDisplay().getPrintingSelectorCardSize());
     connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
             &CardsDisplaySettings::setPrintingSelectorCardSize);
-    cardSizeWidget->enableCtrlScrollResize(flowWidget);
 
     displayOptionsWidget->addSettingsWidget(sortToolBar);
     displayOptionsWidget->addSettingsWidget(navigationCheckBox);

cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp

@@ -149,11 +149,6 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
     connect(&openDeckInNewTabCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().deckEditor(),
             &DeckEditorSettings::setOpenDeckInNewTab);
 
-    visualDeckEditorShowCardCountsCheckBox.setChecked(
-        SettingsCache::instance().cardsDisplay().getVisualDeckEditorShowCardCounts());
-    connect(&visualDeckEditorShowCardCountsCheckBox, &QCheckBox::QT_STATE_CHANGED,
-            &SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::setVisualDeckEditorShowCardCounts);
-
     visualDeckStorageInGameCheckBox.setChecked(
         SettingsCache::instance().visualDeckStorage().getVisualDeckStorageInGame());
     connect(&visualDeckStorageInGameCheckBox, &QCheckBox::QT_STATE_CHANGED,
@@ -249,19 +244,18 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
 
     auto *deckEditorGrid = new QGridLayout;
     deckEditorGrid->addWidget(&openDeckInNewTabCheckBox, 0, 0);
-    deckEditorGrid->addWidget(&visualDeckEditorShowCardCountsCheckBox, 1, 0);
+    deckEditorGrid->addWidget(&visualDeckStorageInGameCheckBox, 1, 0);
-    deckEditorGrid->addWidget(&visualDeckStorageInGameCheckBox, 2, 0);
+    deckEditorGrid->addWidget(&visualDeckStorageSelectionAnimationCheckBox, 2, 0);
-    deckEditorGrid->addWidget(&visualDeckStorageSelectionAnimationCheckBox, 3, 0);
+    deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionLabel, 3, 0);
-    deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionLabel, 4, 0);
+    deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionSelector, 3, 1);
-    deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionSelector, 4, 1);
+    deckEditorGrid->addWidget(&defaultDeckEditorTypeLabel, 4, 0);
-    deckEditorGrid->addWidget(&defaultDeckEditorTypeLabel, 5, 0);
+    deckEditorGrid->addWidget(&defaultDeckEditorTypeSelector, 4, 1);
-    deckEditorGrid->addWidget(&defaultDeckEditorTypeSelector, 5, 1);
+    deckEditorGrid->addWidget(&vdeStartupTabLabel, 5, 0);
-    deckEditorGrid->addWidget(&vdeStartupTabLabel, 6, 0);
+    deckEditorGrid->addWidget(&vdeStartupTabSelector, 5, 1);
-    deckEditorGrid->addWidget(&vdeStartupTabSelector, 6, 1);
+    deckEditorGrid->addWidget(&commanderSpellbookIntegrationEnabledLabel, 6, 0);
-    deckEditorGrid->addWidget(&commanderSpellbookIntegrationEnabledLabel, 7, 0);
+    deckEditorGrid->addWidget(&commanderSpellbookIntegrationEnabledSelector, 6, 1);
-    deckEditorGrid->addWidget(&commanderSpellbookIntegrationEnabledSelector, 7, 1);
+    deckEditorGrid->addWidget(labelWidget, 7, 0);
-    deckEditorGrid->addWidget(labelWidget, 8, 0);
+    deckEditorGrid->addWidget(&commanderSpellbookIntegrationBracketNamingSelector, 7, 1);
-    deckEditorGrid->addWidget(&commanderSpellbookIntegrationBracketNamingSelector, 8, 1);
 
     deckEditorGroupBox = new QGroupBox;
     deckEditorGroupBox->setLayout(deckEditorGrid);
@@ -373,7 +367,6 @@ void UserInterfaceSettingsPage::retranslateUi()
 
     deckEditorGroupBox->setTitle(tr("Deck editor/storage settings"));
     openDeckInNewTabCheckBox.setText(tr("Open deck in new tab by default"));
-    visualDeckEditorShowCardCountsCheckBox.setText(tr("Show card counts in Visual Deck Editor"));
     visualDeckStorageInGameCheckBox.setText(tr("Use visual deck storage in game lobby"));
     visualDeckStorageSelectionAnimationCheckBox.setText(tr("Use selection animation for Visual Deck Storage"));
     visualDeckStoragePromptForConversionLabel.setText(

cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h

@@ -51,7 +51,6 @@ private:
     QComboBox visualDeckStoragePromptForConversionSelector;
     QCheckBox visualDeckStorageInGameCheckBox;
     QCheckBox visualDeckStorageSelectionAnimationCheckBox;
-    QCheckBox visualDeckEditorShowCardCountsCheckBox;
     QLabel defaultDeckEditorTypeLabel;
     QComboBox defaultDeckEditorTypeSelector;
     QLabel vdeStartupTabLabel;

cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp

@@ -15,8 +15,6 @@ ArchidektApiResponseDeckListingsDisplayWidget::ArchidektApiResponseDeckListingsD
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
 
-    cardSizeSlider->enableCtrlScrollResize(flowWidget);
-
     imageNetworkManager = new QNetworkAccessManager(this);
     imageNetworkManager->setTransferTimeout(); // Use Qt's default timeout
     imageNetworkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);

cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp

@@ -54,7 +54,6 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi
                 &CardInfoPictureWidget::setScaleFactor);
         connect(this, &EdhrecApiResponseCardDetailsDisplayWidget::requestUrl, parentTab,
                 &TabEdhRecMain::actNavigatePage);
-        parentTab->getCardSizeSlider()->enableCtrlScrollResize(this);
     }
 }
 

cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp

@@ -38,7 +38,6 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom
         connect(parentTab->getCardSizeSlider()->getSlider(), &QSlider::valueChanged, commanderPicture,
                 &CardInfoPictureWidget::setScaleFactor);
         commanderPicture->setScaleFactor(parentTab->getCardSizeSlider()->getSlider()->value());
-        parentTab->getCardSizeSlider()->enableCtrlScrollResize(this);
     }
 
     commanderDetails.debugPrint();

cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp

@@ -2,7 +2,6 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h"
 #include "../visual_deck_storage/deck_preview/public_deck_preview_widget.h"
@@ -108,7 +107,6 @@ TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_c
             &TabPublicDecks::updateCardSize);
     connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::showTagFilterChanged, this,
             &TabPublicDecks::updateTagsVisibility);
-    quickSettingsWidget->getCardSizeWidget()->enableCtrlScrollResize(flowWidget);
 
     retranslateUi();
     model->refresh(userName);

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp

@@ -69,7 +69,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
                                         SettingsCache::instance().cardsDisplay().getVisualDatabaseDisplayCardSize());
     connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
             &CardsDisplaySettings::setVisualDatabaseDisplayCardSize);
-    cardSizeWidget->enableCtrlScrollResize(flowWidget);
 
     searchContainer = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
 

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp

@@ -48,7 +48,6 @@ VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *pare
     upperLayout->addWidget(flowWidget);
 
     cardSizeWidget = new CardSizeWidget(this, flowWidget);
-    cardSizeWidget->enableCtrlScrollResize(flowWidget);
     upperLayout->addWidget(cardSizeWidget);
 
     auto upperLayoutWidget = new QWidget(this);

cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp

@@ -1,7 +1,6 @@
 #include "visual_deck_storage_folder_display_widget.h"
 
 #include "../cards/card_info_picture_widget.h"
-#include "../cards/card_size_widget.h"
 #include "../general/display/banner_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "deck_preview/deck_preview_widget.h"
@@ -46,8 +45,6 @@ VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget(
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
     containerLayout->addWidget(flowWidget);
 
-    visualDeckStorageWidget->settings()->getCardSizeWidget()->enableCtrlScrollResize(this);
-
     auto *proxy = visualDeckStorageWidget->proxyModel();
     // A burst of proxy changes (one dataChanged per finished deck load, plus the filter
     // invalidations) coalesces into a single reconcile, so a scan of many decks doesn't

cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h

@@ -70,15 +70,6 @@ public:
     [[nodiscard]] TooltipType getDeckPreviewTooltip() const;
     [[nodiscard]] int getCardSize() const;
 
-    /**
-     * @return The card size widget, so card display hosts can resize the cards on
-     * Ctrl + scroll even though the slider itself lives inside this menu.
-     */
-    [[nodiscard]] CardSizeWidget *getCardSizeWidget() const
-    {
-        return cardSizeWidget;
-    }
-
 signals:
     void showFoldersChanged(bool enabled);
     void drawUnusedColorIdentitiesChanged(bool enabled);

libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h

@@ -25,7 +25,6 @@ public:
     [[nodiscard]] virtual int getVisualDeckStorageCardSize() const = 0;
     [[nodiscard]] virtual int getVisualDatabaseDisplayCardSize() const = 0;
     [[nodiscard]] virtual int getVisualDeckEditorCardSize() const = 0;
-    [[nodiscard]] virtual bool getVisualDeckEditorShowCardCounts() const = 0;
     [[nodiscard]] virtual int getEDHRecCardSize() const = 0;
     [[nodiscard]] virtual int getArchidektPreviewSize() const = 0;
     [[nodiscard]] virtual int getSampleHandSize() const = 0;

libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp

@@ -90,11 +90,6 @@ int CardsDisplaySettings::getVisualDeckEditorCardSize() const
     return getValue("visualDeckEditor", "cards", "cardSize", 100).toInt();
 }
 
-bool CardsDisplaySettings::getVisualDeckEditorShowCardCounts() const
-{
-    return getValue("visualDeckEditorShowCardCounts", QString(), QString(), true).toBool();
-}
-
 int CardsDisplaySettings::getEDHRecCardSize() const
 {
     return getValue("edhrec", "cards", "cardSize", 100).toInt();
@@ -222,15 +217,6 @@ void CardsDisplaySettings::setVisualDeckEditorCardSize(int _cardSize)
     emit visualDeckEditorCardSizeChanged();
 }
 
-void CardsDisplaySettings::setVisualDeckEditorShowCardCounts(bool _showCardCounts)
-{
-    if (_showCardCounts == getVisualDeckEditorShowCardCounts()) {
-        return;
-    }
-    setValue(_showCardCounts, "visualDeckEditorShowCardCounts");
-    emit visualDeckEditorShowCardCountsChanged(_showCardCounts);
-}
-
 void CardsDisplaySettings::setEDHRecCardSize(int _edhrecCardSize)
 {
     setValue(_edhrecCardSize, "edhrec", "cards", "cardSize");

libcockatrice_settings/libcockatrice/settings/cards_display_settings.h

@@ -29,7 +29,6 @@ public:
     [[nodiscard]] int getVisualDeckStorageCardSize() const override;
     [[nodiscard]] int getVisualDatabaseDisplayCardSize() const override;
     [[nodiscard]] int getVisualDeckEditorCardSize() const override;
-    [[nodiscard]] bool getVisualDeckEditorShowCardCounts() const override;
     [[nodiscard]] int getEDHRecCardSize() const override;
     [[nodiscard]] int getArchidektPreviewSize() const override;
     [[nodiscard]] int getSampleHandSize() const override;
@@ -53,7 +52,6 @@ public:
     void setVisualDeckStorageCardSize(int _cardSize);
     void setVisualDatabaseDisplayCardSize(int _cardSize);
     void setVisualDeckEditorCardSize(int _cardSize);
-    void setVisualDeckEditorShowCardCounts(bool _showCardCounts);
     void setEDHRecCardSize(int _edhrecCardSize);
     void setArchidektPreviewCardSize(int _archidektPreviewCardSize);
     void setSampleHandSize(int _sampleHandSize);
@@ -72,7 +70,6 @@ signals:
     void visualDeckStorageCardSizeChanged();
     void visualDatabaseDisplayCardSizeChanged();
     void visualDeckEditorCardSizeChanged();
-    void visualDeckEditorShowCardCountsChanged(bool showCardCounts);
     void edhRecCardSizeChanged();
     void archidektPreviewSizeChanged();
     void sampleHandSizeChanged(int amount);

tests/settings/settings_defaults_test.cpp

@@ -570,21 +570,6 @@ TEST_F(SettingsDefaultsTest, CardsDisplay_VisualDeckEditorCardSize_Default)
     ASSERT_EQ(s.getVisualDeckEditorCardSize(), 100);
 }
 
-TEST_F(SettingsDefaultsTest, CardsDisplay_VisualDeckEditorShowCardCounts_Default)
-{
-    CardsDisplaySettings s(settingsPath, nullptr);
-    ASSERT_EQ(s.getVisualDeckEditorShowCardCounts(), true);
-}
-
-TEST_F(SettingsDefaultsTest, CardsDisplay_VisualDeckEditorShowCardCounts_SetAndGet)
-{
-    CardsDisplaySettings s(settingsPath, nullptr);
-    s.setVisualDeckEditorShowCardCounts(false);
-    ASSERT_EQ(s.getVisualDeckEditorShowCardCounts(), false);
-    s.setVisualDeckEditorShowCardCounts(true);
-    ASSERT_EQ(s.getVisualDeckEditorShowCardCounts(), true);
-}
-
 TEST_F(SettingsDefaultsTest, CardsDisplay_EDHRecCardSize_Default)
 {
     CardsDisplaySettings s(settingsPath, nullptr);