From e6d3d98febd38752340674a988d2b1f865cf8739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 14 Jan 2026 13:57:46 +0100 Subject: [PATCH] Same treatment for printing selector. Took 42 minutes --- cockatrice/CMakeLists.txt | 1 + cockatrice/cockatrice.qrc | 1 + .../printing_selector/printing_selector.cpp | 23 +++++++++- .../printing_selector/printing_selector.h | 2 + .../printing_selector_placeholder_widget.cpp | 42 +++++++++++++++++++ .../printing_selector_placeholder_widget.h | 23 ++++++++++ 6 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp create mode 100644 cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 418ac96e9..c6d962ffb 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -203,6 +203,7 @@ set(cockatrice_SOURCES src/interface/widgets/printing_selector/printing_selector.cpp src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp + src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 8d50498c0..f087bfe66 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -61,6 +61,7 @@ resources/backgrounds/home.png resources/backgrounds/card_triplet.svg + resources/backgrounds/placeholder_printing_selector.svg resources/config/general.svg resources/config/appearance.svg diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp index 506395789..2f18c7116 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp @@ -8,6 +8,7 @@ #include "printing_selector_card_search_widget.h" #include "printing_selector_card_selection_widget.h" #include "printing_selector_card_sorting_widget.h" +#include "printing_selector_placeholder_widget.h" #include #include @@ -34,6 +35,8 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded); + placeholderWidget = new PrintingSelectorPlaceholderWidget(this); + sortToolBar = new PrintingSelectorCardSortingWidget(this); sortToolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); @@ -70,8 +73,13 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck layout->addWidget(sortAndOptionsContainer); + layout->addWidget(placeholderWidget); layout->addWidget(flowWidget); + // Initially show placeholder, hide flowWidget + placeholderWidget->setVisible(true); + flowWidget->setVisible(false); + cardSelectionBar = new PrintingSelectorCardSelectionWidget(this, deckStateManager); cardSelectionBar->setVisible(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible()); layout->addWidget(cardSelectionBar); @@ -139,7 +147,16 @@ void PrintingSelector::updateDisplay() widgetLoadingBufferTimer->deleteLater(); widgetLoadingBufferTimer = new QTimer(this); flowWidget->clearLayout(); - if (selectedCard != nullptr) { + + if (selectedCard.isNull()) { + // Show placeholder, hide flowWidget + placeholderWidget->setVisible(true); + flowWidget->setVisible(false); + setWindowTitle(tr("Printing Selector")); + } else { + // Hide placeholder, show flowWidget + placeholderWidget->setVisible(false); + flowWidget->setVisible(true); setWindowTitle(selectedCard->getName()); } getAllSetsForCurrentCard(); @@ -153,6 +170,8 @@ void PrintingSelector::updateDisplay() void PrintingSelector::setCard(const CardInfoPtr &newCard) { if (newCard.isNull()) { + selectedCard = newCard; + updateDisplay(); return; } @@ -229,4 +248,4 @@ void PrintingSelector::getAllSetsForCurrentCard() void PrintingSelector::toggleVisibilityNavigationButtons(bool _state) { cardSelectionBar->setVisible(_state); -} +} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h index e48eb2f2c..f7844504d 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h @@ -10,6 +10,7 @@ #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" #include "../quick_settings/settings_button_widget.h" +#include "printing_selector_placeholder_widget.h" #include #include @@ -70,6 +71,7 @@ private: QCheckBox *navigationCheckBox; PrintingSelectorCardSortingWidget *sortToolBar; PrintingSelectorCardSearchWidget *searchBar; + PrintingSelectorPlaceholderWidget *placeholderWidget; FlowWidget *flowWidget; CardSizeWidget *cardSizeWidget; PrintingSelectorCardSelectionWidget *cardSelectionBar; diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp new file mode 100644 index 000000000..aee34bccd --- /dev/null +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp @@ -0,0 +1,42 @@ +#include "printing_selector_placeholder_widget.h" + +PrintingSelectorPlaceholderWidget::PrintingSelectorPlaceholderWidget(QWidget *parent) : QWidget(parent) +{ + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + mainLayout = new QVBoxLayout(this); + mainLayout->setAlignment(Qt::AlignCenter); + setLayout(mainLayout); + + // Image label with the background image + imageLabel = new QLabel(this); + imageLabel->setAlignment(Qt::AlignCenter); + imageLabel->setStyleSheet(R"( + QLabel { + background-image: url(theme:backgrounds/placeholder_printing_selector.svg); + background-repeat: no-repeat; + background-position: center; + } + )"); + imageLabel->setFixedSize(300, 300); + + textLabel = new QLabel(this); + textLabel->setAlignment(Qt::AlignCenter); + textLabel->setWordWrap(true); + textLabel->setStyleSheet(R"( + QLabel { + color: palette(mid); + font-size: 14px; + padding: 10px; + } + )"); + + mainLayout->addWidget(imageLabel); + mainLayout->addWidget(textLabel); + + retranslateUi(); +} + +void PrintingSelectorPlaceholderWidget::retranslateUi() +{ + textLabel->setText(tr("Select a card to view its available printings")); +} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h new file mode 100644 index 000000000..abf030c69 --- /dev/null +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h @@ -0,0 +1,23 @@ +#ifndef COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H +#define COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H + +#include +#include +#include + +class PrintingSelectorPlaceholderWidget : public QWidget +{ + Q_OBJECT + +public: + explicit PrintingSelectorPlaceholderWidget(QWidget *parent = nullptr); + +private: + QVBoxLayout *mainLayout; + QLabel *imageLabel; + QLabel *textLabel; + + void retranslateUi(); +}; + +#endif // COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H