jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-16 15:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove a non-existant signal, containerize some layouts to silence warnings.

Browse source
This commit is contained in:
Lukas Brübach 2025-03-02 11:37:54 +01:00
parent b774c1881a
commit baaecfd983
6 changed files with 36 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp
View file

@ -21,8 +21,9 @@ ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
bannerWidget->setMaximumHeight(100); bannerWidget->setMaximumHeight(100);
layout->addWidget(bannerWidget); layout->addWidget(bannerWidget);
barLayout = new QHBoxLayout(this); barContainer = new QWidget(this);
layout->addLayout(barLayout); barLayout = new QHBoxLayout(barContainer);
layout->addWidget(barContainer);
connect(deckListModel, &DeckListModel::dataChanged, this, &ManaBaseWidget::analyzeManaBase); connect(deckListModel, &DeckListModel::dataChanged, this, &ManaBaseWidget::analyzeManaBase);

1
cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h
View file

@ -30,6 +30,7 @@ private:
BannerWidget *bannerWidget; BannerWidget *bannerWidget;
QHash<QString, int> manaBaseMap; QHash<QString, int> manaBaseMap;
QVBoxLayout *layout; QVBoxLayout *layout;
QWidget *barContainer;
QHBoxLayout *barLayout; QHBoxLayout *barLayout;
}; };

5
cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp
View file

@ -20,8 +20,9 @@ ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)
bannerWidget->setMaximumHeight(100); bannerWidget->setMaximumHeight(100);
layout->addWidget(bannerWidget); layout->addWidget(bannerWidget);
barLayout = new QHBoxLayout(this); barContainer = new QWidget(this);
layout->addLayout(barLayout); barLayout = new QHBoxLayout(barContainer);
layout->addWidget(barContainer);
connect(deckListModel, &DeckListModel::dataChanged, this, &ManaCurveWidget::analyzeManaCurve); connect(deckListModel, &DeckListModel::dataChanged, this, &ManaCurveWidget::analyzeManaCurve);

3
cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.h
View file

@ -25,8 +25,9 @@ private:
DeckListModel *deckListModel; DeckListModel *deckListModel;
std::unordered_map<int, int> manaCurveMap; std::unordered_map<int, int> manaCurveMap;
QVBoxLayout *layout; QVBoxLayout *layout;
QHBoxLayout *barLayout;
BannerWidget *bannerWidget; BannerWidget *bannerWidget;
QWidget *barContainer;
QHBoxLayout *barLayout;
}; };
#endif // MANA_CURVE_WIDGET_H #endif // MANA_CURVE_WIDGET_H

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

@ -29,17 +29,18 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
cards = new QList<CardInfoPtr>; cards = new QList<CardInfoPtr>;
connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this, connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this,
&VisualDatabaseDisplayWidget::modelDirty); &VisualDatabaseDisplayWidget::modelDirty);
connect(databaseDisplayModel, &QSortFilterProxyModel::invalidate, this, &VisualDatabaseDisplayWidget::modelDirty);
// Set up main layout and widgets // Set up main layout and widgets
setMinimumSize(0, 0); setMinimumSize(0, 0);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
main_layout = new QVBoxLayout(this); mainLayout = new QVBoxLayout(this);
setLayout(main_layout); setLayout(mainLayout);
auto quickFilterWidget = new SettingsButtonWidget(this); auto quickFilterWidget = new SettingsButtonWidget(this);
auto searchLayout = new QHBoxLayout(this); searchContainer = new QWidget(this);
searchLayout = new QHBoxLayout(searchContainer);
searchContainer->setLayout(searchLayout);
searchEdit = new SearchLineEdit(); searchEdit = new SearchLineEdit();
searchEdit->setObjectName("searchEdit"); searchEdit->setObjectName("searchEdit");
@ -77,7 +78,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::searchModelChanged); connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::searchModelChanged);
searchKeySignals.setObjectName("searchKeySignals"); searchKeySignals.setObjectName("searchKeySignals");
connect(searchEdit, SIGNAL(textChanged(const QString &)), this, SLOT(updateSearch(const QString &))); connect(searchEdit, &QLineEdit::textChanged, this, &VisualDatabaseDisplayWidget::updateSearch);
/*connect(&searchKeySignals, SIGNAL(onEnter()), this, SLOT(actAddCard())); /*connect(&searchKeySignals, SIGNAL(onEnter()), this, SLOT(actAddCard()));
connect(&searchKeySignals, SIGNAL(onCtrlAltEqual()), this, SLOT(actAddCard())); connect(&searchKeySignals, SIGNAL(onCtrlAltEqual()), this, SLOT(actAddCard()));
connect(&searchKeySignals, SIGNAL(onCtrlAltRBracket()), this, SLOT(actAddCardToSideboard())); connect(&searchKeySignals, SIGNAL(onCtrlAltRBracket()), this, SLOT(actAddCardToSideboard()));
@ -115,18 +116,18 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
searchLayout->addWidget(quickFilterWidget); searchLayout->addWidget(quickFilterWidget);
searchLayout->addWidget(searchEdit); searchLayout->addWidget(searchEdit);
main_layout->addLayout(searchLayout); mainLayout->addWidget(searchContainer);
flow_widget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded); flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded);
main_layout->addWidget(flow_widget); mainLayout->addWidget(flowWidget);
cardSizeWidget = new CardSizeWidget(this, flow_widget); cardSizeWidget = new CardSizeWidget(this, flowWidget);
main_layout->addWidget(cardSizeWidget); mainLayout->addWidget(cardSizeWidget);
debounce_timer = new QTimer(this); debounceTimer = new QTimer(this);
debounce_timer->setSingleShot(true); // Ensure it only fires once after the timeout debounceTimer->setSingleShot(true); // Ensure it only fires once after the timeout
connect(debounce_timer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::searchModelChanged); connect(debounceTimer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::searchModelChanged);
auto loadCardsTimer = new QTimer(this); auto loadCardsTimer = new QTimer(this);
loadCardsTimer->setSingleShot(true); // Ensure it only fires once after the timeout loadCardsTimer->setSingleShot(true); // Ensure it only fires once after the timeout
@ -154,13 +155,12 @@ void VisualDatabaseDisplayWidget::onHover(CardInfoPtr hoveredCard)
void VisualDatabaseDisplayWidget::addCard(CardInfoPtr cardToAdd) void VisualDatabaseDisplayWidget::addCard(CardInfoPtr cardToAdd)
{ {
cards->append(cardToAdd); cards->append(cardToAdd);
CardInfoPictureWithTextOverlayWidget *display = new CardInfoPictureWithTextOverlayWidget(flow_widget, false); CardInfoPictureWithTextOverlayWidget *display = new CardInfoPictureWithTextOverlayWidget(flowWidget, false);
display->setScaleFactor(cardSizeWidget->getSlider()->value()); display->setScaleFactor(cardSizeWidget->getSlider()->value());
display->setCard(cardToAdd); display->setCard(cardToAdd);
flow_widget->addWidget(display); flowWidget->addWidget(display);
connect(display, SIGNAL(imageClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this, connect(display, &CardInfoPictureWithTextOverlayWidget::imageClicked, this, &VisualDatabaseDisplayWidget::onClick);
SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *))); connect(display, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &VisualDatabaseDisplayWidget::onHover);
connect(display, SIGNAL(hoveredOnCard(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr)));
connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, display, &CardInfoPictureWidget::setScaleFactor); connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, display, &CardInfoPictureWidget::setScaleFactor);
} }
@ -207,10 +207,10 @@ void VisualDatabaseDisplayWidget::updateSearch(const QString &search)
void VisualDatabaseDisplayWidget::searchModelChanged() void VisualDatabaseDisplayWidget::searchModelChanged()
{ {
// Clear the current page and prepare for new data // Clear the current page and prepare for new data
flow_widget->clearLayout(); // Clear existing cards flowWidget->clearLayout(); // Clear existing cards
cards->clear(); // Clear the card list cards->clear(); // Clear the card list
// Reset scrollbar position to the top after loading new cards // Reset scrollbar position to the top after loading new cards
QScrollBar *scrollBar = flow_widget->scrollArea->verticalScrollBar(); QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar();
if (scrollBar) { if (scrollBar) {
scrollBar->setValue(0); // Reset scrollbar to top scrollBar->setValue(0); // Reset scrollbar to top
} }
@ -263,7 +263,7 @@ void VisualDatabaseDisplayWidget::loadCurrentPage()
void VisualDatabaseDisplayWidget::modelDirty() void VisualDatabaseDisplayWidget::modelDirty()
{ {
debounce_timer->start(debounce_time); debounceTimer->start(debounceTime);
} }
void VisualDatabaseDisplayWidget::sortCardList(const QStringList properties, Qt::SortOrder order = Qt::AscendingOrder) void VisualDatabaseDisplayWidget::sortCardList(const QStringList properties, Qt::SortOrder order = Qt::AscendingOrder)

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

@ -41,6 +41,8 @@ public:
void sortCardList(QStringList properties, Qt::SortOrder order); void sortCardList(QStringList properties, Qt::SortOrder order);
void setDeckList(const DeckList &new_deck_list_model); void setDeckList(const DeckList &new_deck_list_model);
QWidget *searchContainer;
QHBoxLayout *searchLayout;
SearchLineEdit *searchEdit; SearchLineEdit *searchEdit;
FilterTreeModel *filterModel; FilterTreeModel *filterModel;
VisualDatabaseDisplayColorFilterWidget *colorFilterWidget; VisualDatabaseDisplayColorFilterWidget *colorFilterWidget;
@ -68,17 +70,17 @@ private:
CardDatabaseDisplayModel *databaseDisplayModel; CardDatabaseDisplayModel *databaseDisplayModel;
QTreeView *databaseView; QTreeView *databaseView;
QList<CardInfoPtr> *cards; QList<CardInfoPtr> *cards;
QVBoxLayout *main_layout; QVBoxLayout *mainLayout;
QScrollArea *scrollArea; QScrollArea *scrollArea;
FlowWidget *flow_widget; FlowWidget *flowWidget;
QWidget *overlap_categories; QWidget *overlap_categories;
QVBoxLayout *overlap_categories_layout; QVBoxLayout *overlap_categories_layout;
OverlapControlWidget *overlap_control_widget; OverlapControlWidget *overlap_control_widget;
CardSizeWidget *cardSizeWidget; CardSizeWidget *cardSizeWidget;
QWidget *container; QWidget *container;
QTimer *debounce_timer; QTimer *debounceTimer;
int debounce_time = 300; int debounceTime = 300;
int currentPage = 0; // Current page index int currentPage = 0; // Current page index
int cardsPerPage = 100; // Number of cards per page int cardsPerPage = 100; // Number of cards per page