From 197efb8b2835f170a9ec5e251754642aa73ca945 Mon Sep 17 00:00:00 2001
From: donovaly <uwestoehr@lyx.org>
Date: Wed, 18 Mar 2020 01:03:18 +0100
Subject: [PATCH] [TD] improve dialogs

- DlgPrefsTechDraw3.ui: improve wording as discussed
- TaskCL2Lines.ui: morph option to QCheckBox
- TaskCenterLine.cpp: the Aligned option is not available for face mode
- TaskCenterLine.ui: use same default line style as in prefs
- TaskCenterLine.ui: correct tooltip for align option
---
 src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui |  6 +++---
 src/Mod/TechDraw/Gui/TaskCL2Lines.ui      |  2 +-
 src/Mod/TechDraw/Gui/TaskCenterLine.cpp   | 10 +++++++++-
 src/Mod/TechDraw/Gui/TaskCenterLine.ui    |  7 +++++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
index 6ac0a5f682..586c23102b 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
@@ -229,7 +229,7 @@
            <string>Dimension text font size</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight</set>
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="value" stdset="0">
            <double>4.000000000000000</double>
@@ -254,7 +254,7 @@
            <string>Arrowhead size</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight</set>
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="value" stdset="0">
            <double>5.000000000000000</double>
@@ -782,7 +782,7 @@
            <string>Restrict Filled Triangle line end to vertical or horizontal directions</string>
           </property>
           <property name="text">
-           <string>Balloon Ortho Triangle</string>
+           <string>Balloon Orthogonal Triangle</string>
           </property>
           <property name="checked">
            <bool>true</bool>
diff --git a/src/Mod/TechDraw/Gui/TaskCL2Lines.ui b/src/Mod/TechDraw/Gui/TaskCL2Lines.ui
index 39ac34dfe9..e8c2ccbf62 100644
--- a/src/Mod/TechDraw/Gui/TaskCL2Lines.ui
+++ b/src/Mod/TechDraw/Gui/TaskCL2Lines.ui
@@ -23,7 +23,7 @@
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
-      <widget class="QRadioButton" name="rbFlip">
+      <widget class="QCheckBox" name="cbFlip">
        <property name="text">
         <string>Flip ends</string>
        </property>
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
index 689a90b986..64d0c336c5 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
@@ -182,6 +182,10 @@ void TaskCenterLine::setUiPrimary()
     ui->qsbExtend->setValue(qVal);
     int precision = Base::UnitsApi::getDecimals();
     ui->dsbRotate->setDecimals(precision);
+    if (m_type == 0) // if face, then aligned is not possible
+        ui->rbAligned->setEnabled(false);
+    else
+        ui->rbAligned->setEnabled(true);
 }
 
 void TaskCenterLine::setUiEdit()
@@ -221,6 +225,10 @@ void TaskCenterLine::setUiEdit()
     ui->qsbHorizShift->setValue(qVal);
     qVal.setValue(m_cl->m_extendBy);
     ui->qsbExtend->setValue(qVal);
+    if (m_cl->m_type == 0) // if face, then aligned is not possible
+        ui->rbAligned->setEnabled(false);
+    else
+        ui->rbAligned->setEnabled(true);
 }
 
 //******************************************************************************
@@ -407,7 +415,7 @@ TaskCL2Lines::TaskCL2Lines(TechDrawGui::TaskCenterLine* tcl) :
 {
     ui->setupUi(this);
 
-    connect(ui->rbFlip, SIGNAL(toggled( bool )), this, SLOT(onFlipToggled( bool )));
+    connect(ui->cbFlip, SIGNAL(toggled( bool )), this, SLOT(onFlipToggled( bool )));
 
     initUi();
 }
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.ui b/src/Mod/TechDraw/Gui/TaskCenterLine.ui
index 61a3237803..605f15c1ec 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.ui
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.ui
@@ -128,7 +128,10 @@
              <bool>true</bool>
             </property>
             <property name="toolTip">
-             <string>Option not implemented yet</string>
+             <string>centerline between
+- lines: in equal distance to the lines and with
+  half of the angle tghe lines have to each other
+- points: in equal distance to the points</string>
             </property>
             <property name="text">
              <string>Aligned</string>
@@ -252,7 +255,7 @@
           <item row="4" column="1">
            <widget class="QComboBox" name="cboxStyle">
             <property name="currentIndex">
-             <number>0</number>
+             <number>1</number>
             </property>
             <item>
              <property name="text">