Expand tutorial again.

Took 46 minutes

Took 6 seconds

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

@@ -1,5 +1,7 @@
 #include "deck_analytics_widget.h"
 
+#include "../general/tutorial/tutorial_controller.h"
+#include "../tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
 #include "abstract_analytics_panel_widget.h"
 #include "add_analytics_panel_dialog.h"
 #include "analytics_panel_widget_factory.h"
@@ -7,6 +9,7 @@
 #include "analyzer_modules/mana_curve/mana_curve_config.h"
 #include "analyzer_modules/mana_devotion/mana_devotion_config.h"
 #include "deck_list_statistics_analyzer.h"
+#include "libcockatrice/utility/qt_utils.h"
 #include "resizable_panel.h"
 
 #include <QEvent>
@@ -60,6 +63,46 @@ DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnal
     retranslateUi();
 }
 
+TutorialSequence DeckAnalyticsWidget::generateTutorialSequence()
+{
+    TutorialSequence analyticsSequence;
+    analyticsSequence.name = tr("Deck Analytics");
+
+    TutorialStep introStep;
+    introStep.targetWidget = this;
+    introStep.text = tr("This is the deck analytics tab.\n\nHere, you can view more detailed information about your "
+                        "deck via the use of specialized analytics widgets.");
+    introStep.onEnter = [this]() {
+        auto tabWidget = QtUtils::findParentOfType<TabDeckEditorVisualTabWidget>(this);
+        if (tabWidget) {
+            tabWidget->setCurrentWidget(tabWidget->deckAnalytics);
+        }
+    };
+
+    analyticsSequence.addStep(introStep);
+
+    TutorialStep controlStep;
+    controlStep.targetWidget = controlContainer;
+    controlStep.text = tr(
+        "These controls will allow you to customize your analytics widget layout.\n\nAll widgets can be resized or "
+        "reordered with the handle at their bottom.\nTo remove a widget, you first have to select it.\nSaving your "
+        "layout will ensure that it is the default for all future decks you open, whereas loading the layout will "
+        "allow you to revert back to your previous configuration in case you decide you do not like your new layout.");
+
+    analyticsSequence.addStep(controlStep);
+
+    TutorialStep widgetStep;
+    widgetStep.targetWidget = this;
+    widgetStep.text =
+        tr("Finally, let's talk about the analytics widgets themselves.\n\nHow the various analytics are displayed for "
+           "each widget can be configured by clicking on the cogwheel next to the respective banner.\nHovering over "
+           "the segments of different diagram types will reveal which cards belong to the respective segment.");
+
+    analyticsSequence.addStep(widgetStep);
+
+    return analyticsSequence;
+}
+
 void DeckAnalyticsWidget::retranslateUi()
 {
     addButton->setText(tr("Add Panel"));

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

@@ -7,6 +7,7 @@
 #ifndef DECK_ANALYTICS_WIDGET_H
 #define DECK_ANALYTICS_WIDGET_H
 
+#include "../general/tutorial/tutorial_controller.h"
 #include "abstract_analytics_panel_widget.h"
 #include "deck_list_statistics_analyzer.h"
 #include "resizable_panel.h"
@@ -29,6 +30,7 @@ public slots:
 public:
     explicit DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
     void retranslateUi();
+    TutorialSequence generateTutorialSequence();
 
 private slots:
     void onAddPanel();

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp

@@ -1,6 +1,7 @@
 #include "deck_editor_deck_dock_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../general/tutorial/tutorial_controller.h"
 #include "deck_list_style_proxy.h"
 #include "deck_state_manager.h"
 
@@ -280,6 +281,22 @@ void DeckEditorDeckDockWidget::createDeckDock()
     }
 }
 
+TutorialSequence DeckEditorDeckDockWidget::generateTutorialSequence()
+{
+    TutorialSequence sequence;
+    sequence.name = tr("The Deck Info Widget");
+
+    TutorialStep introStep;
+    introStep.targetWidget = this;
+    introStep.text = tr("This is the deck info widget.\n\nHere, you can adjust all kinds of metadata such as the name, "
+                        "the comments, or the tags of a deck.\nIt also displays the contents of your deck in a list "
+                        "and provides buttons to manipulate the decklist.");
+
+    sequence.addStep(introStep);
+
+    return sequence;
+}
+
 void DeckEditorDeckDockWidget::initializeFormats()
 {
     QStringList allFormats = CardDatabaseManager::query()->getAllFormatsWithCount().keys();

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h

@@ -10,6 +10,7 @@
 
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../../key_signals.h"
+#include "../general/tutorial/tutorial_controller.h"
 #include "../utility/custom_line_edit.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 #include "deck_list_history_manager_widget.h"
@@ -46,6 +47,8 @@ public:
         return deckView->selectionModel();
     }
 
+    TutorialSequence generateTutorialSequence();
+
 public slots:
     void selectPrevCard();
     void selectNextCard();

cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp

@@ -54,6 +54,10 @@ TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : Abstra
     cardDatabaseDockWidget->setHidden(true);
     tutorialController = new TutorialController(this);
 
+    auto deckDockSequence = deckDockWidget->generateTutorialSequence();
+
+    tutorialController->addSequence(deckDockSequence);
+
     auto sequence = TutorialSequence();
 
     sequence.addStep({tabContainer->tabBar(),
@@ -80,6 +84,23 @@ TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : Abstra
          [this]() { tabContainer->setCurrentWidget(tabContainer->visualDatabaseDisplay); }});
 
     tutorialController->addSequence(vddSequence);
+
+    auto analyticsSequence = tabContainer->deckAnalytics->generateTutorialSequence();
+    analyticsSequence.steps.prepend({tabContainer->tabBar(), "Let's look at the analytics tab now."});
+
+    TutorialStep analyticsConclusionStep;
+    analyticsConclusionStep.targetWidget = tabContainer->tabBar();
+    analyticsConclusionStep.text =
+        tr("That was it for the analytics tab.\n\nLet's now look at an equally useful tab, which provides you with "
+           "detailed information about possible hands, invaluable information when testing out a new deck.");
+
+    analyticsSequence.addStep(analyticsConclusionStep);
+
+    tutorialController->addSequence(analyticsSequence);
+
+    auto sampleHandSequence = tabContainer->sampleHandWidget->generateTutorialSequence();
+
+    tutorialController->addSequence(sampleHandSequence);
 }
 
 void TabDeckEditorVisual::showEvent(QShowEvent *ev)

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp

@@ -5,6 +5,9 @@
 #include "../cards/card_info_picture_widget.h"
 #include "../deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h"
 #include "../deck_analytics/deck_list_statistics_analyzer.h"
+#include "../general/tutorial/tutorial_controller.h"
+#include "../tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
+#include "libcockatrice/utility/qt_utils.h"
 
 #include <QSplitter>
 #include <libcockatrice/card/database/card_database_manager.h>
@@ -66,6 +69,27 @@ VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *pare
     retranslateUi();
 }
 
+TutorialSequence VisualDeckEditorSampleHandWidget::generateTutorialSequence()
+{
+    TutorialSequence sampleHandSequence;
+    sampleHandSequence.name = tr("Sample Hand");
+
+    TutorialStep introStep;
+    introStep.targetWidget = this;
+    introStep.text = tr("This is the sample hand tab.\n\nHere, you can draw a sample hand from your deck without "
+                        "having to start a game as well as view statistical information about your draws.");
+    introStep.onEnter = [this]() {
+        auto tabWidget = QtUtils::findParentOfType<TabDeckEditorVisualTabWidget>(this);
+        if (tabWidget) {
+            tabWidget->setCurrentWidget(tabWidget->sampleHandWidget);
+        }
+    };
+
+    sampleHandSequence.addStep(introStep);
+
+    return sampleHandSequence;
+}
+
 void VisualDeckEditorSampleHandWidget::retranslateUi()
 {
     resetButton->setText(tr("Draw a new sample hand"));

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h

@@ -10,6 +10,7 @@
 #include "../cards/card_size_widget.h"
 #include "../deck_analytics/deck_list_statistics_analyzer.h"
 #include "../general/layout_containers/flow_widget.h"
+#include "../general/tutorial/tutorial_controller.h"
 
 #include <QPushButton>
 #include <QSpinBox>
@@ -25,6 +26,7 @@ public:
                                      DeckListModel *deckListModel,
                                      DeckListStatisticsAnalyzer *statsAnalyzer);
     QList<ExactCard> getRandomCards(int amountToGet);
+    TutorialSequence generateTutorialSequence();
 
 public slots:
     void updateDisplay();