Always show shipyard layout preview and Configure button, disabled until schematic selected

docs/requirements.md

@@ -259,7 +259,7 @@ Modules in `modules.toml` define a `surface_mask` — a list of strings that des
 
 ### Module UI
 
-- REQ-MOD-UI-PREVIEW: When a schematic is selected in a shipyard's selected building panel, a small non-interactive **ship layout preview** widget is shown below the schematic selection button (REQ-UI-SELECT-BUTTON). The preview renders the ship's layout grid at a reduced scale: buildable cells without a module are shown as white, non-buildable cells are shown as black, and cells occupied by a module are shown in that module's `fill_color` with the module's `glyph` character. Below the preview, a "Configure" button is shown.
+- REQ-MOD-UI-PREVIEW: For a selected shipyard (operational building or construction site), the selected building panel always shows a small non-interactive **ship layout preview** widget below the schematic selection button (REQ-UI-SELECT-BUTTON) and a "Configure" button below the preview. Both are **disabled while no schematic is selected**, and enabled once one is; the preview then shows an empty placeholder in place of a layout grid. When a schematic is selected, the preview renders the ship's layout grid at a reduced scale: buildable cells without a module are shown as white, non-buildable cells are shown as black, and cells occupied by a module are shown in that module's `fill_color` with the module's `glyph` character. For non-shipyard buildings, neither the preview nor the "Configure" button is shown.
 - REQ-MOD-UI-DIALOG: Clicking the "Configure" button opens the **layout configuration dialog** as a modal. While the dialog is open, the game is paused (speed set to 0×). On close, the game speed is restored to what it was before the dialog was opened.
 
   The dialog contains:
@@ -461,7 +461,7 @@ The screen is divided into two columns: a main column (75% width) containing the
 - REQ-UI-SINGLE-SELECTION: When one building is selected, the panel shows: building name, current recipe or schematic selection, input buffer contents, and output buffer contents. Buffer counts are displayed as `a/b` where `a` is the current item count and `b` is the per-cycle amount (items consumed per run for inputs; items produced per run for outputs). For a selected construction site, the recipe/schematic selection (and, for a shipyard, the layout preview and "Configure" button) are shown but the buffer rows are omitted (REQ-BLD-SITE-CONFIG).
 - REQ-UI-PRODUCTION-PROGRESS: For buildings that produce items or ships (miner, smelter, assembler, reprocessing plant, shipyard), the selected building panel also shows: (a) the cycle time of the currently selected recipe or schematic in seconds, and (b) the completion percentage of the active production cycle as an integer (e.g. `42%`), or the text `idle` when no production cycle is active. When no recipe or schematic is selected, neither the cycle time nor the progress indicator is shown.
 - REQ-UI-MULTI-SELECT: The player selects multiple buildings by box-drag or by Ctrl+clicking individual buildings to add or remove them from the selection.
-- REQ-UI-MULTI-SELECTION: When multiple buildings are selected, the panel shows how many of each building type are selected. No per-building detail is shown.
+- REQ-UI-MULTI-SELECTION: When multiple buildings are selected, the panel shows how many of each building type are selected. No per-building detail is shown. The panel additionally shows the **total building block cost** of the selection — the sum of each selected building's placement cost (`buildings.toml [[building]].cost`, per REQ-BLD-COST), counting only player-placeable buildings (buildings with a button in the build button grid); non-player-placeable buildings (the HQ and defence stations) are excluded from the total, consistent with the blueprint total (REQ-UI-BLUEPRINT-BUTTON). Construction sites count at their building type's full placement cost regardless of construction progress.
 - REQ-UI-CONFIG-INLINE: Recipe and schematic configuration for a selected building is shown within this panel. Recipe selection (miner, assembler) and schematic selection (shipyard) use the selection button and dialog (REQ-UI-SELECT-BUTTON) rather than an inline control. For shipyards, the panel additionally shows the ship layout preview and "Configure" button below the schematic selection button (REQ-MOD-UI-PREVIEW).
 - REQ-UI-SELECT-BUTTON: **Recipe and schematic selection control.** Recipe selection (Miner ore type, Assembler recipe) and schematic selection (Shipyard) are each presented in the selected building panel as a single **selection button** whose caption is the name of the currently selected recipe or schematic, or a placeholder ("Select recipe" / "Select schematic") when none is selected. Clicking the button opens a modal **selection dialog** that pauses the game (speed set to 0×; on close, the speed is restored to what it was before the dialog was opened). The dialog contains a grid of option buttons, one per selectable option — only options that are currently unlocked are shown (REQ-LOCK-UI-RECIPE for recipes, REQ-LOCK-UI-SCHEMATIC for schematics). Hovering an option button shows the selection info tooltip (REQ-UI-SELECT-TOOLTIP). Clicking an option button selects that recipe/schematic, closes the dialog, and updates the selection button's caption in the selected building panel. The dialog can be dismissed without changing the current selection (e.g. closing it without clicking an option). Selecting a new recipe or schematic has the same effects as before (REQ-MAT-INPUT-BUFFER, REQ-MAT-OUTPUT-BUFFER, REQ-BLD-SHIPYARD).
 - REQ-UI-SELECT-TOOLTIP: **Selection info tooltip.** Hovering an option button in the selection dialog (REQ-UI-SELECT-BUTTON), and hovering the selection button in the selected building panel when a selection is set, displays an info tooltip:

src/lib/config/BuildingsConfig.h

@@ -31,4 +31,18 @@ struct BuildingDef
 struct BuildingsConfig
 {
     std::vector<BuildingDef> buildings;
+
+    // Returns the definition for the given building type, or nullptr if the
+    // type has no entry in buildings.toml.
+    const BuildingDef* findBuildingDef(BuildingType type) const
+    {
+        for (const BuildingDef& def : buildings)
+        {
+            if (def.type == type)
+            {
+                return &def;
+            }
+        }
+        return nullptr;
+    }
 };

src/ui/BlueprintPanel.cpp

@@ -157,14 +157,8 @@ Blueprint BlueprintPanel::createBlueprintFromSelection() const
     {
         const Building* b = m_sim->buildings().findBuilding(id);
         if (!b) { continue; }
-        const bool placeable = [&]() {
-            for (const BuildingDef& def : m_config->buildings.buildings)
-            {
-                if (def.type == b->type) { return def.playerPlaceable; }
-            }
-            return false;
-        }();
-        if (placeable) { entries.push_back({ b }); }
+        const BuildingDef* def = m_config->buildings.findBuildingDef(b->type);
+        if (def && def->playerPlaceable) { entries.push_back({ b }); }
     }
 
     if (entries.empty()) { return Blueprint{}; }
@@ -213,14 +207,8 @@ int BlueprintPanel::computeBlueprintCost(const Blueprint& bp) const
     int total = 0;
     for (const BlueprintBuilding& bb : bp.buildings)
     {
-        for (const BuildingDef& def : m_config->buildings.buildings)
-        {
-            if (def.type == bb.type)
-            {
-                total += def.cost;
-                break;
-            }
-        }
+        const BuildingDef* def = m_config->buildings.findBuildingDef(bb.type);
+        if (def) { total += def->cost; }
     }
     return total;
 }

src/ui/MainWindow.cpp

@@ -49,8 +49,8 @@ MainWindow::MainWindow(Simulation* sim, const std::string& configDir,
 
     m_sidePanel = new QWidget(this);
     QVBoxLayout* sideLayout = new QVBoxLayout(m_sidePanel);
-    sideLayout->setContentsMargins(0, 0, 0, 0);
-    sideLayout->setSpacing(0);
+    sideLayout->setContentsMargins(1, 1, 1, 1);
+    sideLayout->setSpacing(1);
 
     m_selectedBuildingPanel = new SelectedBuildingPanel(sim, &sim->config(), m_sidePanel);
     m_buildButtonGrid       = new BuildButtonGrid(&sim->config(), m_sidePanel);
@@ -60,6 +60,20 @@ MainWindow::MainWindow(Simulation* sim, const std::string& configDir,
     sideLayout->addWidget(m_buildButtonGrid,       1);
     sideLayout->addWidget(m_blueprintPanel,        1);
 
+    // Draw a thin border around each of the three side-panel sections. The class
+    // scoped selectors keep the border on the panels themselves rather than
+    // cascading onto their child widgets; WA_StyledBackground lets the plain
+    // QWidget subclasses honor the stylesheet box (border/background).
+    for (QWidget* panel : { static_cast<QWidget*>(m_selectedBuildingPanel),
+                            static_cast<QWidget*>(m_buildButtonGrid),
+                            static_cast<QWidget*>(m_blueprintPanel) })
+    {
+        panel->setAttribute(Qt::WA_StyledBackground, true);
+    }
+    m_sidePanel->setStyleSheet(QStringLiteral(
+        "SelectedBuildingPanel, BuildButtonGrid, BlueprintPanel {"
+        " border: 1px solid palette(mid); }"));
+
     m_gameWorldView->setFocus();
 
     connect(qApp, &QApplication::focusChanged, this, [this](QWidget*, QWidget* newWidget) {

src/ui/SelectedBuildingPanel.cpp

@@ -566,11 +566,21 @@ void SelectedBuildingPanel::updateShipyardLayoutWidgets(
     const std::string& recipeId,
     const std::optional<ShipLayoutConfig>& shipLayout)
 {
-    const ShipDef* shipDef = (type == BuildingType::Shipyard)
-        ? findShipDef(recipeId)
-        : nullptr;
+    // The preview and Configure button are shipyard-only controls; hide them
+    // entirely for other building types.
+    if (type != BuildingType::Shipyard)
+    {
+        m_layoutPreview->hide();
+        m_configureLayoutBtn->hide();
+        return;
+    }
 
-    if (shipDef && !shipDef->layout.empty())
+    const ShipDef* shipDef = findShipDef(recipeId);
+    const bool hasSchematic = shipDef && !shipDef->layout.empty();
+
+    // Always show the preview and Configure button for a shipyard; they are only
+    // enabled once a schematic is selected (REQ-MOD-UI-PREVIEW).
+    if (hasSchematic)
     {
         ShipLayoutConfig layout;
         if (shipLayout.has_value())
@@ -579,14 +589,16 @@ void SelectedBuildingPanel::updateShipyardLayoutWidgets(
         }
         m_layoutPreview->setShipAndLayout(
             shipDef->layout, layout, &m_config->modules.modules);
-        m_layoutPreview->show();
-        m_configureLayoutBtn->show();
     }
     else
     {
-        m_layoutPreview->hide();
-        m_configureLayoutBtn->hide();
+        m_layoutPreview->showPlaceholder();
     }
+
+    m_layoutPreview->setEnabled(hasSchematic);
+    m_configureLayoutBtn->setEnabled(hasSchematic);
+    m_layoutPreview->show();
+    m_configureLayoutBtn->show();
 }
 
 const RecipeDef* SelectedBuildingPanel::findRecipe(const Building* b) const
@@ -694,6 +706,7 @@ void SelectedBuildingPanel::buildMulti(const std::vector<BuildingId>& ids)
     }
 
     bool hasBelt = false;
+    int totalCost = 0;
     QString text;
     for (const std::pair<const BuildingType, int>& entry : counts)
     {
@@ -703,7 +716,15 @@ void SelectedBuildingPanel::buildMulti(const std::vector<BuildingId>& ids)
         {
             hasBelt = true;
         }
+        // Total placement cost counts only player-placeable buildings; the HQ
+        // and defence stations are excluded (REQ-UI-MULTI-SELECTION).
+        const BuildingDef* def = m_config->buildings.findBuildingDef(entry.first);
+        if (def && def->playerPlaceable)
+        {
+            totalCost += def->cost * entry.second;
         }
+    }
+    text += tr("Total: %1 Building Blocks").arg(totalCost);
     m_titleLabel->setText(text.trimmed());
     m_titleLabel->show();
 

src/ui/ShipLayoutPreview.cpp

@@ -8,6 +8,10 @@ namespace
 
 const int kCellSize = 8;
 
+// Size of the empty placeholder box shown when no schematic is selected.
+const int kPlaceholderWidth  = 64;
+const int kPlaceholderHeight = 40;
+
 const ModuleDef* findModuleDef(const std::vector<ModuleDef>& modules,
                                const std::string& id)
 {
@@ -90,14 +94,28 @@ void ShipLayoutPreview::clear()
     m_modules = nullptr;
     m_rows = 0;
     m_cols = 0;
+    m_placeholder = false;
     setFixedSize(0, 0);
     update();
 }
 
+void ShipLayoutPreview::showPlaceholder()
+{
+    m_grid.clear();
+    m_placedModules.clear();
+    m_modules = nullptr;
+    m_rows = 0;
+    m_cols = 0;
+    m_placeholder = true;
+    setFixedSize(kPlaceholderWidth, kPlaceholderHeight);
+    update();
+}
+
 void ShipLayoutPreview::setShipAndLayout(const std::vector<std::string>& shipLayout,
                                          const ShipLayoutConfig& layout,
                                          const std::vector<ModuleDef>* modules)
 {
+    m_placeholder = false;
     m_modules = modules;
     m_placedModules = layout.placedModules;
     m_rows = static_cast<int>(shipLayout.size());
@@ -156,6 +174,18 @@ void ShipLayoutPreview::setShipAndLayout(const std::vector<std::string>& shipLay
 
 void ShipLayoutPreview::paintEvent(QPaintEvent* /*event*/)
 {
+    if (m_placeholder)
+    {
+        QPainter painter(this);
+        painter.setRenderHint(QPainter::Antialiasing, false);
+        const QRect box = rect().adjusted(0, 0, -1, -1);
+        painter.fillRect(box, QColor(40, 40, 40));
+        painter.setPen(QColor(128, 128, 128));
+        painter.drawRect(box);
+        painter.drawText(box, Qt::AlignCenter, tr("No schematic"));
+        return;
+    }
+
     if (m_rows == 0 || m_cols == 0)
     {
         return;

src/ui/ShipLayoutPreview.h

@@ -20,6 +20,10 @@ public:
                           const std::vector<ModuleDef>* modules);
     void clear();
 
+    // Shows an empty placeholder box (no ship layout) so the preview stays
+    // visible while no schematic is selected (REQ-MOD-UI-PREVIEW).
+    void showPlaceholder();
+
 protected:
     void paintEvent(QPaintEvent* event) override;
 
@@ -35,4 +39,5 @@ private:
     const std::vector<ModuleDef>* m_modules;
     int m_rows;
     int m_cols;
+    bool m_placeholder = false;
 };