From c5f87d8ea8044c6a561d14d612034931fd497100 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Wed, 22 Dec 2021 02:46:07 +0100
Subject: [PATCH] [PD] hole dialog improvements

- no keyboard tracking
- don't disable labels since we don't do this for the other dialog labels
- avoid a doubled word in subsequent labels
- further UI file changes are by Qt's Designer
---
 src/Mod/PartDesign/Gui/TaskHoleParameters.cpp |   4 +-
 src/Mod/PartDesign/Gui/TaskHoleParameters.ui  | 109 +++++-------------
 2 files changed, 31 insertions(+), 82 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
index 4dd00184f3..9add76d640 100644
--- a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
@@ -175,8 +175,8 @@ TaskHoleParameters::TaskHoleParameters(ViewProviderHole *HoleView, QWidget *pare
     // conditional enabling of thread modeling options
     ui->ModelThread->setEnabled(ui->Threaded->isChecked() && ui->ThreadType->currentIndex() != 0);
     ui->UseCustomThreadClearance->setEnabled(ui->Threaded->isChecked() && ui->ModelThread->isChecked());
-    ui->labelThreadClearance->setEnabled(ui->Threaded->isChecked() && ui->ModelThread->isChecked() && ui->UseCustomThreadClearance->isChecked());
-    ui->CustomThreadClearance->setEnabled(ui->Threaded->isChecked() && ui->ModelThread->isChecked() && ui->UseCustomThreadClearance->isChecked());
+    ui->CustomThreadClearance->setEnabled(ui->Threaded->isChecked() && ui->ModelThread->isChecked()
+        && ui->UseCustomThreadClearance->isChecked());
     ui->UpdateView->setChecked(false);
     ui->UpdateView->setEnabled(ui->ModelThread->isChecked());
 
diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui
index 3de7dec4b4..8bb6f26f34 100644
--- a/src/Mod/PartDesign/Gui/TaskHoleParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>342</width>
-    <height>486</height>
+    <width>355</width>
+    <height>561</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -48,12 +48,6 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
     </widget>
    </item>
    <item row="2" column="1">
@@ -114,7 +108,7 @@ Note that the calculation can take some time</string>
       <string>Customize thread clearance</string>
      </property>
      <property name="text">
-      <string>Custom Thread Clearance</string>
+      <string>Custom Thread</string>
      </property>
     </widget>
    </item>
@@ -139,24 +133,18 @@ Note that the calculation can take some time</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <property name="toolTip">
       <string>Custom Thread clearance value</string>
      </property>
+     <property name="keyboardTracking">
+      <bool>false</bool>
+     </property>
      <property name="unit" stdset="0">
       <string notr="true">mm</string>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
-     <property name="keyboardTracking">
-      <bool>false</bool>
-     </property>
     </widget>
    </item>
    <item row="5" column="0">
@@ -231,12 +219,6 @@ Note that the calculation can take some time</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
     </widget>
    </item>
    <item row="8" column="2">
@@ -260,12 +242,6 @@ Note that the calculation can take some time</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <property name="toolTip">
       <string>Hole clearance
 Only available for holes without thread</string>
@@ -308,12 +284,6 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <property name="toolTip">
       <string>Tolerance class for threaded holes according to hole profile</string>
      </property>
@@ -340,15 +310,12 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <property name="toolTip">
       <string>Hole diameter</string>
      </property>
+     <property name="keyboardTracking">
+      <bool>false</bool>
+     </property>
      <property name="unit" stdset="0">
       <string notr="true">mm</string>
      </property>
@@ -378,12 +345,6 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <item>
       <property name="text">
        <string>Dimension</string>
@@ -404,6 +365,9 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="keyboardTracking">
+      <bool>false</bool>
+     </property>
      <property name="unit" stdset="0">
       <string notr="true">mm</string>
      </property>
@@ -430,12 +394,6 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <item>
       <property name="text">
        <string>Hole depth</string>
@@ -461,12 +419,12 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="unit" stdset="0">
-      <string notr="true">mm</string>
-     </property>
      <property name="keyboardTracking">
       <bool>false</bool>
      </property>
+     <property name="unit" stdset="0">
+      <string notr="true">mm</string>
+     </property>
     </widget>
    </item>
    <item row="12" column="0">
@@ -497,12 +455,6 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <property name="toolTip">
       <string>Cut type for screw heads</string>
      </property>
@@ -545,15 +497,12 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <property name="contextMenuPolicy">
       <enum>Qt::NoContextMenu</enum>
      </property>
+     <property name="keyboardTracking">
+      <bool>false</bool>
+     </property>
      <property name="unit" stdset="0">
       <string notr="true">mm</string>
      </property>
@@ -586,11 +535,8 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
+     <property name="keyboardTracking">
+      <bool>false</bool>
      </property>
      <property name="unit" stdset="0">
       <string notr="true">mm</string>
@@ -624,11 +570,8 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
+     <property name="keyboardTracking">
+      <bool>false</bool>
      </property>
      <property name="unit" stdset="0">
       <string notr="true">deg</string>
@@ -710,6 +653,9 @@ Only available for holes without thread</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="keyboardTracking">
+      <bool>false</bool>
+     </property>
      <property name="unit" stdset="0">
       <string notr="true">deg</string>
      </property>
@@ -769,6 +715,9 @@ account for the depth of blind holes</string>
 under 90: smaller hole radius at the bottom
 over 90: larger hole radius at the bottom</string>
      </property>
+     <property name="keyboardTracking">
+      <bool>false</bool>
+     </property>
      <property name="unit" stdset="0">
       <string notr="true">deg</string>
      </property>
@@ -883,7 +832,7 @@ over 90: larger hole radius at the bottom</string>
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="directionButtonGroup"/>
   <buttongroup name="drillPointButtonGroup"/>
+  <buttongroup name="directionButtonGroup"/>
  </buttongroups>
 </ui>