FreeCAD · ein-shved · Oct 4, 2024
diff --git a/src/Gui/DlgAbout.cpp b/src/Gui/DlgAbout.cpp
@@ -55,10 +55,10 @@
 #include "DlgAbout.h"
 #include "MainWindow.h"
 #include "SplashScreen.h"
 #include "ui_AboutApplication.h"

 using namespace Gui;
 using namespace Gui::Dialog;
 namespace fs = boost::filesystem;

 static QString prettyProductInfoWrapper()
@@ -180,7 +180,7 @@
        float scale = static_cast<float>(image.width()) / static_cast<float>(image.height());
        int width = std::min(image.width(), rect.width() / denom);
        int height = std::min(image.height(), rect.height() / denom);
        height = std::min(height, static_cast<int>(width / scale));
        width = static_cast<int>(scale * height);

        image = image.scaled(width, height);
@@ -215,7 +215,11 @@
         about_image.load(fi.filePath(), "PNG");
     }
 
-    std::string about_path = App::Application::Config()["AboutImage"];
+    // Use dev or generic version of image depending on current build version.
+    const auto& suffix = App::Application::Config()["BuildVersionSuffix"];
+    const auto about_path_key = (suffix == "dev") ? "AboutImageDev" : "AboutImage";
+    const auto& about_path = App::Application::Config()[about_path_key];
+
     if (!about_path.empty() && about_image.isNull()) {
         QString path = QString::fromStdString(about_path);
         if (QDir(path).isRelative()) {
@@ -539,7 +543,7 @@
    QString data;
    QTextStream str(&data);
    std::map<std::string, std::string>& config = App::Application::Config();
    std::map<std::string, std::string>::iterator it;
    QString exe = QString::fromStdString(App::Application::getExecutableName());

    QString major = QString::fromStdString(config["BuildVersionMajor"]);
@@ -688,7 +692,7 @@
                firstMod = false;
                str << "Installed mods: \n";
            }
            str << "  * " << QString::fromStdString(mod.path().filename().string());
            auto metadataFile = mod.path() / "package.xml";
            if (fs::exists(metadataFile)) {
                App::Metadata metadata(metadataFile);
@@ -736,4 +740,4 @@
    browser->setSource(url);
 }

 #include "moc_DlgAbout.cpp"
diff --git a/src/Gui/Icons/freecadaboutdev.png b/src/Gui/Icons/freecadaboutdev.png
diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc
@@ -29,6 +29,7 @@
         <file>freecadsplash11_2x.png</file>
         <file>freecadsplash12_2x.png</file>
         <file>freecadabout.png</file>
+        <file>freecadaboutdev.png</file>
         <file>background.png</file>
         <file>mouse_pointer.svg</file>
         <file>Document.svg</file>

diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
@@ -71,7 +71,7 @@
 class Redirection
 {
 public:
    Redirection(FILE* f)
        : fi(Base::FileInfo::getTempFileName())
        , file(f)
    {
@@ -166,6 +166,7 @@
     App::Application::Config()["AppIcon"] = "freecad";
     App::Application::Config()["SplashScreen"] = "freecadsplash";
     App::Application::Config()["AboutImage"] = "freecadabout";
+    App::Application::Config()["AboutImageDev"] = "freecadaboutdev";
     App::Application::Config()["StartWorkbench"] = "PartDesignWorkbench";
     // App::Application::Config()["HiddenDockWindow"] = "Property editor";
     App::Application::Config()["SplashAlignment"] = "Bottom|Left";
@@ -316,7 +317,7 @@

    std::cout.rdbuf(oldcout);
    std::clog.rdbuf(oldclog);
    std::cerr.rdbuf(oldcerr);

    // Destruction phase ===========================================================
    Base::Console().Log("%s terminating...\n", App::Application::Config()["ExeName"].c_str());
@@ -432,7 +433,7 @@
    return EXCEPTION_CONTINUE_SEARCH;  // this will trigger the "normal" OS error-dialog
 }

 void InitMiniDumpWriter(const std::string& filename)
 {
    if (s_hDbgHelpMod != NULL) {
        return;