From baaecfd98361183166db6426dfe30f47d102a276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 2 Mar 2025 11:37:54 +0100 Subject: [PATCH] Remove a non-existant signal, containerize some layouts to silence warnings. --- .../deck_analytics/mana_base_widget.cpp | 5 ++- .../widgets/deck_analytics/mana_base_widget.h | 1 + .../deck_analytics/mana_curve_widget.cpp | 5 ++- .../deck_analytics/mana_curve_widget.h | 3 +- .../visual_database_display_widget.cpp | 42 +++++++++---------- .../visual_database_display_widget.h | 10 +++-- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp index c9183d7ee..1e8633531 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp @@ -21,8 +21,9 @@ ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel) bannerWidget->setMaximumHeight(100); layout->addWidget(bannerWidget); - barLayout = new QHBoxLayout(this); - layout->addLayout(barLayout); + barContainer = new QWidget(this); + barLayout = new QHBoxLayout(barContainer); + layout->addWidget(barContainer); connect(deckListModel, &DeckListModel::dataChanged, this, &ManaBaseWidget::analyzeManaBase); diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h index 2fc53dc2e..25bd36358 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h @@ -30,6 +30,7 @@ private: BannerWidget *bannerWidget; QHash manaBaseMap; QVBoxLayout *layout; + QWidget *barContainer; QHBoxLayout *barLayout; }; diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp index 45322d731..acf240e0e 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp @@ -20,8 +20,9 @@ ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel) bannerWidget->setMaximumHeight(100); layout->addWidget(bannerWidget); - barLayout = new QHBoxLayout(this); - layout->addLayout(barLayout); + barContainer = new QWidget(this); + barLayout = new QHBoxLayout(barContainer); + layout->addWidget(barContainer); connect(deckListModel, &DeckListModel::dataChanged, this, &ManaCurveWidget::analyzeManaCurve); diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.h b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.h index 052db9e0a..b45e5f862 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.h @@ -25,8 +25,9 @@ private: DeckListModel *deckListModel; std::unordered_map manaCurveMap; QVBoxLayout *layout; - QHBoxLayout *barLayout; BannerWidget *bannerWidget; + QWidget *barContainer; + QHBoxLayout *barLayout; }; #endif // MANA_CURVE_WIDGET_H diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp index d4106d720..b0216b1bd 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp @@ -29,17 +29,18 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, cards = new QList; connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this, &VisualDatabaseDisplayWidget::modelDirty); - connect(databaseDisplayModel, &QSortFilterProxyModel::invalidate, this, &VisualDatabaseDisplayWidget::modelDirty); // Set up main layout and widgets setMinimumSize(0, 0); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - main_layout = new QVBoxLayout(this); - setLayout(main_layout); + mainLayout = new QVBoxLayout(this); + setLayout(mainLayout); 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->setObjectName("searchEdit"); @@ -77,7 +78,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::searchModelChanged); 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(onCtrlAltEqual()), this, SLOT(actAddCard())); connect(&searchKeySignals, SIGNAL(onCtrlAltRBracket()), this, SLOT(actAddCardToSideboard())); @@ -115,18 +116,18 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, searchLayout->addWidget(quickFilterWidget); searchLayout->addWidget(searchEdit); - main_layout->addLayout(searchLayout); + mainLayout->addWidget(searchContainer); - flow_widget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded); - main_layout->addWidget(flow_widget); + flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded); + mainLayout->addWidget(flowWidget); - cardSizeWidget = new CardSizeWidget(this, flow_widget); - main_layout->addWidget(cardSizeWidget); + cardSizeWidget = new CardSizeWidget(this, flowWidget); + mainLayout->addWidget(cardSizeWidget); - debounce_timer = new QTimer(this); - debounce_timer->setSingleShot(true); // Ensure it only fires once after the timeout + debounceTimer = new QTimer(this); + 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); 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) { cards->append(cardToAdd); - CardInfoPictureWithTextOverlayWidget *display = new CardInfoPictureWithTextOverlayWidget(flow_widget, false); + CardInfoPictureWithTextOverlayWidget *display = new CardInfoPictureWithTextOverlayWidget(flowWidget, false); display->setScaleFactor(cardSizeWidget->getSlider()->value()); display->setCard(cardToAdd); - flow_widget->addWidget(display); - connect(display, SIGNAL(imageClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this, - SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *))); - connect(display, SIGNAL(hoveredOnCard(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr))); + flowWidget->addWidget(display); + connect(display, &CardInfoPictureWithTextOverlayWidget::imageClicked, this, &VisualDatabaseDisplayWidget::onClick); + connect(display, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &VisualDatabaseDisplayWidget::onHover); connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, display, &CardInfoPictureWidget::setScaleFactor); } @@ -207,10 +207,10 @@ void VisualDatabaseDisplayWidget::updateSearch(const QString &search) void VisualDatabaseDisplayWidget::searchModelChanged() { // 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 // Reset scrollbar position to the top after loading new cards - QScrollBar *scrollBar = flow_widget->scrollArea->verticalScrollBar(); + QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar(); if (scrollBar) { scrollBar->setValue(0); // Reset scrollbar to top } @@ -263,7 +263,7 @@ void VisualDatabaseDisplayWidget::loadCurrentPage() void VisualDatabaseDisplayWidget::modelDirty() { - debounce_timer->start(debounce_time); + debounceTimer->start(debounceTime); } void VisualDatabaseDisplayWidget::sortCardList(const QStringList properties, Qt::SortOrder order = Qt::AscendingOrder) diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h index a691f3c70..6d1f34ed0 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h @@ -41,6 +41,8 @@ public: void sortCardList(QStringList properties, Qt::SortOrder order); void setDeckList(const DeckList &new_deck_list_model); + QWidget *searchContainer; + QHBoxLayout *searchLayout; SearchLineEdit *searchEdit; FilterTreeModel *filterModel; VisualDatabaseDisplayColorFilterWidget *colorFilterWidget; @@ -68,17 +70,17 @@ private: CardDatabaseDisplayModel *databaseDisplayModel; QTreeView *databaseView; QList *cards; - QVBoxLayout *main_layout; + QVBoxLayout *mainLayout; QScrollArea *scrollArea; - FlowWidget *flow_widget; + FlowWidget *flowWidget; QWidget *overlap_categories; QVBoxLayout *overlap_categories_layout; OverlapControlWidget *overlap_control_widget; CardSizeWidget *cardSizeWidget; QWidget *container; - QTimer *debounce_timer; + QTimer *debounceTimer; - int debounce_time = 300; + int debounceTime = 300; int currentPage = 0; // Current page index int cardsPerPage = 100; // Number of cards per page