From ef81bdfd42affa658534a9cdbff3aaac650a433c Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Fri, 17 Jun 2022 01:52:01 +0200
Subject: [PATCH] [Gui] move a NaviCube parameter to the NaviCube parameter
 group

- at the moment some NaviCube parameters are in the general View group, some in the dedicated NaviCube group
---
 src/Gui/DlgSettingsNavigation.cpp        |  9 ++-------
 src/Gui/DlgSettingsNavigation.ui         | 15 +++++++++++++--
 src/Gui/PreferencePackTemplates/View.cfg |  2 +-
 src/Gui/View3DInventor.cpp               | 11 ++++++++---
 src/Gui/View3DInventor.h                 |  1 +
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/Gui/DlgSettingsNavigation.cpp b/src/Gui/DlgSettingsNavigation.cpp
index bae79fd0e0..a2a7f27fcf 100644
--- a/src/Gui/DlgSettingsNavigation.cpp
+++ b/src/Gui/DlgSettingsNavigation.cpp
@@ -77,10 +77,6 @@ void DlgSettingsNavigation::saveSettings()
 
     int index = ui->comboOrbitStyle->currentIndex();
     hGrp->SetInt("OrbitStyle", index);
-
-    index = ui->naviCubeCorner->currentIndex();
-    hGrp->SetInt("CornerNaviCube", index);
-
     index = ui->comboRotationMode->currentIndex();
     hGrp->SetInt("RotationMode", index);
 
@@ -91,6 +87,7 @@ void DlgSettingsNavigation::saveSettings()
     ui->checkBoxUseAutoRotation->onSave();
     ui->qspinNewDocScale->onSave();
     ui->prefStepByTurn->onSave();
+    ui->naviCubeCorner->onSave();
     ui->naviCubeToNearest->onSave();
     ui->prefCubeSize->onSave();
 
@@ -117,6 +114,7 @@ void DlgSettingsNavigation::loadSettings()
     ui->checkBoxUseAutoRotation->onRestore();
     ui->qspinNewDocScale->onRestore();
     ui->prefStepByTurn->onRestore();
+    ui->naviCubeCorner->onRestore();
     ui->naviCubeToNearest->onRestore();
     ui->prefCubeSize->onRestore();
 
@@ -130,9 +128,6 @@ void DlgSettingsNavigation::loadSettings()
     index = Base::clamp(index, 0, ui->comboOrbitStyle->count()-1);
     ui->comboOrbitStyle->setCurrentIndex(index);
 
-    index = hGrp->GetInt("CornerNaviCube", 1);
-    ui->naviCubeCorner->setCurrentIndex(index);
-
     index = hGrp->GetInt("RotationMode", 1);
     ui->comboRotationMode->setCurrentIndex(index);
 
diff --git a/src/Gui/DlgSettingsNavigation.ui b/src/Gui/DlgSettingsNavigation.ui
index ced2092983..76132d0422 100644
--- a/src/Gui/DlgSettingsNavigation.ui
+++ b/src/Gui/DlgSettingsNavigation.ui
@@ -51,7 +51,7 @@
          <cstring>NaviStepByTurn</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>View</cstring>
+         <cstring>NaviCube</cstring>
         </property>
        </widget>
       </item>
@@ -82,13 +82,19 @@
        </widget>
       </item>
       <item row="0" column="4">
-       <widget class="QComboBox" name="naviCubeCorner">
+       <widget class="Gui::PrefComboBox" name="naviCubeCorner">
         <property name="toolTip">
          <string>Corner where navigation cube is shown</string>
         </property>
         <property name="currentIndex">
          <number>1</number>
         </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>CornerNaviCube</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>NaviCube</cstring>
+        </property>
         <item>
          <property name="text">
           <string>Top left</string>
@@ -577,6 +583,11 @@ Mouse tilting is not disabled by this setting.</string>
    <extends>QCheckBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
+  <customwidget>
+   <class>Gui::PrefComboBox</class>
+   <extends>QComboBox</extends>
+   <header>Gui/PrefWidgets.h</header>
+  </customwidget>
   <customwidget>
    <class>Gui::PrefDoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
diff --git a/src/Gui/PreferencePackTemplates/View.cfg b/src/Gui/PreferencePackTemplates/View.cfg
index f2805c10b3..a0ef5b960d 100644
--- a/src/Gui/PreferencePackTemplates/View.cfg
+++ b/src/Gui/PreferencePackTemplates/View.cfg
@@ -7,6 +7,7 @@
           <FCBool Name="UseSoftwareOpenGL" Value="0"/>
         </FCParamGroup>
         <FCParamGroup Name="NaviCube">
+          <FCInt Name="CornerNaviCube" Value="1"/>
           <FCInt Name="CubeSize" Value="132"/>
           <FCBool Name="NaviRotateToNearest" Value="1"/>
         </FCParamGroup>
@@ -15,7 +16,6 @@
           <FCFloat Name="BoundingBoxFontSize" Value="10.0"/>
           <FCBool Name="CornerCoordSystem" Value="1"/>
           <FCInt Name="CornerCoordSystemSize" Value="10"/>
-          <FCInt Name="CornerNaviCube" Value="1"/>
           <FCBool Name="CheckBoxSelectionCheckBoxes" Value="1"/>
           <FCBool Name="InvertZoom" Value="1"/>
           <FCInt Name="NaviStepByTurn" Value="8"/>
diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp
index 4d429c720a..e885f00fef 100644
--- a/src/Gui/View3DInventor.cpp
+++ b/src/Gui/View3DInventor.cpp
@@ -98,6 +98,10 @@ View3DInventor::View3DInventor(Gui::Document* pcDocument, QWidget* parent,
     hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
     hGrp->Attach(this);
 
+    hGrpNavi =
+        App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/NaviCube");
+    hGrpNavi->Attach(this);
+
     //anti-aliasing settings
     bool smoothing = false;
     bool glformat = false;
@@ -145,7 +149,7 @@ View3DInventor::View3DInventor(Gui::Document* pcDocument, QWidget* parent,
     OnChange(*hGrp,"UseBackgroundColorMid");
     OnChange(*hGrp,"ShowFPS");
     OnChange(*hGrp,"ShowNaviCube");
-    OnChange(*hGrp,"CornerNaviCube");
+    OnChange(*hGrpNavi, "CornerNaviCube");
     OnChange(*hGrp,"UseVBO");
     OnChange(*hGrp,"RenderCache");
     OnChange(*hGrp,"Orthographic");
@@ -178,6 +182,7 @@ View3DInventor::~View3DInventor()
             _pcDocument->saveCameraSettings(SoFCDB::writeNodesToString(Cam).c_str());
     }
     hGrp->Detach(this);
+    hGrpNavi->Detach(this);
 
     //If we destroy this viewer by calling 'delete' directly the focus proxy widget which is defined
     //by a widget in SoQtViewer isn't reset. This widget becomes a dangling pointer and makes
@@ -369,8 +374,8 @@ void View3DInventor::OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::M
     else if (strcmp(Reason,"ShowNaviCube") == 0) {
         _viewer->setEnabledNaviCube(rGrp.GetBool("ShowNaviCube",true));
     }
-    else if (strcmp(Reason,"CornerNaviCube") == 0) {
-        _viewer->setNaviCubeCorner(rGrp.GetInt("CornerNaviCube",1));
+    else if (strcmp(Reason, "CornerNaviCube") == 0) {
+        _viewer->setNaviCubeCorner(rGrp.GetInt("CornerNaviCube", 1));
     }
     else if (strcmp(Reason,"UseVBO") == 0) {
         _viewer->setEnabledVBO(rGrp.GetBool("UseVBO",false));
diff --git a/src/Gui/View3DInventor.h b/src/Gui/View3DInventor.h
index 4a7719aade..e629a1a25c 100644
--- a/src/Gui/View3DInventor.h
+++ b/src/Gui/View3DInventor.h
@@ -133,6 +133,7 @@ protected:
 
     /// handle to the viewer parameter group
     ParameterGrp::handle hGrp;
+    ParameterGrp::handle hGrpNavi;
 
 private:
     View3DInventorViewer * _viewer;