merge master via cli

src/Gui/PreferencePages/DlgSettingsDocument.ui

@@ -98,7 +98,7 @@
            <string>Compression level for FCStd files</string>
           </property>
           <property name="value">
-           <number>3</number>
+           <number>7</number>
           </property>
           <property name="prefEntry" stdset="0">
            <cstring>CompressionLevel</cstring>
@@ -393,7 +393,7 @@ Common sizes are 128, 256 and 512</string>
            <number>512</number>
           </property>
           <property name="value">
-           <number>128</number>
+           <number>256</number>
           </property>
           <property name="prefEntry" stdset="0">
            <cstring>ThumbnailSize</cstring>

src/Gui/PreferencePages/DlgSettingsGeneral.cpp

@@ -438,9 +438,9 @@ void DlgSettingsGeneral::changeEvent(QEvent *event)
 void DlgSettingsGeneral::saveDockWindowVisibility()
 {
     auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows");
-    bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", true);
-    bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", true);
-    bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", false);
+    bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", false);
+    bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", false);
+    bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", true);
     switch (ui->treeMode->currentIndex()) {
     case 0:
         comboView = true;
@@ -464,9 +464,9 @@ void DlgSettingsGeneral::loadDockWindowVisibility()
     ui->treeMode->addItem(tr("TreeView and PropertyView"));
 
     auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows");
-    bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", true);
-    bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", true);
-    bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", false);
+    bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", false);
+    bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", false);
+    bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", true);
     int index = -1;
     if (propertyView || treeView) {
         index = 1;

src/Gui/PreferencePages/DlgSettingsNavigation.cpp

@@ -59,6 +59,7 @@ DlgSettingsNavigation::DlgSettingsNavigation(QWidget* parent)
 {
     ui->setupUi(this);
     ui->naviCubeBaseColor->setAllowTransparency(true);
+    ui->rotationCenterColor->setAllowTransparency(true);
     retranslate();
 }
 
@@ -85,10 +86,10 @@ void DlgSettingsNavigation::saveSettings()
     ui->checkBoxZoomAtCursor->onSave();
     ui->checkBoxInvertZoom->onSave();
     ui->checkBoxDisableTilt->onSave();
-    ui->checkBoxShowRotationCenter->onSave();
+    ui->rotationCenterSize->onSave();
+    ui->rotationCenterColor->onSave();
     ui->spinBoxZoomStep->onSave();
-    ui->checkBoxNavigationAnimations->onSave();
-    ui->spinBoxAnimationDuration->onSave();
+    ui->checkBoxUseAutoRotation->onSave();
     ui->qspinNewDocScale->onSave();
     ui->prefStepByTurn->onSave();
     ui->naviCubeCorner->onSave();
@@ -99,6 +100,9 @@ void DlgSettingsNavigation::saveSettings()
     bool showNaviCube = ui->groupBoxNaviCube->isChecked();
     hGrp->SetBool("ShowNaviCube", showNaviCube);
 
+    bool showRotationCenter = ui->groupBoxRotationCenter->isChecked();
+    hGrp->SetBool("ShowRotationCenter", showRotationCenter);
+
     QVariant camera = ui->comboNewDocView->itemData(ui->comboNewDocView->currentIndex(),
         Qt::UserRole);
     hGrp->SetASCII("NewDocumentCameraOrientation", (const char*)camera.toByteArray());
@@ -112,7 +116,7 @@ void DlgSettingsNavigation::saveSettings()
     hGrp = App::GetApplication().GetParameterGroupByPath(
         "User parameter:BaseApp/Preferences/NaviCube");
     if (ui->naviCubeFontName->currentIndex()) {
-        hGrp->SetASCII("FontString", ui->naviCubeFontName->currentText().toLatin1());
+        hGrp->SetASCII("FontString", ui->naviCubeFontName->currentText().toLatin1());        
     } else {
         hGrp->RemoveASCII("FontString");
     }
@@ -123,10 +127,10 @@ void DlgSettingsNavigation::loadSettings()
     ui->checkBoxZoomAtCursor->onRestore();
     ui->checkBoxInvertZoom->onRestore();
     ui->checkBoxDisableTilt->onRestore();
-    ui->checkBoxShowRotationCenter->onRestore();
+    ui->rotationCenterSize->onRestore();
+    ui->rotationCenterColor->onRestore();
     ui->spinBoxZoomStep->onRestore();
-    ui->checkBoxNavigationAnimations->onRestore();
-    ui->spinBoxAnimationDuration->onRestore();
+    ui->checkBoxUseAutoRotation->onRestore();
     ui->qspinNewDocScale->onRestore();
     ui->prefStepByTurn->onRestore();
     ui->naviCubeCorner->onRestore();
@@ -150,6 +154,9 @@ void DlgSettingsNavigation::loadSettings()
     bool showNaviCube = hGrp->GetBool("ShowNaviCube", true);
     ui->groupBoxNaviCube->setChecked(showNaviCube);
 
+    bool showRotationCenter = hGrp->GetBool("ShowRotationCenter", true);
+    ui->groupBoxRotationCenter->setChecked(showRotationCenter);
+
     ui->comboNewDocView->addItem(tr("Isometric"), QByteArray("Isometric"));
     ui->comboNewDocView->addItem(tr("Dimetric"), QByteArray("Dimetric"));
     ui->comboNewDocView->addItem(tr("Trimetric"), QByteArray("Trimetric"));
@@ -185,7 +192,7 @@ void DlgSettingsNavigation::loadSettings()
     QStringList familyNames = QFontDatabase::families(QFontDatabase::Any);
 #endif
     ui->naviCubeFontName->addItems(familyNames);
-
+    
     hGrp = App::GetApplication().GetParameterGroupByPath(
         "User parameter:BaseApp/Preferences/NaviCube");
     int indexFamilyNames = familyNames.indexOf(

src/Gui/PreferencePages/DlgSettingsNavigation.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>432</width>
-    <height>423</height>
+    <width>484</width>
+    <height>586</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -229,6 +229,99 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxRotationCenter">
+     <property name="title">
+      <string>Rotation center indicator</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QLabel" name="sizeLabelRotationCenter">
+        <property name="text">
+         <string>Sphere size</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="colorLabelRotationCenter">
+        <property name="text">
+         <string>Color and transparency</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="Gui::PrefDoubleSpinBox" name="rotationCenterSize">
+        <property name="maximumSize">
+         <size>
+          <width>60</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>The size of the rotation center indicator</string>
+        </property>
+        <property name="decimals">
+         <number>1</number>
+        </property>
+        <property name="minimum">
+         <float>1.0</float>
+        </property>
+        <property name="maximum">
+         <float>100.0</float>
+        </property>
+        <property name="singleStep">
+         <float>0.5</float>
+        </property>
+        <property name="value">
+         <float>5.0</float>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>RotationCenterSize</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>View</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="Gui::PrefColorButton" name="rotationCenterColor">
+        <property name="toolTip">
+         <string>The color of the rotation center indicator</string>
+        </property>
+        <property name="color" stdset="0">
+         <color alpha="51">
+          <red>255</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>RotationCenterColor</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>View</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="GroupBox12">
      <property name="enabled">
@@ -473,91 +566,27 @@ The value is the diameter of the sphere to fit on the screen.</string>
        </widget>
       </item>
       <item row="5" column="0">
-       <widget class="Gui::PrefCheckBox" name="checkBoxNavigationAnimations">
+       <widget class="Gui::PrefCheckBox" name="checkBoxUseAutoRotation">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="toolTip">
-         <string>Enable navigation animations</string>
+         <string>Enable animated rotations</string>
         </property>
         <property name="text">
-         <string>Enable navigation animations</string>
+         <string>Enable animation</string>
         </property>
         <property name="checked">
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
         <property name="prefEntry" stdset="0">
-         <cstring>UseNavigationAnimations</cstring>
+         <cstring>UseAutoRotation</cstring>
         </property>
         <property name="prefPath" stdset="0">
          <cstring>View</cstring>
         </property>
        </widget>
       </item>
-      <item row="5" column="1">
-       <widget class="QLabel" name="navigationAnimationsLabel">
-        <property name="toolTip">
-         <string>Duration of navigation animations that have a fixed duration</string>
-        </property>
-        <property name="text">
-         <string>Animation duration</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="2">
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="Gui::PrefSpinBox" name="spinBoxAnimationDuration">
-          <property name="maximumSize">
-           <size>
-            <width>60</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>The duration of navigation animations in milliseconds</string>
-          </property>
-          <property name="minimum">
-           <number>100</number>
-          </property>
-          <property name="maximum">
-           <number>10000</number>
-          </property>
-          <property name="singleStep">
-           <number>50</number>
-          </property>
-          <property name="value">
-           <number>250</number>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>AnimationDuration</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_4">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>10</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
       <item row="6" column="0">
        <widget class="Gui::PrefCheckBox" name="checkBoxZoomAtCursor">
         <property name="toolTip">
@@ -580,7 +609,7 @@ The value is the diameter of the sphere to fit on the screen.</string>
       <item row="6" column="1">
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>Zoom step</string>
+         <string> Zoom step</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -679,25 +708,6 @@ Mouse tilting is not disabled by this setting.</string>
         </property>
        </widget>
       </item>
-      <item row="9" column="0">
-       <widget class="Gui::PrefCheckBox" name="checkBoxShowRotationCenter">
-        <property name="toolTip">
-         <string>Show the rotation center when dragging.</string>
-        </property>
-        <property name="text">
-         <string>Enable rotation center indication</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowRotationCenter</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>View</cstring>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>