mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-21 09:05:10 -07:00
[Settings] Shuffle some settings around (#7084)
* [Settings] Shuffle some settings around Took 21 minutes Took 1 hour 25 minutes * [Settings] Camel case everything * Revert debug schema change * Add new classes * Fix card counters writing to global * Fix CI tests * Fix Windows CI * interface() is a protected keyword for MSVC Took 5 minutes Took 5 seconds * [Settings] Keep menu settings on the appearance settings page Leave the 'Menu settings' group box on the appearance settings page for now; relocating it to the user interface settings page will be done in a separate PR. Took 6 minutes --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL
GitHub
parent
bf6b2a90bc
commit
adf574e038
79 changed files with 1899 additions and 1123 deletions
|
|
@ -91,258 +91,182 @@ VisualDeckStorageSettings::VisualDeckStorageSettings(const QString &settingPath,
|
|||
|
||||
int VisualDeckStorageSettings::getVisualDeckStorageSortingOrder() const
|
||||
{
|
||||
return getValue("visualdeckstoragesortingorder", QString(), QString(), 0).toInt();
|
||||
return getValue("sortingOrder", "interface", "visualDeckStorage", 0).toInt();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageShowFolders() const
|
||||
{
|
||||
return getValue("visualdeckstorageshowfolders", QString(), QString(), true).toBool();
|
||||
return getValue("showFolders", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageShowTagFilter() const
|
||||
{
|
||||
return getValue("visualdeckstorageshowtagfilter", QString(), QString(), true).toBool();
|
||||
return getValue("showTagFilter", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
QStringList VisualDeckStorageSettings::getVisualDeckStorageDefaultTagsList() const
|
||||
{
|
||||
return getValue("visualdeckstoragedefaulttagslist", QString(), QString(), QVariant::fromValue(defaultTags))
|
||||
return getValue("defaultTagsList", "interface", "visualDeckStorage", QVariant::fromValue(defaultTags))
|
||||
.toStringList();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageSearchFolderNames() const
|
||||
{
|
||||
return getValue("visualdeckstoragesearchfoldernames", QString(), QString(), true).toBool();
|
||||
return getValue("searchFolderNames", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageShowColorIdentity() const
|
||||
{
|
||||
return getValue("visualdeckstorageshowcoloridentity", QString(), QString(), true).toBool();
|
||||
return getValue("showColorIdentity", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageShowBannerCardComboBox() const
|
||||
{
|
||||
return getValue("visualdeckstorageshowbannercardcombobox", QString(), QString(), true).toBool();
|
||||
return getValue("showBannerCardComboBox", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageShowTagsOnDeckPreviews() const
|
||||
{
|
||||
return getValue("visualdeckstorageshowtagsondeckpreviews", QString(), QString(), true).toBool();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getVisualDeckStorageCardSize() const
|
||||
{
|
||||
return getValue("visualdeckstoragecardsize", QString(), QString(), 100).toInt();
|
||||
return getValue("showTagsOnDeckPreviews", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageDrawUnusedColorIdentities() const
|
||||
{
|
||||
return getValue("visualdeckstoragedrawunusedcoloridentities", QString(), QString(), true).toBool();
|
||||
return getValue("drawUnusedColorIdentities", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getVisualDeckStorageUnusedColorIdentitiesOpacity() const
|
||||
{
|
||||
return getValue("visualdeckstorageunusedcoloridentitiesopacity", QString(), QString(), 15).toInt();
|
||||
return getValue("unusedColorIdentitiesOpacity", "interface", "visualDeckStorage", 15).toInt();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getVisualDeckStorageTooltipType() const
|
||||
{
|
||||
return getValue("visualdeckstoragetooltiptype", QString(), QString(), 0).toInt();
|
||||
return getValue("tooltipType", "interface", "visualDeckStorage", 0).toInt();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStoragePromptForConversion() const
|
||||
{
|
||||
return getValue("visualdeckstoragepromptforconversion", QString(), QString(), true).toBool();
|
||||
return getValue("promptForConversion", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageAlwaysConvert() const
|
||||
{
|
||||
return getValue("visualdeckstoragealwaysconvert", QString(), QString(), false).toBool();
|
||||
return getValue("alwaysConvert", "interface", "visualDeckStorage", false).toBool();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageInGame() const
|
||||
{
|
||||
return getValue("visualdeckstorageingame", QString(), QString(), true).toBool();
|
||||
return getValue("inGame", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDeckStorageSelectionAnimation() const
|
||||
{
|
||||
return getValue("visualdeckstorageselectionanimation", QString(), QString(), true).toBool();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getVisualDeckEditorCardSize() const
|
||||
{
|
||||
return getValue("visualdeckeditorcardsize", QString(), QString(), 100).toInt();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getVisualDeckEditorSampleHandSize() const
|
||||
{
|
||||
return getValue("visualdeckeditorsamplehandsize", QString(), QString(), 7).toInt();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getVisualDatabaseDisplayCardSize() const
|
||||
{
|
||||
return getValue("visualdatabasedisplaycardsize", QString(), QString(), 100).toInt();
|
||||
return getValue("selectionAnimation", "interface", "visualDeckStorage", true).toBool();
|
||||
}
|
||||
|
||||
bool VisualDeckStorageSettings::getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
|
||||
{
|
||||
return getValue("visualdatabasedisplayfiltertomostrecentsetsenabled", QString(), QString(), false).toBool();
|
||||
return getValue("filterToMostRecentSetsEnabled", "interface", "visualDatabaseDisplay", false).toBool();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
|
||||
{
|
||||
return getValue("visualdatabasedisplayfiltertomostrecentsetsamount", QString(), QString(), 10).toInt();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getEDHRecCardSize() const
|
||||
{
|
||||
return getValue("edhreccardsize", QString(), QString(), 100).toInt();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getArchidektPreviewSize() const
|
||||
{
|
||||
return getValue("archidektpreviewsize", QString(), QString(), 100).toInt();
|
||||
}
|
||||
|
||||
int VisualDeckStorageSettings::getDefaultDeckEditorType() const
|
||||
{
|
||||
return getValue("defaultDeckEditorType", QString(), QString(), 1).toInt();
|
||||
return getValue("filterToMostRecentSetsAmount", "interface", "visualDatabaseDisplay", 10).toInt();
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageSortingOrder(int _sortingOrder)
|
||||
{
|
||||
setValue(_sortingOrder, "visualdeckstoragesortingorder");
|
||||
setValue(_sortingOrder, "sortingOrder", "interface", "visualDeckStorage");
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageShowFolders(bool value)
|
||||
{
|
||||
setValue(value, "visualdeckstorageshowfolders");
|
||||
setValue(value, "showFolders", "interface", "visualDeckStorage");
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageShowTagFilter(bool _showTags)
|
||||
{
|
||||
setValue(_showTags, "visualdeckstorageshowtagfilter");
|
||||
setValue(_showTags, "showTagFilter", "interface", "visualDeckStorage");
|
||||
emit visualDeckStorageShowTagFilterChanged(_showTags);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageDefaultTagsList(QStringList _defaultTagsList)
|
||||
{
|
||||
setValue(QVariant::fromValue(_defaultTagsList), "visualdeckstoragedefaulttagslist");
|
||||
setValue(QVariant::fromValue(_defaultTagsList), "defaultTagsList", "interface", "visualDeckStorage");
|
||||
emit visualDeckStorageDefaultTagsListChanged();
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageSearchFolderNames(bool value)
|
||||
{
|
||||
setValue(value, "visualdeckstoragesearchfoldernames");
|
||||
setValue(value, "searchFolderNames", "interface", "visualDeckStorage");
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageShowColorIdentity(bool value)
|
||||
{
|
||||
setValue(value, "visualdeckstorageshowcoloridentity");
|
||||
setValue(value, "showColorIdentity", "interface", "visualDeckStorage");
|
||||
emit visualDeckStorageShowColorIdentityChanged(value);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageShowBannerCardComboBox(bool _showBannerCardComboBox)
|
||||
{
|
||||
setValue(_showBannerCardComboBox, "visualdeckstorageshowbannercardcombobox");
|
||||
setValue(_showBannerCardComboBox, "showBannerCardComboBox", "interface", "visualDeckStorage");
|
||||
emit visualDeckStorageShowBannerCardComboBoxChanged(_showBannerCardComboBox);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageShowTagsOnDeckPreviews(bool _showTags)
|
||||
{
|
||||
setValue(_showTags, "visualdeckstorageshowtagsondeckpreviews");
|
||||
setValue(_showTags, "showTagsOnDeckPreviews", "interface", "visualDeckStorage");
|
||||
emit visualDeckStorageShowTagsOnDeckPreviewsChanged(_showTags);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageCardSize(int _cardSize)
|
||||
{
|
||||
setValue(_cardSize, "visualdeckstoragecardsize");
|
||||
emit visualDeckStorageCardSizeChanged();
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageDrawUnusedColorIdentities(bool _draw)
|
||||
{
|
||||
setValue(_draw, "visualdeckstoragedrawunusedcoloridentities");
|
||||
setValue(_draw, "drawUnusedColorIdentities", "interface", "visualDeckStorage");
|
||||
emit visualDeckStorageDrawUnusedColorIdentitiesChanged(_draw);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageUnusedColorIdentitiesOpacity(int _opacity)
|
||||
{
|
||||
setValue(_opacity, "visualdeckstorageunusedcoloridentitiesopacity");
|
||||
setValue(_opacity, "unusedColorIdentitiesOpacity", "interface", "visualDeckStorage");
|
||||
emit visualDeckStorageUnusedColorIdentitiesOpacityChanged(_opacity);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageTooltipType(int value)
|
||||
{
|
||||
setValue(value, "visualdeckstoragetooltiptype");
|
||||
setValue(value, "tooltipType", "interface", "visualDeckStorage");
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStoragePromptForConversion(bool _prompt)
|
||||
{
|
||||
setValue(_prompt, "visualdeckstoragepromptforconversion");
|
||||
setValue(_prompt, "promptForConversion", "interface", "visualDeckStorage");
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageAlwaysConvert(bool _always)
|
||||
{
|
||||
setValue(_always, "visualdeckstoragealwaysconvert");
|
||||
setValue(_always, "alwaysConvert", "interface", "visualDeckStorage");
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageInGame(bool enabled)
|
||||
{
|
||||
setValue(enabled, "visualdeckstorageingame");
|
||||
setValue(enabled, "inGame", "interface", "visualDeckStorage");
|
||||
emit visualDeckStorageInGameChanged(enabled);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckStorageSelectionAnimation(bool enabled)
|
||||
{
|
||||
setValue(enabled, "visualdeckstorageselectionanimation");
|
||||
setValue(enabled, "selectionAnimation", "interface", "visualDeckStorage");
|
||||
emit visualDeckStorageSelectionAnimationChanged(enabled);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckEditorCardSize(int _cardSize)
|
||||
{
|
||||
setValue(_cardSize, "visualdeckeditorcardsize");
|
||||
emit visualDeckEditorCardSizeChanged();
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDeckEditorSampleHandSize(int _amount)
|
||||
{
|
||||
setValue(_amount, "visualdeckeditorsamplehandsize");
|
||||
emit visualDeckEditorSampleHandSizeAmountChanged(_amount);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDatabaseDisplayCardSize(int _cardSize)
|
||||
{
|
||||
setValue(_cardSize, "visualdatabasedisplaycardsize");
|
||||
emit visualDatabaseDisplayCardSizeChanged();
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(bool _enabled)
|
||||
{
|
||||
setValue(_enabled, "visualdatabasedisplayfiltertomostrecentsetsenabled");
|
||||
setValue(_enabled, "filterToMostRecentSetsEnabled", "interface", "visualDatabaseDisplay");
|
||||
emit visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(_enabled);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount)
|
||||
{
|
||||
setValue(_amount, "visualdatabasedisplayfiltertomostrecentsetsamount");
|
||||
setValue(_amount, "filterToMostRecentSetsAmount", "interface", "visualDatabaseDisplay");
|
||||
emit visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(_amount);
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setEDHRecCardSize(int _edhrecCardSize)
|
||||
{
|
||||
setValue(_edhrecCardSize, "edhreccardsize");
|
||||
emit edhRecCardSizeChanged();
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setArchidektPreviewCardSize(int _archidektPreviewCardSize)
|
||||
{
|
||||
setValue(_archidektPreviewCardSize, "archidektpreviewsize");
|
||||
emit archidektPreviewSizeChanged();
|
||||
}
|
||||
|
||||
void VisualDeckStorageSettings::setDefaultDeckEditorType(int value)
|
||||
{
|
||||
setValue(value, "defaultDeckEditorType");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue