jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 09:04:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Pull the subfilters out. (#5836)

Browse source 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-04-16 00:16:19 +02:00 • committed by GitHub
parent b4024ee552
commit a55a287a9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp
View file

@ -26,6 +26,11 @@ void SettingsButtonWidget::addSettingsWidget(QWidget *toAdd) const
popup->addSettingsWidget(toAdd); popup->addSettingsWidget(toAdd);
} }
void SettingsButtonWidget::setButtonIcon(QPixmap iconMap)
{
button->setIcon(iconMap);
}
void SettingsButtonWidget::togglePopup() void SettingsButtonWidget::togglePopup()
{ {
if (popup->isVisible()) { if (popup->isVisible()) {

1
cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.h
View file

@ -13,6 +13,7 @@ class SettingsButtonWidget : public QWidget
public: public:
explicit SettingsButtonWidget(QWidget *parent = nullptr); explicit SettingsButtonWidget(QWidget *parent = nullptr);
void addSettingsWidget(QWidget *toAdd) const; void addSettingsWidget(QWidget *toAdd) const;
void setButtonIcon(QPixmap iconMap);
protected: protected:
void mousePressEvent(QMouseEvent *event) override; void mousePressEvent(QMouseEvent *event) override;

31
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp
View file

@ -91,27 +91,42 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel); colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel);
quickFilterWidget = new SettingsButtonWidget(this); filterContainer = new QWidget(this);
filterContainerLayout = new QHBoxLayout(filterContainer);
filterContainer->setLayout(filterContainerLayout);
quickFilterSaveLoadWidget = new SettingsButtonWidget(this);
quickFilterSaveLoadWidget->setButtonIcon(QPixmap("theme:icons/lock"));
saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel); saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel);
quickFilterNameWidget = new SettingsButtonWidget(this);
quickFilterNameWidget->setButtonIcon(QPixmap("theme:icons/rename"));
nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, deckEditor, filterModel); nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, deckEditor, filterModel);
mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel); mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
quickFilterSubTypeWidget = new SettingsButtonWidget(this);
quickFilterSubTypeWidget->setButtonIcon(QPixmap("theme:icons/player"));
subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel); subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
quickFilterSetWidget = new SettingsButtonWidget(this);
quickFilterSetWidget->setButtonIcon(QPixmap("theme:icons/scales"));
setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel); setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
filterContainer->setMaximumHeight(80);
quickFilterWidget->addSettingsWidget(saveLoadWidget); quickFilterSaveLoadWidget->addSettingsWidget(saveLoadWidget);
quickFilterWidget->addSettingsWidget(nameFilterWidget); quickFilterNameWidget->addSettingsWidget(nameFilterWidget);
// quickFilterWidget->addSettingsWidget(mainTypeFilterWidget); quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget);
quickFilterWidget->addSettingsWidget(subTypeFilterWidget); quickFilterSetWidget->addSettingsWidget(setFilterWidget);
quickFilterWidget->addSettingsWidget(setFilterWidget);
filterContainerLayout->addWidget(mainTypeFilterWidget);
filterContainerLayout->addWidget(quickFilterSaveLoadWidget);
filterContainerLayout->addWidget(quickFilterNameWidget);
filterContainerLayout->addWidget(quickFilterSubTypeWidget);
filterContainerLayout->addWidget(quickFilterSetWidget);
searchLayout->addWidget(colorFilterWidget); searchLayout->addWidget(colorFilterWidget);
searchLayout->addWidget(quickFilterWidget);
searchLayout->addWidget(searchEdit); searchLayout->addWidget(searchEdit);
mainLayout->addWidget(searchContainer); mainLayout->addWidget(searchContainer);
mainLayout->addWidget(mainTypeFilterWidget); mainLayout->addWidget(filterContainer);
mainLayout->addWidget(flowWidget); mainLayout->addWidget(flowWidget);

8
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h
View file

@ -69,11 +69,16 @@ protected slots:
void updateSearch(const QString &search) const; void updateSearch(const QString &search) const;
private: private:
SettingsButtonWidget *quickFilterWidget; QWidget *filterContainer;
QHBoxLayout *filterContainerLayout;
SettingsButtonWidget *quickFilterSaveLoadWidget;
VisualDatabaseDisplayFilterSaveLoadWidget *saveLoadWidget; VisualDatabaseDisplayFilterSaveLoadWidget *saveLoadWidget;
SettingsButtonWidget *quickFilterNameWidget;
VisualDatabaseDisplayNameFilterWidget *nameFilterWidget; VisualDatabaseDisplayNameFilterWidget *nameFilterWidget;
VisualDatabaseDisplayMainTypeFilterWidget *mainTypeFilterWidget; VisualDatabaseDisplayMainTypeFilterWidget *mainTypeFilterWidget;
SettingsButtonWidget *quickFilterSubTypeWidget;
VisualDatabaseDisplaySubTypeFilterWidget *subTypeFilterWidget; VisualDatabaseDisplaySubTypeFilterWidget *subTypeFilterWidget;
SettingsButtonWidget *quickFilterSetWidget;
VisualDatabaseDisplaySetFilterWidget *setFilterWidget; VisualDatabaseDisplaySetFilterWidget *setFilterWidget;
KeySignals searchKeySignals; KeySignals searchKeySignals;
AbstractTabDeckEditor *deckEditor; AbstractTabDeckEditor *deckEditor;
@ -88,7 +93,6 @@ private:
QVBoxLayout *overlapCategoriesLayout; QVBoxLayout *overlapCategoriesLayout;
OverlapControlWidget *overlapControlWidget; OverlapControlWidget *overlapControlWidget;
CardSizeWidget *cardSizeWidget; CardSizeWidget *cardSizeWidget;
QWidget *container;
QTimer *debounceTimer; QTimer *debounceTimer;
QTimer *loadCardsTimer; QTimer *loadCardsTimer;