From 10d802698b77a4a219e9bf4a330343d12165b4fc Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Sun, 15 Mar 2020 15:25:16 -0400
Subject: [PATCH] [TD]fix bad preference keys

- GeomHatch color, centerline color, ortho balloon
  filled triangle end
---
 src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui      |  4 ++--
 src/Mod/TechDraw/Gui/QGIViewBalloon.cpp        |  3 ++-
 src/Mod/TechDraw/Gui/TaskCenterLine.cpp        |  2 +-
 src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp | 14 +++++++-------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
index d0525f7517..6ac0a5f682 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
@@ -779,10 +779,10 @@
            </sizepolicy>
           </property>
           <property name="toolTip">
-           <string>Keep pyramid leader line end in vertical or horizontal position</string>
+           <string>Restrict Filled Triangle line end to vertical or horizontal directions</string>
           </property>
           <property name="text">
-           <string>Balloon Pyramid Vertical</string>
+           <string>Balloon Ortho Triangle</string>
           </property>
           <property name="checked">
            <bool>true</bool>
diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
index e37c687fc2..fd78bc284a 100644
--- a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
@@ -869,7 +869,8 @@ int QGIViewBalloon::prefDefaultArrow() const
 bool QGIViewBalloon::prefOrthoPyramid() const
 {
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
-                                        .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions");
+                                        .GetGroup("BaseApp")->GetGroup("Preferences")->
+                                        GetGroup("Mod/TechDraw/Decorations");
     bool ortho = hGrp->GetBool("PyramidOrtho", true);
     return ortho;
 }
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
index 694410171d..689a90b986 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
@@ -341,7 +341,7 @@ QColor TaskCenterLine::getCenterColor()
 {
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
         .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations");
-    App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("CosmoCLColor", 0x00000000));
+    App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("CenterColor", 0x00000000));
     return fcColor.asValue<QColor>();
 }
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
index 189742c0e3..0c67239bb1 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
@@ -186,7 +186,7 @@ void ViewProviderGeomHatch::getParameters(void)
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
         .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors");
     App::Color fcColor;
-    fcColor.setPackedValue(hGrp->GetUnsigned("Hatch", 0x00FF0000));
+    fcColor.setPackedValue(hGrp->GetUnsigned("GeomHatch", 0x00FF0000)); 
     ColorPattern.setValue(fcColor);
 
     hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations");
@@ -197,12 +197,12 @@ void ViewProviderGeomHatch::getParameters(void)
     WeightPattern.setValue(weight);
 }
 
-bool ViewProviderGeomHatch::canDelete(App::DocumentObject *obj) const
-{
-    // deletion of hatches don't destroy anything
-    // thus we can pass this action
-    Q_UNUSED(obj)
-    return true;
+bool ViewProviderGeomHatch::canDelete(App::DocumentObject *obj) const
+{
+    // deletion of hatches don't destroy anything
+    // thus we can pass this action
+    Q_UNUSED(obj)
+    return true;
 }
 
 TechDraw::DrawGeomHatch* ViewProviderGeomHatch::getViewObject() const