jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-13 05:20:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Replace Visual Deck Storage WUBRG filter with compact Essence dropdown

Browse source
This commit is contained in:
Christian Daniel Jensen 2026-11-03 12:13:34 -07:00
parent 7864af9592
commit 8514122641
1 changed files with 14 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

48
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
View file

@ -1,12 +1,11 @@
#include "deck_preview_color_identity_filter_widget.h" #include "deck_preview_color_identity_filter_widget.h"
#include "../../cards/additional_info/mana_symbol_widget.h" #include "../../cards/additional_info/essence_filter_picker.h"
#include "../visual_deck_storage_sort_filter_proxy_model.h" #include "../visual_deck_storage_sort_filter_proxy_model.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QPushButton> #include <QPushButton>
#include <QSet> #include <QSet>
#include <QSharedPointer>
#include <QString> #include <QString>
DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(QWidget *parent) DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(QWidget *parent)
@ -16,34 +15,26 @@ DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(QWidg
layout->setSpacing(5); layout->setSpacing(5);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
QString fullColorIdentity = "WUBRG"; // Fifteen Essence codes don't fit as inline buttons beside sorting and
for (const QChar &color : fullColorIdentity) { // search. The popup keeps all codes selectable without expanding the row.
auto *manaSymbol = new ManaSymbolWidget(this, color, false, true); essencePicker = new EssenceFilterPicker(this);
manaSymbol->setFixedWidth(25); layout->addWidget(essencePicker);
layout->addWidget(manaSymbol); connect(essencePicker, &EssenceFilterPicker::essenceToggled, this,
[this](QChar /*essence*/, bool /*active*/) { emit activeColorsChanged(); });
// Initialize the activeColors map
activeColors[color] = false;
// Connect the color toggled signal
connect(manaSymbol, &ManaSymbolWidget::colorToggled, this,
&DeckPreviewColorIdentityFilterWidget::handleColorToggled);
}
toggleButton = new QPushButton(this); toggleButton = new QPushButton(this);
layout->addWidget(toggleButton); layout->addWidget(toggleButton);
// Connect the button's clicked signal
connect(toggleButton, &QPushButton::clicked, this, &DeckPreviewColorIdentityFilterWidget::updateFilterMode); connect(toggleButton, &QPushButton::clicked, this, &DeckPreviewColorIdentityFilterWidget::updateFilterMode);
// Call retranslateUi to set the initial text
retranslateUi(); retranslateUi();
} }
void DeckPreviewColorIdentityFilterWidget::retranslateUi() void DeckPreviewColorIdentityFilterWidget::retranslateUi()
{ {
// Set the toggle button text based on the current mode essencePicker->retranslateUi();
// Preserve existing Exact / Includes / Excludes filter semantics.
switch (filterMode) { switch (filterMode) {
case VisualDeckStorageSortFilterProxyModel::FilterMode::ExactMatch: case VisualDeckStorageSortFilterProxyModel::FilterMode::ExactMatch:
toggleButton->setText(tr("Mode: Exact Match")); toggleButton->setText(tr("Mode: Exact Match"));
@ -55,32 +46,21 @@ void DeckPreviewColorIdentityFilterWidget::retranslateUi()
toggleButton->setText(tr("Mode: Excludes")); toggleButton->setText(tr("Mode: Excludes"));
break; break;
} }
toggleButton->setToolTip(tr("Color identity filter mode (AND/OR/NOT conjunctions of filters)")); toggleButton->setToolTip(tr("Essence filter mode (exact match, includes, or excludes)"));
} }
/**
* @brief The colors that are currently toggled on.
*/
QSet<QChar> DeckPreviewColorIdentityFilterWidget::getActiveColors() const QSet<QChar> DeckPreviewColorIdentityFilterWidget::getActiveColors() const
{ {
QSet<QChar> activeColorSet; return essencePicker->activeEssences();
for (auto it = activeColors.constBegin(); it != activeColors.constEnd(); ++it) {
if (it.value()) {
activeColorSet.insert(it.key());
}
}
return activeColorSet;
} }
void DeckPreviewColorIdentityFilterWidget::handleColorToggled(QChar color, bool active) void DeckPreviewColorIdentityFilterWidget::handleColorToggled(QChar /*essence*/, bool /*active*/)
{ {
activeColors[color] = active;
emit activeColorsChanged(); emit activeColorsChanged();
} }
void DeckPreviewColorIdentityFilterWidget::updateFilterMode() void DeckPreviewColorIdentityFilterWidget::updateFilterMode()
{ {
// Cycle through the modes
switch (filterMode) { switch (filterMode) {
case VisualDeckStorageSortFilterProxyModel::FilterMode::ExactMatch: case VisualDeckStorageSortFilterProxyModel::FilterMode::ExactMatch:
filterMode = VisualDeckStorageSortFilterProxyModel::FilterMode::Includes; filterMode = VisualDeckStorageSortFilterProxyModel::FilterMode::Includes;
@ -93,6 +73,6 @@ void DeckPreviewColorIdentityFilterWidget::updateFilterMode()
break; break;
} }
retranslateUi(); // Update the button text retranslateUi();
emit filterModeChanged(filterMode); emit filterModeChanged(filterMode);
} }