jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-13 01:24:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Guard against not-loaded database by delaying initialization. (#6133)

Browse source 
Took 20 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-09-13 15:00:30 +02:00 • committed by GitHub
parent 41ea424359
commit d5ea86bc81
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,19 +108,52 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
quickFilterSaveLoadWidget = new SettingsButtonWidget(this); quickFilterSaveLoadWidget = new SettingsButtonWidget(this);
quickFilterSaveLoadWidget->setButtonIcon(QPixmap("theme:icons/lock")); quickFilterSaveLoadWidget->setButtonIcon(QPixmap("theme:icons/lock"));
saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel);
quickFilterNameWidget = new SettingsButtonWidget(this); quickFilterNameWidget = new SettingsButtonWidget(this);
quickFilterNameWidget->setButtonIcon(QPixmap("theme:icons/rename")); quickFilterNameWidget->setButtonIcon(QPixmap("theme:icons/rename"));
nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, deckEditor, filterModel);
mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
quickFilterSubTypeWidget = new SettingsButtonWidget(this); quickFilterSubTypeWidget = new SettingsButtonWidget(this);
quickFilterSubTypeWidget->setButtonIcon(QPixmap("theme:icons/player")); quickFilterSubTypeWidget->setButtonIcon(QPixmap("theme:icons/player"));
subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
quickFilterSetWidget = new SettingsButtonWidget(this); quickFilterSetWidget = new SettingsButtonWidget(this);
quickFilterSetWidget->setButtonIcon(QPixmap("theme:icons/scales")); quickFilterSetWidget->setButtonIcon(QPixmap("theme:icons/scales"));
setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
filterContainer->setMaximumHeight(80); filterContainer->setMaximumHeight(80);
databaseLoadIndicator = new QLabel(this);
databaseLoadIndicator->setAlignment(Qt::AlignCenter);
mainLayout->addWidget(databaseLoadIndicator);
if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
&VisualDatabaseDisplayWidget::initialize);
quickFilterSaveLoadWidget->setVisible(false);
quickFilterNameWidget->setVisible(false);
quickFilterSubTypeWidget->setVisible(false);
quickFilterSetWidget->setVisible(false);
} else {
initialize();
databaseLoadIndicator->setVisible(false);
}
retranslateUi();
}
void VisualDatabaseDisplayWidget::initialize()
{
databaseLoadIndicator->setVisible(false);
quickFilterSaveLoadWidget->setVisible(true);
quickFilterNameWidget->setVisible(true);
quickFilterSubTypeWidget->setVisible(true);
quickFilterSetWidget->setVisible(true);
saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel);
nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, deckEditor, filterModel);
mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
quickFilterSaveLoadWidget->addSettingsWidget(saveLoadWidget); quickFilterSaveLoadWidget->addSettingsWidget(saveLoadWidget);
quickFilterNameWidget->addSettingsWidget(nameFilterWidget); quickFilterNameWidget->addSettingsWidget(nameFilterWidget);
quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget); quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget);
@ -164,6 +197,8 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
void VisualDatabaseDisplayWidget::retranslateUi() void VisualDatabaseDisplayWidget::retranslateUi()
{ {
databaseLoadIndicator->setText(tr("Loading database ..."));
clearFilterWidget->setToolTip(tr("Clear all filters")); clearFilterWidget->setToolTip(tr("Clear all filters"));
quickFilterSaveLoadWidget->setToolTip(tr("Save and load filters")); quickFilterSaveLoadWidget->setToolTip(tr("Save and load filters"));

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

@ -62,6 +62,7 @@ signals:
void cardHoveredDatabaseDisplay(const ExactCard &hoveredCard); void cardHoveredDatabaseDisplay(const ExactCard &hoveredCard);
protected slots: protected slots:
void initialize();
void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
void onHover(const ExactCard &hoveredCard); void onHover(const ExactCard &hoveredCard);
void addCard(const ExactCard &cardToAdd); void addCard(const ExactCard &cardToAdd);
@ -71,6 +72,7 @@ protected slots:
void updateSearch(const QString &search) const; void updateSearch(const QString &search) const;
private: private:
QLabel *databaseLoadIndicator;
QToolButton *clearFilterWidget; QToolButton *clearFilterWidget;
QWidget *filterContainer; QWidget *filterContainer;
QHBoxLayout *filterContainerLayout; QHBoxLayout *filterContainerLayout;