schematic selection dialog

src/ui/ShipLayoutDialog.cpp

@@ -1,9 +1,10 @@
 #include "ShipLayoutDialog.h"
 #include "ShipStatsPanel.h"
 
-#include <cctype>
 #include <functional>
 
+#include "DisplayName.h"
+
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QInputDialog>
@@ -20,30 +21,6 @@ namespace
 
 const int kCellSize = 32;
 
-QString displayName(const std::string& id)
-{
-    QString result;
-    bool nextUpper = true;
-    for (char c : id)
-    {
-        if (c == '_')
-        {
-            result += ' ';
-            nextUpper = true;
-        }
-        else if (nextUpper)
-        {
-            result += static_cast<char>(std::toupper(static_cast<unsigned char>(c)));
-            nextUpper = false;
-        }
-        else
-        {
-            result += c;
-        }
-    }
-    return result;
-}
-
 std::vector<std::string> rotateMaskCW(const std::vector<std::string>& grid)
 {
     if (grid.empty())
@@ -478,7 +455,7 @@ ShipLayoutDialog::ShipLayoutDialog(const GameConfig* config,
             m_moduleButtons.push_back(nullptr);
             continue;
         }
-        const QString label = displayName(def.id)
+        const QString label = QString::fromStdString(toDisplayName(def.id))
             + "\n" + QString::fromStdString(def.glyph);
         QPushButton* btn = new QPushButton(label, this);
         btn->setCheckable(true);