pdbs

* More granular modification signals.

* Bruh.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

.ci/release_template.md

@@ -10,7 +10,6 @@ Available pre-compiled binaries for installation:
 
   <b>Windows</b>
    • <kbd>Windows 10+</kbd>
-   • <kbd>Windows 7+</kbd>
 
   <b>macOS</b>
    • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>

.github/workflows/desktop-build.yml

@@ -211,7 +211,6 @@ jobs:
             make_package: 1
 
           - target: 14
-            soc: Apple
             os: macos-14
             xcode: "15.4"
             type: Release
@@ -219,17 +218,15 @@ jobs:
             make_package: 1
 
           - target: 15
-            soc: Apple
             os: macos-15
-            xcode: "16.2"
+            xcode: "16.3"
             type: Release
             core_count: 3
             make_package: 1
 
           - target: 15
-            soc: Apple
             os: macos-15
-            xcode: "16.2"
+            xcode: "16.3"
             type: Debug
             core_count: 3
 
@@ -259,10 +256,10 @@ jobs:
         shell: bash
         id: build
         env:
-          BUILDTYPE: '${{matrix.type}}'
+          BUILDTYPE: ${{ matrix.type }}
           MAKE_TEST: 1
-          MAKE_PACKAGE: '${{matrix.make_package}}'
-          PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}'
+          MAKE_PACKAGE: ${{ matrix.make_package }}
+          PACKAGE_SUFFIX: -macOS${{ matrix.target }}${{ matrix.soc == 'Intel' && '_Intel' || '' }}
           MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
@@ -350,13 +347,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - target: 7
-            qt_version: 5.15.*
-            qt_arch: msvc2019_64
-
           - target: 10
             qt_version: 6.6.*
-            qt_arch: msvc2019_64
+            qt_arch: win64_msvc2019_64  # win64_msvc2022_64 is only available with Qt 6.8, which introduces a bug in game window
             qt_modules: "qtimageformats qtmultimedia qtwebsockets"
 
     name: Windows ${{matrix.target}}
@@ -383,20 +376,14 @@ jobs:
           cache: true
           setup-python: true
           version: ${{matrix.qt_version}}
-          arch: win64_${{matrix.qt_arch}}
-          tools: ${{matrix.qt_tools}}
+          arch: ${{matrix.qt_arch}}
           modules: ${{matrix.qt_modules}}
 
-      # TODO: re-enable when https://github.com/lukka/run-vcpkg/issues/243 is fixed
-      - if: false
-        name: Run vcpkg (disabled)
-        uses: lukka/run-vcpkg@v11
+      - name: Setup vcpkg cache
+        id: vcpkg-cache
+        uses: TAServers/vcpkg-cache@v3
         with:
-          runVcpkgInstall: true
-          doNotCache: false
-        env:
-          VCPKG_DEFAULT_TRIPLET: 'x64-windows'
-          VCPKG_DISABLE_METRICS: 1
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Cockatrice
         id: build
@@ -405,7 +392,8 @@ jobs:
           PACKAGE_SUFFIX: '-Win${{matrix.target}}'
           CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
           CMAKE_GENERATOR_PLATFORM: 'x64'
-          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win64_${{matrix.qt_arch}}'
+          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\${{matrix.qt_arch}}'
+          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
         # No need for --parallel flag, MTT is added in the compile script to let cmake/msbuild manage core count,
         # project and process parallelism: https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
         run: .ci/compile.sh --server --release --test --package
@@ -417,13 +405,14 @@ jobs:
           path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 
-      - name: Upload pdb database
+      - name: Upload PDBs (Program Databases)
         uses: actions/upload-artifact@v4
         with:
-          name: Windows${{matrix.target}}-debug-pdbs
+          name: Windows${{matrix.target}}-Release-PDBs
           path: |
             build/cockatrice/Release/*.pdb
             build/servatrice/Release/*.pdb
+            build/oracle/Release/*.pdb
           if-no-files-found: error
 
       - name: Upload to release

cockatrice/CMakeLists.txt

@@ -135,6 +135,7 @@ set(cockatrice_SOURCES
     src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
     src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
     src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
     src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
     src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
     src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp

cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp

@@ -50,6 +50,7 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta
     printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this);
 
     connect(deckDockWidget, &DeckEditorDeckDockWidget::deckChanged, this, &AbstractTabDeckEditor::onDeckChanged);
+    connect(deckDockWidget, &DeckEditorDeckDockWidget::deckModified, this, &AbstractTabDeckEditor::onDeckModified);
     connect(deckDockWidget, &DeckEditorDeckDockWidget::cardChanged, this, &AbstractTabDeckEditor::updateCard);
     connect(this, &AbstractTabDeckEditor::decrementCard, deckDockWidget, &DeckEditorDeckDockWidget::actDecrementCard);
     connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::cardChanged, this,
@@ -77,6 +78,10 @@ void AbstractTabDeckEditor::updateCard(CardInfoPtr _card)
 }
 
 void AbstractTabDeckEditor::onDeckChanged()
+{
+}
+
+void AbstractTabDeckEditor::onDeckModified()
 {
     setModified(!isBlankNewDeck());
     deckMenu->setSaveStatus(!isBlankNewDeck());

cockatrice/src/client/tabs/abstract_tab_deck_editor.h

@@ -70,6 +70,7 @@ public:
 
 public slots:
     virtual void onDeckChanged();
+    virtual void onDeckModified();
     void updateCard(CardInfoPtr _card);
     void actAddCard(CardInfoPtr info);
     void actAddCardToSideboard(CardInfoPtr info);

cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp

@@ -80,7 +80,7 @@ void TabDeckEditorVisual::createCentralFrame()
 
 void TabDeckEditorVisual::onDeckChanged()
 {
-    AbstractTabDeckEditor::onDeckChanged();
+    AbstractTabDeckEditor::onDeckModified();
     tabContainer->visualDeckView->decklistDataChanged(QModelIndex(), QModelIndex());
     tabContainer->deckAnalytics->refreshDisplays(deckDockWidget->deckModel);
     tabContainer->sampleHandWidget->setDeckModel(deckDockWidget->deckModel);

cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp

@@ -228,19 +228,22 @@ void DeckEditorDeckDockWidget::updateCard(const QModelIndex /*&current*/, const
 void DeckEditorDeckDockWidget::updateName(const QString &name)
 {
     deckModel->getDeckList()->setName(name);
-    emit deckChanged();
+    emit nameChanged();
+    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::updateComments()
 {
     deckModel->getDeckList()->setComments(commentsEdit->toPlainText());
-    emit deckChanged();
+    emit commentsChanged();
+    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::updateHash()
 {
     hashLabel->setText(deckModel->getDeckList()->getDeckHash());
-    emit deckChanged();
+    emit hashChanged();
+    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::updateBannerCardComboBox()
@@ -318,7 +321,7 @@ void DeckEditorDeckDockWidget::setBannerCard(int /* changedIndex */)
     QVariantMap itemData = bannerCardComboBox->itemData(bannerCardComboBox->currentIndex()).toMap();
     deckModel->getDeckList()->setBannerCard(
         QPair<QString, QString>(itemData["name"].toString(), itemData["uuid"].toString()));
-    emit deckChanged();
+    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::updateShowBannerCardComboBox(const bool visible)
@@ -366,8 +369,12 @@ void DeckEditorDeckDockWidget::cleanDeck()
 {
     deckModel->cleanList();
     nameEdit->setText(QString());
+    emit nameChanged();
     commentsEdit->setText(QString());
+    emit commentsChanged();
     hashLabel->setText(QString());
+    emit hashChanged();
+    emit deckModified();
     emit deckChanged();
     updateBannerCardComboBox();
     deckTagsDisplayWidget->connectDeckList(deckModel->getDeckList());
@@ -426,7 +433,7 @@ void DeckEditorDeckDockWidget::actSwapCard()
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     if (isModified) {
-        emit deckChanged();
+        emit deckModified();
     }
 
     update();
@@ -521,7 +528,7 @@ void DeckEditorDeckDockWidget::actRemoveCard()
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     if (isModified) {
-        emit deckChanged();
+        emit deckModified();
     }
 }
 
@@ -539,7 +546,7 @@ void DeckEditorDeckDockWidget::offsetCountAtIndex(const QModelIndex &idx, int of
     else
         deckModel->setData(numberIndex, new_count, Qt::EditRole);
 
-    emit deckChanged();
+    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::decklistCustomMenu(QPoint point)

cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h

@@ -49,7 +49,11 @@ public slots:
     void offsetCountAtIndex(const QModelIndex &idx, int offset);
 
 signals:
+    void nameChanged();
+    void commentsChanged();
+    void hashChanged();
     void deckChanged();
+    void deckModified();
     void cardChanged(CardInfoPtr _card);
 
 private:

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp

@@ -90,9 +90,9 @@ void VisualDeckStorageFolderDisplayWidget::createWidgetsForFiles()
                 &VisualDeckStorageWidget::deckLoadRequested);
         connect(display, &DeckPreviewWidget::openDeckEditor, visualDeckStorageWidget,
                 &VisualDeckStorageWidget::openDeckEditor);
-        connect(visualDeckStorageWidget->cardSizeWidget->getSlider(), &QSlider::valueChanged,
+        connect(visualDeckStorageWidget->settings(), &VisualDeckStorageQuickSettingsWidget::cardSizeChanged,
                 display->bannerCardDisplayWidget, &CardInfoPictureWidget::setScaleFactor);
-        display->bannerCardDisplayWidget->setScaleFactor(visualDeckStorageWidget->cardSizeWidget->getSlider()->value());
+        display->bannerCardDisplayWidget->setScaleFactor(visualDeckStorageWidget->settings()->getCardSize());
         allDecks.append(display);
     }
 

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp

@@ -0,0 +1,155 @@
+#include "visual_deck_storage_quick_settings_widget.h"
+
+#include "../../../../settings/cache_settings.h"
+#include "visual_deck_storage_widget.h"
+
+#include <QCheckBox>
+#include <QSpinBox>
+
+VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidget *parent)
+    : SettingsButtonWidget(parent)
+{
+    // show folders checkbox
+    showFoldersCheckBox = new QCheckBox(this);
+    showFoldersCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowFolders());
+    connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &VisualDeckStorageQuickSettingsWidget::showFoldersChanged);
+    connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageShowFolders);
+
+    // show tag filter widget checkbox
+    showTagFilterCheckBox = new QCheckBox(this);
+    showTagFilterCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowTagFilter());
+    connect(showTagFilterCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &VisualDeckStorageQuickSettingsWidget::showTagFilterChanged);
+    connect(showTagFilterCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageShowTagFilter);
+
+    // show tags on DeckPreviewWidget checkbox
+    showTagsOnDeckPreviewsCheckBox = new QCheckBox(this);
+    showTagsOnDeckPreviewsCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowTagsOnDeckPreviews());
+    connect(showTagsOnDeckPreviewsCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &VisualDeckStorageQuickSettingsWidget::showTagsOnDeckPreviewsChanged);
+    connect(showTagsOnDeckPreviewsCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews);
+
+    // show banner card selector checkbox
+    showBannerCardComboBoxCheckBox = new QCheckBox(this);
+    showBannerCardComboBoxCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowBannerCardComboBox());
+    connect(showBannerCardComboBoxCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &VisualDeckStorageQuickSettingsWidget::showBannerCardComboBoxChanged);
+    connect(showBannerCardComboBoxCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageShowBannerCardComboBox);
+
+    // search folder names checkbox
+    searchFolderNamesCheckBox = new QCheckBox(this);
+    searchFolderNamesCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageSearchFolderNames());
+    connect(searchFolderNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &VisualDeckStorageQuickSettingsWidget::searchFolderNamesChanged);
+    connect(searchFolderNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageSearchFolderNames);
+
+    // draw unused color identities checkbox
+    drawUnusedColorIdentitiesCheckBox = new QCheckBox(this);
+    drawUnusedColorIdentitiesCheckBox->setChecked(
+        SettingsCache::instance().getVisualDeckStorageDrawUnusedColorIdentities());
+    connect(drawUnusedColorIdentitiesCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &VisualDeckStorageQuickSettingsWidget::drawUnusedColorIdentitiesChanged);
+    connect(drawUnusedColorIdentitiesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities);
+
+    // color identity opacity selector
+    auto unusedColorIdentityOpacityWidget = new QWidget(this);
+
+    unusedColorIdentitiesOpacityLabel = new QLabel(unusedColorIdentityOpacityWidget);
+    unusedColorIdentitiesOpacitySpinBox = new QSpinBox(unusedColorIdentityOpacityWidget);
+
+    unusedColorIdentitiesOpacitySpinBox->setMinimum(0);
+    unusedColorIdentitiesOpacitySpinBox->setMaximum(100);
+    unusedColorIdentitiesOpacitySpinBox->setValue(
+        SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity());
+    connect(unusedColorIdentitiesOpacitySpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
+            &VisualDeckStorageQuickSettingsWidget::unusedColorIdentitiesOpacityChanged);
+    connect(unusedColorIdentitiesOpacitySpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+            &SettingsCache::instance(), &SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity);
+
+    unusedColorIdentitiesOpacityLabel->setBuddy(unusedColorIdentitiesOpacitySpinBox);
+
+    auto unusedColorIdentityOpacityLayout = new QHBoxLayout(unusedColorIdentityOpacityWidget);
+    unusedColorIdentityOpacityLayout->setContentsMargins(11, 0, 11, 0);
+    unusedColorIdentityOpacityLayout->addWidget(unusedColorIdentitiesOpacityLabel);
+    unusedColorIdentityOpacityLayout->addWidget(unusedColorIdentitiesOpacitySpinBox);
+
+    // card size slider
+    cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckStorageCardSize());
+    connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, this,
+            &VisualDeckStorageQuickSettingsWidget::cardSizeChanged);
+    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageCardSize);
+
+    // putting everything together
+    this->addSettingsWidget(showFoldersCheckBox);
+    this->addSettingsWidget(showTagFilterCheckBox);
+    this->addSettingsWidget(showTagsOnDeckPreviewsCheckBox);
+    this->addSettingsWidget(showBannerCardComboBoxCheckBox);
+    this->addSettingsWidget(searchFolderNamesCheckBox);
+    this->addSettingsWidget(drawUnusedColorIdentitiesCheckBox);
+    this->addSettingsWidget(unusedColorIdentityOpacityWidget);
+    this->addSettingsWidget(cardSizeWidget);
+
+    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this,
+            &VisualDeckStorageQuickSettingsWidget::retranslateUi);
+    retranslateUi();
+}
+
+void VisualDeckStorageQuickSettingsWidget::retranslateUi()
+{
+    showFoldersCheckBox->setText(tr("Show Folders"));
+    showTagFilterCheckBox->setText(tr("Show Tag Filter"));
+    showTagsOnDeckPreviewsCheckBox->setText(tr("Show Tags On Deck Previews"));
+    showBannerCardComboBoxCheckBox->setText(tr("Show Banner Card Selection Option"));
+    searchFolderNamesCheckBox->setText(tr("Include Folder Names in Search"));
+    drawUnusedColorIdentitiesCheckBox->setText(tr("Draw unused Color Identities"));
+    unusedColorIdentitiesOpacityLabel->setText(tr("Unused Color Identities Opacity"));
+    unusedColorIdentitiesOpacitySpinBox->setSuffix("%");
+}
+
+bool VisualDeckStorageQuickSettingsWidget::getShowFolders() const
+{
+    return showFoldersCheckBox->isChecked();
+}
+
+bool VisualDeckStorageQuickSettingsWidget::getDrawUnusedColorIdentities() const
+{
+    return drawUnusedColorIdentitiesCheckBox->isChecked();
+}
+
+bool VisualDeckStorageQuickSettingsWidget::getShowBannerCardComboBox() const
+{
+    return showBannerCardComboBoxCheckBox->isChecked();
+}
+
+bool VisualDeckStorageQuickSettingsWidget::getShowTagFilter() const
+{
+    return showTagFilterCheckBox->isChecked();
+}
+
+bool VisualDeckStorageQuickSettingsWidget::getShowTagsOnDeckPreviews() const
+{
+    return showTagsOnDeckPreviewsCheckBox->isChecked();
+}
+
+bool VisualDeckStorageQuickSettingsWidget::getSearchFolderNames() const
+{
+    return searchFolderNamesCheckBox->isChecked();
+}
+
+int VisualDeckStorageQuickSettingsWidget::getUnusedColorIdentitiesOpacity() const
+{
+    return unusedColorIdentitiesOpacitySpinBox->value();
+}
+
+int VisualDeckStorageQuickSettingsWidget::getCardSize() const
+{
+    return cardSizeWidget->getSlider()->value();
+}

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h

@@ -0,0 +1,55 @@
+#ifndef VISUAL_DECK_STORAGE_QUICK_SETTINGS_WIDGET_H
+#define VISUAL_DECK_STORAGE_QUICK_SETTINGS_WIDGET_H
+
+#include "../quick_settings/settings_button_widget.h"
+
+class CardSizeWidget;
+class QLabel;
+class QSpinBox;
+class QCheckBox;
+
+/**
+ * The VDS's quick settings menu.
+ * Manages the widgets in the quick settings menu dropdown, as well as syncing their values with SettingsCache.
+ * The current values of the settings are exposed through getters and signals.
+ */
+class VisualDeckStorageQuickSettingsWidget : public SettingsButtonWidget
+{
+    Q_OBJECT
+
+    QCheckBox *showFoldersCheckBox;
+    QCheckBox *drawUnusedColorIdentitiesCheckBox;
+    QCheckBox *showBannerCardComboBoxCheckBox;
+    QCheckBox *showTagFilterCheckBox;
+    QCheckBox *showTagsOnDeckPreviewsCheckBox;
+    QCheckBox *searchFolderNamesCheckBox;
+    QLabel *unusedColorIdentitiesOpacityLabel;
+    QSpinBox *unusedColorIdentitiesOpacitySpinBox;
+    CardSizeWidget *cardSizeWidget;
+
+public:
+    explicit VisualDeckStorageQuickSettingsWidget(QWidget *parent = nullptr);
+
+    void retranslateUi();
+
+    bool getShowFolders() const;
+    bool getDrawUnusedColorIdentities() const;
+    bool getShowBannerCardComboBox() const;
+    bool getShowTagFilter() const;
+    bool getShowTagsOnDeckPreviews() const;
+    bool getSearchFolderNames() const;
+    int getUnusedColorIdentitiesOpacity() const;
+    int getCardSize() const;
+
+signals:
+    void showFoldersChanged(bool enabled);
+    void drawUnusedColorIdentitiesChanged(bool enabled);
+    void showBannerCardComboBoxChanged(bool enabled);
+    void showTagFilterChanged(bool enabled);
+    void showTagsOnDeckPreviewsChanged(bool enabled);
+    void searchFolderNamesChanged(bool enabled);
+    void unusedColorIdentitiesOpacityChanged(int opacity);
+    void cardSizeChanged(int scale);
+};
+
+#endif // VISUAL_DECK_STORAGE_QUICK_SETTINGS_WIDGET_H

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp

@@ -41,81 +41,13 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     refreshButton->setFixedSize(32, 32);
     connect(refreshButton, &QPushButton::clicked, this, &VisualDeckStorageWidget::refreshIfPossible);
 
-    // quick settings menu
-    showFoldersCheckBox = new QCheckBox(this);
-    showFoldersCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowFolders());
-    connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &VisualDeckStorageWidget::updateShowFolders);
-    connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageShowFolders);
-
-    tagFilterVisibilityCheckBox = new QCheckBox(this);
-    tagFilterVisibilityCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowTagFilter());
-    connect(tagFilterVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+    quickSettingsWidget = new VisualDeckStorageQuickSettingsWidget(this);
+    connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::showFoldersChanged, this,
+            &VisualDeckStorageWidget::updateShowFolders);
+    connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::showTagFilterChanged, this,
             &VisualDeckStorageWidget::updateTagsVisibility);
-    connect(tagFilterVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageShowTagFilter);
-
-    tagsOnWidgetsVisibilityCheckBox = new QCheckBox(this);
-    tagsOnWidgetsVisibilityCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowTagsOnDeckPreviews());
-    connect(tagsOnWidgetsVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews);
-
-    drawUnusedColorIdentitiesCheckBox = new QCheckBox(this);
-    drawUnusedColorIdentitiesCheckBox->setChecked(
-        SettingsCache::instance().getVisualDeckStorageDrawUnusedColorIdentities());
-    connect(drawUnusedColorIdentitiesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities);
-
-    bannerCardComboBoxVisibilityCheckBox = new QCheckBox(this);
-    bannerCardComboBoxVisibilityCheckBox->setChecked(
-        SettingsCache::instance().getVisualDeckStorageShowBannerCardComboBox());
-    connect(bannerCardComboBoxVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageShowBannerCardComboBox);
-
-    searchFolderNamesCheckBox = new QCheckBox(this);
-    searchFolderNamesCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageSearchFolderNames());
-    connect(searchFolderNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+    connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::searchFolderNamesChanged, this,
             &VisualDeckStorageWidget::updateSearchFilter);
-    connect(searchFolderNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageSearchFolderNames);
-
-    // color identity opacity selector
-    auto unusedColorIdentityOpacityWidget = new QWidget(this);
-
-    unusedColorIdentitiesOpacityLabel = new QLabel(unusedColorIdentityOpacityWidget);
-    unusedColorIdentitiesOpacitySpinBox = new QSpinBox(unusedColorIdentityOpacityWidget);
-
-    unusedColorIdentitiesOpacitySpinBox->setMinimum(0);
-    unusedColorIdentitiesOpacitySpinBox->setMaximum(100);
-    unusedColorIdentitiesOpacitySpinBox->setValue(
-        SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity());
-    connect(unusedColorIdentitiesOpacitySpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
-            &SettingsCache::instance(), &SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity);
-
-    unusedColorIdentitiesOpacityLabel->setBuddy(unusedColorIdentitiesOpacitySpinBox);
-
-    unusedColorIdentitiesOpacitySpinBox->setValue(
-        SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity());
-
-    auto unusedColorIdentityOpacityLayout = new QHBoxLayout(unusedColorIdentityOpacityWidget);
-    unusedColorIdentityOpacityLayout->setContentsMargins(11, 0, 11, 0);
-    unusedColorIdentityOpacityLayout->addWidget(unusedColorIdentitiesOpacityLabel);
-    unusedColorIdentityOpacityLayout->addWidget(unusedColorIdentitiesOpacitySpinBox);
-
-    // card size slider
-    cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckStorageCardSize());
-    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageCardSize);
-
-    quickSettingsWidget = new SettingsButtonWidget(this);
-    quickSettingsWidget->addSettingsWidget(showFoldersCheckBox);
-    quickSettingsWidget->addSettingsWidget(tagFilterVisibilityCheckBox);
-    quickSettingsWidget->addSettingsWidget(tagsOnWidgetsVisibilityCheckBox);
-    quickSettingsWidget->addSettingsWidget(bannerCardComboBoxVisibilityCheckBox);
-    quickSettingsWidget->addSettingsWidget(searchFolderNamesCheckBox);
-    quickSettingsWidget->addSettingsWidget(drawUnusedColorIdentitiesCheckBox);
-    quickSettingsWidget->addSettingsWidget(unusedColorIdentityOpacityWidget);
-    quickSettingsWidget->addSettingsWidget(cardSizeWidget);
 
     searchAndSortLayout->addWidget(deckPreviewColorIdentityFilterWidget);
     searchAndSortLayout->addWidget(sortWidget);
@@ -188,19 +120,18 @@ void VisualDeckStorageWidget::retranslateUi()
 {
     databaseLoadIndicator->setText(tr("Loading database ..."));
 
-    showFoldersCheckBox->setText(tr("Show Folders"));
-    tagFilterVisibilityCheckBox->setText(tr("Show Tag Filter"));
-    tagsOnWidgetsVisibilityCheckBox->setText(tr("Show Tags On Deck Previews"));
-    bannerCardComboBoxVisibilityCheckBox->setText(tr("Show Banner Card Selection Option"));
-    searchFolderNamesCheckBox->setText(tr("Include Folder Names in Search"));
-    drawUnusedColorIdentitiesCheckBox->setText(tr("Draw unused Color Identities"));
-    unusedColorIdentitiesOpacityLabel->setText(tr("Unused Color Identities Opacity"));
-    unusedColorIdentitiesOpacitySpinBox->setSuffix("%");
-
     refreshButton->setToolTip(tr("Refresh loaded files"));
     quickSettingsWidget->setToolTip(tr("Visual Deck Storage Settings"));
 }
 
+/**
+ * Gets a const pointer to the quick settings so that the values can be accessed.
+ */
+const VisualDeckStorageQuickSettingsWidget *VisualDeckStorageWidget::settings() const
+{
+    return quickSettingsWidget;
+}
+
 /**
  * Reapplies all sort and filter options by calling the appropriate update methods.
  */
@@ -215,7 +146,7 @@ void VisualDeckStorageWidget::reapplySortAndFilters()
 void VisualDeckStorageWidget::createRootFolderWidget()
 {
     folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().getDeckPath(), false,
-                                                            showFoldersCheckBox->isChecked());
+                                                            quickSettingsWidget->getShowFolders());
 
     scrollArea->setWidget(folderWidget); // this automatically destroys the old folderWidget
     scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
@@ -266,7 +197,7 @@ void VisualDeckStorageWidget::updateSearchFilter()
 {
     if (folderWidget) {
         searchWidget->filterWidgets(folderWidget->findChildren<DeckPreviewWidget *>(), searchWidget->getSearchText(),
-                                    searchFolderNamesCheckBox->isChecked());
+                                    quickSettingsWidget->getSearchFolderNames());
         folderWidget->updateVisibility();
     }
 }

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h

@@ -8,6 +8,7 @@
 #include "deck_preview/deck_preview_color_identity_filter_widget.h"
 #include "deck_preview/deck_preview_widget.h"
 #include "visual_deck_storage_folder_display_widget.h"
+#include "visual_deck_storage_quick_settings_widget.h"
 #include "visual_deck_storage_search_widget.h"
 #include "visual_deck_storage_sort_widget.h"
 #include "visual_deck_storage_tag_filter_widget.h"
@@ -29,10 +30,11 @@ public:
     void refreshIfPossible();
     void retranslateUi();
 
-    CardSizeWidget *cardSizeWidget;
     VisualDeckStorageTagFilterWidget *tagFilterWidget;
     bool deckPreviewSelectionAnimationEnabled;
 
+    const VisualDeckStorageQuickSettingsWidget *settings() const;
+
 public slots:
     void createRootFolderWidget(); // Refresh the display of cards based on the current sorting option
     void updateShowFolders(bool enabled);
@@ -60,15 +62,7 @@ private:
     VisualDeckStorageSearchWidget *searchWidget;
     DeckPreviewColorIdentityFilterWidget *deckPreviewColorIdentityFilterWidget;
     QToolButton *refreshButton;
-    SettingsButtonWidget *quickSettingsWidget;
-    QCheckBox *showFoldersCheckBox;
-    QCheckBox *drawUnusedColorIdentitiesCheckBox;
-    QCheckBox *bannerCardComboBoxVisibilityCheckBox;
-    QCheckBox *tagFilterVisibilityCheckBox;
-    QCheckBox *tagsOnWidgetsVisibilityCheckBox;
-    QCheckBox *searchFolderNamesCheckBox;
-    QLabel *unusedColorIdentitiesOpacityLabel;
-    QSpinBox *unusedColorIdentitiesOpacitySpinBox;
+    VisualDeckStorageQuickSettingsWidget *quickSettingsWidget;
     QScrollArea *scrollArea;
     VisualDeckStorageFolderDisplayWidget *folderWidget;