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

[Playmats] Add fixed override and configurable fallbacks to settings.

Browse source 
Took 29 minutes

Took 43 seconds
This commit is contained in:
Lukas Brübach 2026-08-13 12:40:04 +02:00
parent 92c8f1a1a1
commit fa669544d3
19 changed files with 845 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

80
libcockatrice_settings/libcockatrice/settings/interface_settings.cpp
View file

@ -1,5 +1,34 @@
#include "interface_settings.h"
namespace
{
const QChar PLAYMAT_FIELD_SEP = QChar(0x1F); ///< Separator between StoredPlaymat fields.
QString encodeStoredPlaymat(const StoredPlaymat &stored)
{
return stored.name + PLAYMAT_FIELD_SEP + stored.providerId + PLAYMAT_FIELD_SEP +
QString::number(stored.marginPctL, 'f', 4) + PLAYMAT_FIELD_SEP + QString::number(stored.marginPctR, 'f', 4) +
PLAYMAT_FIELD_SEP + QString::number(stored.verticalOffset, 'f', 4) + PLAYMAT_FIELD_SEP +
QString::number(stored.zoom, 'f', 4);
}
StoredPlaymat decodeStoredPlaymat(const QString &encoded)
{
const QStringList fields = encoded.split(PLAYMAT_FIELD_SEP);
if (fields.size() != 6) {
return {};
}
StoredPlaymat stored;
stored.name = fields.at(0);
stored.providerId = fields.at(1);
stored.marginPctL = fields.at(2).toDouble();
stored.marginPctR = fields.at(3).toDouble();
stored.verticalOffset = fields.at(4).toDouble();
stored.zoom = fields.at(5).toDouble();
return stored;
}
} // namespace
InterfaceSettings::InterfaceSettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "interface.ini", "interface", QString(), parent)
{
@ -165,6 +194,30 @@ int InterfaceSettings::getPlaymatVisibility() const
return getValue("playmatvisibility", QString(), QString(), 2).toInt();
}
QList<StoredPlaymat> InterfaceSettings::getPlaymatFallbackList() const
{
const QStringList entries = getValue("playmatFallbackList", QString(), QString(), QStringList()).toStringList();
QList<StoredPlaymat> result;
result.reserve(entries.size());
for (const QString &entry : entries) {
const StoredPlaymat stored = decodeStoredPlaymat(entry);
if (!stored.isEmpty()) {
result.append(stored);
}
}
return result;
}
StoredPlaymat InterfaceSettings::getPlaymatOverride() const
{
return decodeStoredPlaymat(getValue("playmatOverride", QString(), QString(), QString()).toString());
}
int InterfaceSettings::getPlaymatFallbackMode() const
{
return qBound(0, getValue("playmatFallbackMode", QString(), QString(), 1).toInt(), 2);
}
bool InterfaceSettings::getLifeCounterAnimationsEnabled() const
{
return getValue("lifeCounterAnimationsEnabled", QString(), QString(), true).toBool();
@ -357,6 +410,33 @@ void InterfaceSettings::setPlaymatVisibility(int _visibility)
emit playmatVisibilityChanged(_visibility);
}
void InterfaceSettings::setPlaymatFallbackList(const QList<StoredPlaymat> &_fallbackList)
{
QStringList entries;
entries.reserve(_fallbackList.size());
for (const StoredPlaymat &stored : _fallbackList) {
entries.append(encodeStoredPlaymat(stored));
}
setValue(entries, "playmatFallbackList");
emit playmatSettingsChanged();
}
void InterfaceSettings::setPlaymatOverride(const StoredPlaymat &_override)
{
setValue(_override.isEmpty() ? QString() : encodeStoredPlaymat(_override), "playmatOverride");
emit playmatSettingsChanged();
}
void InterfaceSettings::setPlaymatFallbackMode(int _fallbackMode)
{
const int mode = qBound(0, _fallbackMode, 2);
if (getPlaymatFallbackMode() == mode) {
return;
}
setValue(mode, "playmatFallbackMode");
emit playmatSettingsChanged();
}
void InterfaceSettings::setLifeCounterAnimationsEnabled(bool _lifeCounterAnimationsEnabled)
{
setValue(_lifeCounterAnimationsEnabled, "lifeCounterAnimationsEnabled");

7
libcockatrice_settings/libcockatrice/settings/interface_settings.h
View file

@ -43,6 +43,9 @@ public:
[[nodiscard]] bool getShowShortcuts() const override;
[[nodiscard]] bool getShowGameSelectorFilterToolbar() const override;
[[nodiscard]] int getPlaymatVisibility() const override;
[[nodiscard]] QList<StoredPlaymat> getPlaymatFallbackList() const override;
[[nodiscard]] StoredPlaymat getPlaymatOverride() const override;
[[nodiscard]] int getPlaymatFallbackMode() const override;
[[nodiscard]] bool getLifeCounterAnimationsEnabled() const override;
[[nodiscard]] bool getBattlefieldFlashEnabled() const override;
[[nodiscard]] QStringList getUserListExpandedSections() const override;
@ -79,6 +82,9 @@ public:
void setShowShortcuts(bool _showShortcuts);
void setShowGameSelectorFilterToolbar(bool _showGameSelectorFilterToolbar);
void setPlaymatVisibility(int _visibility);
void setPlaymatFallbackList(const QList<StoredPlaymat> &_fallbackList);
void setPlaymatOverride(const StoredPlaymat &_override);
void setPlaymatFallbackMode(int _fallbackMode);
void setLifeCounterAnimationsEnabled(bool _lifeCounterAnimationsEnabled);
void setBattlefieldFlashEnabled(bool _battlefieldFlashEnabled);
void setUserListExpandedSections(const QStringList &sections);
@ -94,6 +100,7 @@ signals:
void showStatusBarChanged(bool state);
void showGameSelectorFilterToolbarChanged(bool state);
void playmatVisibilityChanged(int visibility);
void playmatSettingsChanged();
void lifeCounterAnimationsEnabledChanged(bool state);
void battlefieldFlashEnabledChanged(bool state);