Merge branch 'master' into ci/use-ninja-win-clean

cockatrice/src/client/network/interfaces/tapped_out_interface.cpp

@@ -89,6 +89,8 @@ void TappedOutInterface::analyzeDeck(const DeckList &deck)
     QNetworkRequest request(QUrl("https://tappedout.net/mtg-decks/paste/"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
     request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+    // we interpret the redirect and open it in the browser instead, do not follow redirects
+    request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::ManualRedirectPolicy);
 
     manager->post(request, data);
 }

cockatrice/src/game/board/card_item.cpp

@@ -460,9 +460,6 @@ void CardItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 
 bool CardItem::animationEvent()
 {
-    if (owner == nullptr) {
-        return false;
-    }
     int rotation = ROTATION_DEGREES_PER_FRAME;
     bool animationIncomplete = true;
     if (!tapped)

cockatrice/src/game/game_event_handler.cpp

@@ -429,13 +429,13 @@ void GameEventHandler::eventLeave(const Event_Leave &event, int eventPlayerId, c
     if (!player)
         return;
 
+    player->clear();
     emit playerLeft(eventPlayerId);
 
     emit logLeave(player, getLeaveReason(event.reason()));
 
     game->getPlayerManager()->removePlayer(eventPlayerId);
 
-    player->clear();
     player->deleteLater();
 
     // Rearrange all remaining zones so that attachment relationship updates take place

cockatrice/src/game/log/message_log_widget.cpp

@@ -54,7 +54,7 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
                     fromStr = tr(" from the top of their library");
                 }
             }
-        } else if (position >= zone->getCards().size() - 1) {
+        } else if (position == zone->getCards().size()) {
             if (cardName.isEmpty()) {
                 if (ownerChange) {
                     cardName = tr("the bottom card of %1's library").arg(zone->getPlayer()->getPlayerInfo()->getName());

cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp

@@ -62,7 +62,7 @@ void CardInfoTextWidget::setCard(const ExactCard &exactCard)
     text += QString("<tr><td>%1</td><td width=\"5\"></td><td>%2</td></tr>")
                 .arg(tr("Name:"), card->getName().toHtmlEscaped());
 
-    if (exactCard.getPrinting() != PrintingInfo()) {
+    if (!exactCard.getPrinting().isEmpty()) {
         QString setShort = exactCard.getPrinting().getSet()->getShortName().toHtmlEscaped();
         QString cardNum = exactCard.getPrinting().getProperty("num").toHtmlEscaped();
 

cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp

@@ -29,10 +29,14 @@ DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnal
     removeButton = new QPushButton(this);
     saveButton = new QPushButton(this);
     loadButton = new QPushButton(this);
+    includeSideboardCheckBox = new QCheckBox(this);
+    includeSideboardCheckBox->setChecked(false);
+
     controlLayout->addWidget(addButton);
     controlLayout->addWidget(removeButton);
     controlLayout->addWidget(saveButton);
     controlLayout->addWidget(loadButton);
+    controlLayout->addWidget(includeSideboardCheckBox);
 
     layout->addWidget(controlContainer);
 
@@ -40,6 +44,7 @@ DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnal
     connect(removeButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::onRemoveSelected);
     connect(saveButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::saveLayout);
     connect(loadButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::loadLayout);
+    connect(includeSideboardCheckBox, &QCheckBox::clicked, this, &DeckAnalyticsWidget::includeSideboardChanged);
 
     // Scroll area and container
     scrollArea = new QScrollArea(this);
@@ -66,6 +71,13 @@ void DeckAnalyticsWidget::retranslateUi()
     removeButton->setText(tr("Remove Panel"));
     saveButton->setText(tr("Save Layout"));
     loadButton->setText(tr("Load Layout"));
+    includeSideboardCheckBox->setText(tr("Include Sideboard"));
+}
+
+void DeckAnalyticsWidget::includeSideboardChanged(bool checked)
+{
+    statsAnalyzer->getConfig().includeSideboard = checked;
+    updateDisplays();
 }
 
 void DeckAnalyticsWidget::updateDisplays()

cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h

@@ -11,6 +11,7 @@
 #include "deck_list_statistics_analyzer.h"
 #include "resizable_panel.h"
 
+#include <QCheckBox>
 #include <QJsonObject>
 #include <QScrollArea>
 #include <QVBoxLayout>
@@ -29,6 +30,7 @@ public slots:
 public:
     explicit DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
     void retranslateUi();
+    void includeSideboardChanged(bool checked);
 
 private slots:
     void onAddPanel();
@@ -57,6 +59,8 @@ private:
     QPushButton *saveButton;
     QPushButton *loadButton;
 
+    QCheckBox *includeSideboardCheckBox;
+
     QScrollArea *scrollArea;
     QWidget *panelContainer;
     QVBoxLayout *panelLayout;

cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp

@@ -19,7 +19,13 @@ void DeckListStatisticsAnalyzer::analyze()
 {
     clearData();
 
-    QList<const DecklistCardNode *> nodes = model->getCardNodes();
+    QList<const DecklistCardNode *> nodes;
+
+    if (config.includeSideboard) {
+        nodes = model->getCardNodes();
+    } else {
+        nodes = model->getCardNodesForZone(DECK_ZONE_MAIN);
+    }
 
     for (auto node : nodes) {
         CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(node->getName());

cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h

@@ -17,6 +17,7 @@ struct DeckListStatisticsAnalyzerConfig
     bool computeCategories = true;
     bool computeCurveBreakdowns = true;
     bool computeProbabilities = true;
+    bool includeSideboard = false;
 };
 
 class DeckListStatisticsAnalyzer : public QObject
@@ -133,6 +134,11 @@ public:
         return model;
     }
 
+    DeckListStatisticsAnalyzerConfig &getConfig()
+    {
+        return config;
+    }
+
 signals:
     void statsUpdated();
 

cockatrice/src/interface/widgets/dialogs/dlg_update.cpp

@@ -219,7 +219,9 @@ void DlgUpdate::downloadSuccessful(const QUrl &filepath)
 {
     setLabel(tr("Installing..."));
     // Try to open the installer. If it opens, quit Cockatrice
-    if (QDesktopServices::openUrl(filepath)) {
+    if (QProcess::startDetached(filepath.toLocalFile(),
+                                QStringList()
+                                    << "/R" << QString("/D=%1").arg(QCoreApplication::applicationDirPath()))) {
         QMetaObject::invokeMethod(static_cast<MainWindow *>(parent()), "close", Qt::QueuedConnection);
         qCInfo(DlgUpdateLog) << "Opened downloaded update file successfully - closing Cockatrice";
         close();

cockatrice/src/interface/widgets/server/game_selector.cpp

@@ -91,6 +91,7 @@ GameSelector::GameSelector(AbstractClient *_client,
     bool filtersSetToDefault = showFilters && gameListProxyModel->areFilterParametersSetToDefaults();
     clearFilterButton->setEnabled(!filtersSetToDefault);
     connect(clearFilterButton, &QPushButton::clicked, this, &GameSelector::actClearFilter);
+    connect(gameListProxyModel, &GamesProxyModel::filtersChanged, this, &GameSelector::checkClearFilterButtonState);
 
     if (room) {
         createButton = new QPushButton;
@@ -188,15 +189,16 @@ void GameSelector::actSetFilter()
         dlg.getShowOnlyIfSpectatorsCanChat(), dlg.getShowOnlyIfSpectatorsCanSeeHands());
     gameListProxyModel->saveFilterParameters(gameTypeMap);
 
-    clearFilterButton->setEnabled(!gameListProxyModel->areFilterParametersSetToDefaults());
-
     updateTitle();
 }
 
+void GameSelector::checkClearFilterButtonState()
+{
+    clearFilterButton->setEnabled(!gameListProxyModel->areFilterParametersSetToDefaults());
+}
+
 void GameSelector::actClearFilter()
 {
-    clearFilterButton->setEnabled(false);
-
     gameListProxyModel->resetFilterParameters();
     gameListProxyModel->saveFilterParameters(gameTypeMap);
 

cockatrice/src/interface/widgets/server/game_selector.h

@@ -40,6 +40,7 @@ private slots:
      * Updates the proxy model with selected filter parameters and refreshes the displayed game list.
      */
     void actSetFilter();
+    void checkClearFilterButtonState();
 
     /**
      * @brief Clears all filters applied to the game list.

cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp

@@ -19,32 +19,46 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
     mainLayout->setSpacing(5);
 
     searchBar = new QLineEdit(this);
-    searchBar->setText(model->getCreatorNameFilters().join(", "));
-    connect(searchBar, &QLineEdit::textChanged, this, [this](const QString &text) { model->setGameNameFilter(text); });
+    searchBar->setText(model->getGameNameFilter());
+    connect(searchBar, &QLineEdit::textChanged, this, [this](const QString &text) {
+        applyFilters([&](auto &, auto &, auto &, auto &, auto &, auto &, auto &, QString &gameNameFilter, auto &,
+                         auto &, auto &, auto &, auto &, auto &, auto &, auto &, auto &) { gameNameFilter = text; });
+    });
 
     hideGamesNotCreatedByBuddiesCheckBox = new QCheckBox(this);
-    hideGamesNotCreatedByBuddiesCheckBox->setChecked(model->getHideBuddiesOnlyGames());
+    hideGamesNotCreatedByBuddiesCheckBox->setChecked(model->getHideNotBuddyCreatedGames());
     connect(hideGamesNotCreatedByBuddiesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
-        if (checked) {
-            QStringList buddyNames;
-            for (auto buddy : tabSupervisor->getUserListManager()->getBuddyList().values()) {
-                buddyNames << QString::fromStdString(buddy.name());
+        applyFilters([&](auto &, auto &, auto &, auto &, auto &, bool &hideNotBuddyCreatedGames, auto &, auto &,
+                         QStringList &creatorNameFilters, auto &, auto &, auto &, auto &, auto &, auto &, auto &,
+                         auto &) {
+            hideNotBuddyCreatedGames = checked;
+
+            if (checked) {
+                QStringList buddyNames;
+                for (auto buddy : tabSupervisor->getUserListManager()->getBuddyList().values()) {
+                    buddyNames << QString::fromStdString(buddy.name());
+                }
+                creatorNameFilters = buddyNames;
+            } else {
+                creatorNameFilters.clear();
             }
-            model->setCreatorNameFilters(buddyNames);
-        } else {
-            model->setCreatorNameFilters({});
-        }
+        });
     });
 
     hideFullGamesCheckBox = new QCheckBox(this);
     hideFullGamesCheckBox->setChecked(model->getHideFullGames());
-    connect(hideFullGamesCheckBox, &QCheckBox::toggled, this,
-            [this](bool checked) { model->setHideFullGames(checked); });
+    connect(hideFullGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
+        applyFilters([&](auto &, auto &, bool &hideFullGames, auto &, auto &, auto &, auto &, auto &, auto &, auto &,
+                         auto &, auto &, auto &, auto &, auto &, auto &, auto &) { hideFullGames = checked; });
+    });
 
     hideStartedGamesCheckBox = new QCheckBox(this);
     hideStartedGamesCheckBox->setChecked(model->getHideGamesThatStarted());
-    connect(hideStartedGamesCheckBox, &QCheckBox::toggled, this,
-            [this](bool checked) { model->setHideGamesThatStarted(checked); });
+    connect(hideStartedGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
+        applyFilters([&](auto &, auto &, auto &, bool &hideGamesThatStarted, auto &, auto &, auto &, auto &, auto &,
+                         auto &, auto &, auto &, auto &, auto &, auto &, auto &,
+                         auto &) { hideGamesThatStarted = checked; });
+    });
 
     filterToFormatComboBox = new QComboBox(this);
 
@@ -69,13 +83,15 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
 
     // Update proxy model on selection change
     connect(filterToFormatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
-        QVariant data = filterToFormatComboBox->itemData(index);
-        if (!data.isValid()) {
-            model->setGameTypeFilter({}); // empty = no filter
-        } else {
-            int typeId = data.toInt();
-            model->setGameTypeFilter({typeId});
-        }
+        applyFilters([&](auto &, auto &, auto &, auto &, auto &, auto &, auto &, auto &, auto &,
+                         QSet<int> &gameTypeFilter, auto &, auto &, auto &, auto &, auto &, auto &, auto &) {
+            QVariant data = filterToFormatComboBox->itemData(index);
+            if (!data.isValid()) {
+                gameTypeFilter.clear();
+            } else {
+                gameTypeFilter = {data.toInt()};
+            }
+        });
     });
 
     hideGamesNotCreatedByBuddiesCheckBox->setMinimumSize(20, 20);
@@ -96,9 +112,87 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
 
     setLayout(mainLayout);
 
+    syncFromModel();
+
+    connect(model, &GamesProxyModel::filtersChanged, this, &GameSelectorQuickFilterToolBar::syncFromModel);
+
     retranslateUi();
 }
 
+void GameSelectorQuickFilterToolBar::syncFromModel()
+{
+    QSignalBlocker b1(searchBar);
+    QSignalBlocker b2(filterToFormatComboBox);
+    QSignalBlocker b3(hideGamesNotCreatedByBuddiesCheckBox);
+    QSignalBlocker b4(hideFullGamesCheckBox);
+    QSignalBlocker b5(hideStartedGamesCheckBox);
+
+    searchBar->setText(model->getGameNameFilter());
+
+    hideGamesNotCreatedByBuddiesCheckBox->setChecked(model->getHideNotBuddyCreatedGames());
+    hideFullGamesCheckBox->setChecked(model->getHideFullGames());
+    hideStartedGamesCheckBox->setChecked(model->getHideGamesThatStarted());
+
+    QSet<int> types = model->getGameTypeFilter();
+    if (types.size() == 1) {
+        int idx = filterToFormatComboBox->findData(*types.begin());
+        filterToFormatComboBox->setCurrentIndex(idx >= 0 ? idx : 0);
+    } else {
+        filterToFormatComboBox->setCurrentIndex(0);
+    }
+}
+
+void GameSelectorQuickFilterToolBar::applyFilters(std::function<void(bool &,
+                                                                     bool &,
+                                                                     bool &,
+                                                                     bool &,
+                                                                     bool &,
+                                                                     bool &,
+                                                                     bool &,
+                                                                     QString &,
+                                                                     QStringList &,
+                                                                     QSet<int> &,
+                                                                     int &,
+                                                                     int &,
+                                                                     QTime &,
+                                                                     bool &,
+                                                                     bool &,
+                                                                     bool &,
+                                                                     bool &)> mutator)
+{
+    bool hideBuddiesOnlyGames = model->getHideBuddiesOnlyGames();
+    bool hideIgnoredUserGames = model->getHideIgnoredUserGames();
+    bool hideFullGames = model->getHideFullGames();
+    bool hideGamesThatStarted = model->getHideGamesThatStarted();
+    bool hidePasswordProtectedGames = model->getHidePasswordProtectedGames();
+    bool hideNotBuddyCreatedGames = model->getHideNotBuddyCreatedGames();
+    bool hideOpenDecklistGames = model->getHideOpenDecklistGames();
+
+    QString gameNameFilter = model->getGameNameFilter();
+    QStringList creatorNameFilters = model->getCreatorNameFilters();
+    QSet<int> gameTypeFilter = model->getGameTypeFilter();
+
+    int minPlayers = model->getMaxPlayersFilterMin();
+    int maxPlayers = model->getMaxPlayersFilterMax();
+    QTime maxGameAge = model->getMaxGameAge();
+
+    bool showOnlyIfSpectatorsCanWatch = model->getShowOnlyIfSpectatorsCanWatch();
+    bool showSpectatorPasswordProtected = model->getShowSpectatorPasswordProtected();
+    bool showOnlyIfSpectatorsCanChat = model->getShowOnlyIfSpectatorsCanChat();
+    bool showOnlyIfSpectatorsCanSeeHands = model->getShowOnlyIfSpectatorsCanSeeHands();
+
+    mutator(hideBuddiesOnlyGames, hideIgnoredUserGames, hideFullGames, hideGamesThatStarted, hidePasswordProtectedGames,
+            hideNotBuddyCreatedGames, hideOpenDecklistGames, gameNameFilter, creatorNameFilters, gameTypeFilter,
+            minPlayers, maxPlayers, maxGameAge, showOnlyIfSpectatorsCanWatch, showSpectatorPasswordProtected,
+            showOnlyIfSpectatorsCanChat, showOnlyIfSpectatorsCanSeeHands);
+
+    model->setGameFilters(hideBuddiesOnlyGames, hideIgnoredUserGames, hideFullGames, hideGamesThatStarted,
+                          hidePasswordProtectedGames, hideNotBuddyCreatedGames, hideOpenDecklistGames, gameNameFilter,
+                          creatorNameFilters, gameTypeFilter, minPlayers, maxPlayers, maxGameAge,
+                          showOnlyIfSpectatorsCanWatch, showSpectatorPasswordProtected, showOnlyIfSpectatorsCanChat,
+                          showOnlyIfSpectatorsCanSeeHands);
+}
+
 void GameSelectorQuickFilterToolBar::retranslateUi()
 {
     searchBar->setPlaceholderText(tr("Filter by game name..."));

cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h

@@ -18,6 +18,24 @@ public:
                                             TabSupervisor *tabSupervisor,
                                             GamesProxyModel *model,
                                             const QMap<int, QString> &allGameTypes);
+    void syncFromModel();
+    void applyFilters(std::function<void(bool &,
+                                         bool &,
+                                         bool &,
+                                         bool &,
+                                         bool &,
+                                         bool &,
+                                         bool &,
+                                         QString &,
+                                         QStringList &,
+                                         QSet<int> &,
+                                         int &,
+                                         int &,
+                                         QTime &,
+                                         bool &,
+                                         bool &,
+                                         bool &,
+                                         bool &)> mutator);
     void retranslateUi();
 
 private:

cockatrice/src/interface/widgets/server/games_model.cpp

@@ -326,6 +326,7 @@ void GamesProxyModel::setGameFilters(bool _hideBuddiesOnlyGames,
 #else
     invalidateFilter();
 #endif
+    emit filtersChanged();
 }
 
 int GamesProxyModel::getNumFilteredGames() const

cockatrice/src/interface/widgets/server/games_model.h

@@ -138,6 +138,9 @@ private:
     bool showOnlyIfSpectatorsCanChat;
     bool showOnlyIfSpectatorsCanSeeHands;
 
+signals:
+    void filtersChanged();
+
 public:
     /**
      * @brief Constructs a GamesProxyModel.

cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp

@@ -4,10 +4,29 @@ void ArchidektApiResponseCardEntry::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
 
+    categories.clear();
+
     auto categoriesJson = json.value("categories").toArray();
 
-    for (auto category : categoriesJson) {
-        categories.append(category.toString());
+    for (const auto &categoryValue : categoriesJson) {
+        Category cat;
+
+        if (categoryValue.isObject()) {
+            QJsonObject obj = categoryValue.toObject();
+
+            cat.id = obj.value("id").toInt();
+            cat.name = obj.value("name").toString();
+            cat.isPremier = obj.value("isPremier").toBool();
+            cat.includedInDeck = obj.value("includedInDeck").toBool();
+            cat.includedInPrice = obj.value("includedInPrice").toBool();
+        } else if (categoryValue.isString()) {
+            cat.name = categoryValue.toString();
+
+            // assume mainboard unless known otherwise
+            cat.includedInDeck = true;
+        }
+
+        categories.append(cat);
     }
 
     companion = json.value("companion").toBool();
@@ -27,7 +46,13 @@ void ArchidektApiResponseCardEntry::fromJson(const QJsonObject &json)
 void ArchidektApiResponseCardEntry::debugPrint() const
 {
     qDebug() << "Id:" << id;
-    qDebug() << "Categories:" << categories;
+    for (auto category : categories) {
+        qDebug() << "Category ID:" << category.id;
+        qDebug() << "Category Name:" << category.name;
+        qDebug() << "Category Premier:" << category.isPremier;
+        qDebug() << "Category Included in Deck:" << category.includedInDeck;
+        qDebug() << "Category Included in Price:" << category.includedInPrice;
+    }
     qDebug() << "Companion:" << companion;
     qDebug() << "FlippedDefault:" << flippedDefault;
     qDebug() << "Label:" << label;

cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h

@@ -9,6 +9,15 @@
 #include <QString>
 #include <QVector>
 
+struct Category
+{
+    int id;
+    QString name;
+    bool isPremier;
+    bool includedInDeck;
+    bool includedInPrice;
+};
+
 class ArchidektApiResponseCardEntry
 {
 public:
@@ -26,7 +35,7 @@ public:
         return card;
     };
 
-    QStringList getCategories() const
+    QList<Category> getCategories() const
     {
         return categories;
     }
@@ -38,7 +47,7 @@ public:
 
 private:
     int id;
-    QStringList categories;
+    QList<Category> categories;
     bool companion;
     bool flippedDefault;
     QString label;

cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp

@@ -63,16 +63,60 @@ ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWi
     QString tempDeck;
     QTextStream deckStream(&tempDeck);
 
-    for (auto card : response.getCards()) {
+    QString mainboardText;
+    QString sideboardText;
+
+    QTextStream mainStream(&mainboardText);
+    QTextStream sideStream(&sideboardText);
+
+    for (const auto &card : response.getCards()) {
         QString fullName = card.getCard().getOracleCard().value("name").toString();
         // We don't really care about the second card, the card database already has it as a relation
         QString cleanName = fullName.split("//").first().trimmed();
 
-        tempDeck += QString("%1 %2 (%3) %4\n")
-                        .arg(card.getQuantity())
-                        .arg(cleanName)
-                        .arg(card.getCard().getEdition().getEditionCode().toUpper())
-                        .arg(card.getCard().getCollectorNumber());
+        QString line = QString("%1 %2 (%3) %4\n")
+                           .arg(card.getQuantity())
+                           .arg(cleanName)
+                           .arg(card.getCard().getEdition().getEditionCode().toUpper())
+                           .arg(card.getCard().getCollectorNumber());
+
+        bool isCommander = false;
+        bool isSideboardCategory = false;
+        bool includedInDeck = false;
+
+        for (const auto &cat : card.getCategories()) {
+
+            if (cat.name.compare("Commander", Qt::CaseInsensitive) == 0) {
+                isCommander = true;
+            }
+
+            if (cat.name.compare("Sideboard", Qt::CaseInsensitive) == 0 ||
+                cat.name.compare("Maybeboard", Qt::CaseInsensitive) == 0) {
+                isSideboardCategory = true;
+            }
+
+            if (cat.includedInDeck) {
+                includedInDeck = true;
+            }
+        }
+
+        QString target;
+
+        if (isCommander || isSideboardCategory) {
+            sideStream << line;
+        } else if (includedInDeck) {
+            mainStream << line;
+        } else {
+            sideStream << line;
+        }
+    }
+
+    // Combine with blank line separator
+    tempDeck = mainboardText;
+
+    if (!sideboardText.isEmpty()) {
+        tempDeck += "\n";
+        tempDeck += sideboardText;
     }
 
     model = new DeckListModel(this);

cockatrice/src/interface/widgets/tabs/tab_game.cpp

@@ -259,6 +259,9 @@ TabGame::~TabGame()
     if (replayManager) {
         delete replayManager->replay;
     }
+    for (auto &player : game->getPlayerManager()->getPlayers()) {
+        player->clear();
+    }
 }
 
 void TabGame::updatePlayerListDockTitle()

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_button.h

@@ -0,0 +1,21 @@
+#ifndef COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_BUTTON_H
+#define COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_BUTTON_H
+
+#include <QString>
+
+const QString visualDatabaseDisplayFilterButtonStyle = QString(R"(
+    QPushButton {
+        background-color: palette(button);
+        color: palette(button-text);
+        padding: 5px 10px;
+        border-radius: 4px;
+        border: 1px solid palette(dark);
+    }
+    QPushButton:checked {
+        background-color: palette(highlight);
+        color: palette(highlighted-text);
+        border: 1px solid palette(shadow);
+    }
+)");
+
+#endif // COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_BUTTON_H

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp

@@ -1,6 +1,7 @@
 #include "visual_database_display_format_legality_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
+#include "visual_database_display_filter_button.h"
 
 #include <QLabel>
 #include <QPushButton>
@@ -80,8 +81,7 @@ void VisualDatabaseDisplayFormatLegalityFilterWidget::createFormatButtons()
     for (auto it = allFormatsWithCount.begin(); it != allFormatsWithCount.end(); ++it) {
         auto *button = new QPushButton(it.key(), flowWidget);
         button->setCheckable(true);
-        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                              "QPushButton:checked { background-color: green; color: white; }");
+        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
 
         flowWidget->addWidget(button);
         formatButtons[it.key()] = button;

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp

@@ -1,6 +1,7 @@
 #include "visual_database_display_main_type_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
+#include "visual_database_display_filter_button.h"
 
 #include <QLabel>
 #include <QPushButton>
@@ -75,8 +76,8 @@ void VisualDatabaseDisplayMainTypeFilterWidget::createMainTypeButtons()
     for (auto it = allMainCardTypesWithCount.begin(); it != allMainCardTypesWithCount.end(); ++it) {
         auto *button = new QPushButton(it.key(), flowWidget);
         button->setCheckable(true);
-        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                              "QPushButton:checked { background-color: green; color: white; }");
+
+        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
 
         flowWidget->addWidget(button);
         typeButtons[it.key()] = button;

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp

@@ -3,6 +3,7 @@
 #include "../../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../deck_editor/deck_state_manager.h"
+#include "visual_database_display_filter_button.h"
 
 #include <QHBoxLayout>
 
@@ -95,8 +96,8 @@ void VisualDatabaseDisplayNameFilterWidget::createNameFilter(const QString &name
 
     // Create a button for the filter
     auto *button = new QPushButton(name, flowWidget);
-    button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                          "QPushButton:hover { background-color: red; color: white; }");
+
+    button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
 
     connect(button, &QPushButton::clicked, this, [this, name]() {
         removeNameFilter(name);

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp

@@ -2,6 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_tree_model.h"
+#include "visual_database_display_filter_button.h"
 
 #include <QLineEdit>
 #include <QPushButton>
@@ -101,8 +102,8 @@ void VisualDatabaseDisplaySetFilterWidget::createSetButtons()
 
         auto *button = new QPushButton(longName + " (" + shortName + ")", flowWidget);
         button->setCheckable(true);
-        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                              "QPushButton:checked { background-color: green; color: white; }");
+
+        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
 
         flowWidget->addWidget(button);
         setButtons[shortName] = button;

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp

@@ -1,6 +1,7 @@
 #include "visual_database_display_sub_type_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
+#include "visual_database_display_filter_button.h"
 
 #include <QLabel>
 #include <QLineEdit>
@@ -80,8 +81,8 @@ void VisualDatabaseDisplaySubTypeFilterWidget::createSubTypeButtons()
     for (auto it = allSubCardTypesWithCount.begin(); it != allSubCardTypesWithCount.end(); ++it) {
         auto *button = new QPushButton(it.key(), flowWidget);
         button->setCheckable(true);
-        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                              "QPushButton:checked { background-color: green; color: white; }");
+
+        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
 
         flowWidget->addWidget(button);
         typeButtons[it.key()] = button;