gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-05 20:39:59 -08:00
Code Issues Packages Projects Releases Wiki Activity

[VDD] Add sorting (#6355)

Browse Source 
* [VDD] Add sorting

Took 17 seconds

Took 3 minutes

* Adjust to contents.

Took 13 minutes

* Adjust sort order as well.

Took 5 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL
2025-11-27 23:31:40 +01:00
committed by GitHub
parent 122926c6cd
commit 587a8bc524
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
View File

@@ -98,12 +98,50 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
searchEdit->setTreeView(databaseView);
sortByLabel = new QLabel(this);
sortColumnCombo = new QComboBox(this);
sortColumnCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
sortOrderCombo = new QComboBox(this);
sortOrderCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
sortOrderCombo->addItem("Ascending", Qt::AscendingOrder);
sortOrderCombo->addItem("Descending", Qt::DescendingOrder);
sortOrderCombo->view()->setMinimumWidth(sortOrderCombo->view()->sizeHintForColumn(0));
sortOrderCombo->adjustSize();
// Populate columns dynamically from the model
for (int i = 0; i < databaseDisplayModel->columnCount(); ++i) {
QString header = databaseDisplayModel->headerData(i, Qt::Horizontal).toString();
sortColumnCombo->addItem(header, i);
}
sortColumnCombo->view()->setMinimumWidth(sortColumnCombo->view()->sizeHintForColumn(0));
sortColumnCombo->adjustSize();
connect(sortColumnCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
int column = sortColumnCombo->currentData().toInt();
Qt::SortOrder order = static_cast<Qt::SortOrder>(sortOrderCombo->currentData().toInt());
databaseView->sortByColumn(column, order);
searchModelChanged();
});
connect(sortOrderCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
int column = sortColumnCombo->currentData().toInt();
Qt::SortOrder order = static_cast<Qt::SortOrder>(sortOrderCombo->currentData().toInt());
databaseView->sortByColumn(column, order);
searchModelChanged();
});
colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel);
filterContainer = new QWidget(this);
filterContainerLayout = new QHBoxLayout(filterContainer);
filterContainer->setLayout(filterContainerLayout);
filterByLabel = new QLabel(this);
clearFilterWidget = new QToolButton();
clearFilterWidget->setFixedSize(32, 32);
clearFilterWidget->setIcon(QPixmap("theme:icons/delete"));
@@ -139,6 +177,8 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
&VisualDatabaseDisplayWidget::initialize);
sortByLabel->setVisible(false);
filterByLabel->setVisible(false);
quickFilterSaveLoadWidget->setVisible(false);
quickFilterNameWidget->setVisible(false);
quickFilterSubTypeWidget->setVisible(false);
@@ -155,6 +195,8 @@ void VisualDatabaseDisplayWidget::initialize()
{
databaseLoadIndicator->setVisible(false);
sortByLabel->setVisible(true);
filterByLabel->setVisible(true);
quickFilterSaveLoadWidget->setVisible(true);
quickFilterNameWidget->setVisible(true);
quickFilterSubTypeWidget->setVisible(true);
@@ -171,6 +213,10 @@ void VisualDatabaseDisplayWidget::initialize()
quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget);
quickFilterSetWidget->addSettingsWidget(setFilterWidget);
filterContainerLayout->addWidget(sortByLabel);
filterContainerLayout->addWidget(sortColumnCombo);
filterContainerLayout->addWidget(sortOrderCombo);
filterContainerLayout->addWidget(filterByLabel);
filterContainerLayout->addWidget(quickFilterSaveLoadWidget);
filterContainerLayout->addWidget(quickFilterNameWidget);
filterContainerLayout->addWidget(quickFilterSubTypeWidget);
@@ -216,6 +262,9 @@ void VisualDatabaseDisplayWidget::retranslateUi()
clearFilterWidget->setToolTip(tr("Clear all filters"));
sortByLabel->setText(tr("Sort by:"));
filterByLabel->setText(tr("Filter by:"));
quickFilterSaveLoadWidget->setToolTip(tr("Save and load filters"));
quickFilterNameWidget->setToolTip(tr("Filter by exact card name"));
quickFilterSubTypeWidget->setToolTip(tr("Filter by card sub-type"));

5
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
View File

@@ -81,6 +81,11 @@ protected slots:
private:
QLabel *databaseLoadIndicator;
QLabel *sortByLabel;
QComboBox *sortColumnCombo, *sortOrderCombo;
QLabel *filterByLabel;
QToolButton *clearFilterWidget;
QWidget *filterContainer;
QHBoxLayout *filterContainerLayout;