From c3e4d3c25880ad1b3b9b7165ec2fb49ee79432f3 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Mon, 17 Oct 2022 02:31:08 +0200
Subject: [PATCH] Revert "[Sketch] TaskSketcherGeneral: restore wording of FC
 0.20"

This reverts commit 354cffe5592d3a1aaae65cbe4c00b3329e23bf14.
---
 src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp |  1 -
 src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui  | 89 +++++++-------------
 2 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
index 9823d3c917..a57a465d1a 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
@@ -167,7 +167,6 @@ void SketcherGeneralWidget::checkAvoidRedundant(bool on)
 void SketcherGeneralWidget::enableGridSettings(bool on)
 {
     ui->gridSize->setEnabled(on);
-    ui->gridSizeLabel->setEnabled(on);
     ui->checkBoxGridSnap->setEnabled(on);
 }
 
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui
index c3d397647c..752c9100e5 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="Gui::PrefCheckBox" name="checkBoxShowGrid">
        <property name="enabled">
@@ -25,7 +25,7 @@
         <string>A grid will be shown</string>
        </property>
        <property name="text">
-        <string>Show grid</string>
+        <string>Grid</string>
        </property>
        <property name="checked">
         <bool>false</bool>
@@ -39,59 +39,35 @@
       </widget>
      </item>
      <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+      <widget class="Gui::PrefQuantitySpinBox" name="gridSize">
+       <property name="toolTip">
+        <string>Distance between two subsequent grid lines</string>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
+       <property name="unit" stdset="0">
+        <string notr="true">mm</string>
        </property>
-      </spacer>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLabel" name="gridSizeLabel">
-         <property name="text">
-          <string>Grid size:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="Gui::PrefQuantitySpinBox" name="gridSize">
-         <property name="toolTip">
-          <string>Distance between two subsequent grid lines</string>
-         </property>
-         <property name="unit" stdset="0">
-          <string notr="true">mm</string>
-         </property>
-         <property name="minimum">
-          <double>0.001000000000000</double>
-         </property>
-         <property name="maximum">
-          <double>99999999.000000000000000</double>
-         </property>
-         <property name="singleStep">
-          <double>1.000000000000000</double>
-         </property>
-         <property name="value">
-          <double>10.000000000000000</double>
-         </property>
-         <property name="prefEntry" stdset="0">
-          <cstring>GridSize</cstring>
-         </property>
-         <property name="prefPath" stdset="0">
-          <cstring>Mod/Sketcher/General/GridSize</cstring>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
-        </widget>
-       </item>
-      </layout>
+       <property name="decimals" stdset="0">
+        <number>3</number>
+       </property>
+       <property name="maximum" stdset="0">
+        <double>99999999.000000000000000</double>
+       </property>
+       <property name="minimum" stdset="0">
+        <double>0.001000000000000</double>
+       </property>
+       <property name="singleStep" stdset="0">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="value" stdset="0">
+        <double>10.000000000000000</double>
+       </property>
+       <property name="prefEntry" stdset="0">
+        <cstring>GridSize</cstring>
+       </property>
+       <property name="prefPath" stdset="0">
+        <cstring>Mod/Sketcher/General/GridSize</cstring>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -197,11 +173,6 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.<
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>Gui::QuantitySpinBox</class>
-   <extends>QWidget</extends>
-   <header>Gui/QuantitySpinBox.h</header>
-  </customwidget>
   <customwidget>
    <class>Gui::PrefCheckBox</class>
    <extends>QCheckBox</extends>
@@ -209,7 +180,7 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.<
   </customwidget>
   <customwidget>
    <class>Gui::PrefQuantitySpinBox</class>
-   <extends>Gui::QuantitySpinBox</extends>
+   <extends>QWidget</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
  </customwidgets>