From f2ed09e9442c6e9d31f62d5cffb3b06598693075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=BCbach=2C=20Lukas?= Date: Tue, 25 Nov 2025 12:07:50 +0100 Subject: [PATCH] Refresh on filter change. --- ..._response_deck_listings_display_widget.cpp | 2 +- .../tabs/api/archidekt/tab_archidekt.cpp | 35 +++++-------------- .../tabs/api/archidekt/tab_archidekt.h | 2 +- 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp index d03174d49..73ce0a0f8 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp @@ -10,7 +10,7 @@ ArchidektApiResponseDeckListingsDisplayWidget::ArchidektApiResponseDeckListingsD : QWidget(parent), cardSizeSlider(_cardSizeSlider) { layout = new QHBoxLayout(this); - layout->setContentsMargins(0,0,0,0); + layout->setContentsMargins(0, 0, 0, 0); setLayout(layout); flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded); diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp index e8f31f0ab..4f3f75f81 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp @@ -34,13 +34,13 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) container = new QWidget(this); mainLayout = new QVBoxLayout(container); - mainLayout->setContentsMargins(0, 0, 0, 1); + mainLayout->setContentsMargins(0, 0, 0, 0); container->setLayout(mainLayout); navigationContainer = new QWidget(container); navigationContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); navigationLayout = new QHBoxLayout(navigationContainer); - navigationLayout->setSpacing(5); + navigationLayout->setSpacing(3); navigationContainer->setLayout(navigationLayout); // Colors @@ -53,12 +53,13 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) manaSymbol->setFixedWidth(25); colorLayout->addWidget(manaSymbol); - connect(manaSymbol, &ManaSymbolWidget::colorToggled, this, [=](QChar c, bool active) { + connect(manaSymbol, &ManaSymbolWidget::colorToggled, this, [this](QChar c, bool active) { if (active) { activeColors.insert(c); } else { activeColors.remove(c); } + doSearch(); }); } @@ -79,6 +80,7 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) for (int i = 0; i < formatNames.size(); ++i) { QCheckBox *formatCheckBox = new QCheckBox(formatNames[i], navigationContainer); + connect(formatCheckBox, &QCheckBox::clicked, this, [this]() { doSearch(); }); formatChecks << formatCheckBox; formatSettingsWidget->addSettingsWidget(formatCheckBox); } @@ -143,7 +145,7 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) } });*/ - //navigationLayout->addWidget(searchBar); + // navigationLayout->addWidget(searchBar); // Do search button @@ -194,7 +196,7 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) void TabArchidekt::retranslateUi() { - //searchBar->setPlaceholderText(tr("Search for a card ...")); + // searchBar->setPlaceholderText(tr("Search for a card ...")); searchPushButton->setText(tr("Search")); formatLabel->setText(tr("Formats")); pageSizeLabel->setText(tr("Max. Results:")); @@ -210,28 +212,7 @@ QString TabArchidekt::buildSearchUrl() // colors QStringList selectedColors; for (QChar c : activeColors) { - switch (c.unicode()) { - case 'W': - selectedColors << "White"; - break; - case 'U': - selectedColors << "Blue"; - break; - case 'B': - selectedColors << "Black"; - break; - case 'G': - selectedColors << "Green"; - break; - case 'R': - selectedColors << "Red"; - break; - case 'C': - selectedColors << "Colorless"; - break; - default: - break; - } + selectedColors.append(c); } if (!selectedColors.isEmpty()) diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h index ad86eda34..422909179 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h @@ -53,7 +53,7 @@ private: QVBoxLayout *mainLayout; QHBoxLayout *navigationLayout; QVBoxLayout *currentPageLayout; - //QLineEdit *searchBar; + // QLineEdit *searchBar; QPushButton *searchPushButton; // Required / basic fields