From d13f7958f937dd92eadaa29983a7201fcebc7da7 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Mon, 23 Aug 2021 16:01:41 -0500 Subject: [PATCH] Add ToolBarManager Save and Restore calls --- src/Gui/PreferencePackManager.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp index 2978b2c39f..e0260b43e8 100644 --- a/src/Gui/PreferencePackManager.cpp +++ b/src/Gui/PreferencePackManager.cpp @@ -38,6 +38,7 @@ #include "Base/Interpreter.h" #include "Base/Console.h" #include "DockWindowManager.h" +#include "ToolBarManager.h" #include @@ -211,6 +212,10 @@ bool PreferencePackManager::apply(const std::string& preferencePackName) const Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance(); pDockMgr->loadState(); + // Same goes for toolbars: + Gui::ToolBarManager* pToolbarMgr = Gui::ToolBarManager::getInstance(); + pToolbarMgr->restoreState(); + // TODO: Are there other things that have to be manually triggered? } return wasApplied; @@ -228,6 +233,10 @@ void copyTemplateParameters(Base::Reference templateGroup, const s Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance(); pDockMgr->saveState(); + // Do the same for ToolBars + Gui::ToolBarManager* pToolbarMgr = Gui::ToolBarManager::getInstance(); + pToolbarMgr->saveState(); + auto boolMap = templateGroup->GetBoolMap(); for (const auto& kv : boolMap) { auto currentValue = userParameterHandle->GetBool(kv.first.c_str(), kv.second);