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

Add option to hide card size slider in VDS.

Browse source
This commit is contained in:
Lukas Brübach 2025-02-10 13:58:20 +01:00
parent ea30497527
commit 39af6f211a
6 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
View file

@ -45,9 +45,17 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
connect(tagsVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), connect(tagsVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
&SettingsCache::setVisualDeckStorageShowTags); &SettingsCache::setVisualDeckStorageShowTags);
cardSizeSliderVisibilityCheckBox = new QCheckBox(this);
cardSizeSliderVisibilityCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowCardSizeSlider());
connect(cardSizeSliderVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
&VisualDeckStorageWidget::updateCardSizeSliderVisibility);
connect(cardSizeSliderVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
&SettingsCache::setVisualDeckStorageShowCardSizeSlider);
quickSettingsWidget = new SettingsButtonWidget(this); quickSettingsWidget = new SettingsButtonWidget(this);
quickSettingsWidget->addSettingsWidget(showFoldersCheckBox); quickSettingsWidget->addSettingsWidget(showFoldersCheckBox);
quickSettingsWidget->addSettingsWidget(tagsVisibilityCheckBox); quickSettingsWidget->addSettingsWidget(tagsVisibilityCheckBox);
quickSettingsWidget->addSettingsWidget(cardSizeSliderVisibilityCheckBox);
searchAndSortLayout->addWidget(deckPreviewColorIdentityFilterWidget); searchAndSortLayout->addWidget(deckPreviewColorIdentityFilterWidget);
searchAndSortLayout->addWidget(sortWidget); searchAndSortLayout->addWidget(sortWidget);
@ -60,6 +68,7 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
// card size slider // card size slider
cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckStorageCardSize()); cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckStorageCardSize());
updateCardSizeSliderVisibility(SettingsCache::instance().getVisualDeckStorageShowCardSizeSlider());
// deck area // deck area
scrollArea = new QScrollArea(this); scrollArea = new QScrollArea(this);
@ -114,6 +123,7 @@ void VisualDeckStorageWidget::retranslateUi()
showFoldersCheckBox->setText(tr("Show Folders")); showFoldersCheckBox->setText(tr("Show Folders"));
tagsVisibilityCheckBox->setText(tr("Show Tags")); tagsVisibilityCheckBox->setText(tr("Show Tags"));
cardSizeSliderVisibilityCheckBox->setText(tr("Show Card Size Slider"));
} }
void VisualDeckStorageWidget::deckPreviewClickedEvent(QMouseEvent *event, DeckPreviewWidget *instance) void VisualDeckStorageWidget::deckPreviewClickedEvent(QMouseEvent *event, DeckPreviewWidget *instance)
@ -193,3 +203,12 @@ void VisualDeckStorageWidget::updateTagsVisibility(const bool visible)
} }
emit tagsVisibilityChanged(visible); emit tagsVisibilityChanged(visible);
} }
void VisualDeckStorageWidget::updateCardSizeSliderVisibility(const bool _visible) const
{
if (_visible) {
cardSizeWidget->setVisible(true);
} else {
cardSizeWidget->setHidden(true);
}
}

2
cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
View file

@ -39,6 +39,7 @@ public slots:
void updateColorFilter(); void updateColorFilter();
void updateSearchFilter(); void updateSearchFilter();
void updateTagsVisibility(bool visible); void updateTagsVisibility(bool visible);
void updateCardSizeSliderVisibility(bool _visible) const;
void updateSortOrder(); void updateSortOrder();
void resizeEvent(QResizeEvent *event) override; void resizeEvent(QResizeEvent *event) override;
void showEvent(QShowEvent *event) override; void showEvent(QShowEvent *event) override;
@ -64,6 +65,7 @@ private:
SettingsButtonWidget *quickSettingsWidget; SettingsButtonWidget *quickSettingsWidget;
QCheckBox *showFoldersCheckBox; QCheckBox *showFoldersCheckBox;
QCheckBox *tagsVisibilityCheckBox; QCheckBox *tagsVisibilityCheckBox;
QCheckBox *cardSizeSliderVisibilityCheckBox;
QScrollArea *scrollArea; QScrollArea *scrollArea;
VisualDeckStorageFolderDisplayWidget *folderWidget; VisualDeckStorageFolderDisplayWidget *folderWidget;
}; };

8
cockatrice/src/settings/cache_settings.cpp
View file

@ -268,6 +268,8 @@ SettingsCache::SettingsCache()
visualDeckStorageSortingOrder = settings->value("interface/visualdeckstoragesortingorder", 0).toInt(); visualDeckStorageSortingOrder = settings->value("interface/visualdeckstoragesortingorder", 0).toInt();
visualDeckStorageShowFolders = settings->value("interface/visualdeckstorageshowfolders", true).toBool(); visualDeckStorageShowFolders = settings->value("interface/visualdeckstorageshowfolders", true).toBool();
visualDeckStorageShowTags = settings->value("interface/visualdeckstorageshowtags", true).toBool(); visualDeckStorageShowTags = settings->value("interface/visualdeckstorageshowtags", true).toBool();
visualDeckStorageShowCardSizeSlider =
settings->value("interface/visualdeckstorageshowcardsizeslider", true).toBool();
visualDeckStorageDrawUnusedColorIdentities = visualDeckStorageDrawUnusedColorIdentities =
settings->value("interface/visualdeckstoragedrawunusedcoloridentities", true).toBool(); settings->value("interface/visualdeckstoragedrawunusedcoloridentities", true).toBool();
visualDeckStorageUnusedColorIdentitiesOpacity = visualDeckStorageUnusedColorIdentitiesOpacity =
@ -692,6 +694,12 @@ void SettingsCache::setVisualDeckStorageShowTags(QT_STATE_CHANGED_T _showTags)
settings->setValue("interface/visualdeckstorageshowtags", visualDeckStorageShowTags); settings->setValue("interface/visualdeckstorageshowtags", visualDeckStorageShowTags);
} }
void SettingsCache::setVisualDeckStorageShowCardSizeSlider(QT_STATE_CHANGED_T _showCardSizeSlider)
{
visualDeckStorageShowCardSizeSlider = _showCardSizeSlider;
settings->setValue("interface/visualdeckstorageshowcardsizeslider", visualDeckStorageShowCardSizeSlider);
}
void SettingsCache::setVisualDeckStorageCardSize(int _visualDeckStorageCardSize) void SettingsCache::setVisualDeckStorageCardSize(int _visualDeckStorageCardSize)
{ {
visualDeckStorageCardSize = _visualDeckStorageCardSize; visualDeckStorageCardSize = _visualDeckStorageCardSize;

6
cockatrice/src/settings/cache_settings.h
View file

@ -133,6 +133,7 @@ private:
int visualDeckStorageSortingOrder; int visualDeckStorageSortingOrder;
bool visualDeckStorageShowFolders; bool visualDeckStorageShowFolders;
bool visualDeckStorageShowTags; bool visualDeckStorageShowTags;
bool visualDeckStorageShowCardSizeSlider;
int visualDeckStorageCardSize; int visualDeckStorageCardSize;
bool visualDeckStorageDrawUnusedColorIdentities; bool visualDeckStorageDrawUnusedColorIdentities;
int visualDeckStorageUnusedColorIdentitiesOpacity; int visualDeckStorageUnusedColorIdentitiesOpacity;
@ -426,6 +427,10 @@ public:
{ {
return visualDeckStorageShowTags; return visualDeckStorageShowTags;
} }
bool getVisualDeckStorageShowCardSizeSlider() const
{
return visualDeckStorageShowCardSizeSlider;
}
int getVisualDeckStorageCardSize() const int getVisualDeckStorageCardSize() const
{ {
return visualDeckStorageCardSize; return visualDeckStorageCardSize;
@ -773,6 +778,7 @@ public slots:
void setVisualDeckStorageSortingOrder(int _visualDeckStorageSortingOrder); void setVisualDeckStorageSortingOrder(int _visualDeckStorageSortingOrder);
void setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T value); void setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T value);
void setVisualDeckStorageShowTags(QT_STATE_CHANGED_T _showTags); void setVisualDeckStorageShowTags(QT_STATE_CHANGED_T _showTags);
void setVisualDeckStorageShowCardSizeSlider(QT_STATE_CHANGED_T _showCardSizeSlider);
void setVisualDeckStorageCardSize(int _visualDeckStorageCardSize); void setVisualDeckStorageCardSize(int _visualDeckStorageCardSize);
void setVisualDeckStorageDrawUnusedColorIdentities(QT_STATE_CHANGED_T _visualDeckStorageDrawUnusedColorIdentities); void setVisualDeckStorageDrawUnusedColorIdentities(QT_STATE_CHANGED_T _visualDeckStorageDrawUnusedColorIdentities);
void setVisualDeckStorageUnusedColorIdentitiesOpacity(int _visualDeckStorageUnusedColorIdentitiesOpacity); void setVisualDeckStorageUnusedColorIdentitiesOpacity(int _visualDeckStorageUnusedColorIdentitiesOpacity);

3
dbconverter/src/mocks.cpp
View file

@ -217,6 +217,9 @@ void SettingsCache::setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T /* value
void SettingsCache::setVisualDeckStorageShowTags(QT_STATE_CHANGED_T /* _showTags */) void SettingsCache::setVisualDeckStorageShowTags(QT_STATE_CHANGED_T /* _showTags */)
{ {
} }
void SettingsCache::setVisualDeckStorageShowCardSizeSlider(QT_STATE_CHANGED_T /* _showCardSizeSlider */)
{
}
void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */) void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */)
{ {
} }

3
tests/carddatabase/mocks.cpp
View file

@ -221,6 +221,9 @@ void SettingsCache::setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T /* value
void SettingsCache::setVisualDeckStorageShowTags(QT_STATE_CHANGED_T /* _showTags */) void SettingsCache::setVisualDeckStorageShowTags(QT_STATE_CHANGED_T /* _showTags */)
{ {
} }
void SettingsCache::setVisualDeckStorageShowCardSizeSlider(QT_STATE_CHANGED_T /* _showCardSizeSlider */)
{
}
void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */) void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */)
{ {
} }