mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-13 09:34:47 -07:00
Remember more card sizes. (#6360)
Took 22 minutes Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
587a8bc524
commit
bc2ae6c486
5 changed files with 72 additions and 3 deletions
|
|
@ -314,6 +314,11 @@ SettingsCache::SettingsCache()
|
||||||
visualDatabaseDisplayFilterToMostRecentSetsAmount =
|
visualDatabaseDisplayFilterToMostRecentSetsAmount =
|
||||||
settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsamount", 10).toInt();
|
settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsamount", 10).toInt();
|
||||||
visualDeckEditorSampleHandSize = settings->value("interface/visualdeckeditorsamplehandsize", 7).toInt();
|
visualDeckEditorSampleHandSize = settings->value("interface/visualdeckeditorsamplehandsize", 7).toInt();
|
||||||
|
visualDeckEditorCardSize = settings->value("interface/visualdeckeditorcardsize", 100).toInt();
|
||||||
|
visualDatabaseDisplayCardSize = settings->value("interface/visualdatabasedisplaycardsize", 100).toInt();
|
||||||
|
edhrecCardSize = settings->value("interface/edhreccardsize", 100).toInt();
|
||||||
|
archidektPreviewSize = settings->value("interface/archidektpreviewsize", 100).toInt();
|
||||||
|
|
||||||
horizontalHand = settings->value("hand/horizontal", true).toBool();
|
horizontalHand = settings->value("hand/horizontal", true).toBool();
|
||||||
invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool();
|
invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool();
|
||||||
minPlayersForMultiColumnLayout = settings->value("interface/min_players_multicolumn", 4).toInt();
|
minPlayersForMultiColumnLayout = settings->value("interface/min_players_multicolumn", 4).toInt();
|
||||||
|
|
@ -863,6 +868,34 @@ void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T va
|
||||||
emit visualDeckStorageSelectionAnimationChanged(visualDeckStorageSelectionAnimation);
|
emit visualDeckStorageSelectionAnimationChanged(visualDeckStorageSelectionAnimation);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SettingsCache::setVisualDeckEditorCardSize(int _visualDeckEditorCardSize)
|
||||||
|
{
|
||||||
|
visualDeckEditorCardSize = _visualDeckEditorCardSize;
|
||||||
|
settings->setValue("interface/visualdeckeditorcardsize", visualDeckEditorCardSize);
|
||||||
|
emit visualDeckEditorCardSizeChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SettingsCache::setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize)
|
||||||
|
{
|
||||||
|
visualDatabaseDisplayCardSize = _visualDatabaseDisplayCardSize;
|
||||||
|
settings->setValue("interface/visualdatabasedisplaycardsize", visualDatabaseDisplayCardSize);
|
||||||
|
emit visualDatabaseDisplayCardSizeChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SettingsCache::setEDHRecCardSize(int _edhrecCardSize)
|
||||||
|
{
|
||||||
|
edhrecCardSize = _edhrecCardSize;
|
||||||
|
settings->setValue("interface/edhreccardsize", edhrecCardSize);
|
||||||
|
emit edhRecCardSizeChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SettingsCache::setArchidektPreviewCardSize(int _archidektPreviewCardSize)
|
||||||
|
{
|
||||||
|
archidektPreviewSize = _archidektPreviewCardSize;
|
||||||
|
settings->setValue("interface/archidektpreviewsize", archidektPreviewSize);
|
||||||
|
emit archidektPreviewSizeChanged();
|
||||||
|
}
|
||||||
|
|
||||||
void SettingsCache::setDefaultDeckEditorType(int value)
|
void SettingsCache::setDefaultDeckEditorType(int value)
|
||||||
{
|
{
|
||||||
defaultDeckEditorType = value;
|
defaultDeckEditorType = value;
|
||||||
|
|
|
||||||
|
|
@ -167,6 +167,10 @@ signals:
|
||||||
void visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(bool enabled);
|
void visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(bool enabled);
|
||||||
void visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(int amount);
|
void visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(int amount);
|
||||||
void visualDeckEditorSampleHandSizeAmountChanged(int amount);
|
void visualDeckEditorSampleHandSizeAmountChanged(int amount);
|
||||||
|
void visualDeckEditorCardSizeChanged();
|
||||||
|
void visualDatabaseDisplayCardSizeChanged();
|
||||||
|
void edhRecCardSizeChanged();
|
||||||
|
void archidektPreviewSizeChanged();
|
||||||
void horizontalHandChanged();
|
void horizontalHandChanged();
|
||||||
void handJustificationChanged();
|
void handJustificationChanged();
|
||||||
void invertVerticalCoordinateChanged();
|
void invertVerticalCoordinateChanged();
|
||||||
|
|
@ -250,6 +254,10 @@ private:
|
||||||
QStringList visualDeckStorageDefaultTagsList;
|
QStringList visualDeckStorageDefaultTagsList;
|
||||||
bool visualDeckStorageSearchFolderNames;
|
bool visualDeckStorageSearchFolderNames;
|
||||||
int visualDeckStorageCardSize;
|
int visualDeckStorageCardSize;
|
||||||
|
int visualDeckEditorCardSize;
|
||||||
|
int visualDatabaseDisplayCardSize;
|
||||||
|
int edhrecCardSize;
|
||||||
|
int archidektPreviewSize;
|
||||||
bool visualDeckStorageDrawUnusedColorIdentities;
|
bool visualDeckStorageDrawUnusedColorIdentities;
|
||||||
int visualDeckStorageUnusedColorIdentitiesOpacity;
|
int visualDeckStorageUnusedColorIdentitiesOpacity;
|
||||||
int visualDeckStorageTooltipType;
|
int visualDeckStorageTooltipType;
|
||||||
|
|
@ -642,6 +650,22 @@ public:
|
||||||
{
|
{
|
||||||
return visualDeckStorageSelectionAnimation;
|
return visualDeckStorageSelectionAnimation;
|
||||||
}
|
}
|
||||||
|
int getVisualDeckEditorCardSize() const
|
||||||
|
{
|
||||||
|
return visualDeckEditorCardSize;
|
||||||
|
}
|
||||||
|
int getVisualDatabaseDisplayCardSize() const
|
||||||
|
{
|
||||||
|
return visualDatabaseDisplayCardSize;
|
||||||
|
}
|
||||||
|
int getEDHRecCardSize() const
|
||||||
|
{
|
||||||
|
return edhrecCardSize;
|
||||||
|
}
|
||||||
|
int getArchidektPreviewSize() const
|
||||||
|
{
|
||||||
|
return archidektPreviewSize;
|
||||||
|
}
|
||||||
int getDefaultDeckEditorType() const
|
int getDefaultDeckEditorType() const
|
||||||
{
|
{
|
||||||
return defaultDeckEditorType;
|
return defaultDeckEditorType;
|
||||||
|
|
@ -1018,6 +1042,10 @@ public slots:
|
||||||
void setVisualDeckStorageAlwaysConvert(bool _visualDeckStorageAlwaysConvert);
|
void setVisualDeckStorageAlwaysConvert(bool _visualDeckStorageAlwaysConvert);
|
||||||
void setVisualDeckStorageInGame(QT_STATE_CHANGED_T value);
|
void setVisualDeckStorageInGame(QT_STATE_CHANGED_T value);
|
||||||
void setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T value);
|
void setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T value);
|
||||||
|
void setVisualDeckEditorCardSize(int _visualDeckEditorCardSize);
|
||||||
|
void setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize);
|
||||||
|
void setEDHRecCardSize(int _EDHRecCardSize);
|
||||||
|
void setArchidektPreviewCardSize(int _archidektPreviewCardSize);
|
||||||
void setDefaultDeckEditorType(int value);
|
void setDefaultDeckEditorType(int value);
|
||||||
void setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled);
|
void setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled);
|
||||||
void setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount);
|
void setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
#include "tab_edhrec_main.h"
|
#include "tab_edhrec_main.h"
|
||||||
|
|
||||||
|
#include "../../../../../client/settings/cache_settings.h"
|
||||||
#include "../../tab_supervisor.h"
|
#include "../../tab_supervisor.h"
|
||||||
#include "api_response/average_deck/edhrec_average_deck_api_response.h"
|
#include "api_response/average_deck/edhrec_average_deck_api_response.h"
|
||||||
#include "api_response/commander/edhrec_commander_api_response.h"
|
#include "api_response/commander/edhrec_commander_api_response.h"
|
||||||
|
|
@ -96,7 +97,9 @@ TabEdhRecMain::TabEdhRecMain(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor
|
||||||
|
|
||||||
settingsButton = new SettingsButtonWidget(this);
|
settingsButton = new SettingsButtonWidget(this);
|
||||||
|
|
||||||
cardSizeSlider = new CardSizeWidget(this);
|
cardSizeSlider = new CardSizeWidget(this, nullptr, SettingsCache::instance().getEDHRecCardSize());
|
||||||
|
connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
|
||||||
|
&SettingsCache::setEDHRecCardSize);
|
||||||
|
|
||||||
settingsButton->addSettingsWidget(cardSizeSlider);
|
settingsButton->addSettingsWidget(cardSizeSlider);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,9 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
|
||||||
mainLayout->setContentsMargins(0, 0, 0, 0);
|
mainLayout->setContentsMargins(0, 0, 0, 0);
|
||||||
|
|
||||||
flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded);
|
flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded);
|
||||||
cardSizeWidget = new CardSizeWidget(this, flowWidget);
|
cardSizeWidget = new CardSizeWidget(this, flowWidget, SettingsCache::instance().getVisualDatabaseDisplayCardSize());
|
||||||
|
connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
|
||||||
|
&SettingsCache::setVisualDatabaseDisplayCardSize);
|
||||||
|
|
||||||
searchContainer = new QWidget(this);
|
searchContainer = new QWidget(this);
|
||||||
searchLayout = new QHBoxLayout(searchContainer);
|
searchLayout = new QHBoxLayout(searchContainer);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
#include "visual_deck_editor_widget.h"
|
#include "visual_deck_editor_widget.h"
|
||||||
|
|
||||||
|
#include "../../../client/settings/cache_settings.h"
|
||||||
#include "../../../main.h"
|
#include "../../../main.h"
|
||||||
#include "../../deck_loader/deck_loader.h"
|
#include "../../deck_loader/deck_loader.h"
|
||||||
#include "../../layouts/overlap_layout.h"
|
#include "../../layouts/overlap_layout.h"
|
||||||
|
|
@ -194,7 +195,9 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
|
||||||
scrollArea->addScrollBarWidget(zoneContainer, Qt::AlignHCenter);
|
scrollArea->addScrollBarWidget(zoneContainer, Qt::AlignHCenter);
|
||||||
scrollArea->setWidget(zoneContainer);
|
scrollArea->setWidget(zoneContainer);
|
||||||
|
|
||||||
cardSizeWidget = new CardSizeWidget(this);
|
cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckEditorCardSize());
|
||||||
|
connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
|
||||||
|
&SettingsCache::setVisualDeckEditorCardSize);
|
||||||
|
|
||||||
mainLayout->addWidget(groupAndSortContainer);
|
mainLayout->addWidget(groupAndSortContainer);
|
||||||
mainLayout->addWidget(scrollArea);
|
mainLayout->addWidget(scrollArea);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue