From 49e6cf95c4c1738e132869860089d664eefe3ac0 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Sun, 25 Jan 2026 04:34:53 +0100 Subject: [PATCH 1/3] fix package description (#6565) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 574ccecb3..fb4f3bd2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,7 +254,7 @@ endif() set(CPACK_PACKAGE_CONTACT "Zach Halpern ") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}") set(CPACK_PACKAGE_VENDOR "Cockatrice Development Team") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md") +set(CPACK_PACKAGE_DESCRIPTION "Cockatrice is an open-source, multiplatform application for playing tabletop card games over a network. The program's server design prevents users from manipulating the game for unfair advantage. The client also provides a single-player mode, which allows users to brew while offline.") set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}") From 92f02fa4ee4c45d1da203b9dcb7008a6495e0b38 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Sun, 25 Jan 2026 07:37:19 +0100 Subject: [PATCH 2/3] mess with the font rendering of the home screen until it works (#6563) * mess with the font rendering of the home screen until it works * add more fonts --- .../interface/widgets/general/home_styled_button.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.cpp b/cockatrice/src/interface/widgets/general/home_styled_button.cpp index 07c9894c1..e8f2722cd 100644 --- a/cockatrice/src/interface/widgets/general/home_styled_button.cpp +++ b/cockatrice/src/interface/widgets/general/home_styled_button.cpp @@ -41,6 +41,8 @@ QString HomeStyledButton::generateButtonStylesheet(const QPair & return QString(R"( QPushButton { font-size: 34px; + font-weight: bold; + font-family: sans-serif, "Segoe UI", "Helvetica Neue"; padding: 30px; color: white; border: 2px solid %1; @@ -88,16 +90,12 @@ void HomeStyledButton::paintEvent(QPaintEvent *event) painter.setRenderHint(QPainter::Antialiasing); painter.setRenderHint(QPainter::TextAntialiasing); - QFont font = this->font(); - font.setBold(true); - painter.setFont(font); - - QFontMetrics fm(font); - QSize textSize = fm.size(Qt::TextSingleLine, this->text()); + QFontMetrics fm(font()); + QSize textSize = fm.size(Qt::TextSingleLine, text()); QPointF center((width() - textSize.width()) / 2.0, (height() + textSize.height() / 2.0) / 2.0); QPainterPath path; - path.addText(center, font, this->text()); + path.addText(center, font(), text()); painter.setPen(QPen(Qt::black, 2.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); painter.setBrush(Qt::white); From c02cf5e89e1d8cc227f3fce8856dacd4d960150f Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Sun, 25 Jan 2026 01:36:10 -0800 Subject: [PATCH 3/3] [VDE] Fix crash from alt-click when card has unknown set (#6566) --- .../interface/widgets/deck_editor/deck_state_manager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp index 09254608e..8afbfaaa2 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp @@ -175,9 +175,11 @@ QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zone QString zone = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : zoneName; - QString reason = tr("Added (%1): %2 (%3) %4") - .arg(zone, card.getName(), card.getPrinting().getSet()->getCorrectedShortName(), - card.getPrinting().getProperty("num")); + CardSetPtr set = card.getPrinting().getSet(); + QString setName = set ? set->getCorrectedShortName() : ""; + + QString reason = + tr("Added (%1): %2 (%3) %4").arg(zone, card.getName(), setName, card.getPrinting().getProperty("num")); QModelIndex idx = modifyDeck(reason, [&card, &zone](auto model) { return model->addCard(card, zone); });