List unlocked recipes with tooltips in schematic choice dialog instead of unlocked item names

src/ui/CMakeLists.txt

@@ -13,6 +13,7 @@ SET(HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipStatsPanel.h
     ${CMAKE_CURRENT_SOURCE_DIR}/SchematicChoiceDialog.h
     ${CMAKE_CURRENT_SOURCE_DIR}/RecipeSelectionDialog.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/RecipeTooltip.h
     PARENT_SCOPE
 )
 
@@ -30,5 +31,6 @@ SET(SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipStatsPanel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SchematicChoiceDialog.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/RecipeSelectionDialog.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/RecipeTooltip.cpp
     PARENT_SCOPE
 )

src/ui/MainWindow.cpp

@@ -142,7 +142,7 @@ void MainWindow::handleEvent(std::shared_ptr<const SchematicChoicesAvailableEven
     const double prevSpeed = m_gameWorldView->gameSpeed();
     m_gameWorldView->setGameSpeed(0.0);
 
-    SchematicChoiceDialog dialog(event->choices, this);
+    SchematicChoiceDialog dialog(event->choices, m_sim->config().recipes, this);
     dialog.exec();
 
     std::shared_ptr<ApplySchematicChoiceCommand> command =

src/ui/RecipeSelectionDialog.cpp

@@ -12,6 +12,7 @@
 #include "DisplayName.h"
 #include "GameConfig.h"
 #include "RecipesConfig.h"
+#include "RecipeTooltip.h"
 #include "ShipsConfig.h"
 #include "Simulation.h"
 
@@ -25,39 +26,6 @@ QString itemLine(const std::string& itemId, int amount)
         + QStringLiteral(" ×") + QString::number(amount);
 }
 
-QString recipeTooltip(const RecipeDef& recipe)
-{
-    QStringList lines;
-    lines << QObject::tr("Recipe: %1")
-        .arg(QString::fromStdString(toDisplayName(recipe.id)));
-
-    if (recipe.inputs.empty())
-    {
-        lines << QObject::tr("Inputs: none");
-    }
-    else
-    {
-        lines << QObject::tr("Inputs:");
-        for (const RecipeIngredient& ingredient : recipe.inputs)
-        {
-            lines << itemLine(ingredient.item, ingredient.amount);
-        }
-    }
-
-    lines << QObject::tr("Completion time: %1 s").arg(recipe.durationSeconds);
-
-    if (!recipe.outputs.empty())
-    {
-        lines << QObject::tr("Produces:");
-        for (const RecipeOutput& output : recipe.outputs)
-        {
-            lines << itemLine(output.item, output.amount);
-        }
-    }
-
-    return lines.join('\n');
-}
-
 QString shipTooltip(const ShipDef& def)
 {
     const QString name = QString::fromStdString(toDisplayName(def.id));
@@ -116,7 +84,7 @@ std::vector<RecipeSelectionOption> buildRecipeSelectionOptions(
             }
             options.push_back({recipe.id,
                                QString::fromStdString(toDisplayName(recipe.id)),
-                               recipeTooltip(recipe)});
+                               buildRecipeTooltip(recipe)});
         }
     }
 

src/ui/RecipeTooltip.cpp

@@ -0,0 +1,52 @@
+#include "RecipeTooltip.h"
+
+#include <QObject>
+#include <QStringList>
+
+#include "DisplayName.h"
+#include "RecipesConfig.h"
+
+namespace
+{
+
+QString itemLine(const std::string& itemId, int amount)
+{
+    return QStringLiteral("  ")
+        + QString::fromStdString(toDisplayName(itemId))
+        + QStringLiteral(" ×") + QString::number(amount);
+}
+
+}  // namespace
+
+QString buildRecipeTooltip(const RecipeDef& recipe)
+{
+    QStringList lines;
+    lines << QObject::tr("Recipe: %1")
+        .arg(QString::fromStdString(toDisplayName(recipe.id)));
+
+    if (recipe.inputs.empty())
+    {
+        lines << QObject::tr("Inputs: none");
+    }
+    else
+    {
+        lines << QObject::tr("Inputs:");
+        for (const RecipeIngredient& ingredient : recipe.inputs)
+        {
+            lines << itemLine(ingredient.item, ingredient.amount);
+        }
+    }
+
+    lines << QObject::tr("Completion time: %1 s").arg(recipe.durationSeconds);
+
+    if (!recipe.outputs.empty())
+    {
+        lines << QObject::tr("Produces:");
+        for (const RecipeOutput& output : recipe.outputs)
+        {
+            lines << itemLine(output.item, output.amount);
+        }
+    }
+
+    return lines.join('\n');
+}

src/ui/RecipeTooltip.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <QString>
+
+struct RecipeDef;
+
+// Builds the recipe info tooltip text (REQ-UI-SELECT-TOOLTIP): the recipe name,
+// each input item name and quantity, the completion time, and the produced
+// output item name and quantity. Shared by the recipe-selection dialog and the
+// schematic choice dialog's "Unlocks recipes:" list so both render identically.
+QString buildRecipeTooltip(const RecipeDef& recipe);

src/ui/SchematicChoiceDialog.cpp

@@ -3,11 +3,29 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <QStringList>
 #include <QVBoxLayout>
 
+#include "DisplayName.h"
+#include "RecipeTooltip.h"
+#include "RecipesConfig.h"
+
+namespace
+{
+
+const RecipeDef* findRecipe(const RecipesConfig& recipes, const std::string& id)
+{
+    for (const RecipeDef& recipe : recipes.recipes)
+    {
+        if (recipe.id == id) { return &recipe; }
+    }
+    return nullptr;
+}
+
+}  // namespace
+
 SchematicChoiceDialog::SchematicChoiceDialog(
     const std::vector<SchematicChoiceOption>& options,
+    const RecipesConfig& recipes,
     QWidget* parent)
     : QDialog(parent)
     , m_chosenIndex(0)
@@ -70,30 +88,33 @@ SchematicChoiceDialog::SchematicChoiceDialog(
             typeLabel->setAlignment(Qt::AlignCenter);
             cardLayout->addWidget(typeLabel);
 
-            QLabel* unlocksHeaderLabel = new QLabel(tr("Unlocks recipes for:"), card);
+            QLabel* unlocksHeaderLabel = new QLabel(tr("Unlocks recipes:"), card);
             QFont unlocksHeaderFont = unlocksHeaderLabel->font();
             unlocksHeaderFont.setBold(true);
             unlocksHeaderLabel->setFont(unlocksHeaderFont);
             unlocksHeaderLabel->setAlignment(Qt::AlignCenter);
             cardLayout->addWidget(unlocksHeaderLabel);
 
-            QString unlocksText;
-            if (option.newlyUnlockedItemNames.empty())
+            if (option.newlyUnlockedRecipeIds.empty())
             {
-                unlocksText = tr("None");
+                QLabel* noneLabel = new QLabel(tr("None"), card);
+                noneLabel->setAlignment(Qt::AlignCenter);
+                cardLayout->addWidget(noneLabel);
             }
             else
             {
-                QStringList itemLines;
-                for (const std::string& itemName : option.newlyUnlockedItemNames)
+                for (const std::string& recipeId : option.newlyUnlockedRecipeIds)
                 {
-                    itemLines << QString::fromStdString(itemName);
+                    QLabel* recipeLabel = new QLabel(
+                        QString::fromStdString(toDisplayName(recipeId)), card);
+                    recipeLabel->setAlignment(Qt::AlignCenter);
+                    if (const RecipeDef* def = findRecipe(recipes, recipeId))
+                    {
+                        recipeLabel->setToolTip(buildRecipeTooltip(*def));
+                    }
+                    cardLayout->addWidget(recipeLabel);
                 }
-                unlocksText = itemLines.join("\n");
             }
-            QLabel* unlocksLabel = new QLabel(unlocksText, card);
-            unlocksLabel->setAlignment(Qt::AlignCenter);
-            cardLayout->addWidget(unlocksLabel);
         }
 
         QPushButton* selectButton = new QPushButton(tr("Select"), card);

src/ui/SchematicChoiceDialog.h

@@ -6,12 +6,15 @@
 
 #include "SchematicChoiceOption.h"
 
+struct RecipesConfig;
+
 class SchematicChoiceDialog : public QDialog
 {
     Q_OBJECT
 
 public:
     SchematicChoiceDialog(const std::vector<SchematicChoiceOption>& options,
+                          const RecipesConfig& recipes,
                           QWidget* parent = nullptr);
 
     int getChosenIndex() const;