From 429e1b8f31ae7f6a93077154332eff46c0f51950 Mon Sep 17 00:00:00 2001
From: PaddleStroke <pierrelouis.boyer@gmail.com>
Date: Mon, 13 Jan 2025 17:37:14 +0100
Subject: [PATCH] Extend branding options (#18804)

---
 src/App/Branding.cpp | 9 +++++++++
 src/Main/MainGui.cpp | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/App/Branding.cpp b/src/App/Branding.cpp
index 2be169e8e6..c3ddfe01d2 100644
--- a/src/App/Branding.cpp
+++ b/src/App/Branding.cpp
@@ -39,23 +39,32 @@ Branding::Branding()
     filter.push_back("WindowIcon");
     filter.push_back("ProgramLogo");
     filter.push_back("ProgramIcons");
+    filter.push_back("DesktopFileName");
     filter.push_back("StyleSheet");
 
     filter.push_back("BuildVersionMajor");
     filter.push_back("BuildVersionMinor");
+    filter.push_back("BuildVersionPoint");
     filter.push_back("BuildRevision");
     filter.push_back("BuildRevisionDate");
+    filter.push_back("BuildVersionSuffix");
+    filter.push_back("BuildRepositoryURL");
 
+    filter.push_back("AboutImage");
     filter.push_back("SplashScreen");
     filter.push_back("SplashAlignment");
     filter.push_back("SplashTextColor");
     filter.push_back("SplashInfoColor");
+    filter.push_back("SplashInfoFont");
+    filter.push_back("SplashInfoPosition");
     filter.push_back("SplashWarningColor");
 
     filter.push_back("StartWorkbench");
 
     filter.push_back("ExeName");
     filter.push_back("ExeVendor");
+    filter.push_back("ExeVersion");
+    filter.push_back("AppDataSkipVendor");
     filter.push_back("NavigationStyle");
     filter.push_back("UserParameterTemplate");
 }
diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
index d56d1a842c..be25becbef 100644
--- a/src/Main/MainGui.cpp
+++ b/src/Main/MainGui.cpp
@@ -173,8 +173,7 @@ int main(int argc, char** argv)
     App::Application::Config()["SplashWarningColor"] = "#CA333B";
     App::Application::Config()["SplashInfoColor"] = "#000000";
     App::Application::Config()["SplashInfoPosition"] = "6,75";
-
-    QGuiApplication::setDesktopFileName(QStringLiteral("org.freecad.FreeCAD"));
+    App::Application::Config()["DesktopFileName"] = "org.freecad.FreeCAD";
 
     try {
         // Init phase ===========================================================
@@ -189,6 +188,10 @@ int main(int argc, char** argv)
 #else
         App::Application::init(argc, argv);
 #endif
+        // to set window icon on wayland, the desktop file has to be available to the compositor
+        QGuiApplication::setDesktopFileName(
+            QString::fromLatin1(App::Application::Config()["DesktopFileName"].c_str()));
+
 #if defined(_MSC_VER)
         // create a dump file when the application crashes
         std::string dmpfile = App::Application::getUserAppDataDir();