From e89ba462816612374895a4957e8b5337d16b3580 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Tue, 14 Jan 2025 00:45:54 -0800 Subject: [PATCH] remove the visual deck storage on load setting --- cockatrice/src/client/tabs/tab_supervisor.cpp | 2 +- cockatrice/src/dialogs/dlg_settings.cpp | 12 +++--------- cockatrice/src/dialogs/dlg_settings.h | 1 - cockatrice/src/settings/cache_settings.cpp | 7 ------- cockatrice/src/settings/cache_settings.h | 6 ------ dbconverter/src/mocks.cpp | 3 --- tests/carddatabase/mocks.cpp | 3 --- 7 files changed, 4 insertions(+), 30 deletions(-) diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp index 92cad6c20..3cc2d1c10 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.cpp +++ b/cockatrice/src/client/tabs/tab_supervisor.cpp @@ -278,7 +278,7 @@ void TabSupervisor::initStartupTabs() { addDeckEditorTab(nullptr); - checkAndTrigger(aTabVisualDeckStorage, SettingsCache::instance().getVisualDeckStorageShowOnLoad()); + checkAndTrigger(aTabVisualDeckStorage, SettingsCache::instance().getTabVisualDeckStorageOpen()); } /** diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index 6da0ce721..9034097d7 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -346,10 +346,6 @@ AppearanceSettingsPage::AppearanceSettingsPage() showShortcutsCheckBox.setChecked(settings.getShowShortcuts()); connect(&showShortcutsCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &AppearanceSettingsPage::showShortcutsChanged); - showVisualDeckStorageOnLoadCheckBox.setChecked(settings.getVisualDeckStorageShowOnLoad()); - connect(&showVisualDeckStorageOnLoadCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, - &SettingsCache::setVisualDeckStorageShowOnLoad); - visualDeckStorageDrawUnusedColorIdentitiesCheckBox.setChecked( settings.getVisualDeckStorageDrawUnusedColorIdentities()); connect(&visualDeckStorageDrawUnusedColorIdentitiesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, @@ -366,10 +362,9 @@ AppearanceSettingsPage::AppearanceSettingsPage() auto *menuGrid = new QGridLayout; menuGrid->addWidget(&showShortcutsCheckBox, 0, 0); - menuGrid->addWidget(&showVisualDeckStorageOnLoadCheckBox, 1, 0); - menuGrid->addWidget(&visualDeckStorageDrawUnusedColorIdentitiesCheckBox, 2, 0); - menuGrid->addWidget(&visualDeckStorageUnusedColorIdentitiesOpacityLabel, 3, 0); - menuGrid->addWidget(&visualDeckStorageUnusedColorIdentitiesOpacitySpinBox, 3, 1); + menuGrid->addWidget(&visualDeckStorageDrawUnusedColorIdentitiesCheckBox, 1, 0); + menuGrid->addWidget(&visualDeckStorageUnusedColorIdentitiesOpacityLabel, 2, 0); + menuGrid->addWidget(&visualDeckStorageUnusedColorIdentitiesOpacitySpinBox, 2, 1); menuGroupBox = new QGroupBox; menuGroupBox->setLayout(menuGrid); @@ -504,7 +499,6 @@ void AppearanceSettingsPage::retranslateUi() menuGroupBox->setTitle(tr("Menu settings")); showShortcutsCheckBox.setText(tr("Show keyboard shortcuts in right-click menus")); - showVisualDeckStorageOnLoadCheckBox.setText(tr("Show visual deck storage on database load")); visualDeckStorageDrawUnusedColorIdentitiesCheckBox.setText( tr("Draw missing color identities in visual deck storage without color label")); visualDeckStorageUnusedColorIdentitiesOpacityLabel.setText(tr("Missing color identity opacity")); diff --git a/cockatrice/src/dialogs/dlg_settings.h b/cockatrice/src/dialogs/dlg_settings.h index 5902a4a72..4aefd1856 100644 --- a/cockatrice/src/dialogs/dlg_settings.h +++ b/cockatrice/src/dialogs/dlg_settings.h @@ -95,7 +95,6 @@ private: QLabel minPlayersForMultiColumnLayoutLabel; QLabel maxFontSizeForCardsLabel; QCheckBox showShortcutsCheckBox; - QCheckBox showVisualDeckStorageOnLoadCheckBox; QCheckBox visualDeckStorageDrawUnusedColorIdentitiesCheckBox; QLabel visualDeckStorageUnusedColorIdentitiesOpacityLabel; QSpinBox visualDeckStorageUnusedColorIdentitiesOpacitySpinBox; diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp index b6fdfe6c9..80cd46b01 100644 --- a/cockatrice/src/settings/cache_settings.cpp +++ b/cockatrice/src/settings/cache_settings.cpp @@ -268,7 +268,6 @@ SettingsCache::SettingsCache() printingSelectorNavigationButtonsVisible = settings->value("cards/printingselectornavigationbuttonsvisible", true).toBool(); visualDeckStorageCardSize = settings->value("cards/visualdeckstoragecardsize", 100).toInt(); - visualDeckStorageShowOnLoad = settings->value("interface/visualdeckstorageshowonload", true).toBool(); visualDeckStorageSortingOrder = settings->value("interface/visualdeckstoragesortingorder", 0).toInt(); visualDeckStorageDrawUnusedColorIdentities = settings->value("interface/visualdeckstoragedrawunusedcoloridentities", true).toBool(); @@ -679,12 +678,6 @@ void SettingsCache::setVisualDeckStorageCardSize(int _visualDeckStorageCardSize) emit visualDeckStorageCardSizeChanged(); } -void SettingsCache::setVisualDeckStorageShowOnLoad(QT_STATE_CHANGED_T _visualDeckStorageShowOnLoad) -{ - visualDeckStorageShowOnLoad = _visualDeckStorageShowOnLoad; - settings->setValue("interface/visualdeckstorageshowonload", visualDeckStorageShowOnLoad); -} - void SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities( QT_STATE_CHANGED_T _visualDeckStorageDrawUnusedColorIdentities) { diff --git a/cockatrice/src/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h index 3a4b81ee4..8c75b6789 100644 --- a/cockatrice/src/settings/cache_settings.h +++ b/cockatrice/src/settings/cache_settings.h @@ -130,7 +130,6 @@ private: int visualDeckStorageCardSize; bool visualDeckStorageDrawUnusedColorIdentities; int visualDeckStorageUnusedColorIdentitiesOpacity; - bool visualDeckStorageShowOnLoad; bool horizontalHand; bool invertVerticalCoordinate; int minPlayersForMultiColumnLayout; @@ -421,10 +420,6 @@ public: { return visualDeckStorageUnusedColorIdentitiesOpacity; } - bool getVisualDeckStorageShowOnLoad() const - { - return visualDeckStorageShowOnLoad; - } bool getHorizontalHand() const { return horizontalHand; @@ -744,7 +739,6 @@ public slots: void setVisualDeckStorageCardSize(int _visualDeckStorageCardSize); void setVisualDeckStorageDrawUnusedColorIdentities(QT_STATE_CHANGED_T _visualDeckStorageDrawUnusedColorIdentities); void setVisualDeckStorageUnusedColorIdentitiesOpacity(int _visualDeckStorageUnusedColorIdentitiesOpacity); - void setVisualDeckStorageShowOnLoad(QT_STATE_CHANGED_T _visualDeckStorageShowOnLoad); void setHorizontalHand(QT_STATE_CHANGED_T _horizontalHand); void setInvertVerticalCoordinate(QT_STATE_CHANGED_T _invertVerticalCoordinate); void setMinPlayersForMultiColumnLayout(int _minPlayersForMultiColumnLayout); diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp index 25a98b4ec..303e0a46c 100644 --- a/dbconverter/src/mocks.cpp +++ b/dbconverter/src/mocks.cpp @@ -211,9 +211,6 @@ void SettingsCache::setVisualDeckStorageSortingOrder(int /* _visualDeckStorageSo void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */) { } -void SettingsCache::setVisualDeckStorageShowOnLoad(QT_STATE_CHANGED_T /* _visualDeckStorageShowOnLoad */) -{ -} void SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities( QT_STATE_CHANGED_T /* _visualDeckStorageDrawUnusedColorIdentities */) { diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp index a683485d3..f409c1078 100644 --- a/tests/carddatabase/mocks.cpp +++ b/tests/carddatabase/mocks.cpp @@ -215,9 +215,6 @@ void SettingsCache::setVisualDeckStorageSortingOrder(int /* _visualDeckStorageSo void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */) { } -void SettingsCache::setVisualDeckStorageShowOnLoad(QT_STATE_CHANGED_T /* _visualDeckStorageShowOnLoad */) -{ -} void SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities( QT_STATE_CHANGED_T /* _visualDeckStorageDrawUnusedColorIdentities */) {