Default font saving and adding to schemes

Author: vorlov-playrix

src/cegui/CEGUIManager.cpp

@@ -12,6 +12,7 @@
 #include "src/util/Utils.h"
 #include "src/Application.h"
 #include <CEGUI/CEGUI.h>
+#include <CEGUI/FreeTypeFont.h>
 #include <CEGUI/RendererModules/OpenGL/GLRenderer.h>
 #include <CEGUI/RendererModules/OpenGL/GL3Renderer.h>
 #include <CEGUI/RendererModules/OpenGL/ViewportTarget.h>
@@ -25,6 +26,8 @@
 #include "qopenglframebufferobject.h"
 #include "qopenglfunctions.h"
 #include <qopenglfunctions_3_2_core.h>
+#include <qdom.h>
+#include <qtextstream.h>
 
 // Allows us to register subscribers that want CEGUI log info
 // This prevents writing CEGUI.log into CWD and allow log display inside the app
@@ -648,6 +651,82 @@ QStringList CEGUIManager::getAvailableFonts() const
     return fonts;
 }
 
+bool CEGUIManager::saveFont(CEGUI::Font& font, bool addToSchemes) const
+{
+    const QString fontName = CEGUIUtils::stringToQString(font.getName());
+    const QString fontDescFileName = fontName + ".font";
+
+    // Save an XML font description to the project
+    // TODO: rewrite with FontManager::writeFontToStream!
+
+    QDomDocument doc;
+    auto xmlHeader = doc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"");
+    doc.appendChild(xmlHeader);
+    auto xmlRoot = doc.createElement("Font");
+    xmlRoot.setAttribute("version", "3");
+    xmlRoot.setAttribute("name", fontName);
+    xmlRoot.setAttribute("filename", CEGUIUtils::stringToQString(font.getFileName()));
+    xmlRoot.setAttribute("type", CEGUIUtils::stringToQString(font.getTypeName()));
+    if (auto freeTypeFont = dynamic_cast<CEGUI::FreeTypeFont*>(&font))
+        xmlRoot.setAttribute("size", QString::number(static_cast<int>(freeTypeFont->getSize())));
+    xmlRoot.setAttribute("nativeHorzRes", QString::number(static_cast<int>(font.getNativeResolution().d_width)));
+    xmlRoot.setAttribute("nativeVertRes", QString::number(static_cast<int>(font.getNativeResolution().d_height)));
+    xmlRoot.setAttribute("autoScaled", CEGUIUtils::stringToQString(CEGUI::PropertyHelper<CEGUI::AutoScaledMode>::toString(font.getAutoScaled())));
+    doc.appendChild(xmlRoot);
+
+    {
+        const auto dstFontDescPath = currentProject->getResourceFilePath(fontDescFileName, "fonts");
+        QFile file(dstFontDescPath);
+        if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return false;
+
+        QTextStream stream(&file);
+        doc.save(stream, 4);
+        file.close();
+    }
+
+    // Add a new font to all schemes
+
+    if (!addToSchemes) return true;
+
+    const auto absoluteSchemesPath = currentProject->getAbsolutePathOf(currentProject->schemesPath);
+    if (!QDir(absoluteSchemesPath).exists()) return true;
+
+    QDirIterator schemesIt(absoluteSchemesPath);
+    while (schemesIt.hasNext())
+    {
+        schemesIt.next();
+        QFileInfo info = schemesIt.fileInfo();
+        if (info.isDir() || info.suffix() != "scheme") continue;
+
+        // Open, read & close file. We will work with a DOM document.
+        {
+            QFile file(info.absoluteFilePath());
+            if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+                return false;
+
+            if (!doc.setContent(&file))
+                return false;
+        }
+
+        auto xmlGUIScheme = doc.documentElement();
+        QDomElement xmlFontRec = doc.createElement("Font");
+        xmlFontRec.setAttribute("filename", fontDescFileName);
+        xmlGUIScheme.appendChild(xmlFontRec);
+
+        // Write XML back with changes
+        {
+            QFile file(info.absoluteFilePath());
+            if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return false;
+
+            QTextStream stream(&file);
+            doc.save(stream, 4);
+            file.close();
+        }
+    }
+
+    return true;
+}
+
 // Retrieves names of images that are available from the set of schemes that were loaded.
 // see syncProjectToCEGUIInstance
 QStringList CEGUIManager::getAvailableImages() const

src/cegui/CEGUIManager.h

@@ -45,6 +45,7 @@ class CEGUIManager
 
     QStringList getAvailableSkins() const;
     QStringList getAvailableFonts() const;
+    bool saveFont(CEGUI::Font& font, bool addToSchemes) const;
     QStringList getAvailableImages() const;
     void getAvailableWidgetsBySkin(std::map<QString, QStringList>& out) const;
     const QImage& getWidgetPreviewImage(const QString& widgetType, int previewWidth = 0, int previewHeight = 0);

src/ui/CEGUIGraphicsScene.cpp

@@ -15,8 +15,6 @@
 #include <qopenglframebufferobject.h>
 #include <qmessagebox.h>
 #include <qdir.h>
-#include <qdom.h>
-#include <qtextstream.h>
 
 static void validateResolution(float& width, float& height)
 {
@@ -152,8 +150,7 @@ bool CEGUIGraphicsScene::ensureDefaultFontExists()
     {
         auto ret = QMessageBox::question(qobject_cast<Application*>(qApp)->getMainWindow(),
                                          "Project has no fonts",
-                                         "Do you want CEED to create a default font? Note that some widgets may render wrong without a font.\n"
-                                         "NOTE: You must add a new font into your scheme file by hand to get it loaded in the future. Will be fixed later.",
+                                         "Do you want CEED to create a default font? Note that some widgets may render wrong without a font.\n",
                                          QMessageBox::Yes | QMessageBox::No,
                                          QMessageBox::Yes);
         if (ret != QMessageBox::Yes) return false;
@@ -179,31 +176,9 @@ bool CEGUIGraphicsScene::ensureDefaultFontExists()
             return false;
         }
 
-        // Save an XML font description to the project
-        QDomDocument doc;
-        auto xmlHeader = doc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"");
-        doc.appendChild(xmlHeader);
-        auto xmlRoot = doc.createElement("Font");
-        xmlRoot.setAttribute("version", "3");
-        xmlRoot.setAttribute("name", "Default");
-        xmlRoot.setAttribute("filename", "DejaVuSans.ttf");
-        xmlRoot.setAttribute("type", "FreeType");
-        xmlRoot.setAttribute("size", "14");
-        xmlRoot.setAttribute("nativeHorzRes", QString::number(static_cast<int>(resolution.width())));
-        xmlRoot.setAttribute("nativeVertRes", QString::number(static_cast<int>(resolution.height())));
-        xmlRoot.setAttribute("autoScaled", "disabled"); // CEGUI::PropertyHelper<CEGUI::AutoScaledMode>::toString(CEGUI::AutoScaledMode::Disabled));
-        doc.appendChild(xmlRoot);
-
-        const auto dstFontDescPath = currentProject->getResourceFilePath("Default.font", "fonts");
-        QFile file(dstFontDescPath);
-        if (file.open(QIODevice::WriteOnly | QIODevice::Text))
-        {
-            QTextStream stream(&file);
-            doc.save(stream, 4);
-            file.close();
-        }
-
-        // TODO: add to scheme
+        // Save font XML description and add it to all schemes
+        // FIXME: createFont() with family, size etc instead of this, add to particular schemes optionally!
+        CEGUIManager::Instance().saveFont(*defaultFont, true);
     }
 
     if (ceguiContext) ceguiContext->setDefaultFont(defaultFont);