jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixups.

Browse source 
Took 2 minutes
This commit is contained in:
Lukas Brübach 2025-07-09 21:42:24 +02:00
parent 6b435eb2b4
commit 72e6a3069d
2 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp
View file

@ -11,13 +11,10 @@ static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
PictureLoaderLocal::PictureLoaderLocal(QObject *parent) PictureLoaderLocal::PictureLoaderLocal(QObject *parent)
: QObject(parent), picsPath(SettingsCache::instance().getPicsPath()), : QObject(parent), picsPath(SettingsCache::instance().getPicsPath()),
customPicsPath(SettingsCache::instance().getCustomPicsPath()), customPicsPath(SettingsCache::instance().getCustomPicsPath())
overrideAllCardArtWithPersonalPreference(SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference())
{ {
// Hook up signals to settings // Hook up signals to settings
connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &PictureLoaderLocal::picsPathChanged); connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &PictureLoaderLocal::picsPathChanged);
connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
&PictureLoaderLocal::setOverrideAllCardArtWithPersonalPreference);
refreshIndex(); refreshIndex();
@ -89,15 +86,15 @@ QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
// Order is cardName_providerId, cardName_setName_collectorNumber, setName-collectorNumber-cardName and then just // 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. // generically cardName, if the user has decided to override every printing. Most-to-least specific.
const QStringList nameVariants = {!providerId.isEmpty() ? QString("%1_%2").arg(correctedCardName, providerId) QStringList nameVariants;
: QString(), if (!providerId.isEmpty()) {
(!setName.isEmpty() && !collectorNumber.isEmpty()) nameVariants << QString("%1_%2").arg(correctedCardName, providerId);
? QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber) }
: QString(), if (!setName.isEmpty() && !collectorNumber.isEmpty()) {
(!setName.isEmpty() && !collectorNumber.isEmpty()) nameVariants << QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber)
? QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName) << QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName);
: QString(), }
correctedCardName}; nameVariants << correctedCardName;
for (const QString &nameVariant : nameVariants) { for (const QString &nameVariant : nameVariants) {
if (nameVariant.isEmpty()) { if (nameVariant.isEmpty()) {
@ -144,8 +141,3 @@ void PictureLoaderLocal::picsPathChanged()
picsPath = SettingsCache::instance().getPicsPath(); picsPath = SettingsCache::instance().getPicsPath();
customPicsPath = SettingsCache::instance().getCustomPicsPath(); customPicsPath = SettingsCache::instance().getCustomPicsPath();
} }
void PictureLoaderLocal::setOverrideAllCardArtWithPersonalPreference(bool _overrideAllCardArtWithPersonalPreference)
{
overrideAllCardArtWithPersonalPreference = _overrideAllCardArtWithPersonalPreference;
}

2
cockatrice/src/client/ui/picture_loader/picture_loader_local.h
View file

@ -24,7 +24,6 @@ public:
private: private:
QString picsPath, customPicsPath; QString picsPath, customPicsPath;
bool overrideAllCardArtWithPersonalPreference;
QMultiHash<QString, QString> customFolderIndex; // multimap of cardName to picPaths QMultiHash<QString, QString> customFolderIndex; // multimap of cardName to picPaths
QTimer *refreshTimer; QTimer *refreshTimer;
@ -38,7 +37,6 @@ private:
private slots: private slots:
void picsPathChanged(); void picsPathChanged();
void setOverrideAllCardArtWithPersonalPreference(bool _overrideAllCardArtWithPersonalPreference);
}; };
#endif // PICTURE_LOADER_LOCAL_H #endif // PICTURE_LOADER_LOCAL_H