mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-26 08:33:54 -07:00
[VDD] Add sorting (#6355)
* [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:
parent
122926c6cd
commit
587a8bc524
2 changed files with 54 additions and 0 deletions
|
|
@ -98,12 +98,50 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
|
||||||
|
|
||||||
searchEdit->setTreeView(databaseView);
|
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);
|
colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel);
|
||||||
|
|
||||||
filterContainer = new QWidget(this);
|
filterContainer = new QWidget(this);
|
||||||
filterContainerLayout = new QHBoxLayout(filterContainer);
|
filterContainerLayout = new QHBoxLayout(filterContainer);
|
||||||
filterContainer->setLayout(filterContainerLayout);
|
filterContainer->setLayout(filterContainerLayout);
|
||||||
|
|
||||||
|
filterByLabel = new QLabel(this);
|
||||||
|
|
||||||
clearFilterWidget = new QToolButton();
|
clearFilterWidget = new QToolButton();
|
||||||
clearFilterWidget->setFixedSize(32, 32);
|
clearFilterWidget->setFixedSize(32, 32);
|
||||||
clearFilterWidget->setIcon(QPixmap("theme:icons/delete"));
|
clearFilterWidget->setIcon(QPixmap("theme:icons/delete"));
|
||||||
|
|
@ -139,6 +177,8 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
|
||||||
if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
|
if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
|
||||||
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
|
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
|
||||||
&VisualDatabaseDisplayWidget::initialize);
|
&VisualDatabaseDisplayWidget::initialize);
|
||||||
|
sortByLabel->setVisible(false);
|
||||||
|
filterByLabel->setVisible(false);
|
||||||
quickFilterSaveLoadWidget->setVisible(false);
|
quickFilterSaveLoadWidget->setVisible(false);
|
||||||
quickFilterNameWidget->setVisible(false);
|
quickFilterNameWidget->setVisible(false);
|
||||||
quickFilterSubTypeWidget->setVisible(false);
|
quickFilterSubTypeWidget->setVisible(false);
|
||||||
|
|
@ -155,6 +195,8 @@ void VisualDatabaseDisplayWidget::initialize()
|
||||||
{
|
{
|
||||||
databaseLoadIndicator->setVisible(false);
|
databaseLoadIndicator->setVisible(false);
|
||||||
|
|
||||||
|
sortByLabel->setVisible(true);
|
||||||
|
filterByLabel->setVisible(true);
|
||||||
quickFilterSaveLoadWidget->setVisible(true);
|
quickFilterSaveLoadWidget->setVisible(true);
|
||||||
quickFilterNameWidget->setVisible(true);
|
quickFilterNameWidget->setVisible(true);
|
||||||
quickFilterSubTypeWidget->setVisible(true);
|
quickFilterSubTypeWidget->setVisible(true);
|
||||||
|
|
@ -171,6 +213,10 @@ void VisualDatabaseDisplayWidget::initialize()
|
||||||
quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget);
|
quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget);
|
||||||
quickFilterSetWidget->addSettingsWidget(setFilterWidget);
|
quickFilterSetWidget->addSettingsWidget(setFilterWidget);
|
||||||
|
|
||||||
|
filterContainerLayout->addWidget(sortByLabel);
|
||||||
|
filterContainerLayout->addWidget(sortColumnCombo);
|
||||||
|
filterContainerLayout->addWidget(sortOrderCombo);
|
||||||
|
filterContainerLayout->addWidget(filterByLabel);
|
||||||
filterContainerLayout->addWidget(quickFilterSaveLoadWidget);
|
filterContainerLayout->addWidget(quickFilterSaveLoadWidget);
|
||||||
filterContainerLayout->addWidget(quickFilterNameWidget);
|
filterContainerLayout->addWidget(quickFilterNameWidget);
|
||||||
filterContainerLayout->addWidget(quickFilterSubTypeWidget);
|
filterContainerLayout->addWidget(quickFilterSubTypeWidget);
|
||||||
|
|
@ -216,6 +262,9 @@ void VisualDatabaseDisplayWidget::retranslateUi()
|
||||||
|
|
||||||
clearFilterWidget->setToolTip(tr("Clear all filters"));
|
clearFilterWidget->setToolTip(tr("Clear all filters"));
|
||||||
|
|
||||||
|
sortByLabel->setText(tr("Sort by:"));
|
||||||
|
filterByLabel->setText(tr("Filter by:"));
|
||||||
|
|
||||||
quickFilterSaveLoadWidget->setToolTip(tr("Save and load filters"));
|
quickFilterSaveLoadWidget->setToolTip(tr("Save and load filters"));
|
||||||
quickFilterNameWidget->setToolTip(tr("Filter by exact card name"));
|
quickFilterNameWidget->setToolTip(tr("Filter by exact card name"));
|
||||||
quickFilterSubTypeWidget->setToolTip(tr("Filter by card sub-type"));
|
quickFilterSubTypeWidget->setToolTip(tr("Filter by card sub-type"));
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,11 @@ protected slots:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QLabel *databaseLoadIndicator;
|
QLabel *databaseLoadIndicator;
|
||||||
|
|
||||||
|
QLabel *sortByLabel;
|
||||||
|
QComboBox *sortColumnCombo, *sortOrderCombo;
|
||||||
|
|
||||||
|
QLabel *filterByLabel;
|
||||||
QToolButton *clearFilterWidget;
|
QToolButton *clearFilterWidget;
|
||||||
QWidget *filterContainer;
|
QWidget *filterContainer;
|
||||||
QHBoxLayout *filterContainerLayout;
|
QHBoxLayout *filterContainerLayout;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue