Merge pull request 'fix(prefs): apply KindredCreate defaults after Reset All (#229)' (#234) from fix/reset-defaults-create into main
Some checks failed
Build and Test / build (push) Has been cancelled
Some checks failed
Build and Test / build (push) Has been cancelled
Reviewed-on: #234
This commit was merged in pull request #234.
This commit is contained in:
@@ -66,8 +66,10 @@
|
|||||||
|
|
||||||
#include "Dialogs/DlgPreferencesImp.h"
|
#include "Dialogs/DlgPreferencesImp.h"
|
||||||
#include "ui_DlgPreferences.h"
|
#include "ui_DlgPreferences.h"
|
||||||
|
#include "Application.h"
|
||||||
#include "BitmapFactory.h"
|
#include "BitmapFactory.h"
|
||||||
#include "MainWindow.h"
|
#include "MainWindow.h"
|
||||||
|
#include "PreferencePackManager.h"
|
||||||
#include "Tools.h"
|
#include "Tools.h"
|
||||||
#include "WidgetFactory.h"
|
#include "WidgetFactory.h"
|
||||||
|
|
||||||
@@ -834,6 +836,12 @@ void DlgPreferencesImp::restoreDefaults()
|
|||||||
.GetParameterGroupByPath("User parameter:BaseApp/Preferences/General")
|
.GetParameterGroupByPath("User parameter:BaseApp/Preferences/General")
|
||||||
->SetBool("SaveUserParameter", saveParameter);
|
->SetBool("SaveUserParameter", saveParameter);
|
||||||
|
|
||||||
|
// Re-apply Kindred Create defaults so we don't revert to upstream FreeCAD defaults
|
||||||
|
auto* packMgr = Gui::Application::Instance->prefPackManager();
|
||||||
|
if (packMgr) {
|
||||||
|
packMgr->apply("KindredCreate");
|
||||||
|
}
|
||||||
|
|
||||||
reject();
|
reject();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user