From a5eb40a9a6f34e55a1059d0f9fab03f44ec5e6f8 Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 18 Jul 2022 12:42:26 +0200 Subject: [PATCH] [Part] cleanup new preferences Feature - correct preferences location - handle preferences packs - remove unused code --- src/Gui/PreferencePackTemplates/CMakeLists.txt | 1 + src/Gui/PreferencePackTemplates/Part_Colors.cfg | 16 ++++++++++++++++ .../FreeCAD Classic Colors.cfg | 5 +++++ src/Mod/Part/Gui/CMakeLists.txt | 1 - src/Mod/Part/Gui/DlgSettingsMeasure.cpp | 6 ++---- src/Mod/Part/Gui/DlgSettingsMeasure.ui | 10 +++++----- src/Mod/Part/Gui/TaskDimension.cpp | 8 ++++---- 7 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 src/Gui/PreferencePackTemplates/Part_Colors.cfg diff --git a/src/Gui/PreferencePackTemplates/CMakeLists.txt b/src/Gui/PreferencePackTemplates/CMakeLists.txt index 52e1c41faf..b915b05b1f 100644 --- a/src/Gui/PreferencePackTemplates/CMakeLists.txt +++ b/src/Gui/PreferencePackTemplates/CMakeLists.txt @@ -6,6 +6,7 @@ SET(PreferencePackTemplates_Files Editor_Colors.cfg Editor_Font.cfg Main_window_layout.cfg + Part_Colors.cfg Path_Colors.cfg Sketcher_Colors.cfg Start_Colors.cfg diff --git a/src/Gui/PreferencePackTemplates/Part_Colors.cfg b/src/Gui/PreferencePackTemplates/Part_Colors.cfg new file mode 100644 index 0000000000..eb4c32a70e --- /dev/null +++ b/src/Gui/PreferencePackTemplates/Part_Colors.cfg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/Gui/PreferencePacks/FreeCAD Classic Colors/FreeCAD Classic Colors.cfg b/src/Gui/PreferencePacks/FreeCAD Classic Colors/FreeCAD Classic Colors.cfg index c18797a155..12843a67b9 100644 --- a/src/Gui/PreferencePacks/FreeCAD Classic Colors/FreeCAD Classic Colors.cfg +++ b/src/Gui/PreferencePacks/FreeCAD Classic Colors/FreeCAD Classic Colors.cfg @@ -21,6 +21,11 @@ + + + + + diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index 8e4132c964..758324d489 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -62,7 +62,6 @@ set(PartGui_UIC_SRCS DlgSettingsGeneral.ui DlgSettingsMeasure.ui DlgSettingsObjectColor.ui - DlgSettingsMeasure.ui DlgProjectionOnSurface.ui SectionCutting.ui ShapeFromMesh.ui diff --git a/src/Mod/Part/Gui/DlgSettingsMeasure.cpp b/src/Mod/Part/Gui/DlgSettingsMeasure.cpp index 1611774c61..c202818e0b 100644 --- a/src/Mod/Part/Gui/DlgSettingsMeasure.cpp +++ b/src/Mod/Part/Gui/DlgSettingsMeasure.cpp @@ -20,14 +20,13 @@ * * ***************************************************************************/ - #include "PreCompiled.h" +#include + #include "DlgSettingsMeasure.h" #include "ui_DlgSettingsMeasure.h" -#include -#include using namespace PartGui; @@ -86,7 +85,6 @@ void DlgSettingsMeasure::changeEvent(QEvent *e) } } - void DlgSettingsMeasure::onMeasureRefresh() { DlgSettingsMeasure::saveSettings(); diff --git a/src/Mod/Part/Gui/DlgSettingsMeasure.ui b/src/Mod/Part/Gui/DlgSettingsMeasure.ui index aa48021349..50cbd189a5 100644 --- a/src/Mod/Part/Gui/DlgSettingsMeasure.ui +++ b/src/Mod/Part/Gui/DlgSettingsMeasure.ui @@ -41,7 +41,7 @@ Dimensions3dColor - View + Mod/Part @@ -78,7 +78,7 @@ DimensionsDeltaColor - View + Mod/Part @@ -102,7 +102,7 @@ DimensionsAngularColor - View + Mod/Part @@ -135,7 +135,7 @@ DimensionsFontSize - View + Mod/Part @@ -192,7 +192,7 @@ DimensionsFontName - View + Mod/Part diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp index 49cc0f2351..8a7889744b 100644 --- a/src/Mod/Part/Gui/TaskDimension.cpp +++ b/src/Mod/Part/Gui/TaskDimension.cpp @@ -226,7 +226,7 @@ void PartGui::dumpLinearResults(const BRepExtrema_DistShapeShape &measure) auto PartGui::getDimensionsFontName() { - ParameterGrp::handle group = App::GetApplication().GetUserParameter().GetGroup("BaseApp/Preferences/View"); + ParameterGrp::handle group = App::GetApplication().GetUserParameter().GetGroup("BaseApp/Preferences/Mod/Part"); std::string fontName = group->GetASCII("DimensionsFontName", "defaultFont") + (group->GetBool("DimensionsFontStyleBold", false) ? " :Bold" : "") + (group->GetBool("DimensionsFontStyleItalic", false) ? " :Italic" : ""); @@ -235,7 +235,7 @@ auto PartGui::getDimensionsFontName() auto PartGui::getDimensionsFontSize() { - ParameterGrp::handle group = App::GetApplication().GetUserParameter().GetGroup("BaseApp/Preferences/View"); + ParameterGrp::handle group = App::GetApplication().GetUserParameter().GetGroup("BaseApp/Preferences/Mod/Part"); return group->GetInt("DimensionsFontSize", 30); } @@ -255,7 +255,7 @@ Gui::View3DInventorViewer * PartGui::getViewer() void PartGui::addLinearDimensions(const BRepExtrema_DistShapeShape &measure) { - ParameterGrp::handle group = App::GetApplication().GetUserParameter().GetGroup("BaseApp/Preferences/View"); + ParameterGrp::handle group = App::GetApplication().GetUserParameter().GetGroup("BaseApp/Preferences/Mod/Part"); App::Color c((uint32_t) group->GetUnsigned("Dimensions3dColor", 0xFF000000)); App::Color d((uint32_t) group->GetUnsigned("DimensionsDeltaColor", 0x00FF0000)); @@ -1118,7 +1118,7 @@ void PartGui::goDimensionAngularNoTask(const VectorAdapter &vector1Adapter, cons dimSys = dimSys.transpose(); } - ParameterGrp::handle group = App::GetApplication().GetUserParameter().GetGroup("BaseApp/Preferences/View"); + ParameterGrp::handle group = App::GetApplication().GetUserParameter().GetGroup("BaseApp/Preferences/Mod/Part"); App::Color c((uint32_t) group->GetUnsigned("DimensionsAngularColor", 0x0000FF00)); DimensionAngular *dimension = new DimensionAngular();