From 33ab8fa2e88c2de3f1fb1816d39f5526f6d8f276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= <benj5378@outlook.com>
Date: Wed, 4 Sep 2024 15:31:20 +0200
Subject: [PATCH] [Gui] QtStyle preference consistency

Previously, the some of the code searched for the QtStyle in the wrong location
---
 src/Gui/PreferencePacks/FreeCAD Classic/post.FCMacro    | 2 +-
 src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg   | 4 +---
 src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg | 4 +---
 src/Gui/StartupProcess.cpp                              | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Gui/PreferencePacks/FreeCAD Classic/post.FCMacro b/src/Gui/PreferencePacks/FreeCAD Classic/post.FCMacro
index b74390d66d..f0a0625bc9 100644
--- a/src/Gui/PreferencePacks/FreeCAD Classic/post.FCMacro	
+++ b/src/Gui/PreferencePacks/FreeCAD Classic/post.FCMacro	
@@ -4,5 +4,5 @@ import FreeCAD
 editorPrefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Editor")
 editorPrefs.RemInt("Text")
 
-appPrefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
+appPrefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/MainWindow")
 appPrefs.RemString("QtStyle")
diff --git a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg
index 16cf08d9fe..edf3c6b5b5 100644
--- a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg	
@@ -4,9 +4,6 @@
   <FCParamGroup Name="Root">
     <FCParamGroup Name="BaseApp">
       <FCParamGroup Name="Preferences">
-        <FCParamGroup Name="General">
-          <FCText Name="QtStyle">Fusion</FCText>
-        </FCParamGroup>
         <FCParamGroup Name="Themes">
           <FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
           <FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
@@ -179,6 +176,7 @@
           <FCInt Name="FontSize" Value="11"/>
         </FCParamGroup>
         <FCParamGroup Name="MainWindow">
+          <FCText Name="QtStyle">Fusion</FCText>
           <FCBool Name="TiledBackground" Value="0"/>
           <FCText Name="Theme">FreeCAD Dark</FCText>
           <FCText Name="StyleSheet">FreeCAD Dark.qss</FCText>
diff --git a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg
index 3ce2e8bae1..220fb5352c 100644
--- a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
@@ -3,9 +3,6 @@
   <FCParamGroup Name="Root">
     <FCParamGroup Name="BaseApp">
       <FCParamGroup Name="Preferences">
-        <FCParamGroup Name="General">
-          <FCText Name="QtStyle">Fusion</FCText>
-        </FCParamGroup>
         <FCParamGroup Name="Themes">
           <FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
           <FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
@@ -209,6 +206,7 @@
           <FCUInt Name="BaseColor" Value="3505127423"/>
         </FCParamGroup>
         <FCParamGroup Name="MainWindow">
+          <FCText Name="QtStyle">Fusion</FCText>
           <FCText Name="Theme">FreeCAD Light</FCText>
           <FCText Name="StyleSheet">FreeCAD Light.qss</FCText>
           <FCText Name="OverlayActiveStyleSheet">Light Theme + Light Background.qss</FCText>
diff --git a/src/Gui/StartupProcess.cpp b/src/Gui/StartupProcess.cpp
index 6f91024fce..7b7e131410 100644
--- a/src/Gui/StartupProcess.cpp
+++ b/src/Gui/StartupProcess.cpp
@@ -304,7 +304,7 @@ void StartupPostProcess::setCursorFlashing()
 
 void StartupPostProcess::setQtStyle()
 {
-    ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("General");
+    ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("MainWindow");
     auto qtStyle = hGrp->GetASCII("QtStyle");
     QApplication::setStyle(QString::fromStdString(qtStyle));
 }