From 3771f1dbc3ad095bc4ad3f766650b02c265fa6a7 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 12 Feb 2019 13:09:51 +0100
Subject: [PATCH] enhance capabilities to render text in splashscreen

---
 src/Gui/MainWindow.cpp | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 3d1c53a18f..83bfb4acaf 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -1266,16 +1266,29 @@ QPixmap MainWindow::splashImage() const
         QString major   = QString::fromLatin1(App::Application::Config()["BuildVersionMajor"].c_str());
         QString minor   = QString::fromLatin1(App::Application::Config()["BuildVersionMinor"].c_str());
         QString version = QString::fromLatin1("%1.%2").arg(major, minor);
+        QString position, fontFamily;
 
         std::map<std::string,std::string>::const_iterator te = App::Application::Config().find("SplashInfoExeName");
         std::map<std::string,std::string>::const_iterator tv = App::Application::Config().find("SplashInfoVersion");
+        std::map<std::string,std::string>::const_iterator tp = App::Application::Config().find("SplashInfoPosition");
+        std::map<std::string,std::string>::const_iterator tf = App::Application::Config().find("SplashInfoFont");
         if (te != App::Application::Config().end())
             title = QString::fromUtf8(te->second.c_str());
         if (tv != App::Application::Config().end())
             version = QString::fromUtf8(tv->second.c_str());
+        if (tp != App::Application::Config().end())
+            position = QString::fromUtf8(tp->second.c_str());
+        if (tf != App::Application::Config().end())
+            fontFamily = QString::fromUtf8(tf->second.c_str());
 
         QPainter painter;
         painter.begin(&splash_image);
+        if (!fontFamily.isEmpty()) {
+            QFont font = painter.font();
+            if (font.fromString(fontFamily))
+                painter.setFont(font);
+        }
+
         QFont fontExe = painter.font();
         fontExe.setPointSize(20);
         QFontMetrics metricExe(fontExe);
@@ -1288,14 +1301,25 @@ QPixmap MainWindow::splashImage() const
         QFontMetrics metricVer(fontVer);
         int v = metricVer.width(version);
 
+        int x = -1, y = -1;
+        QRegExp rx(QLatin1String("(\\d+).(\\d+)"));
+        if (rx.indexIn(position) != -1) {
+            x = rx.cap(1).toInt();
+            y = rx.cap(2).toInt();
+        }
+        else {
+            x = w - (l + v + 10);
+            y = h - 20;
+        }
+
         QColor color;
         color.setNamedColor(QString::fromLatin1(tc->second.c_str()));
         if (color.isValid()) {
             painter.setPen(color);
             painter.setFont(fontExe);
-            painter.drawText(w-(l+v+10),h-20, title);
+            painter.drawText(x, y, title);
             painter.setFont(fontVer);
-            painter.drawText(w-(v+5),h-20, version);
+            painter.drawText(x - (l + 5), y, version);
             painter.end();
         }
     }