From 4f0b5dbc4af70fa2ce1569275b48cf670da7f360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Mon, 3 Mar 2025 20:58:21 +0100 Subject: [PATCH] Fixup some thangs. --- cockatrice/cockatrice.qrc | 59 ------------------- .../additional_info/mana_cost_widget.cpp | 3 - .../additional_info/mana_symbol_widget.cpp | 14 +---- ...k_preview_color_identity_filter_widget.cpp | 9 ++- 4 files changed, 5 insertions(+), 80 deletions(-) diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index f88cf83d3..38c40561f 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -40,70 +40,11 @@ resources/icons/update.png resources/icons/view.svg - resources/icons/mana/0.svg - resources/icons/mana/1.svg - resources/icons/mana/2.svg - resources/icons/mana/3.svg - resources/icons/mana/4.svg - resources/icons/mana/5.svg - resources/icons/mana/6.svg - resources/icons/mana/7.svg - resources/icons/mana/8.svg - resources/icons/mana/9.svg - resources/icons/mana/10.svg - resources/icons/mana/11.svg - resources/icons/mana/12.svg - resources/icons/mana/13.svg - resources/icons/mana/14.svg - resources/icons/mana/15.svg - resources/icons/mana/16.svg - resources/icons/mana/17.svg - resources/icons/mana/18.svg - resources/icons/mana/19.svg - resources/icons/mana/20.svg - resources/icons/mana/2B.svg - resources/icons/mana/2G.svg - resources/icons/mana/2R.svg - resources/icons/mana/2U.svg - resources/icons/mana/2W.svg resources/icons/mana/B.svg - resources/icons/mana/BG.svg - resources/icons/mana/BGP.svg - resources/icons/mana/BP.svg - resources/icons/mana/BR.svg - resources/icons/mana/BRP.svg - resources/icons/mana/C.svg - resources/icons/mana/CB.svg - resources/icons/mana/CG.svg - resources/icons/mana/CR.svg - resources/icons/mana/CU.svg - resources/icons/mana/CW.svg resources/icons/mana/G.svg - resources/icons/mana/GP.svg - resources/icons/mana/GU.svg - resources/icons/mana/GUP.svg - resources/icons/mana/GW.svg - resources/icons/mana/GWP.svg resources/icons/mana/R.svg - resources/icons/mana/RG.svg - resources/icons/mana/RGP.svg - resources/icons/mana/RP.svg - resources/icons/mana/RW.svg - resources/icons/mana/RWP.svg - resources/icons/mana/S.svg resources/icons/mana/U.svg - resources/icons/mana/UB.svg - resources/icons/mana/UBP.svg - resources/icons/mana/UP.svg - resources/icons/mana/UR.svg - resources/icons/mana/URP.svg resources/icons/mana/W.svg - resources/icons/mana/WB.svg - resources/icons/mana/WBP.svg - resources/icons/mana/WP.svg - resources/icons/mana/WU.svg - resources/icons/mana/WUP.svg - resources/icons/mana/X.svg resources/config/general.svg resources/config/appearance.svg diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp b/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp index cfab4d8b2..e5d1127aa 100644 --- a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp @@ -27,9 +27,6 @@ ManaCostWidget::ManaCostWidget(QWidget *parent, CardInfoPtr _card) : QWidget(par layout->addWidget(manaSymbol); } } - - // Set minimum width based on number of icons - // setMinimumWidth(symbols.size() * 50 + (symbols.size() - 1) * 5); } void ManaCostWidget::resizeEvent(QResizeEvent *event) diff --git a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp b/cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp index 578374490..a66c314a5 100644 --- a/cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp @@ -48,22 +48,10 @@ void ManaSymbolWidget::resizeEvent(QResizeEvent *event) void ManaSymbolWidget::loadManaIcon() { - qDebug() << "Symbol: " << symbol; QString filename = "theme:icons/mana/"; - if (symbol == "W" || symbol == "U" || symbol == "B" || symbol == "R" || symbol == "G" || symbol == "C" || - symbol == "S" || symbol == "X") { + if (symbol == "W" || symbol == "U" || symbol == "B" || symbol == "R" || symbol == "G") { filename += symbol + ".svg"; - } else if (symbol.toInt() >= 0 && symbol.toInt() <= 20) { - filename += symbol + ".svg"; // Handle generic mana costs - qDebug() << "ManaIcon: " << filename; - } else if (symbol.contains('/')) { - QString cleanSymbol = symbol; - cleanSymbol.remove('{').remove('}').remove('/'); // Clean up hybrid & Phyrexian mana - filename += cleanSymbol + ".svg"; - } else { - qDebug() << "ManaIcon: " << symbol << " was not a number."; - filename += symbol + ".svg"; // Fallback } manaIcon = QPixmap(filename); diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp index d30d83aa7..79fcc01fb 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp @@ -15,17 +15,16 @@ DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(Visua QString fullColorIdentity = "WUBRG"; for (const QChar &color : fullColorIdentity) { - // auto *circle = new DeckPreviewColorIdentityFilterCircleWidget(color, this); - auto *circle = new ManaSymbolWidget(this, color, false, true); - circle->setMaximumWidth(25); + auto *manaSymbol = new ManaSymbolWidget(this, color, false, true); + manaSymbol->setMaximumWidth(25); - layout->addWidget(circle); + layout->addWidget(manaSymbol); // Initialize the activeColors map activeColors[color] = false; // Connect the color toggled signal - connect(circle, &ManaSymbolWidget::colorToggled, this, + connect(manaSymbol, &ManaSymbolWidget::colorToggled, this, &DeckPreviewColorIdentityFilterWidget::handleColorToggled); }