Add setting for which deck editor tab to open deck in (#5895)

* Create new setting

* Update settings dlg

* implement functionality

* Make setting into an enum

cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp

@@ -356,7 +356,7 @@ void TabEdhRecMain::processAverageDeckResponse(QJsonObject reply)
 {
     EdhrecAverageDeckApiResponse deckData;
     deckData.fromJson(reply);
-    tabSupervisor->addVisualDeckEditorTab(deckData.deck.deckLoader);
+    tabSupervisor->openDeckInNewTab(deckData.deck.deckLoader);
 }
 
 void TabEdhRecMain::prettyPrintJson(const QJsonValue &value, int indentLevel)

cockatrice/src/client/tabs/tab_supervisor.cpp

@@ -590,7 +590,7 @@ void TabSupervisor::actTabDeckStorage(bool checked)
 void TabSupervisor::openTabDeckStorage()
 {
     tabDeckStorage = new TabDeckStorage(this, client, userInfo);
-    connect(tabDeckStorage, &TabDeckStorage::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
+    connect(tabDeckStorage, &TabDeckStorage::openDeckEditor, this, &TabSupervisor::openDeckInNewTab);
     myAddTab(tabDeckStorage, aTabDeckStorage);
     connect(tabDeckStorage, &Tab::closed, this, [this] {
         tabDeckStorage = nullptr;
@@ -691,7 +691,7 @@ void TabSupervisor::gameJoined(const Event_GameJoined &event)
     auto *tab = new TabGame(this, QList<AbstractClient *>() << client, event, roomGameTypes);
     connect(tab, &TabGame::gameClosing, this, &TabSupervisor::gameLeft);
     connect(tab, &TabGame::openMessageDialog, this, &TabSupervisor::addMessageTab);
-    connect(tab, &TabGame::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
+    connect(tab, &TabGame::openDeckEditor, this, &TabSupervisor::openDeckInNewTab);
     myAddTab(tab);
     gameTabs.insert(event.game_info().game_id(), tab);
     setCurrentWidget(tab);
@@ -701,7 +701,7 @@ void TabSupervisor::localGameJoined(const Event_GameJoined &event)
 {
     auto *tab = new TabGame(this, localClients, event, QMap<int, QString>());
     connect(tab, &TabGame::gameClosing, this, &TabSupervisor::gameLeft);
-    connect(tab, &TabGame::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
+    connect(tab, &TabGame::openDeckEditor, this, &TabSupervisor::openDeckInNewTab);
     myAddTab(tab);
     gameTabs.insert(event.game_info().game_id(), tab);
     setCurrentWidget(tab);
@@ -807,6 +807,29 @@ void TabSupervisor::talkLeft(TabMessage *tab)
     removeTab(indexOf(tab));
 }
 
+/**
+ * Creates a new deck editor tab and loads the deck into it.
+ * Creates either a classic or visual deck editor tab depending on settings
+ * @param deckToOpen The deck to open in the tab. Creates a copy of the DeckLoader instance.
+ */
+void TabSupervisor::openDeckInNewTab(const DeckLoader *deckToOpen)
+{
+    int type = SettingsCache::instance().getDefaultDeckEditorType();
+    switch (type) {
+        case ClassicDeckEditor:
+            addDeckEditorTab(deckToOpen);
+            break;
+        case VisualDeckEditor:
+            addVisualDeckEditorTab(deckToOpen);
+            break;
+        default:
+            qCWarning(TabSupervisorLog) << "Unknown DeckEditorType [" << type
+                                        << "]; opening ClassicDeckEditor as fallback";
+            addDeckEditorTab(deckToOpen);
+            break;
+    }
+}
+
 /**
  * Creates a new deck editor tab
  * @param deckToOpen The deck to open in the tab. Creates a copy of the DeckLoader instance.

cockatrice/src/client/tabs/tab_supervisor.h

@@ -75,6 +75,14 @@ protected:
 class TabSupervisor : public QTabWidget
 {
     Q_OBJECT
+
+public:
+    enum DeckEditorType
+    {
+        ClassicDeckEditor,
+        VisualDeckEditor
+    };
+
 private:
     ServerInfo_User *userInfo;
     AbstractClient *client;
@@ -152,6 +160,7 @@ signals:
     void showWindowIfHidden();
 
 public slots:
+    void openDeckInNewTab(const DeckLoader *deckToOpen);
     TabDeckEditor *addDeckEditorTab(const DeckLoader *deckToOpen);
     TabDeckEditorVisual *addVisualDeckEditorTab(const DeckLoader *deckToOpen);
     TabVisualDatabaseDisplay *addVisualDatabaseDisplayTab();

cockatrice/src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp

@@ -12,7 +12,7 @@
 TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)
     : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this))
 {
-    connect(this, &TabDeckStorageVisual::openDeckEditor, tabSupervisor, &TabSupervisor::addVisualDeckEditorTab);
+    connect(this, &TabDeckStorageVisual::openDeckEditor, tabSupervisor, &TabSupervisor::openDeckInNewTab);
     connect(visualDeckStorageWidget, &VisualDeckStorageWidget::deckLoadRequested, this,
             &TabDeckStorageVisual::actOpenLocalDeck);
     connect(visualDeckStorageWidget, &VisualDeckStorageWidget::openDeckEditor, this,

cockatrice/src/dialogs/dlg_settings.cpp

@@ -4,6 +4,7 @@
 #include "../client/network/release_channel.h"
 #include "../client/network/spoiler_background_updater.h"
 #include "../client/sound_engine.h"
+#include "../client/tabs/tab_supervisor.h"
 #include "../client/ui/picture_loader/picture_loader.h"
 #include "../client/ui/theme_manager.h"
 #include "../deck/custom_line_edit.h"
@@ -699,12 +700,20 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
                     index == visualDeckStoragePromptForConversionIndexAlways);
             });
 
+    defaultDeckEditorTypeSelector.addItem(""); // these will be set in retranslateUI
+    defaultDeckEditorTypeSelector.addItem("");
+    defaultDeckEditorTypeSelector.setCurrentIndex(SettingsCache::instance().getDefaultDeckEditorType());
+    connect(&defaultDeckEditorTypeSelector, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            &SettingsCache::instance(), &SettingsCache::setDefaultDeckEditorType);
+
     auto *deckEditorGrid = new QGridLayout;
     deckEditorGrid->addWidget(&openDeckInNewTabCheckBox, 0, 0);
     deckEditorGrid->addWidget(&visualDeckStorageInGameCheckBox, 1, 0);
     deckEditorGrid->addWidget(&visualDeckStorageSelectionAnimationCheckBox, 2, 0);
     deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionLabel, 3, 0);
     deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionSelector, 3, 1);
+    deckEditorGrid->addWidget(&defaultDeckEditorTypeLabel, 4, 0);
+    deckEditorGrid->addWidget(&defaultDeckEditorTypeSelector, 4, 1);
 
     deckEditorGroupBox = new QGroupBox;
     deckEditorGroupBox->setLayout(deckEditorGrid);
@@ -774,6 +783,9 @@ void UserInterfaceSettingsPage::retranslateUi()
                                                              tr("ask to convert to .cod"));
     visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexAlways,
                                                              tr("always convert to .cod"));
+    defaultDeckEditorTypeLabel.setText(tr("Default deck editor type"));
+    defaultDeckEditorTypeSelector.setItemText(TabSupervisor::ClassicDeckEditor, tr("Classic Deck Editor"));
+    defaultDeckEditorTypeSelector.setItemText(TabSupervisor::VisualDeckEditor, tr("Visual Deck Editor"));
     replayGroupBox->setTitle(tr("Replay settings"));
     rewindBufferingMsLabel.setText(tr("Buffer time for backwards skip via shortcut:"));
     rewindBufferingMsBox.setSuffix(" ms");

cockatrice/src/dialogs/dlg_settings.h

@@ -155,6 +155,8 @@ private:
     QComboBox visualDeckStoragePromptForConversionSelector;
     QCheckBox visualDeckStorageInGameCheckBox;
     QCheckBox visualDeckStorageSelectionAnimationCheckBox;
+    QLabel defaultDeckEditorTypeLabel;
+    QComboBox defaultDeckEditorTypeSelector;
     QLabel rewindBufferingMsLabel;
     QSpinBox rewindBufferingMsBox;
     QGroupBox *generalGroupBox;

cockatrice/src/settings/cache_settings.cpp

@@ -285,6 +285,7 @@ SettingsCache::SettingsCache()
     visualDeckStorageInGame = settings->value("interface/visualdeckstorageingame", true).toBool();
     visualDeckStorageSelectionAnimation =
         settings->value("interface/visualdeckstorageselectionanimation", true).toBool();
+    defaultDeckEditorType = settings->value("interface/defaultDeckEditorType", 1).toInt();
     visualDatabaseDisplayFilterToMostRecentSetsEnabled =
         settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", true).toBool();
     visualDatabaseDisplayFilterToMostRecentSetsAmount =
@@ -791,6 +792,12 @@ void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T va
     emit visualDeckStorageSelectionAnimationChanged(visualDeckStorageSelectionAnimation);
 }
 
+void SettingsCache::setDefaultDeckEditorType(int value)
+{
+    defaultDeckEditorType = value;
+    settings->setValue("interface/defaultDeckEditorType", defaultDeckEditorType);
+}
+
 void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled)
 {
     visualDatabaseDisplayFilterToMostRecentSetsEnabled = _enabled;

cockatrice/src/settings/cache_settings.h

@@ -153,6 +153,7 @@ private:
     bool visualDeckStorageAlwaysConvert;
     bool visualDeckStorageInGame;
     bool visualDeckStorageSelectionAnimation;
+    int defaultDeckEditorType;
     bool visualDatabaseDisplayFilterToMostRecentSetsEnabled;
     int visualDatabaseDisplayFilterToMostRecentSetsAmount;
     bool horizontalHand;
@@ -488,6 +489,10 @@ public:
     {
         return visualDeckStorageSelectionAnimation;
     }
+    int getDefaultDeckEditorType() const
+    {
+        return defaultDeckEditorType;
+    }
     bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
     {
         return visualDatabaseDisplayFilterToMostRecentSetsEnabled;
@@ -839,6 +844,7 @@ public slots:
     void setVisualDeckStorageAlwaysConvert(bool _visualDeckStorageAlwaysConvert);
     void setVisualDeckStorageInGame(QT_STATE_CHANGED_T value);
     void setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T value);
+    void setDefaultDeckEditorType(int value);
     void setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled);
     void setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount);
     void setHorizontalHand(QT_STATE_CHANGED_T _horizontalHand);

dbconverter/src/mocks.cpp

@@ -256,6 +256,9 @@ void SettingsCache::setVisualDeckStorageInGame(QT_STATE_CHANGED_T /* value */)
 void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T /* value */)
 {
 }
+void SettingsCache::setDefaultDeckEditorType(int /* value */)
+{
+}
 void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T /* _enabled */)
 {
 }

tests/carddatabase/mocks.cpp

@@ -260,6 +260,9 @@ void SettingsCache::setVisualDeckStorageInGame(QT_STATE_CHANGED_T /* value */)
 void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T /* value */)
 {
 }
+void SettingsCache::setDefaultDeckEditorType(int /* value */)
+{
+}
 void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T /* _enabled */)
 {
 }