diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index 0a740df0e..8e43f703e 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -59,19 +59,15 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare connect(drawUnusedColorIdentitiesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), &SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities); - 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); + // card size slider + cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckStorageCardSize()); quickSettingsWidget = new SettingsButtonWidget(this); quickSettingsWidget->addSettingsWidget(showFoldersCheckBox); quickSettingsWidget->addSettingsWidget(tagFilterVisibilityCheckBox); quickSettingsWidget->addSettingsWidget(tagsOnWidgetsVisibilityCheckBox); quickSettingsWidget->addSettingsWidget(drawUnusedColorIdentitiesCheckBox); - quickSettingsWidget->addSettingsWidget(cardSizeSliderVisibilityCheckBox); + quickSettingsWidget->addSettingsWidget(cardSizeWidget); searchAndSortLayout->addWidget(deckPreviewColorIdentityFilterWidget); searchAndSortLayout->addWidget(sortWidget); @@ -82,10 +78,6 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare tagFilterWidget = new VisualDeckStorageTagFilterWidget(this); updateTagsVisibility(SettingsCache::instance().getVisualDeckStorageShowTagFilter()); - // card size slider - cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckStorageCardSize()); - updateCardSizeSliderVisibility(SettingsCache::instance().getVisualDeckStorageShowCardSizeSlider()); - // deck area scrollArea = new QScrollArea(this); scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); @@ -96,7 +88,6 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare layout->addWidget(searchAndSortContainer); layout->addWidget(tagFilterWidget); layout->addWidget(scrollArea); - layout->addWidget(cardSizeWidget); connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this, &VisualDeckStorageWidget::createRootFolderWidget); @@ -141,7 +132,6 @@ void VisualDeckStorageWidget::retranslateUi() tagFilterVisibilityCheckBox->setText(tr("Show Tag Filter")); tagsOnWidgetsVisibilityCheckBox->setText(tr("Show Tags On Deck Previews")); drawUnusedColorIdentitiesCheckBox->setText(tr("Draw not contained Color Identities")); - cardSizeSliderVisibilityCheckBox->setText(tr("Show Card Size Slider")); } void VisualDeckStorageWidget::deckPreviewClickedEvent(QMouseEvent *event, DeckPreviewWidget *instance) @@ -218,12 +208,3 @@ void VisualDeckStorageWidget::updateTagsVisibility(const bool visible) tagFilterWidget->setHidden(true); } } - -void VisualDeckStorageWidget::updateCardSizeSliderVisibility(const bool _visible) const -{ - if (_visible) { - cardSizeWidget->setVisible(true); - } else { - cardSizeWidget->setHidden(true); - } -} diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h index e8a986cbc..b6ced6375 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h @@ -39,7 +39,6 @@ public slots: void updateColorFilter(); void updateSearchFilter(); void updateTagsVisibility(bool visible); - void updateCardSizeSliderVisibility(bool _visible) const; void updateSortOrder(); void resizeEvent(QResizeEvent *event) override; void showEvent(QShowEvent *event) override; @@ -67,7 +66,6 @@ private: QCheckBox *drawUnusedColorIdentitiesCheckBox; QCheckBox *tagFilterVisibilityCheckBox; QCheckBox *tagsOnWidgetsVisibilityCheckBox; - QCheckBox *cardSizeSliderVisibilityCheckBox; QScrollArea *scrollArea; VisualDeckStorageFolderDisplayWidget *folderWidget; }; diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp index 896872047..0b33920fd 100644 --- a/cockatrice/src/settings/cache_settings.cpp +++ b/cockatrice/src/settings/cache_settings.cpp @@ -270,8 +270,6 @@ SettingsCache::SettingsCache() visualDeckStorageShowTagFilter = settings->value("interface/visualdeckstorageshowtagfilter", true).toBool(); visualDeckStorageShowTagsOnDeckPreviews = settings->value("interface/visualdeckstorageshowtagsondeckpreviews", true).toBool(); - visualDeckStorageShowCardSizeSlider = - settings->value("interface/visualdeckstorageshowcardsizeslider", true).toBool(); visualDeckStorageDrawUnusedColorIdentities = settings->value("interface/visualdeckstoragedrawunusedcoloridentities", true).toBool(); visualDeckStorageUnusedColorIdentitiesOpacity = @@ -704,12 +702,6 @@ void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_ emit visualDeckStorageShowTagsOnDeckPreviewsChanged(visualDeckStorageShowTagsOnDeckPreviews); } -void SettingsCache::setVisualDeckStorageShowCardSizeSlider(QT_STATE_CHANGED_T _showCardSizeSlider) -{ - visualDeckStorageShowCardSizeSlider = _showCardSizeSlider; - settings->setValue("interface/visualdeckstorageshowcardsizeslider", visualDeckStorageShowCardSizeSlider); -} - void SettingsCache::setVisualDeckStorageCardSize(int _visualDeckStorageCardSize) { visualDeckStorageCardSize = _visualDeckStorageCardSize; diff --git a/cockatrice/src/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h index 14a3c7f54..a51d9444f 100644 --- a/cockatrice/src/settings/cache_settings.h +++ b/cockatrice/src/settings/cache_settings.h @@ -137,7 +137,6 @@ private: bool visualDeckStorageShowFolders; bool visualDeckStorageShowTagsOnDeckPreviews; bool visualDeckStorageShowTagFilter; - bool visualDeckStorageShowCardSizeSlider; int visualDeckStorageCardSize; bool visualDeckStorageDrawUnusedColorIdentities; int visualDeckStorageUnusedColorIdentitiesOpacity; @@ -435,10 +434,6 @@ public: { return visualDeckStorageShowTagsOnDeckPreviews; } - bool getVisualDeckStorageShowCardSizeSlider() const - { - return visualDeckStorageShowCardSizeSlider; - } int getVisualDeckStorageCardSize() const { return visualDeckStorageCardSize; @@ -787,7 +782,6 @@ public slots: void setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T value); void setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T _showTags); void setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T _showTags); - void setVisualDeckStorageShowCardSizeSlider(QT_STATE_CHANGED_T _showCardSizeSlider); void setVisualDeckStorageCardSize(int _visualDeckStorageCardSize); void setVisualDeckStorageDrawUnusedColorIdentities(QT_STATE_CHANGED_T _visualDeckStorageDrawUnusedColorIdentities); void setVisualDeckStorageUnusedColorIdentitiesOpacity(int _visualDeckStorageUnusedColorIdentitiesOpacity); diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp index eb0ab4829..268aec766 100644 --- a/dbconverter/src/mocks.cpp +++ b/dbconverter/src/mocks.cpp @@ -220,9 +220,6 @@ void SettingsCache::setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T /* _sho void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T /* _showTags */) { } -void SettingsCache::setVisualDeckStorageShowCardSizeSlider(QT_STATE_CHANGED_T /* _showCardSizeSlider */) -{ -} void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */) { } diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp index 067bb4d31..d1e660f14 100644 --- a/tests/carddatabase/mocks.cpp +++ b/tests/carddatabase/mocks.cpp @@ -224,9 +224,6 @@ void SettingsCache::setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T /* _sho void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T /* _showTags */) { } -void SettingsCache::setVisualDeckStorageShowCardSizeSlider(QT_STATE_CHANGED_T /* _showCardSizeSlider */) -{ -} void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */) { }