From f12e63423c7a18cb06a9bc1f80312bc61e660f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 9 Jul 2025 21:48:23 +0200 Subject: [PATCH] Even more naming schemes. Took 6 minutes --- .../ui/picture_loader/picture_loader_local.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp index 0d9d45738..ede8a9017 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp @@ -83,17 +83,25 @@ QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName, QImageReader imgReader; imgReader.setDecideFormatFromContent(true); - // Order is cardName_providerId, cardName_setName_collectorNumber, setName-collectorNumber-cardName and then just - // generically cardName, if the user has decided to override every printing. Most-to-least specific. + // Most-to-least specific, these will fall through in order. QStringList nameVariants; + // cardName_providerId if (!providerId.isEmpty()) { + nameVariants << QString("%1-%2").arg(correctedCardName, providerId); nameVariants << QString("%1_%2").arg(correctedCardName, providerId); } + // cardName_setName_collectorNumber & setName-collectorNumber-cardName if (!setName.isEmpty() && !collectorNumber.isEmpty()) { nameVariants << QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber) << QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName); } + // cardName_setName + if (!setName.isEmpty()) { + nameVariants << QString("%1_%2").arg(correctedCardName, setName) + << QString("%1-%2").arg(setName, correctedCardName); + } + // cardName nameVariants << correctedCardName; for (const QString &nameVariant : nameVariants) {