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

Change settings file name.

Browse source 
Took 8 minutes
This commit is contained in:
Lukas Brübach 2026-07-27 09:55:28 +02:00
parent 65deea0f16
commit a9bf6f8937
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp
View file

@ -1,7 +1,7 @@
#include "cards_display_settings.h"
CardsDisplaySettings::CardsDisplaySettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "cards.ini", "cards", QString(), parent)
: SettingsManager(settingPath + "cards_display.ini", "cards", QString(), parent)
{
}

2
libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
View file

@ -249,7 +249,7 @@ static void migrateCardsDisplaySettings(const QString &settingsPath, QSettings &
return;
}
QSettings cardsIni(settingsPath + "cards.ini", QSettings::IniFormat);
QSettings cardsIni(settingsPath + "cards_display.ini", QSettings::IniFormat);
for (const auto &key : cardsRootKeys) {
if (globalIni.contains(key)) {
cardsIni.setValue(key, globalIni.value(key));

12
tests/settings/settings_migration_test.cpp
View file

@ -206,9 +206,9 @@ TEST_F(SettingsMigrationTest, MigratesAllSettingsGroups)
ASSERT_EQ(readFromIni("personal.ini", "home/background"), QVariant("custom_bg"));
ASSERT_EQ(readFromIni("personal.ini", "tipOfDay/showTips"), QVariant(false));
ASSERT_TRUE(fileExists("cards.ini"));
ASSERT_EQ(readFromIni("cards.ini", "cards/displaycardnames"), QVariant(false));
ASSERT_EQ(readFromIni("cards.ini", "cards/tapanimation"), QVariant(true));
ASSERT_TRUE(fileExists("cards_display.ini"));
ASSERT_EQ(readFromIni("cards_display.ini", "cards/displaycardnames"), QVariant(false));
ASSERT_EQ(readFromIni("cards_display.ini", "cards/tapanimation"), QVariant(true));
ASSERT_TRUE(fileExists("interface.ini"));
ASSERT_EQ(readFromIni("interface.ini", "interface/usetearoffmenus"), QVariant(true));
@ -318,11 +318,11 @@ TEST_F(SettingsMigrationTest, CardsKeysKeepGroupPrefix)
ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
ASSERT_TRUE(fileExists("global.ini.old"));
ASSERT_TRUE(fileExists("cards.ini"));
ASSERT_TRUE(fileExists("cards_display.ini"));
// "cards/displaycardnames" should be stored with its group prefix
ASSERT_EQ(readFromIni("cards.ini", "cards/displaycardnames"), QVariant(false));
ASSERT_EQ(readFromIni("cards_display.ini", "cards/displaycardnames"), QVariant(false));
// "interface/..." keys should keep their full path
ASSERT_EQ(readFromIni("cards.ini", "interface/deckeditorbannercardcomboboxvisible"), QVariant(true));
ASSERT_EQ(readFromIni("cards_display.ini", "interface/deckeditorbannercardcomboboxvisible"), QVariant(true));
}
TEST_F(SettingsMigrationTest, LegacyMigrationIsIdempotent)