From af36a78f7f333473b0c2541c4038d60017658f22 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 15 Nov 2018 10:58:14 +0100 Subject: [PATCH] harmonize settings for DAGView with other dockable windows --- src/Gui/MainWindow.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index fe84f70704..7e55e83336 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -419,16 +419,24 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f) //Dag View. if (hiddenDockWindows.find("Std_DAGView") == std::string::npos) { //work through parameter. + // old group name + ParameterGrp::handle deprecateGroup = App::GetApplication().GetUserParameter(). + GetGroup("BaseApp")->GetGroup("Preferences"); + bool enabled = false; + if (deprecateGroup->HasGroup("DAGView")) { + deprecateGroup = deprecateGroup->GetGroup("DAGView"); + enabled = deprecateGroup->GetBool("Enabled", enabled); + } + // new group name ParameterGrp::handle group = App::GetApplication().GetUserParameter(). - GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DAGView"); - bool enabled = group->GetBool("Enabled", false); + GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("DAGView"); + enabled = group->GetBool("Enabled", enabled); group->SetBool("Enabled", enabled); //ensure entry exists. - if (enabled) - { - DAG::DockWindow *dagDockWindow = new DAG::DockWindow(nullptr, this); - dagDockWindow->setObjectName - (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","DAG View"))); - pDockMgr->registerDockWindow("Std_DAGView", dagDockWindow); + if (enabled) { + DAG::DockWindow *dagDockWindow = new DAG::DockWindow(nullptr, this); + dagDockWindow->setObjectName + (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","DAG View"))); + pDockMgr->registerDockWindow("Std_DAGView", dagDockWindow); } }